is-null

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

Author: joseph-isaacs

vortex-array/src/scalar_fns/is_null/mod.rs

@@ -5,21 +5,19 @@ use vortex_dtype::DType;
 use vortex_dtype::Nullability::NonNullable;
 use vortex_error::VortexResult;
 use vortex_mask::Mask;
+use vortex_vector::bool::BoolVector;
 use vortex_vector::Datum;
-use vortex_vector::Scalar;
 use vortex_vector::ScalarOps;
 use vortex_vector::Vector;
 use vortex_vector::VectorOps;
-use vortex_vector::bool::BoolScalar;
-use vortex_vector::bool::BoolVector;
 
-use crate::expr::ChildName;
-use crate::expr::ExprId;
 use crate::expr::functions::ArgName;
 use crate::expr::functions::Arity;
 use crate::expr::functions::EmptyOptions;
 use crate::expr::functions::ExecutionArgs;
 use crate::expr::functions::VTable;
+use crate::expr::ChildName;
+use crate::expr::ExprId;
 
 pub struct IsNull;
 impl VTable for IsNull {
@@ -45,14 +43,12 @@ impl VTable for IsNull {
     }
 
     fn execute(&self, _: &Self::Options, args: &ExecutionArgs) -> VortexResult<Datum> {
-        Ok(args.input_datums(0).as_ref().map2(
-            |sc| sc.is_invalid().into(),
-            |arr| {
-                Vector::Bool(BoolVector::new(
-                    arr.validity().to_bit_buffer(),
-                    Mask::AllTrue(arr.len()),
-                ))
-            },
-        ))
+        Ok(match args.input_datums(0) {
+            Datum::Scalar(sc) => Datum::Scalar(sc.is_invalid().into()),
+            Datum::Vector(vec) => Vector::Bool(BoolVector::new(
+                vec.validity().to_bit_buffer(),
+                Mask::AllTrue(vec.len()),
+            )).into()
+        })
     }
 }

vortex-vector/src/datum.rs

@@ -81,18 +81,6 @@ impl Datum {
             Datum::Vector(vector) => Some(vector),
         }
     }
-
-    /// Maps over the scalar or vector value, applying the appropriate function based on the variant.
-    pub fn map2(
-        self,
-        sc_fn: impl FnOnce(Scalar) -> Scalar,
-        arr_fn: impl FnOnce(Vector) -> Vector,
-    ) -> Datum {
-        match self {
-            Datum::Scalar(scalar) => Datum::Scalar(sc_fn(scalar)),
-            Datum::Vector(vector) => Datum::Vector(arr_fn(vector)),
-        }
-    }
 }
 
 impl Datum {