Skip to content

Move expression analysis, rewrites and statistics pruning into vortex-expr #10734

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 2 commits into from
Oct 23, 2026
+1,036 −1,624
Merged

Move expression analysis, rewrites and statistics pruning into vortex-expr #10734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a6aa33
Move expression analysis, rewrites and statistics pruning into vortex…
claude Oct 16, 2026
27d44ed
Register only the session variables each bench uses
claude Oct 23, 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
19 changes: 19 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ members = [
"vortex-io",
"vortex-cloud",
"vortex-array",
"vortex-expr",
"vortex-arrow",
"vortex-row",
"vortex-tensor",
Expand Down Expand Up @@ -319,6 +320,7 @@ vortex-datetime-parts = { version = "0.1.0", path = "./encodings/datetime-parts"
vortex-decimal-byte-parts = { version = "0.1.0", path = "encodings/decimal-byte-parts", default-features = false }
vortex-edition = { version = "0.1.0", path = "./vortex-edition", default-features = false }
vortex-error = { version = "0.1.0", path = "./vortex-error", default-features = false }
vortex-expr = { version = "0.1.0", path = "./vortex-expr", default-features = false }
vortex-fastlanes = { version = "0.1.0", path = "./encodings/fastlanes", default-features = false }
vortex-file = { version = "0.1.0", path = "./vortex-file", default-features = false }
vortex-fsst = { version = "0.1.0", path = "./encodings/fsst", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions docs/developer-guide/internals/stats-pruning.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ the proof was unknown, usually because a required stat was missing or inexact.

The pruning pipeline has two phases:

1. `Expression::falsify(scope, session)` asks the session's
`StatsRewriteRule`s to rewrite a filter into an abstract proof expression.
1. `BoundExpressionPruneExt::falsify(session)`, from `vortex_expr::stats::rewrite`, asks the
session's `StatsRewriteRule`s to rewrite a bound filter into an abstract proof expression.
Rules describe semantics in terms of `vortex.stat(input, aggregate_fn)`
placeholders. These placeholders name the statistic needed by the proof, but
not where that statistic is stored.
Expand Down
8 changes: 1 addition & 7 deletions encodings/alp/benches/alp_compress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::dtype::NativePType;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::Buffer;
use vortex_buffer::buffer;
Expand Down Expand Up @@ -67,11 +64,8 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<MemorySession>();
vortex_alp::initialize(&session);
session
});
Expand Down
18 changes: 2 additions & 16 deletions encodings/datetime-parts/benches/split_temporal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,10 @@ use rand::SeedableRng as _;
use rand::rngs::StdRng;
use vortex_array::IntoArray;
use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::arrays::TemporalArray;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::extension::datetime::TimeUnit;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::Buffer;
use vortex_datetime_parts::split_temporal;
Expand All @@ -35,16 +29,8 @@ fn main() {
divan::main();
}

static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>()
});
static SESSION: LazyLock<VortexSession> =
LazyLock::new(|| VortexSession::empty().with::<KernelSession>());

