fix

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

encodings/bytebool/src/array.rs

@@ -80,9 +80,7 @@ impl VTable for ByteBool {
     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 {

encodings/bytebool/src/compute.rs

@@ -25,7 +25,8 @@ impl CastReduce for ByteBool {
 
         // If just changing nullability, we can optimize
         if array.dtype().eq_ignore_nullability(dtype) {
-            let new_validity = array._validity()
+            let new_validity = array
+                ._validity()
                 .cast_nullability(dtype.nullability(), array.len())?;
 
             return Ok(Some(
@@ -43,8 +44,7 @@ impl MaskReduce for ByteBool {
         Ok(Some(
             ByteBoolArray::new(
                 array.buffer().clone(),
-                array._validity()
-                    .and(Validity::Array(mask.clone()))?,
+                array._validity().and(Validity::Array(mask.clone()))?,
             )
             .into_array(),
         ))
@@ -61,8 +61,7 @@ impl TakeExecute for ByteBool {
         let bools = array.as_slice();
 
         // This handles combining validity from both source array and nullable indices
-        let validity = array._validity()
-            .take(&indices.clone().into_array())?;
+        let validity = array._validity().take(&indices.clone().into_array())?;
 
         let taken_bools = match_each_integer_ptype!(indices.ptype(), |I| {
             indices

vortex-array/public-api.lock

@@ -22496,10 +22496,14 @@ pub fn vortex_array::vtable::DynVTable::execute(&self, array: vortex_array::Arra
 
 pub fn vortex_array::vtable::DynVTable::execute_parent(&self, array: &vortex_array::ArrayRef, parent: &vortex_array::ArrayRef, child_idx: usize, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
+pub fn vortex_array::vtable::DynVTable::put_slot(&self, array: &mut vortex_array::ArrayRef, slot_idx: usize, value: vortex_array::ArrayRef)
+
 pub fn vortex_array::vtable::DynVTable::reduce(&self, array: &vortex_array::ArrayRef) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
 pub fn vortex_array::vtable::DynVTable::reduce_parent(&self, array: &vortex_array::ArrayRef, parent: &vortex_array::ArrayRef, child_idx: usize) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
+pub fn vortex_array::vtable::DynVTable::take_slot(&self, array: &mut vortex_array::ArrayRef, slot_idx: usize) -> core::option::Option<vortex_array::ArrayRef>
+
 pub fn vortex_array::vtable::DynVTable::with_slots_mut(&self, array: vortex_array::ArrayRef, f: &mut dyn core::ops::function::FnMut(&mut [core::option::Option<vortex_array::ArrayRef>])) -> vortex_error::VortexResult<vortex_array::ArrayRef>
 
 impl<V: vortex_array::vtable::VTable> vortex_array::vtable::DynVTable for V
@@ -22512,10 +22516,14 @@ pub fn V::execute(&self, array: vortex_array::ArrayRef, ctx: &mut vortex_array::
 
 pub fn V::execute_parent(&self, array: &vortex_array::ArrayRef, parent: &vortex_array::ArrayRef, child_idx: usize, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
+pub fn V::put_slot(&self, array: &mut vortex_array::ArrayRef, slot_idx: usize, value: vortex_array::ArrayRef)
+
 pub fn V::reduce(&self, array: &vortex_array::ArrayRef) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
 pub fn V::reduce_parent(&self, array: &vortex_array::ArrayRef, parent: &vortex_array::ArrayRef, child_idx: usize) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
+pub fn V::take_slot(&self, array: &mut vortex_array::ArrayRef, slot_idx: usize) -> core::option::Option<vortex_array::ArrayRef>
+
 pub fn V::with_slots_mut(&self, array: vortex_array::ArrayRef, f: &mut dyn core::ops::function::FnMut(&mut [core::option::Option<vortex_array::ArrayRef>])) -> vortex_error::VortexResult<vortex_array::ArrayRef>
 
 pub trait vortex_array::vtable::OperationsVTable<V: vortex_array::vtable::VTable>

vortex-array/src/arrays/patched/vtable/mod.rs

@@ -655,15 +655,13 @@ mod tests {
         let indices = array.patch_indices().clone();
         let values = array.patch_values().clone();
 
-        // Create new PatchedArray with same children using with_slots_mut
-        let array_ref = array.clone().into_array();
-        let vtable = array_ref.vtable().clone_boxed();
-        let new_array = vtable.with_slots_mut(array_ref, &mut |slots| {
-            slots[0] = Some(inner.clone());
-            slots[1] = Some(lane_offsets.clone());
-            slots[2] = Some(indices.clone());
-            slots[3] = Some(values.clone());
-        })?;
+        // Create new PatchedArray with same children using put_slot
+        let mut new_array = array.clone().into_array();
+        let vtable = new_array.vtable().clone_boxed();
+        vtable.put_slot(&mut new_array, 0, inner.clone());
+        vtable.put_slot(&mut new_array, 1, lane_offsets.clone());
+        vtable.put_slot(&mut new_array, 2, indices.clone());
+        vtable.put_slot(&mut new_array, 3, values.clone());
 
         assert!(new_array.is::<Patched>());
         assert_eq!(array.len(), new_array.len());
@@ -692,14 +690,12 @@ mod tests {
         let indices = array.patch_indices().clone();
         let values = array.patch_values().clone();
 
-        let array_ref = array.into_array();
-        let vtable = array_ref.vtable().clone_boxed();
-        let new_array = vtable.with_slots_mut(array_ref, &mut |slots| {
-            slots[0] = Some(new_inner.clone());
-            slots[1] = Some(lane_offsets.clone());
-            slots[2] = Some(indices.clone());
-            slots[3] = Some(values.clone());
-        })?;
+        let mut new_array = array.into_array();
+        let vtable = new_array.vtable().clone_boxed();
+        vtable.put_slot(&mut new_array, 0, new_inner.clone());
+        vtable.put_slot(&mut new_array, 1, lane_offsets.clone());
+        vtable.put_slot(&mut new_array, 2, indices.clone());
+        vtable.put_slot(&mut new_array, 3, values.clone());
 
         // Execute and verify the inner values changed (except at patch positions)
         let mut ctx = ExecutionCtx::new(VortexSession::empty());

vortex-array/src/vtable/dyn_.rs

@@ -48,16 +48,6 @@ pub trait DynVTable: 'static + Send + Sync + Debug {
         children: &dyn ArrayChildren,
         session: &VortexSession,
     ) -> VortexResult<ArrayRef>;
-    /// Unwrap the Arc, get mutable access to slots, apply a mutation, and re-wrap.
-    ///
-    /// The callback receives `&mut [Option<ArrayRef>]` so callers can modify individual
-    /// slots in-place without cloning all children.
-    fn with_slots_mut(
-        &self,
-        array: ArrayRef,
-        f: &mut dyn FnMut(&mut [Option<ArrayRef>]),
-    ) -> VortexResult<ArrayRef>;
-
     /// Remove a child from a slot, returning it.
     ///
     /// With unique ownership (Arc refcount == 1), the slot is set to `None` in-place.
@@ -136,17 +126,6 @@ impl<V: VTable> DynVTable for V {
         Ok(array.into_array())
     }
 
-    fn with_slots_mut(
-        &self,
-        array: ArrayRef,
-        f: &mut dyn FnMut(&mut [Option<ArrayRef>]),
-    ) -> VortexResult<ArrayRef> {
-        let arc = downcast_owned::<V>(array);
-        let mut inner = Arc::try_unwrap(arc).unwrap_or_else(|arc| arc.as_ref().clone());
-        f(V::slots_mut(&mut inner.array));
-        Ok(inner.into_array())
-    }
-
     fn take_slot(&self, array: &mut ArrayRef, slot_idx: usize) -> Option<ArrayRef> {
         // If we have unique ownership, take in-place. Otherwise, clone the child.
         if let Some(inner) = downcast_mut::<V>(array) {