fix mut slots

encodings/alp/public-api.lock

@@ -92,12 +92,12 @@ pub fn vortex_alp::ALP::slot_name(_array: &vortex_alp::ALPArray, idx: usize) ->
 
 pub fn vortex_alp::ALP::slots(array: &vortex_alp::ALPArray) -> &[core::option::Option<vortex_array::array::ArrayRef>]
 
+pub fn vortex_alp::ALP::slots_mut(array: &mut vortex_alp::ALPArray) -> &mut [core::option::Option<vortex_array::array::ArrayRef>]
+
 pub fn vortex_alp::ALP::stats(array: &vortex_alp::ALPArray) -> vortex_array::stats::array::StatsSetRef<'_>
 
 pub fn vortex_alp::ALP::vtable(_array: &Self::Array) -> &Self
 
-pub fn vortex_alp::ALP::with_slots(array: &mut vortex_alp::ALPArray, slots: alloc::vec::Vec<core::option::Option<vortex_array::array::ArrayRef>>) -> vortex_error::VortexResult<()>
-
 impl vortex_array::vtable::operations::OperationsVTable<vortex_alp::ALP> for vortex_alp::ALP
 
 pub fn vortex_alp::ALP::scalar_at(array: &vortex_alp::ALPArray, index: usize, _ctx: &mut vortex_array::executor::ExecutionCtx) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>
@@ -252,12 +252,12 @@ pub fn vortex_alp::ALPRD::slot_name(_array: &vortex_alp::ALPRDArray, idx: usize)
 
 pub fn vortex_alp::ALPRD::slots(array: &vortex_alp::ALPRDArray) -> &[core::option::Option<vortex_array::array::ArrayRef>]
 
+pub fn vortex_alp::ALPRD::slots_mut(array: &mut vortex_alp::ALPRDArray) -> &mut [core::option::Option<vortex_array::array::ArrayRef>]
+
 pub fn vortex_alp::ALPRD::stats(array: &vortex_alp::ALPRDArray) -> vortex_array::stats::array::StatsSetRef<'_>
 
 pub fn vortex_alp::ALPRD::vtable(_array: &Self::Array) -> &Self
 
-pub fn vortex_alp::ALPRD::with_slots(array: &mut vortex_alp::ALPRDArray, slots: alloc::vec::Vec<core::option::Option<vortex_array::array::ArrayRef>>) -> vortex_error::VortexResult<()>
-
 impl vortex_array::vtable::operations::OperationsVTable<vortex_alp::ALPRD> for vortex_alp::ALPRD
 
 pub fn vortex_alp::ALPRD::scalar_at(array: &vortex_alp::ALPRDArray, index: usize, _ctx: &mut vortex_array::executor::ExecutionCtx) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>

encodings/alp/src/alp/array.rs

@@ -109,22 +109,8 @@ impl VTable for ALP {
         SLOT_NAMES[idx].to_string()
     }
 