const BENCH_ARGS: &[(usize, TimeUnit)] = &[
(65_536, TimeUnit::Seconds),
Expand Down
18 changes: 2 additions & 16 deletions encodings/decimal-byte-parts/benches/dbp_assemble.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,9 @@ mod arrays {
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::dtype::DecimalDType;
use vortex_array::dtype::DecimalType;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::buffer;
use vortex_decimal_byte_parts::_benchmarking::assemble_decimal;
Expand All @@ -131,16 +125,8 @@ mod arrays {
use crate::common::arrays::cases;
use crate::common::arrays::decimal_array;

pub(super) static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>()
});
pub(super) static SESSION: LazyLock<VortexSession> =
LazyLock::new(|| VortexSession::empty().with::<KernelSession>());

#[divan::bench(args = cases())]
fn dbp_assemble(bencher: Bencher, (values_type, len): (DecimalType, usize)) {
Expand Down
18 changes: 2 additions & 16 deletions encodings/decimal-byte-parts/benches/dbp_split.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,8 @@ mod arrays {
use rand::SeedableRng;
use rand::rngs::StdRng;
use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::dtype::DecimalType;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_decimal_byte_parts::split_decimal;
use vortex_error::VortexExpect;
Expand All @@ -100,16 +94,8 @@ mod arrays {
use crate::common::arrays::cases;
use crate::common::arrays::decimal_array;

pub(super) static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>()
});
pub(super) static SESSION: LazyLock<VortexSession> =
LazyLock::new(|| VortexSession::empty().with::<KernelSession>());

#[divan::bench(args = cases())]
fn dbp_split_all_valid(bencher: Bencher, (values_type, len): (DecimalType, usize)) {
Expand Down
10 changes: 1 addition & 9 deletions encodings/fastlanes/benches/bitpack_blocked.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ use mimalloc::MiMalloc;
use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_fastlanes::bitpack_compress::bitpack_encode_blocked;
use vortex_session::VortexSession;

Expand All @@ -34,11 +30,7 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<AggregateFnSession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
8 changes: 1 addition & 7 deletions encodings/fastlanes/benches/bitpack_blocked_decompress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::dtype::NativePType;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_fastlanes::BitPackedArraySlotsExt;
use vortex_fastlanes::bitpack_compress::bitpack_encode_blocked;
use vortex_fastlanes::bitpack_decompress::unpack_array_blocked;
Expand All @@ -38,11 +35,8 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<MemorySession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
8 changes: 1 addition & 7 deletions encodings/fastlanes/benches/bitpack_compare.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@ use vortex_array::arrays::BoolArray;
use vortex_array::arrays::ConstantArray;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::fns::operators::Operator;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::Alignment;
use vortex_buffer::BufferMut;
Expand All @@ -52,11 +49,8 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<MemorySession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
10 changes: 1 addition & 9 deletions encodings/fastlanes/benches/bitpack_compare_sweep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,10 @@ use vortex_array::arrays::ConstantArray;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::NativePType;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar::Scalar;
use vortex_array::scalar_fn::fns::operators::Operator;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::Alignment;
use vortex_buffer::BufferMut;
Expand All @@ -56,11 +52,7 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<AggregateFnSession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
10 changes: 1 addition & 9 deletions encodings/fastlanes/benches/bitpacking_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ use vortex_array::IntoArray;
use vortex_array::VortexSessionExecute;
use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::BufferMut;
use vortex_fastlanes::BitPackedData;
Expand All @@ -36,11 +32,7 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<AggregateFnSession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
8 changes: 1 addition & 7 deletions encodings/fastlanes/benches/bitpacking_take.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,9 @@ use vortex_array::assert_arrays_eq;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::NativePType;
use vortex_array::dtype::PType;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_array::validity::Validity;
use vortex_buffer::Buffer;
use vortex_buffer::BufferMut;
Expand All @@ -52,11 +49,8 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<MemorySession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
8 changes: 1 addition & 7 deletions encodings/fastlanes/benches/canonicalize_bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@ use vortex_array::aggregate_fn::session::AggregateFnSession;
use vortex_array::arrays::ChunkedArray;
use vortex_array::builders::ArrayBuilder;
use vortex_array::builders::PrimitiveBuilder;
use vortex_array::dtype::session::DTypeSession;
use vortex_array::memory::MemorySession;
use vortex_array::optimizer::kernels::KernelSession;
use vortex_array::scalar_fn::session::ScalarFnSession;
use vortex_array::session::ArraySession;
use vortex_array::stats::session::StatsSession;
use vortex_error::VortexExpect;
use vortex_fastlanes::bitpack_compress::test_harness::make_array;
use vortex_session::VortexSession;
Expand Down Expand Up @@ -50,11 +47,8 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
let session = VortexSession::empty()
.with::<ArraySession>()
.with::<KernelSession>()
.with::<DTypeSession>()
.with::<ScalarFnSession>()
.with::<AggregateFnSession>()
.with::<MemorySession>()
.with::<StatsSession>();
.with::<MemorySession>();
vortex_fastlanes::initialize(&session);
session
});
Expand Down
Loading
Loading