Skip to content

ARROW-10684: [Rust] Inherit struct nulls in child null equality #8739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nevi-me wants to merge 3 commits into from
Closed

ARROW-10684: [Rust] Inherit struct nulls in child null equality #8739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8104bc
ARROW-10684: [Rust] Inherit struct nulls in child
nevi-me Nov 22, 2020
2b3c7f8
test nested structs
nevi-me Nov 27, 2020
9ab2067
use the merged nulls for struct nullness
nevi-me Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion rust/arrow/src/array/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ use crate::{bitmap::Bitmap, datatypes::ArrowNativeType};
use super::equal::equal;

#[inline]
fn count_nulls(null_bit_buffer: Option<&Buffer>, offset: usize, len: usize) -> usize {
pub(crate) fn count_nulls(
null_bit_buffer: Option<&Buffer>,
offset: usize,
len: usize,
) -> usize {
if let Some(ref buf) = null_bit_buffer {
len.checked_sub(buf.count_set_bits_offset(offset, len))
.unwrap()
Expand Down
4 changes: 4 additions & 0 deletions rust/arrow/src/array/equal/dictionary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ pub(super) fn dictionary_equal<T: ArrowNativeType>(
equal_range(
lhs_values,
rhs_values,
lhs_values.null_buffer(),
rhs_values.null_buffer(),
lhs_keys[lhs_pos].to_usize().unwrap(),
rhs_keys[rhs_pos].to_usize().unwrap(),
1,
Expand All @@ -58,6 +60,8 @@ pub(super) fn dictionary_equal<T: ArrowNativeType>(
&& equal_range(
lhs_values,
rhs_values,
lhs_values.null_buffer(),
rhs_values.null_buffer(),
lhs_keys[lhs_pos].to_usize().unwrap(),
rhs_keys[rhs_pos].to_usize().unwrap(),
1,
Expand Down
4 changes: 4 additions & 0 deletions rust/arrow/src/array/equal/fixed_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ pub(super) fn fixed_list_equal(
equal_range(
lhs_values,
rhs_values,
lhs_values.null_buffer(),
rhs_values.null_buffer(),
size * lhs_start,
size * rhs_start,
size * len,
Expand All @@ -56,6 +58,8 @@ pub(super) fn fixed_list_equal(
&& equal_range(
lhs_values,
rhs_values,
lhs_values.null_buffer(),
rhs_values.null_buffer(),
lhs_pos * size,
rhs_pos * size,
size, // 1 * size since we are comparing a single entry
Expand Down
4 changes: 4 additions & 0 deletions rust/arrow/src/array/equal/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ fn offset_value_equal<T: OffsetSizeTrait>(
&& equal_range(
lhs_values,
rhs_values,
lhs_values.null_buffer(),
rhs_values.null_buffer(),
lhs_start,
rhs_start,
lhs_len.to_usize().unwrap(),
Expand All @@ -86,6 +88,8 @@ pub(super) fn list_equal<T: OffsetSizeTrait>(
) && equal_range(
lhs_values,
rhs_values,
lhs_values.null_buffer(),
rhs_values.null_buffer(),
lhs_offsets[lhs_start].to_usize().unwrap(),
rhs_offsets[rhs_start].to_usize().unwrap(),
(lhs_offsets[len] - lhs_offsets[lhs_start])
Expand Down
Loading