Cleanup

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

Author: AdamGS

vortex-array/public-api.lock

@@ -15990,8 +15990,6 @@ pub fn vortex_array::scalar::Scalar::is_null(&self) -> bool
 
 pub fn vortex_array::scalar::Scalar::is_valid(&self) -> bool
 
-pub fn vortex_array::scalar::Scalar::is_variant_null(&self) -> core::option::Option<bool>
-
 pub fn vortex_array::scalar::Scalar::is_zero(&self) -> core::option::Option<bool>
 
 pub unsafe fn vortex_array::scalar::Scalar::new_unchecked(dtype: vortex_array::dtype::DType, value: core::option::Option<vortex_array::scalar::ScalarValue>) -> Self
@@ -16748,6 +16746,8 @@ pub fn vortex_array::scalar::VariantScalar<'a>::is_null(&self) -> bool
 
 pub fn vortex_array::scalar::VariantScalar<'a>::is_variant_null(&self) -> core::option::Option<bool>
 
+pub fn vortex_array::scalar::VariantScalar<'a>::is_zero(&self) -> core::option::Option<bool>
+
 pub fn vortex_array::scalar::VariantScalar<'a>::value(&self) -> core::option::Option<&'a vortex_array::scalar::Scalar>
 
 impl core::fmt::Display for vortex_array::scalar::VariantScalar<'_>

vortex-array/src/scalar/scalar_impl.rs

@@ -177,10 +177,6 @@ impl Scalar {
     /// Returns `None` if the scalar is null, otherwise returns `Some(true)` if the value is zero
     /// and `Some(false)` otherwise.
     pub fn is_zero(&self) -> Option<bool> {
-        if self.dtype().is_variant() {
-            return self.is_variant_null();
-        }
-
         let value = self.value()?;
 
         let is_zero = match self.dtype() {
@@ -194,20 +190,12 @@ impl Scalar {
             DType::FixedSizeList(_, list_size, _) => value.as_list().len() == *list_size as usize,
             DType::Struct(struct_fields, _) => value.as_list().len() == struct_fields.nfields(),
             DType::Extension(_) => self.as_extension().to_storage_scalar().is_zero()?,
-            DType::Variant(_) => unreachable!("handled above"),
+            DType::Variant(_) => self.as_variant().is_zero()?,
         };
 
         Some(is_zero)
     }
 
-    /// Returns whether a present variant scalar contains the variant-null payload.
-    ///
-    /// Returns `None` for non-variant scalars and for outer-null variants.
-    pub fn is_variant_null(&self) -> Option<bool> {
-        self.as_variant_opt()
-            .and_then(|variant| variant.is_variant_null())
-    }
-
     /// Reinterprets the bytes of this scalar as a different primitive type.
     ///
     /// # Errors

vortex-array/src/scalar/typed_view/variant.rs

@@ -65,6 +65,11 @@ impl<'a> VariantScalar<'a> {
     pub fn is_variant_null(&self) -> Option<bool> {
         Some(self.value?.is_null())
     }
+
+    /// Returns `Some(true)` if the inner [`Scalar`] has a non-null zero value.
+    pub fn is_zero(&self) -> Option<bool> {
+        self.value?.is_zero()
+    }
 }
 
 #[cfg(test)]