-    fn with_slots(array: &mut ALPArray, slots: Vec<Option<ArrayRef>>) -> VortexResult<()> {
-        vortex_ensure!(
-            slots.len() == NUM_SLOTS,
-            "ALPArray expects {} slots, got {}",
-            NUM_SLOTS,
-            slots.len()
-        );
-
-        // If patch slots are being cleared, clear the metadata too
-        if slots[PATCH_INDICES_SLOT].is_none() || slots[PATCH_VALUES_SLOT].is_none() {
-            array.patch_offset = None;
-            array.patch_offset_within_chunk = None;
-        }
-
-        array.slots = slots;
-        Ok(())
+    fn slots_mut(array: &mut ALPArray) -> &mut [Option<ArrayRef>] {
+        &mut array.slots
     }
 
     fn metadata(array: &ALPArray) -> VortexResult<Self::Metadata> {

encodings/alp/src/alp_rd/array.rs

@@ -41,7 +41,6 @@ use vortex_buffer::Buffer;
 use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
-use vortex_error::vortex_ensure;
 use vortex_error::vortex_err;
 use vortex_error::vortex_panic;
 use vortex_session::VortexSession;
@@ -99,7 +98,7 @@ impl VTable for ALPRD {
         array.left_parts_dictionary.array_hash(state, precision);
         array.right_parts().array_hash(state, precision);
         array.right_bit_width.hash(state);
-        array.left_parts_patches.array_hash(state, precision);
+        array.left_parts_patches().array_hash(state, precision);
     }
 
     fn array_eq(array: &ALPRDArray, other: &ALPRDArray, precision: Precision) -> bool {
@@ -111,8 +110,8 @@ impl VTable for ALPRD {
             && array.right_parts().array_eq(other.right_parts(), precision)
             && array.right_bit_width == other.right_bit_width
             && array
-                .left_parts_patches
-                .array_eq(&other.left_parts_patches, precision)
+                .left_parts_patches()
+                .array_eq(&other.left_parts_patches(), precision)
     }
 
     fn nbuffers(_array: &ALPRDArray) -> usize {
@@ -239,34 +238,8 @@ impl VTable for ALPRD {
         SLOT_NAMES[idx].to_string()
     }
 
-    fn with_slots(array: &mut ALPRDArray, slots: Vec<Option<ArrayRef>>) -> VortexResult<()> {
-        vortex_ensure!(
-            slots.len() == NUM_SLOTS,
-            "ALPRDArray expects {} slots, got {}",
-            NUM_SLOTS,
-            slots.len()
-        );
-
-        // Reconstruct patches from slots + existing metadata
-        array.left_parts_patches =
-            match (&slots[LP_PATCH_INDICES_SLOT], &slots[LP_PATCH_VALUES_SLOT]) {
-                (Some(indices), Some(values)) => {
-                    let old = array
-                        .left_parts_patches
-                        .as_ref()
-                        .vortex_expect("ALPRDArray had patch slots but no patches metadata");
-                    Some(Patches::new(
-                        old.array_len(),
-                        old.offset(),
-                        indices.clone(),
-                        values.clone(),
-                        slots[LP_PATCH_CHUNK_OFFSETS_SLOT].clone(),
-                    )?)
-                }
-                _ => None,
-            };
-        array.slots = slots;
-        Ok(())
+    fn slots_mut(array: &mut ALPRDArray) -> &mut [Option<ArrayRef>] {
+        &mut array.slots
     }
 
     fn execute(array: Arc<Array<Self>>, ctx: &mut ExecutionCtx) -> VortexResult<ExecutionResult> {
@@ -374,7 +347,8 @@ pub(super) const SLOT_NAMES: [&str; NUM_SLOTS] = [
 pub struct ALPRDArray {
     dtype: DType,
     slots: Vec<Option<ArrayRef>>,
-    left_parts_patches: Option<Patches>,
+    patch_offset: Option<usize>,
+    patch_offset_within_chunk: Option<usize>,
     left_parts_dictionary: Buffer<u16>,
     right_bit_width: u8,
     stats_set: ArrayStats,
@@ -452,13 +426,18 @@ impl ALPRDArray {
             .transpose()?;
 
         let slots = Self::make_slots(&left_parts, &right_parts, &left_parts_patches);
+        let (patch_offset, patch_offset_within_chunk) = match &left_parts_patches {
+            Some(p) => (Some(p.offset()), p.offset_within_chunk()),
+            None => (None, None),
+        };
 
         Ok(Self {
             dtype,
             slots,
+            patch_offset,
+            patch_offset_within_chunk,
             left_parts_dictionary,
             right_bit_width,
-            left_parts_patches,
             stats_set: Default::default(),
         })
     }
@@ -474,11 +453,16 @@ impl ALPRDArray {
         left_parts_patches: Option<Patches>,
     ) -> Self {
         let slots = Self::make_slots(&left_parts, &right_parts, &left_parts_patches);
+        let (patch_offset, patch_offset_within_chunk) = match &left_parts_patches {
+            Some(p) => (Some(p.offset()), p.offset_within_chunk()),
+            None => (None, None),
+        };
 
         Self {
             dtype,
             slots,
-            left_parts_patches,
+            patch_offset,
+            patch_offset_within_chunk,
             left_parts_dictionary,
             right_bit_width,
             stats_set: Default::default(),
@@ -509,6 +493,7 @@ impl ALPRDArray {
 
     /// Return all the owned parts of the array
     pub fn into_parts(mut self) -> ALPRDArrayParts {
+        let left_parts_patches = self.left_parts_patches();
         let left_parts = self.slots[LEFT_PARTS_SLOT]
             .take()
             .vortex_expect("ALPRDArray left_parts slot");
@@ -518,7 +503,7 @@ impl ALPRDArray {
         ALPRDArrayParts {
             dtype: self.dtype,
             left_parts,
-            left_parts_patches: self.left_parts_patches,
+            left_parts_patches,
             left_parts_dictionary: self.left_parts_dictionary,
             right_parts,
         }
@@ -556,7 +541,27 @@ impl ALPRDArray {
 
     /// Patches of left-most bits.
     pub fn left_parts_patches(&self) -> Option<Patches> {
-        self.left_parts_patches.clone()
+        match (
+            &self.slots[LP_PATCH_INDICES_SLOT],
+            &self.slots[LP_PATCH_VALUES_SLOT],
+        ) {
+            (Some(indices), Some(values)) => {
+                let patch_offset = self
+                    .patch_offset
+                    .vortex_expect("has patch slots but no patch_offset");
+                Some(unsafe {
+                    Patches::new_unchecked(
+                        self.left_parts().len(),
+                        patch_offset,
+                        indices.clone(),
+                        values.clone(),
+                        self.slots[LP_PATCH_CHUNK_OFFSETS_SLOT].clone(),
+                        self.patch_offset_within_chunk,
+                    )
+                })
+            }
+            _ => None,
+        }
     }
 
     /// The dictionary that maps the codes in `left_parts` into bit patterns.
@@ -566,19 +571,21 @@ impl ALPRDArray {
     }
 
     pub fn replace_left_parts_patches(&mut self, patches: Option<Patches>) {
-        // Update both the patches and the corresponding slots to keep them in sync.
-        let (pi, pv, pco) = match &patches {
+        let (pi, pv, pco, patch_offset, patch_offset_within_chunk) = match &patches {
             Some(p) => (
                 Some(p.indices().clone()),
                 Some(p.values().clone()),
                 p.chunk_offsets().clone(),
+                Some(p.offset()),
+                p.offset_within_chunk(),
             ),
-            None => (None, None, None),
+            None => (None, None, None, None, None),
         };
         self.slots[LP_PATCH_INDICES_SLOT] = pi;
         self.slots[LP_PATCH_VALUES_SLOT] = pv;
         self.slots[LP_PATCH_CHUNK_OFFSETS_SLOT] = pco;
-        self.left_parts_patches = patches;
+        self.patch_offset = patch_offset;
+        self.patch_offset_within_chunk = patch_offset_within_chunk;
     }
 }
 

encodings/bytebool/public-api.lock

@@ -38,7 +38,7 @@ pub type vortex_bytebool::ByteBool::Metadata = vortex_array::metadata::EmptyMeta
 
 pub type vortex_bytebool::ByteBool::OperationsVTable = vortex_bytebool::ByteBool
 
-pub type vortex_bytebool::ByteBool::ValidityVTable = vortex_array::vtable::validity::ValidityVTableFromValidityHelper
+pub type vortex_bytebool::ByteBool::ValidityVTable = vortex_bytebool::ByteBool
 
 pub fn vortex_bytebool::ByteBool::array_eq(array: &vortex_bytebool::ByteBoolArray, other: &vortex_bytebool::ByteBoolArray, precision: vortex_array::hash::Precision) -> bool
 
@@ -74,16 +74,20 @@ pub fn vortex_bytebool::ByteBool::slot_name(_array: &vortex_bytebool::ByteBoolAr
 
 pub fn vortex_bytebool::ByteBool::slots(array: &vortex_bytebool::ByteBoolArray) -> &[core::option::Option<vortex_array::array::ArrayRef>]
 
+pub fn vortex_bytebool::ByteBool::slots_mut(array: &mut vortex_bytebool::ByteBoolArray) -> &mut [core::option::Option<vortex_array::array::ArrayRef>]
+
 pub fn vortex_bytebool::ByteBool::stats(array: &vortex_bytebool::ByteBoolArray) -> vortex_array::stats::array::StatsSetRef<'_>
 
 pub fn vortex_bytebool::ByteBool::vtable(_array: &Self::Array) -> &Self
 
-pub fn vortex_bytebool::ByteBool::with_slots(array: &mut vortex_bytebool::ByteBoolArray, slots: alloc::vec::Vec<core::option::Option<vortex_array::array::ArrayRef>>) -> vortex_error::VortexResult<()>
-
 impl vortex_array::vtable::operations::OperationsVTable<vortex_bytebool::ByteBool> for vortex_bytebool::ByteBool
 
 pub fn vortex_bytebool::ByteBool::scalar_at(array: &vortex_bytebool::ByteBoolArray, index: usize, _ctx: &mut vortex_array::executor::ExecutionCtx) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>
 
+impl vortex_array::vtable::validity::ValidityVTable<vortex_bytebool::ByteBool> for vortex_bytebool::ByteBool
+
+pub fn vortex_bytebool::ByteBool::validity(array: &vortex_bytebool::ByteBoolArray) -> vortex_error::VortexResult<vortex_array::validity::Validity>
+
 pub struct vortex_bytebool::ByteBoolArray
 
 impl vortex_bytebool::ByteBoolArray
@@ -133,7 +137,3 @@ pub fn vortex_bytebool::ByteBoolArray::deref(&self) -> &Self::Target
 impl vortex_array::array::IntoArray for vortex_bytebool::ByteBoolArray
 
 pub fn vortex_bytebool::ByteBoolArray::into_array(self) -> vortex_array::array::ArrayRef
-
-impl vortex_array::vtable::validity::ValidityHelper for vortex_bytebool::ByteBoolArray
-
-pub fn vortex_bytebool::ByteBoolArray::validity(&self) -> vortex_array::validity::Validity

encodings/bytebool/src/array.rs

@@ -26,14 +26,13 @@ use vortex_array::vtable::Array;
 use vortex_array::vtable::ArrayId;
 use vortex_array::vtable::OperationsVTable;
 use vortex_array::vtable::VTable;
-use vortex_array::vtable::ValidityHelper;
-use vortex_array::vtable::ValidityVTableFromValidityHelper;
+use vortex_array::vtable::ValidityVTable;
+use vortex_array::vtable::child_to_validity;
 use vortex_array::vtable::validity_to_child;
 use vortex_buffer::BitBuffer;
 use vortex_buffer::ByteBuffer;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
-use vortex_error::vortex_ensure;
 use vortex_error::vortex_panic;
 use vortex_session::VortexSession;
 
@@ -46,7 +45,7 @@ impl VTable for ByteBool {
 
     type Metadata = EmptyMetadata;
     type OperationsVTable = Self;
-    type ValidityVTable = ValidityVTableFromValidityHelper;
+    type ValidityVTable = Self;
 
     fn vtable(_array: &Self::Array) -> &Self {
         &ByteBool
@@ -75,13 +74,13 @@ impl VTable for ByteBool {
     ) {
         array.dtype.hash(state);
         array.buffer.array_hash(state, precision);
-        array.validity.array_hash(state, precision);
+        array._validity().array_hash(state, precision);
     }
 
     fn array_eq(array: &ByteBoolArray, other: &ByteBoolArray, precision: Precision) -> bool {
         array.dtype == other.dtype
             && array.buffer.array_eq(&other.buffer, precision)
-            && array.validity.array_eq(&other.validity, precision)
+            && array._validity().array_eq(&other._validity(), precision)
     }
 
     fn nbuffers(_array: &ByteBoolArray) -> usize {
@@ -152,19 +151,8 @@ impl VTable for ByteBool {
         SLOT_NAMES[idx].to_string()
     }
 
-    fn with_slots(array: &mut ByteBoolArray, slots: Vec<Option<ArrayRef>>) -> VortexResult<()> {
-        vortex_ensure!(
-            slots.len() == NUM_SLOTS,
-            "ByteBoolArray expects {} slots, got {}",
-            NUM_SLOTS,
-            slots.len()
-        );
-        array.validity = match &slots[VALIDITY_SLOT] {
-            Some(arr) => Validity::Array(arr.clone()),
-            None => Validity::from(array.dtype.nullability()),
-        };
-        array.slots = slots;
-        Ok(())
+    fn slots_mut(array: &mut ByteBoolArray) -> &mut [Option<ArrayRef>] {
+        &mut array.slots
     }
 
     fn reduce_parent(
@@ -177,7 +165,7 @@ impl VTable for ByteBool {
 
     fn execute(array: Arc<Array<Self>>, _ctx: &mut ExecutionCtx) -> VortexResult<ExecutionResult> {
         let boolean_buffer = BitBuffer::from(array.as_slice());
-        let validity = array.validity();
+        let validity = array.validity()?;
         Ok(ExecutionResult::done(
             BoolArray::new(boolean_buffer, validity).into_array(),
         ))
@@ -202,7 +190,6 @@ pub(super) const SLOT_NAMES: [&str; NUM_SLOTS] = ["validity"];
 pub struct ByteBoolArray {
     dtype: DType,
     buffer: BufferHandle,
-    validity: Validity,
     pub(super) slots: Vec<Option<ArrayRef>>,
     stats_set: ArrayStats,
 }
@@ -230,11 +217,11 @@ impl ByteBoolArray {
                 vlen
             );
         }
+        let dtype = DType::Bool(validity.nullability());
         let slots = Self::make_slots(&validity, length);
         Self {
-            dtype: DType::Bool(validity.nullability()),
+            dtype,
             buffer,
-            validity,
             slots,
             stats_set: Default::default(),
         }
@@ -256,11 +243,16 @@ impl ByteBoolArray {
         // Safety: The internal buffer contains byte-sized bools
         unsafe { std::mem::transmute(self.buffer().as_host().as_slice()) }
     }
+
+    /// Returns the validity derived from the validity slot.
+    pub(crate) fn _validity(&self) -> Validity {
+        child_to_validity(&self.slots[VALIDITY_SLOT], self.dtype.nullability())
+    }
 }
 
-impl ValidityHelper for ByteBoolArray {
-    fn validity(&self) -> Validity {
-        self.validity.clone()
+impl ValidityVTable<ByteBool> for ByteBool {
+    fn validity(array: &ByteBoolArray) -> VortexResult<Validity> {
+        Ok(array._validity())
     }
 }