Move things around

Signed-off-by: Adam Gutglick <adam@spiraldb.com>

Author: AdamGS

vortex-array/src/arrays/bool/compute/rules.rs

@@ -45,18 +45,15 @@ impl ArrayParentReduceRule<Bool> for BoolMaskedValidityRule {
             return Ok(None);
         }
 
+        let bit_buffer = array.to_bit_buffer();
         // Merge the parent's validity mask into the child's validity
         // TODO(joe): make this lazy
+        let validity = array.validity()?.and(parent.validity()?)?;
+
         // Safety:
         // we know all elements are valid, the AND operation will fail if mismatched.
-        unsafe {
-            Ok(Some(
-                BoolArray::new_unchecked(
-                    array.to_bit_buffer(),
-                    array.validity()?.and(parent.validity()?)?,
-                )
-                .into_array(),
-            ))
-        }
+        let array = unsafe { BoolArray::new_unchecked(bit_buffer, validity).into_array() };
+
+        Ok(Some(array))
     }
 }

vortex-array/src/arrays/bool/compute/slice.rs

@@ -15,16 +15,13 @@ use crate::arrays::slice::SliceReduce;
 
 impl SliceReduce for Bool {
     fn slice(array: ArrayView<'_, Bool>, range: Range<usize>) -> VortexResult<Option<ArrayRef>> {
+        let bit_buffer = array.to_bit_buffer().slice(range.clone());
+        let validity = array.validity()?.slice(range)?;
+
         // Safety:
         // range is verified in the callers and is the same for both bits and validity.
-        unsafe {
-            Ok(Some(
-                BoolArray::new_unchecked(
-                    array.to_bit_buffer().slice(range.clone()),
-                    array.validity()?.slice(range)?,
-                )
-                .into_array(),
-            ))
-        }
+        let array = unsafe { BoolArray::new_unchecked(bit_buffer, validity).into_array() };
+
+        Ok(Some(array))
     }
 }

vortex-array/src/arrays/primitive/compute/slice.rs

@@ -19,11 +19,13 @@ impl SliceReduce for Primitive {
         let values = array.buffer_handle().slice(byte_range);
         let validity = array.validity()?.slice(range)?;
 
-        // SAFETY: slicing an existing PrimitiveArray on element boundaries preserves the buffer
+        // SAFETY:
+        //slicing an existing PrimitiveArray on element boundaries preserves the buffer
         // alignment, ptype, length, and validity invariants.
-        Ok(Some(
-            unsafe { PrimitiveArray::new_unchecked_from_handle(values, array.ptype(), validity) }
-                .into_array(),
-        ))
+        let array = unsafe {
+            PrimitiveArray::new_unchecked_from_handle(values, array.ptype(), validity).into_array()
+        };
+
+        Ok(Some(array))
     }
 }

vortex-array/src/arrays/varbinview/compute/slice.rs

@@ -16,20 +16,19 @@ use crate::arrays::varbinview::BinaryView;
 
 impl SliceReduce for VarBinView {
     fn slice(array: ArrayView<'_, Self>, range: Range<usize>) -> VortexResult<Option<ArrayRef>> {
+        let views = array
+            .views_handle()
+            .slice_typed::<BinaryView>(range.clone());
+        let data_buffers = Arc::clone(array.data_buffers());
+        let dtype = array.dtype().clone();
+        let validity = array.validity()?.slice(range)?;
+
         // Safety:
         // range is validated within bounds, and is shared between all children.
-        unsafe {
-            Ok(Some(
-                VarBinViewArray::new_handle_unchecked(
-                    array
-                        .views_handle()
-                        .slice_typed::<BinaryView>(range.clone()),
-                    Arc::clone(array.data_buffers()),
-                    array.dtype().clone(),
-                    array.validity()?.slice(range)?,
-                )
-                .into_array(),
-            ))
-        }
+        let array = unsafe {
+            VarBinViewArray::new_handle_unchecked(views, data_buffers, dtype, validity).into_array()
+        };
+
+        Ok(Some(array))
     }
 }