Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions vortex-array/src/arrays/masked/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,15 @@ fn mask_validity_varbinview(
fn mask_validity_listview(array: ListViewArray, validity: Validity) -> VortexResult<ListViewArray> {
let new_validity = Validity::and(array.validity()?, validity)?;
// SAFETY: We're only changing validity, not the data structure
let is_zctl = array.is_zero_copy_to_list();
Ok(unsafe {
ListViewArray::new_unchecked(
array.elements().clone(),
array.offsets().clone(),
array.sizes().clone(),
new_validity,
)
.with_zero_copy_to_list(is_zctl)
})
}

Expand Down
21 changes: 21 additions & 0 deletions vortex-array/src/arrays/masked/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::Canonical;
use crate::IntoArray;
use crate::VortexSessionExecute;
use crate::array_session;
use crate::arrays::ListViewArray;
use crate::arrays::PrimitiveArray;
use crate::assert_arrays_eq;
use crate::dtype::DType;
Expand Down Expand Up @@ -140,3 +141,23 @@ fn test_masked_child_preserves_length(#[case] validity: Validity) {
.unwrap(),
);
}

#[test]
fn masked_listview_execute_preserves_zctl_true() -> VortexResult<()> {
// Masking only intersects validity, so the zero-copy-to-list survives
// execution.
let elements = PrimitiveArray::from_iter([1i32, 2, 3]).into_array();
let offsets = PrimitiveArray::from_iter([0i32, 2]).into_array();
let sizes = PrimitiveArray::from_iter([2i32, 1]).into_array();
let list_view = unsafe {
ListViewArray::new_unchecked(elements, offsets, sizes, Validity::NonNullable)
.with_zero_copy_to_list(true)
};

let masked = MaskedArray::try_new(list_view.into_array(), Validity::from_iter([true, false]))?;
let canonical = masked
.into_array()
.execute::<Canonical>(&mut array_session().create_execution_ctx())?;
assert!(canonical.into_listview().is_zero_copy_to_list());
Ok(())
}
Loading