between

Signed-off-by: Robert Kruszewski <github@robertk.io>

Author: robert3005

vortex-array/src/arrays/scalar_fn/rules.rs

@@ -9,9 +9,7 @@ use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
 
 use crate::ArrayRef;
-use crate::Canonical;
 use crate::IntoArray;
-use crate::LEGACY_SESSION;
 use crate::VortexSessionExecute;
 use crate::array::ArrayView;
 use crate::arrays::Constant;
@@ -36,7 +34,6 @@ use crate::validity::Validity;
 
 pub(super) const RULES: ReduceRuleSet<ScalarFnVTable> = ReduceRuleSet::new(&[
     &ScalarFnPackToStructRule,
-    &ScalarFnConstantRule,
     &ScalarFnAbstractReduceRule,
 ]);
 
@@ -71,24 +68,6 @@ impl ArrayReduceRule<ScalarFnVTable> for ScalarFnPackToStructRule {
     }
 }
 
-#[derive(Debug)]
-struct ScalarFnConstantRule;
-impl ArrayReduceRule<ScalarFnVTable> for ScalarFnConstantRule {
-    fn reduce(&self, array: ArrayView<'_, ScalarFnVTable>) -> VortexResult<Option<ArrayRef>> {
-        if !array.children().iter().all(|c| c.is::<Constant>()) {
-            return Ok(None);
-        }
-        if array.is_empty() {
-            Ok(Some(Canonical::empty(array.dtype()).into_array()))
-        } else {
-            let result = array
-                .array()
-                .execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())?;
-            Ok(Some(ConstantArray::new(result, array.len()).into_array()))
-        }
-    }
-}
-
 #[derive(Debug)]
 struct ScalarFnSliceReduceRule;
 impl ArrayParentReduceRule<ScalarFnVTable> for ScalarFnSliceReduceRule {

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

@@ -13,7 +13,7 @@ use vortex_error::vortex_bail;
 use vortex_proto::expr as pb;
 use vortex_session::VortexSession;
 
-use crate::ArrayRef;
+use crate::{ArrayRef, Columnar};
 use crate::Canonical;
 use crate::ExecutionCtx;
 use crate::IntoArray;