Skip to content

Commit 29fe7c3

Browse files
committed
Move scalar functions out of vortex-array into vortex-functions
vortex-array keeps the scalar function machinery (the `ScalarFnVTable` trait, binding, reduction, execution, the session registry and kernel registry) and the few functions its own arrays, validity and expressions are built on: literal, get_item, pack and select, is_null, is_not_null, not and the binary operators, and cast, mask and fill_null, which canonical arrays apply to their own children. That module is renamed from `scalar_fn::fns` to `scalar_fn::builtin`, matching `ArrayBuiltins`. Select stays because get_item reads through a selection. Every other scalar function moves to the new `vortex-functions` crate: - byte_length, case_when, ext_storage, list_length, list_sum, list_transform, merge, replace_time_zone, dynamic, dynamic_expression, stat, between, like, list_contains, variant_get, is_nan and zip, with their expression constructors in `vortex_functions::expr` (and `expr::bound`) - the kernels and parent-reduce rules for vortex-array's encodings, including `Widen`'s between and zip kernels, which `vortex_functions::initialize` registers with a session's kernel registry - the `ArrayBuiltins`/`ExprBuiltins` methods for the moved functions, which become the `ArrayFunctions`/`ExprFunctions` extension traits `ArrayHaystack`, `LazyBitBufferBuilder`, `DeduplicatedBuffers::{extend_from_iter, finish}`, `ListScalar::element_values`, `is_not_null_node`, `build_row_comparator`, `merge_typed_scalar_as_variant` and the `Widen` compute helpers become public for the moved kernels, and `ForeignExtDType` is public under `_test-harness` for the moved tests. The umbrella crate re-exports the moved constructors under `vortex::expr` and the crate as `vortex::functions`. vortex-array's integration tests and benches use vortex-functions as a dev-dependency. The CodSpeed shard plan picks up the benchmarks that move to `vortex-functions`; their recorded counts and durations move with them. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01Ps4mp7KF5c4p66aoSoXx5j Signed-off-by: Claude <[email protected]>
1 parent 26a12a6 commit 29fe7c3

430 files changed

