update

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

vortex-array/src/scalar_fn/fns/binary/mod.rs

@@ -117,7 +117,7 @@ impl ScalarFnVTable for Binary {
         let rhs = &arg_dtypes[1];
 
         if operator.is_arithmetic() {
-            if lhs.is_primitive() && lhs.eq_ignore_nullability(rhs) {
+            if (lhs.is_primitive() || lhs.is_decimal()) && lhs.eq_ignore_nullability(rhs) {
                 return Ok(lhs.with_nullability(lhs.nullability() | rhs.nullability()));
             }
             vortex_bail!(
@@ -135,6 +135,16 @@ impl ScalarFnVTable for Binary {
             vortex_bail!("Cannot compare different DTypes {} and {}", lhs, rhs);
         }
 
+        if matches!(operator, Operator::And | Operator::Or)
+            && (!lhs.is_boolean() || !rhs.is_boolean())
+        {
+            vortex_bail!(
+                "boolean operations require boolean inputs, got {} and {}",
+                lhs,
+                rhs
+            );
+        }
+
         Ok(DType::Bool((lhs.is_nullable() || rhs.is_nullable()).into()))
     }
 

vortex-array/src/scalar_fn/fns/mask/kernel.rs

@@ -57,7 +57,7 @@ pub trait MaskKernel: VTable {
 /// If the mask is a constant boolean, handle the trivial cases and return `Some`.
 /// Returns `None` if the mask is not a constant.
 fn handle_constant_mask(
-    array: &dyn crate::array::DynArray,
+    array: &dyn crate::DynArray,
     mask: &ArrayRef,
 ) -> VortexResult<Option<ArrayRef>> {
     if let Some(constant_mask) = mask.as_opt::<Constant>() {