Skip to content

Remove ScalarFnConstantRule #7575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robert3005 merged 6 commits into from
Apr 20, 2026
+22 −46
Merged

Remove ScalarFnConstantRule #7575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5557a34
between
robert3005 Apr 20, 2026
45c624a
more
robert3005 Apr 20, 2026
9019c38
format
robert3005 Apr 20, 2026
d20159f
fix
robert3005 Apr 20, 2026
b40f7a0
fixtests
robert3005 Apr 20, 2026
5b07f05
import
robert3005 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions vortex-array/src/arrays/scalar_fn/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +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;
use crate::arrays::ConstantArray;
Expand All @@ -34,11 +31,8 @@ use crate::scalar_fn::ScalarFnRef;
use crate::scalar_fn::fns::pack::Pack;
use crate::validity::Validity;

pub(super) const RULES: ReduceRuleSet<ScalarFnVTable> = ReduceRuleSet::new(&[
&ScalarFnPackToStructRule,
&ScalarFnConstantRule,
&ScalarFnAbstractReduceRule,
]);
pub(super) const RULES: ReduceRuleSet<ScalarFnVTable> =
ReduceRuleSet::new(&[&ScalarFnPackToStructRule, &ScalarFnAbstractReduceRule]);

pub(super) const PARENT_RULES: ParentRuleSet<ScalarFnVTable> = ParentRuleSet::new(&[
ParentRuleSet::lift(&ScalarFnUnaryFilterPushDownRule),
Expand Down Expand Up @@ -71,24 +65,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 {
Expand Down
37 changes: 20 additions & 17 deletions vortex-array/src/scalar_fn/fns/between/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,13 @@ impl ScalarFnVTable for Between {

#[cfg(test)]
mod tests {
use std::sync::LazyLock;

use rstest::rstest;
use vortex_buffer::buffer;

use super::*;
use crate::IntoArray;
use crate::LEGACY_SESSION;
#[expect(deprecated)]
use crate::ToCanonical as _;
use crate::VortexSessionExecute;
use crate::arrays::BoolArray;
use crate::arrays::DecimalArray;
Expand All @@ -346,9 +345,13 @@ mod tests {
use crate::expr::root;
use crate::scalar::DecimalValue;
use crate::scalar::Scalar;
use crate::session::ArraySession;
use crate::test_harness::to_int_indices;
use crate::validity::Validity;

static SESSION: LazyLock<VortexSession> =
LazyLock::new(|| VortexSession::empty().with::<ArraySession>());

#[test]
fn test_display() {
let expr = between(
Expand Down Expand Up @@ -388,7 +391,6 @@ mod tests {
let array = buffer![1, 0, 1, 0, 1].into_array();
let upper = buffer![2, 1, 1, 0, 0].into_array();

#[expect(deprecated)]
let matches = between_canonical(
&array,
&lower,
Expand All @@ -397,10 +399,11 @@ mod tests {
lower_strict,
upper_strict,
},
&mut LEGACY_SESSION.create_execution_ctx(),
&mut SESSION.create_execution_ctx(),
)
.unwrap()
.to_bool();
.execute::<BoolArray>(&mut SESSION.create_execution_ctx())
.unwrap();

let indices = to_int_indices(matches).unwrap();
assert_eq!(indices, expected);
Expand All @@ -418,7 +421,6 @@ mod tests {
)
.into_array();

#[expect(deprecated)]
let matches = between_canonical(
&array,
&lower,
Expand All @@ -427,17 +429,17 @@ mod tests {
lower_strict: StrictComparison::NonStrict,
upper_strict: StrictComparison::NonStrict,
},
&mut LEGACY_SESSION.create_execution_ctx(),
&mut SESSION.create_execution_ctx(),
)
.unwrap()
.to_bool();
.execute::<BoolArray>(&mut SESSION.create_execution_ctx())
.unwrap();

let indices = to_int_indices(matches).unwrap();
assert!(indices.is_empty());

// upper is a fixed constant
let upper = ConstantArray::new(Scalar::from(2), 5).into_array();
#[expect(deprecated)]
let matches = between_canonical(
&array,
&lower,
Expand All @@ -446,17 +448,17 @@ mod tests {
lower_strict: StrictComparison::NonStrict,
upper_strict: StrictComparison::NonStrict,
},
&mut LEGACY_SESSION.create_execution_ctx(),
&mut SESSION.create_execution_ctx(),
)
.unwrap()
.to_bool();
.execute::<BoolArray>(&mut SESSION.create_execution_ctx())
.unwrap();
let indices = to_int_indices(matches).unwrap();
assert_eq!(indices, vec![0, 1, 3]);

// lower is also a constant
let lower = ConstantArray::new(Scalar::from(0), 5).into_array();

#[expect(deprecated)]
let matches = between_canonical(
&array,
&lower,
Expand All @@ -465,10 +467,11 @@ mod tests {
lower_strict: StrictComparison::NonStrict,
upper_strict: StrictComparison::NonStrict,
},
&mut LEGACY_SESSION.create_execution_ctx(),
&mut SESSION.create_execution_ctx(),
)
.unwrap()
.to_bool();
.execute::<BoolArray>(&mut SESSION.create_execution_ctx())
.unwrap();
let indices = to_int_indices(matches).unwrap();
assert_eq!(indices, vec![0, 1, 2, 3, 4]);
}
Expand Down Expand Up @@ -507,7 +510,7 @@ mod tests {
lower_strict: StrictComparison::Strict,
upper_strict: StrictComparison::NonStrict,
},
&mut LEGACY_SESSION.create_execution_ctx(),
&mut SESSION.create_execution_ctx(),
)
.unwrap();
assert_arrays_eq!(
Expand All @@ -524,7 +527,7 @@ mod tests {
lower_strict: StrictComparison::NonStrict,
upper_strict: StrictComparison::Strict,
},
&mut LEGACY_SESSION.create_execution_ctx(),
&mut SESSION.create_execution_ctx(),
)
.unwrap();
assert_arrays_eq!(
Expand Down
3 changes: 0 additions & 3 deletions vortex-array/src/scalar_fn/fns/list_contains/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ mod tests {
use crate::expr::stats::Stat;
use crate::scalar::Scalar;
use crate::scalar_fn::fns::list_contains::BoolArray;
use crate::scalar_fn::fns::list_contains::Constant;
use crate::scalar_fn::fns::list_contains::ConstantArray;
use crate::scalar_fn::fns::list_contains::ListViewArray;
use crate::scalar_fn::fns::list_contains::PrimitiveArray;
Expand Down Expand Up @@ -827,7 +826,6 @@ mod tests {

let expr = list_contains(root(), lit(2i32));
let contains = list_array.apply(&expr).unwrap();
assert!(contains.is::<Constant>(), "Expected constant result");
let expected = BoolArray::from_iter([true, true]);
assert_arrays_eq!(contains, expected);
}
Expand All @@ -845,7 +843,6 @@ mod tests {

let expr = list_contains(root(), lit(2i32));
let contains = list_array.apply(&expr).unwrap();
assert!(contains.is::<Constant>(), "Expected constant result");

let expected = BoolArray::new(
[false, false, false, false, false].into_iter().collect(),
Expand Down
Loading