Skip to content

Commit 8eef241

Browse files
committed
Keep MaskValuesRef at shared-handle boundaries
Signed-off-by: Connor Tsui <[email protected]>
1 parent 1692baa commit 8eef241

11 files changed

Lines changed: 41 additions & 39 deletions

File tree

‎vortex-array/src/arrays/bool/compute/filter.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ use vortex_buffer::BitBuffer;
55
use vortex_buffer::BitBufferMut;
66
use vortex_buffer::CpuKernel;
77
use vortex_buffer::get_bit;
8+
use vortex_error::VortexExpect;
89
use vortex_error::VortexResult;
9-
use vortex_error::vortex_panic;
1010
use vortex_mask::Mask;
11-
use vortex_mask::MaskValuesRef;
11+
use vortex_mask::MaskValues;
1212

1313
use crate::ArrayRef;
1414
use crate::IntoArray;
@@ -26,9 +26,9 @@ impl FilterReduce for Bool {
2626
fn filter(array: ArrayView<'_, Bool>, mask: &Mask) -> VortexResult<Option<ArrayRef>> {
2727
let validity = array.validity()?.filter(mask)?;
2828

29-
let Mask::Values(mask_values) = mask else {
30-
vortex_panic!("Bool FilterReduce requires Mask::Values, got {mask:?}");
31-
};
29+
let mask_values = mask
30+
.values()
31+
.vortex_expect("AllTrue and AllFalse are handled by filter fn");
3232

3333
let src = array.to_bit_buffer();
3434
let density = mask_values.density();
@@ -42,7 +42,7 @@ impl FilterReduce for Bool {
4242
}
4343
}
4444

45-
fn filter_sparse(src: &BitBuffer, mask_values: &MaskValuesRef, true_count: usize) -> BitBuffer {
45+
fn filter_sparse(src: &BitBuffer, mask_values: &MaskValues, true_count: usize) -> BitBuffer {
4646
if let Some(slices) = mask_values.cached_slices() {
4747
filter_slices(src, true_count, slices.iter().copied())
4848
} else if let Some(indices) = mask_values.cached_indices() {

‎vortex-array/src/arrays/filter/execute/bitbuffer.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
//! [`BitBuffer`] filtering algorithms.
55
66
use vortex_buffer::BitBuffer;
7-
use vortex_mask::MaskValuesRef;
7+
use vortex_mask::MaskValues;
88

99
use crate::arrays::bool::compute::filter::filter_bitbuffer_by_mask;
1010

11-
/// Filter a [`BitBuffer`] by [`MaskValuesRef`], returning a new [`BitBuffer`].
12-
pub(super) fn filter_bit_buffer(bb: &BitBuffer, mask: &MaskValuesRef) -> BitBuffer {
11+
/// Filter a [`BitBuffer`] by [`MaskValues`], returning a new [`BitBuffer`].
12+
pub(super) fn filter_bit_buffer(bb: &BitBuffer, mask: &MaskValues) -> BitBuffer {
1313
assert_eq!(
1414
mask.len(),
1515
bb.len(),
@@ -30,9 +30,7 @@ mod tests {
3030
fn filter_bool_by_mask_test() {
3131
let buf = bitbuffer![1 1 0];
3232
let mask = Mask::from_iter([true, false, true]);
33-
let Mask::Values(mask_values) = &mask else {
34-
panic!("a partially selective mask must contain mask values");
35-
};
33+
let mask_values = mask.values().unwrap();
3634
let filtered = filter_bit_buffer(&buf, mask_values);
3735
assert_eq!(2, filtered.len());
3836
assert_eq!(filtered, bitbuffer![1 0])

‎vortex-array/src/arrays/filter/execute/bool.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn filter_bool(array: &BoolArray, mask: &MaskValuesRef) -> BoolArray {
1616
let filtered_validity = filter_validity(validity, mask);
1717

1818
let bit_buffer = array.to_bit_buffer();
19-
let filtered_buffer = bitbuffer::filter_bit_buffer(&bit_buffer, mask);
19+
let filtered_buffer = bitbuffer::filter_bit_buffer(&bit_buffer, mask.as_ref());
2020

2121
BoolArray::new(filtered_buffer, filtered_validity)
2222
}

‎vortex-array/src/arrays/filter/execute/buffer.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44
//! Buffer-level filter dispatch.
55
//!
6-
//! Provides [`filter_buffer`] which filters a [`Buffer<T>`] by [`MaskValuesRef`], attempting an
6+
//! Provides [`filter_buffer`] which filters a [`Buffer<T>`] by [`MaskValues`], attempting an
77
//! in-place filter when the buffer has exclusive ownership.
88
99
use vortex_buffer::Buffer;
10-
use vortex_mask::MaskValuesRef;
10+
use vortex_mask::MaskValues;
1111

1212
use crate::arrays::filter::execute::slice;
1313

14-
/// Filter a [`Buffer<T>`] by [`MaskValuesRef`], returning a new buffer.
14+
/// Filter a [`Buffer<T>`] by [`MaskValues`], returning a new buffer.
1515
///
1616
/// This will attempt to filter in-place (via [`Buffer::try_into_mut`]) when the buffer has
1717
/// exclusive ownership, avoiding an extra allocation.
18-
pub(crate) fn filter_buffer<T: Copy>(buffer: Buffer<T>, mask: &MaskValuesRef) -> Buffer<T> {
18+
pub(crate) fn filter_buffer<T: Copy>(buffer: Buffer<T>, mask: &MaskValues) -> Buffer<T> {
1919
match buffer.try_into_mut() {
2020
Ok(mut buffer_mut) => {
2121
let new_len = slice::filter_slice_mut_by_mask_values(buffer_mut.as_mut_slice(), mask);
@@ -35,9 +35,10 @@ mod tests {
3535

3636
use super::*;
3737

38-
fn mask_values(mask: &Mask) -> &MaskValuesRef {
38+
// Helper to get `MaskValues` from a `Mask`.
39+
fn mask_values(mask: &Mask) -> &MaskValues {
3940
match mask {
40-
Mask::Values(values) => values,
41+
Mask::Values(v) => v.as_ref(),
4142
_ => panic!("expected Mask::Values"),
4243
}
4344
}

‎vortex-array/src/arrays/filter/execute/byte_compress.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::mem::size_of;
1111

1212
use vortex_buffer::Buffer;
1313
use vortex_buffer::BufferMut;
14-
use vortex_mask::MaskValuesRef;
14+
use vortex_mask::MaskValues;
1515

1616
const BYTE_COMPRESS_DENSITY_THRESHOLD: f64 = 0.5;
1717

@@ -45,7 +45,7 @@ static BYTE_COMPRESS_LUT: &[([u8; 8], u8); 256] = &{
4545
///
4646
/// Processes the mask one byte at a time (8 source elements per byte),
4747
/// using a precomputed permutation to compact selected elements.
48-
pub(crate) fn filter_buffer<T: Copy>(buffer: Buffer<T>, mask: &MaskValuesRef) -> Buffer<T> {
48+
pub(crate) fn filter_buffer<T: Copy>(buffer: Buffer<T>, mask: &MaskValues) -> Buffer<T> {
4949
debug_assert_eq!(buffer.len(), mask.len());
5050

5151
let src = buffer.as_slice();
@@ -176,9 +176,9 @@ mod tests {
176176

177177
use super::*;
178178

179-
fn mask_values(mask: &Mask) -> &MaskValuesRef {
179+
fn mask_values(mask: &Mask) -> &MaskValues {
180180
match mask {
181-
Mask::Values(values) => values,
181+
Mask::Values(v) => v.as_ref(),
182182
_ => panic!("expected Mask::Values"),
183183
}
184184
}

‎vortex-array/src/arrays/filter/execute/fixed_size_list.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use vortex_error::VortexExpect;
55
use vortex_mask::Mask;
66
use vortex_mask::MaskIter;
7+
use vortex_mask::MaskValues;
78
use vortex_mask::MaskValuesRef;
89

910
use crate::arrays::FixedSizeListArray;
@@ -38,7 +39,8 @@ pub fn filter_fixed_size_list(
3839
let new_elements = {
3940
if list_size != 0 {
4041
// TODO(connor): Push down an indices or slices selection to avoid expanding the mask.
41-
let elements_mask = compute_mask_for_fsl_elements(selection_mask, list_size as usize);
42+
let elements_mask =
43+
compute_mask_for_fsl_elements(selection_mask.as_ref(), list_size as usize);
4244

4345
let new_elements = elements
4446
.filter(elements_mask)
@@ -73,7 +75,7 @@ pub fn filter_fixed_size_list(
7375
/// `list_size` times.
7476
///
7577
/// The output `Mask` is guaranteed to have a length equal to `selection_mask.len() * list_size`.
76-
fn compute_mask_for_fsl_elements(selection_mask: &MaskValuesRef, list_size: usize) -> Mask {
78+
fn compute_mask_for_fsl_elements(selection_mask: &MaskValues, list_size: usize) -> Mask {
7779
let expanded_len = selection_mask.len() * list_size;
7880

7981
// Use threshold_iter to choose the optimal representation based on density.

‎vortex-array/src/arrays/filter/execute/slice.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::ptr;
1111
use vortex_buffer::Buffer;
1212
use vortex_buffer::BufferMut;
1313
use vortex_mask::MaskIter;
14-
use vortex_mask::MaskValuesRef;
14+
use vortex_mask::MaskValues;
1515

1616
// This is modeled after the constant with the equivalent name in arrow-rs.
1717
pub(super) const FILTER_SLICES_SELECTIVITY_THRESHOLD: f64 = 0.8;
@@ -20,9 +20,9 @@ pub(super) const FILTER_SLICES_SELECTIVITY_THRESHOLD: f64 = 0.8;
2020
// Immutable slice filtering
2121
// ---------------------------------------------------------------------------
2222

23-
/// Filter a slice by [`MaskValuesRef`], dispatching to the indices or slices path based on a
23+
/// Filter a slice by [`MaskValues`], dispatching to the indices or slices path based on a
2424
/// selectivity threshold.
25-
pub(super) fn filter_slice_by_mask_values<T: Copy>(slice: &[T], mask: &MaskValuesRef) -> Buffer<T> {
25+
pub(super) fn filter_slice_by_mask_values<T: Copy>(slice: &[T], mask: &MaskValues) -> Buffer<T> {
2626
assert_eq!(
2727
mask.len(),
2828
slice.len(),
@@ -56,14 +56,14 @@ fn filter_slice_by_slices<T: Copy>(slice: &[T], slices: &[(usize, usize)]) -> Bu
5656
// Mutable (in-place) slice filtering
5757
// ---------------------------------------------------------------------------
5858

59-
/// Filter a mutable slice in-place by [`MaskValuesRef`], returning the new valid length.
59+
/// Filter a mutable slice in-place by [`MaskValues`], returning the new valid length.
6060
///
6161
/// We always use the slices path here because iterating over indices will have strictly more
6262
/// loop iterations than slices (more branches), and the overhead of batched `ptr::copy(len)` is
6363
/// not that high.
6464
pub(super) fn filter_slice_mut_by_mask_values<T: Copy>(
6565
slice: &mut [T],
66-
mask: &MaskValuesRef,
66+
mask: &MaskValues,
6767
) -> usize {
6868
assert_eq!(
6969
slice.len(),

‎vortex-array/src/arrays/filter/execute/varbinview.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn filter_varbinview(array: &VarBinViewArray, mask: &MaskValuesRef) -> VarBi
1717
let filtered_validity = filter_validity(array.varbinview_validity(), mask);
1818

1919
let views = Buffer::<BinaryView>::from_byte_buffer(array.views_handle().as_host().clone());
20-
let filtered_views = buffer::filter_buffer(views, mask);
20+
let filtered_views = buffer::filter_buffer(views, mask.as_ref());
2121

2222
// SAFETY: the filtered views are a subset of the original views and reference the same data
2323
// buffers, and the validity is filtered by the same mask so lengths stay aligned.

‎vortex-array/src/arrays/fixed_width/filter.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use vortex_buffer::Buffer;
55
use vortex_buffer::BufferMut;
66
use vortex_buffer::ByteBuffer;
77
use vortex_error::VortexExpect;
8+
use vortex_mask::MaskValues;
89
use vortex_mask::MaskValuesRef;
910

1011
use super::FixedWidthArray;
@@ -21,7 +22,7 @@ mod tests;
2122

2223
pub(crate) fn filter<V: FixedWidthArray>(array: &Array<V>, mask: &MaskValuesRef) -> Array<V> {
2324
let array = array.as_view();
24-
let values = filter_records(V::values(array), V::byte_width(array), mask);
25+
let values = filter_records(V::values(array), V::byte_width(array), mask.as_ref());
2526
let validity = filter_validity(
2627
array
2728
.validity()
@@ -32,7 +33,7 @@ pub(crate) fn filter<V: FixedWidthArray>(array: &Array<V>, mask: &MaskValuesRef)
3233
.vortex_expect("filtering fixed-width values preserves array invariants")
3334
}
3435

35-
fn filter_records(values: ByteBuffer, byte_width: usize, mask: &MaskValuesRef) -> ByteBuffer {
36+
fn filter_records(values: ByteBuffer, byte_width: usize, mask: &MaskValues) -> ByteBuffer {
3637
let alignment = values.alignment();
3738

3839
match_each_record_width!(

‎vortex-array/src/scalar_fn/fns/zip/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use vortex_error::VortexResult;
1212
use vortex_error::vortex_ensure;
1313
use vortex_error::vortex_err;
1414
use vortex_mask::Mask;
15-
use vortex_mask::MaskValuesRef;
15+
use vortex_mask::MaskValues;
1616
use vortex_session::VortexSession;
1717
use vortex_session::registry::CachedId;
1818

@@ -215,7 +215,7 @@ pub(crate) fn zip_impl(
215215
zip_impl_with_builder(
216216
&if_true,
217217
&if_false,
218-
mask_values,
218+
mask_values.as_ref(),
219219
builder_with_capacity(&return_type, if_true.len()),
220220
ctx,
221221
)
@@ -284,7 +284,7 @@ fn zip_nullability_union(lhs: &DType, rhs: &DType) -> Option<DType> {
284284
fn zip_impl_with_builder(
285285
if_true: &ArrayRef,
286286
if_false: &ArrayRef,
287-
mask: &MaskValuesRef,
287+
mask: &MaskValues,
288288
mut builder: Box<dyn ArrayBuilder>,
289289
ctx: &mut ExecutionCtx,
290290
) -> VortexResult<ArrayRef> {

0 commit comments

Comments
 (0)