u

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

encodings/fastlanes/src/bitpacking/vtable/mod.rs

@@ -43,9 +43,11 @@ use crate::BitPackedArray;
 use crate::bitpack_decompress::unpack_array;
 use crate::bitpack_decompress::unpack_into_primitive_builder;
 use crate::bitpacking::array::NUM_SLOTS;
+use crate::bitpacking::array::PATCH_CHUNK_OFFSETS_SLOT;
 use crate::bitpacking::array::PATCH_INDICES_SLOT;
 use crate::bitpacking::array::PATCH_VALUES_SLOT;
 use crate::bitpacking::array::SLOT_NAMES;
+use crate::bitpacking::array::VALIDITY_SLOT;
 use crate::bitpacking::vtable::kernels::PARENT_KERNELS;
 use crate::bitpacking::vtable::rules::RULES;
 mod kernels;
@@ -296,7 +298,7 @@ impl VTable for BitPacked {
             PATCH_VALUES_SLOT,
             PATCH_CHUNK_OFFSETS_SLOT
         );
-        require_validity!(array, &array.validity, VALIDITY_SLOT => AnyCanonical);
+        require_validity!(array, &array.validity(), VALIDITY_SLOT => AnyCanonical);
 
         Ok(ExecutionResult::done(
             unpack_array(&array, ctx)?.into_array(),

vortex-array/src/executor.rs

@@ -507,19 +507,22 @@ macro_rules! require_opt_child {
 #[macro_export]
 macro_rules! require_patches {
     ($parent:expr, $patches:expr, $indices_slot:expr, $values_slot:expr, $chunk_offsets_slot:expr) => {
+        let __patches = $patches;
         $crate::require_opt_child!(
             $parent,
-            $patches.map(|p| p.indices()),
+            __patches.as_ref().map(|p| p.indices()),
             $indices_slot => $crate::arrays::Primitive
         );
+        let __patches = $patches;
         $crate::require_opt_child!(
             $parent,
-            $patches.map(|p| p.values()),
+            __patches.as_ref().map(|p| p.values()),
             $values_slot => $crate::arrays::Primitive
         );
+        let __patches = $patches;
         $crate::require_opt_child!(
             $parent,
-            $patches.and_then(|p| p.chunk_offsets().as_ref()),
+            __patches.as_ref().and_then(|p| p.chunk_offsets().as_ref()),
             $chunk_offsets_slot => $crate::arrays::Primitive
         );
     };