fixup

Signed-off-by: Andrew Duffy <andrew@a10y.dev>

Author: a10y

vortex-array/src/arrays/patched/compute/compare.rs

@@ -7,7 +7,6 @@ use vortex_error::VortexResult;
 
 use crate::ArrayRef;
 use crate::Canonical;
-use crate::DynArray;
 use crate::ExecutionCtx;
 use crate::IntoArray;
 use crate::arrays::BoolArray;
@@ -43,7 +42,6 @@ impl CompareKernel for Patched {
         //  We slice the inner before performing the comparison.
         let result = lhs
             .inner
-            .slice(lhs.offset..lhs.offset + lhs.len)?
             .binary(
                 ConstantArray::new(constant.clone(), lhs.len()).into_array(),
                 operator.into(),
@@ -142,6 +140,9 @@ impl<V: NativePType> ApplyPatches<'_, V> {
                     continue;
                 }
                 let bit_index = bit_index - self.offset;
+                if bit_index >= self.bits.len() {
+                    break;
+                }
                 if cmp(patch_value, self.constant) {
                     self.bits.set(bit_index)
                 } else {

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

@@ -33,7 +33,6 @@ use crate::SerializeMetadata;
 use crate::arrays::PrimitiveArray;
 use crate::arrays::patched::PatchedArray;
 use crate::arrays::patched::compute::rules::PARENT_RULES;
-use crate::arrays::patched::patch_lanes;
 use crate::arrays::patched::vtable::kernels::PARENT_KERNELS;
 use crate::arrays::primitive::PrimitiveArrayParts;
 use crate::buffer::BufferHandle;
@@ -222,9 +221,7 @@ impl VTable for Patched {
 
         let len = array.len();
 
-        // Slice the inner by its offset before appending it.
-        let sliced_inner = array.inner.slice(array.offset..array.offset + array.len)?;
-        sliced_inner.append_to_builder(builder, ctx)?;
+        array.inner.append_to_builder(builder, ctx)?;
 
         let offset = array.offset;
         let lane_offsets: Buffer<u32> =
@@ -336,10 +333,6 @@ impl VTable for Patched {
             let offset = array.offset;
             let len = array.len;
 
-            // Slice the buffer and validity from the offset.
-            let buffer = buffer.slice_typed::<V>(offset..offset + len);
-            let validity = validity.slice(offset..offset + len)?;
-
             let mut output = Buffer::<V>::from_byte_buffer(buffer.unwrap_host()).into_mut();
 
             apply_patches_primitive::<V>(

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

@@ -47,7 +47,7 @@ impl OperationsVTable<Patched> for Patched {
         }
 
         // Otherwise, access the underlying value.
-        array.inner.scalar_at(index + array.offset)
+        array.inner.scalar_at(index)
     }
 }
 

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

@@ -24,10 +24,7 @@ impl SliceReduce for Patched {
         let chunk_start = (range.start + array.offset) / 1024;
         let chunk_stop = (range.end + array.offset).div_ceil(1024);
 
-        // Slice the inner to chunk boundaries
-        let inner_start = chunk_start * 1024;
-        let inner_stop = (chunk_stop * 1024).min(array.inner.len());
-        let inner = array.inner.slice(inner_start..inner_stop)?;
+        let inner = array.inner.slice(range.start..range.end)?;
 
         // Slice to only maintain offsets to the sliced chunks
         let sliced_lane_offsets = array
@@ -78,20 +75,19 @@ mod tests {
         let values = buffer![0u16; 512].into_array();
         let patch_indices = buffer![1u32, 8, 30].into_array();
         let patch_values = buffer![u16::MAX; 3].into_array();
-        let patches = Patches::new(512, 0, patch_indices, patch_values, None).unwrap();
+        let patches = Patches::new(512, 0, patch_indices, patch_values, None)?;
 
         let mut ctx = ExecutionCtx::new(LEGACY_SESSION.clone());
 
-        let patched_array =
-            PatchedArray::from_array_and_patches(values, &patches, &mut ctx).unwrap();
+        let patched_array = PatchedArray::from_array_and_patches(values, &patches, &mut ctx)?;
 
         let sliced = patched_array.slice(1..10)?;
 
         insta::assert_snapshot!(
             sliced.display_tree_encodings_only(),
             @r#"
             root: vortex.patched(u16, len=9)
-              inner: vortex.primitive(u16, len=512)
+              inner: vortex.primitive(u16, len=9)
               patch_indices: vortex.primitive(u16, len=3)
               patch_values: vortex.primitive(u16, len=3)
             "#);