Lines changed: 5027 additions & 4413 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 46 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ members = [
1313
"vortex-io",
1414
"vortex-cloud",
1515
"vortex-array",
16+
"vortex-functions",
1617
"vortex-expr",
1718
"vortex-arrow",
1819
"vortex-row",
@@ -322,6 +323,7 @@ vortex-expr = { version = "0.1.0", path = "./vortex-expr", default-features = fa
322323
vortex-fastlanes = { version = "0.1.0", path = "./encodings/fastlanes", default-features = false }
323324
vortex-file = { version = "0.1.0", path = "./vortex-file", default-features = false }
324325
vortex-fsst = { version = "0.1.0", path = "./encodings/fsst", default-features = false }
326+
vortex-functions = { version = "0.1.0", path = "./vortex-functions", default-features = false }
325327
vortex-io = { version = "0.1.0", path = "./vortex-io", default-features = false }
326328
vortex-ipc = { version = "0.1.0", path = "./vortex-ipc", default-features = false }
327329
vortex-json = { version = "0.1.0", path = "./vortex-json", default-features = false }

‎encodings/alp/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ vortex-array = { workspace = true }
2424
vortex-buffer = { workspace = true }
2525
vortex-error = { workspace = true }
2626
vortex-fastlanes = { workspace = true }
27+
vortex-functions = { workspace = true }
2728
vortex-mask = { workspace = true }
2829
vortex-session = { workspace = true }
2930

‎encodings/alp/src/alp/compute/between.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ use vortex_array::ArrayView;
99
use vortex_array::ExecutionCtx;
1010
use vortex_array::IntoArray;
1111
use vortex_array::arrays::ConstantArray;
12-
use vortex_array::builtins::ArrayBuiltins;
1312
use vortex_array::dtype::NativeDType;
1413
use vortex_array::dtype::NativePType;
1514
use vortex_array::dtype::Nullability;
1615
use vortex_array::scalar::PValue;
1716
use vortex_array::scalar::Scalar;
18-
use vortex_array::scalar_fn::fns::between::BetweenKernel;
19-
use vortex_array::scalar_fn::fns::between::BetweenOptions;
20-
use vortex_array::scalar_fn::fns::between::BetweenReduce;
21-
use vortex_array::scalar_fn::fns::between::StrictComparison;
2217
use vortex_error::VortexResult;
18+
use vortex_functions::between::BetweenKernel;
19+
use vortex_functions::between::BetweenOptions;
20+
use vortex_functions::between::BetweenReduce;
21+
use vortex_functions::between::StrictComparison;
22+
use vortex_functions::builtins::ArrayFunctions;
2323

2424
use crate::ALP;
2525
use crate::ALPFloat;
@@ -199,12 +199,12 @@ mod tests {
199199
use vortex_array::arrays::ConstantArray;
200200
use vortex_array::arrays::PrimitiveArray;
201201
use vortex_array::assert_arrays_eq;
202-
use vortex_array::builtins::ArrayBuiltins;
203202
use vortex_array::dtype::Nullability;
204203
use vortex_array::scalar::Scalar;
205-
use vortex_array::scalar_fn::fns::between::BetweenOptions;
206-
use vortex_array::scalar_fn::fns::between::StrictComparison;
207204
use vortex_error::VortexResult;
205+
use vortex_functions::between::BetweenOptions;
206+
use vortex_functions::between::StrictComparison;
207+
use vortex_functions::builtins::ArrayFunctions;
208208
use vortex_session::VortexSession;
209209

210210
use crate::ALPArray;

‎encodings/alp/src/alp/compute/cast.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use vortex_array::ArrayView;
66
use vortex_array::IntoArray;
77
use vortex_array::builtins::ArrayBuiltins;
88
use vortex_array::dtype::DType;
9-
use vortex_array::scalar_fn::fns::cast::CastReduce;
9+
use vortex_array::scalar_fn::builtin::cast::CastReduce;
1010
use vortex_error::VortexResult;
1111

1212
use crate::ALPArrayExt;

‎encodings/alp/src/alp/compute/compare.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ use vortex_array::dtype::NativePType;
1111
use vortex_array::dtype::Nullability;
1212
use vortex_array::scalar::PValue;
1313
use vortex_array::scalar::Scalar;
14-
use vortex_array::scalar_fn::fns::binary::CompareKernel;
15-
use vortex_array::scalar_fn::fns::operators::CompareOperator;
16-
use vortex_array::scalar_fn::fns::operators::Operator;
14+
use vortex_array::scalar_fn::builtin::binary::CompareKernel;
15+
use vortex_array::scalar_fn::builtin::operators::CompareOperator;
16+
use vortex_array::scalar_fn::builtin::operators::Operator;
1717
use vortex_error::VortexExpect;
1818
use vortex_error::VortexResult;
1919

@@ -144,9 +144,9 @@ mod tests {
144144
use vortex_array::dtype::Nullability;
145145
use vortex_array::dtype::PType;
146146
use vortex_array::scalar::Scalar;
147-
use vortex_array::scalar_fn::fns::binary::CompareKernel;
148-
use vortex_array::scalar_fn::fns::operators::CompareOperator;
149-
use vortex_array::scalar_fn::fns::operators::Operator;
147+
use vortex_array::scalar_fn::builtin::binary::CompareKernel;
148+
use vortex_array::scalar_fn::builtin::operators::CompareOperator;
149+
use vortex_array::scalar_fn::builtin::operators::Operator;
150150
use vortex_error::VortexResult;
151151
use vortex_session::VortexSession;
152152

‎encodings/alp/src/alp/compute/mask.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use vortex_array::ArrayView;
66
use vortex_array::ExecutionCtx;
77
use vortex_array::IntoArray;
88
use vortex_array::builtins::ArrayBuiltins;
9-
use vortex_array::scalar_fn::fns::mask::MaskKernel;
10-
use vortex_array::scalar_fn::fns::mask::MaskReduce;
9+
use vortex_array::scalar_fn::builtin::mask::MaskKernel;
10+
use vortex_array::scalar_fn::builtin::mask::MaskReduce;
1111
use vortex_array::validity::Validity;
1212
use vortex_error::VortexResult;
1313

@@ -58,7 +58,7 @@ mod test {
5858
use vortex_array::arrays::PrimitiveArray;
5959
use vortex_array::compute::conformance::mask::test_mask_conformance;
6060
use vortex_array::dtype::Nullability;
61-
use vortex_array::scalar_fn::fns::mask::MaskKernel;
61+
use vortex_array::scalar_fn::builtin::mask::MaskKernel;
6262
use vortex_buffer::buffer;
6363
use vortex_session::VortexSession;
6464

‎encodings/alp/src/alp/rules.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ use vortex_array::arrays::filter::FilterExecuteAdaptor;
1010
use vortex_array::arrays::slice::SliceExecuteAdaptor;
1111
use vortex_array::optimizer::kernels::ArrayKernelsExt;
1212
use vortex_array::scalar_fn::ScalarFnVTable;
13-
use vortex_array::scalar_fn::fns::between::Between;
14-
use vortex_array::scalar_fn::fns::between::BetweenExecuteAdaptor;
15-
use vortex_array::scalar_fn::fns::between::BetweenReduceAdaptor;
16-
use vortex_array::scalar_fn::fns::binary::Binary;
17-
use vortex_array::scalar_fn::fns::binary::CompareExecuteAdaptor;
18-
use vortex_array::scalar_fn::fns::cast::Cast;
19-
use vortex_array::scalar_fn::fns::cast::CastReduceAdaptor;
20-
use vortex_array::scalar_fn::fns::mask::Mask as MaskFn;
21-
use vortex_array::scalar_fn::fns::mask::Mask;
22-
use vortex_array::scalar_fn::fns::mask::MaskExecuteAdaptor;
23-
use vortex_array::scalar_fn::fns::mask::MaskReduceAdaptor;
13+
use vortex_array::scalar_fn::builtin::binary::Binary;
14+
use vortex_array::scalar_fn::builtin::binary::CompareExecuteAdaptor;
15+
use vortex_array::scalar_fn::builtin::cast::Cast;
16+
use vortex_array::scalar_fn::builtin::cast::CastReduceAdaptor;
17+
use vortex_array::scalar_fn::builtin::mask::Mask;
18+
use vortex_array::scalar_fn::builtin::mask::Mask as MaskFn;
19+
use vortex_array::scalar_fn::builtin::mask::MaskExecuteAdaptor;
20+
use vortex_array::scalar_fn::builtin::mask::MaskReduceAdaptor;
21+
use vortex_functions::between::Between;
22+
use vortex_functions::between::BetweenExecuteAdaptor;
23+
use vortex_functions::between::BetweenReduceAdaptor;
2424
use vortex_session::VortexSession;
2525

2626
use crate::ALP;

‎encodings/alp/src/alp_rd/compute/cast.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use vortex_array::ArrayView;
66
use vortex_array::IntoArray;
77
use vortex_array::builtins::ArrayBuiltins;
88
use vortex_array::dtype::DType;
9-
use vortex_array::scalar_fn::fns::cast::CastReduce;
9+
use vortex_array::scalar_fn::builtin::cast::CastReduce;
1010
use vortex_error::VortexResult;
1111

1212
use crate::ALPRDArrayExt;

‎encodings/alp/src/alp_rd/compute/mask.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
use vortex_array::ArrayRef;
55
use vortex_array::ArrayView;
66
use vortex_array::IntoArray;
7-
use vortex_array::scalar_fn::fns::mask::Mask as MaskExpr;
8-
use vortex_array::scalar_fn::fns::mask::MaskReduce;
7+
use vortex_array::scalar_fn::builtin::mask::Mask as MaskExpr;
8+
use vortex_array::scalar_fn::builtin::mask::MaskReduce;
99
use vortex_error::VortexResult;
1010

1111
use crate::ALPRD;

0 commit comments

Comments
 (0)