fix[fuzz]: apply mask to validity in baseline

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

Author: joseph-isaacs

fuzz/src/array/mask.rs

@@ -25,11 +25,11 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult<A
             array.into_array()
         }
         Canonical::Bool(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
             BoolArray::from_bit_buffer(array.bit_buffer().clone(), new_validity).into_array()
         }
         Canonical::Primitive(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
             PrimitiveArray::from_byte_buffer(
                 array.byte_buffer().clone(),
                 array.ptype(),
@@ -38,14 +38,14 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult<A
             .into_array()
         }
         Canonical::Decimal(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
             match_each_decimal_value_type!(array.values_type(), |D| {
                 DecimalArray::new(array.buffer::<D>(), array.decimal_dtype(), new_validity)
                     .into_array()
             })
         }
         Canonical::VarBinView(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
             VarBinViewArray::new(
                 array.views().clone(),
                 array.buffers().clone(),
@@ -55,7 +55,7 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult<A
             .into_array()
         }
         Canonical::List(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
 
             // SAFETY: Since we are only masking the validity and everything else comes from an
             // already valid `ListViewArray`, all of the invariants are still upheld.
@@ -71,7 +71,7 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult<A
             .into_array()
         }
         Canonical::FixedSizeList(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
             FixedSizeListArray::new(
                 array.elements().clone(),
                 array.list_size(),
@@ -81,7 +81,7 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult<A
             .into_array()
         }
         Canonical::Struct(array) => {
-            let new_validity = apply_mask_to_validity(array.validity(), mask);
+            let new_validity = array.validity().mask(mask);
             StructArray::try_new_with_dtype(
                 array.fields().clone(),
                 array.struct_fields().clone(),
@@ -113,24 +113,6 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult<A
     })
 }
 
-fn apply_mask_to_validity(validity: &Validity, mask: &Mask) -> Validity {
-    match mask.bit_buffer() {
-        AllOr::All => Validity::AllInvalid,
-        AllOr::None => validity.clone(),
-        AllOr::Some(make_invalid) => match validity {
-            Validity::NonNullable | Validity::AllValid => {
-                Validity::Array(BoolArray::from(make_invalid.not()).into_array())
-            }
-            Validity::AllInvalid => Validity::AllInvalid,
-            Validity::Array(is_valid) => {
-                let is_valid = is_valid.to_bool();
-                let keep_valid = make_invalid.not();
-                Validity::from(is_valid.bit_buffer() & &keep_valid)
-            }
-        },
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use vortex_array::arrays::{