more fixes for gharchive

Signed-off-by: Andrew Duffy <[email protected]>

Author: a10y

encodings/fsst/src/array.rs

@@ -21,6 +21,7 @@ use vortex_array::DeserializeMetadata;
 use vortex_array::Precision;
 use vortex_array::ProstMetadata;
 use vortex_array::SerializeMetadata;
+use vortex_array::ToCanonical;
 use vortex_array::arrays::VarBinArray;
 use vortex_array::arrays::VarBinVTable;
 use vortex_array::serde::ArrayChildren;
@@ -42,7 +43,6 @@ use vortex_buffer::BufferHandle;
 use vortex_dtype::DType;
 use vortex_dtype::Nullability;
 use vortex_dtype::PType;
-use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_ensure;
@@ -157,7 +157,10 @@ impl VTable for FSSTVTable {
         );
 
         let mut children_iter = children.into_iter();
-        let codes = children_iter.next().vortex_expect("codes child");
+        let codes = children_iter
+            .next()
+            .ok_or_else(|| vortex_err!("FSSTArray with_children missing codes"))?;
+
         let codes = codes
             .as_opt::<VarBinVTable>()
             .ok_or_else(|| {
@@ -169,7 +172,7 @@ impl VTable for FSSTVTable {
             .clone();
         let uncompressed_lengths = children_iter
             .next()
-            .vortex_expect("uncompressed_lengths child");
+            .ok_or_else(|| vortex_err!("FSSTArray with_children missing uncompressed_lengths"))?;
 
         array.codes = codes;
         array.uncompressed_lengths = uncompressed_lengths;

vortex-layout/src/layouts/struct_/reader.rs

@@ -12,7 +12,9 @@ use vortex_array::ArrayRef;
 use vortex_array::IntoArray;
 use vortex_array::MaskFuture;
 use vortex_array::ToCanonical;
+use vortex_array::arrays::MaskedArray;
 use vortex_array::arrays::StructArray;
+use vortex_array::builtins::ArrayBuiltins;
 use vortex_array::expr::ExactExpr;
 use vortex_array::expr::Expression;
 use vortex_array::expr::Merge;
@@ -24,6 +26,7 @@ use vortex_array::expr::transform::PartitionedExpr;
 use vortex_array::expr::transform::partition;
 use vortex_array::expr::transform::replace;
 use vortex_array::expr::transform::replace_root_fields;
+use vortex_array::validity::Validity;
 use vortex_array::vtable::ValidityHelper;
 use vortex_dtype::DType;
 use vortex_dtype::FieldMask;
@@ -343,15 +346,14 @@ impl LayoutReader for StructReader {
         Ok(Box::pin(async move {
             if let Some(validity_fut) = validity_fut {
                 let (array, validity) = try_join!(projected, validity_fut)?;
-                let mask = Mask::from_buffer(validity.to_bool().bit_buffer().not());
 
                 // If root expression was a pack, then we apply the validity to each child field
                 if is_pack_merge {
                     let struct_array = array.to_struct();
                     let masked_fields: Vec<ArrayRef> = struct_array
                         .fields()
                         .iter()
-                        .map(|a| vortex_array::compute::mask(a.as_ref(), &mask))
+                        .map(|a| a.mask(&validity))
                         .try_collect()?;
 
                     Ok(StructArray::try_new(
@@ -364,7 +366,7 @@ impl LayoutReader for StructReader {
                 } else {
                     // If the root expression was not a pack or merge, e.g. if it's something like
                     // a get_item, then we apply the validity directly to the result
-                    vortex_array::compute::mask(array.as_ref(), &mask)
+                    array.mask(&validity)
                 }
             } else {
                 projected.await

vortex-vector/src/listview/vector.rs

@@ -227,8 +227,18 @@ impl VectorOps for ListViewVector {
         ListViewScalar::new(self.slice(index..index + 1))
     }
 
-    fn slice(&self, _range: impl RangeBounds<usize> + Clone + Debug) -> Self {
-        todo!()
+    fn slice(&self, range: impl RangeBounds<usize> + Clone + Debug) -> Self {
+        let offsets = self.offsets.slice(range.clone());
+        let sizes = self.sizes.slice(range);
+        // SAFETY: offsets/sizes combined still point at valid elements
+        unsafe {
+            Self::new_unchecked(
+                self.elements().clone(),
+                offsets,
+                sizes,
+                self.validity().clone(),
+            )
+        }
     }
 
     fn clear(&mut self) {

vortex-vector/src/vector_mut.rs

@@ -86,7 +86,9 @@ impl VectorMut {
             DType::Utf8(..) => StringVectorMut::with_capacity(capacity).into(),
             DType::Binary(..) => BinaryVectorMut::with_capacity(capacity).into(),
             DType::Extension(ext) => VectorMut::with_capacity(ext.storage_dtype(), capacity),
-            DType::List(elem, ..) => ListViewVectorMut::with_capacity(elem.as_ref(), capacity).into(),
+            DType::List(elem, ..) => {
+                ListViewVectorMut::with_capacity(elem.as_ref(), capacity).into()
+            }
         }
     }
 }