Skip to content
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

Jump to bottom

Use bit_slice in combine_option_bitmap #1900

Merged
merged 1 commit into from Jun 18, 2022
Merged

Use bit_slice in combine_option_bitmap #1900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 39 additions & 2 deletions arrow/src/compute/util.rs
View file
Open in desktop
Expand Up @@ -55,7 +55,9 @@ pub(super) fn combine_option_bitmap(
Err(ArrowError::ComputeError(
"Arrays must not be empty".to_string(),
)),
|(buffer, offset)| Ok(buffer.map(|buffer| buffer.slice(offset))),
|(buffer, offset)| {
Ok(buffer.map(|buffer| buffer.bit_slice(offset, len_in_bits)))
},
)
}

Expand Down Expand Up @@ -185,7 +187,7 @@ pub(super) mod tests {
offset: usize,
null_bit_buffer: Option<Buffer>,
) -> Arc<ArrayData> {
let buffer = Buffer::from(&vec![11; len]);
let buffer = Buffer::from(&vec![11; len + offset]);

Arc::new(
ArrayData::try_new(
Expand Down Expand Up @@ -256,6 +258,41 @@ pub(super) mod tests {
);
}

#[test]
fn test_combine_option_bitmap_with_offsets() {
let none_bitmap = make_data_with_null_bit_buffer(8, 0, None);
let bitmap0 =
make_data_with_null_bit_buffer(8, 0, Some(Buffer::from([0b10101010])));
let bitmap1 =
make_data_with_null_bit_buffer(8, 1, Some(Buffer::from([0b01010100, 0b1])));
let bitmap2 =
make_data_with_null_bit_buffer(8, 2, Some(Buffer::from([0b10101000, 0b10])));
assert_eq!(
Some(Buffer::from([0b10101010])),
combine_option_bitmap(&[&bitmap1], 8).unwrap()
);
assert_eq!(
Some(Buffer::from([0b10101010])),
combine_option_bitmap(&[&bitmap2], 8).unwrap()
);
assert_eq!(
Some(Buffer::from([0b10101010])),
combine_option_bitmap(&[&bitmap1, &none_bitmap], 8).unwrap()
);
assert_eq!(
Some(Buffer::from([0b10101010])),
combine_option_bitmap(&[&none_bitmap, &bitmap2], 8).unwrap()
);
assert_eq!(
Some(Buffer::from([0b10101010])),
combine_option_bitmap(&[&bitmap0, &bitmap1], 8).unwrap()
);
assert_eq!(
Some(Buffer::from([0b10101010])),
combine_option_bitmap(&[&bitmap1, &bitmap2], 8).unwrap()
);
}

#[test]
fn test_compare_option_bitmap() {
let none_bitmap = make_data_with_null_bit_buffer(8, 0, None);
Expand Down