wip

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

Cargo.lock

@@ -14,7 +14,6 @@ members = [
     "vortex-dtype",
     "vortex-duckdb",
     "vortex-error",
-    "vortex-expr",
     "vortex-ffi",
     "vortex-file",
     "vortex-flatbuffers",
@@ -230,7 +229,6 @@ vortex-decimal-byte-parts = { version = "0.1.0", path = "encodings/decimal-byte-
 vortex-dict = { version = "0.1.0", path = "./encodings/dict", default-features = false }
 vortex-dtype = { version = "0.1.0", path = "./vortex-dtype", 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-flatbuffers = { version = "0.1.0", path = "./vortex-flatbuffers", default-features = false }

Cargo.toml

@@ -44,7 +44,6 @@ rand = { workspace = true }
 rstest = { workspace = true }
 vortex-alp = { path = "../alp" }
 vortex-array = { workspace = true, features = ["test-harness"] }
-vortex-expr = { workspace = true }
 vortex-fastlanes = { path = ".", features = ["test-harness"] }
 
 [features]

encodings/fastlanes/Cargo.toml

@@ -31,7 +31,6 @@ itertools = { workspace = true }
 rstest = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 vortex-array = { path = "../../vortex-array", features = ["test-harness"] }
-vortex-expr = { path = "../../vortex-expr" }
 vortex-file = { path = "../../vortex-file", features = ["tokio"] }
 vortex-layout = { path = "../../vortex-layout" }
 

encodings/sequence/Cargo.toml

@@ -27,7 +27,6 @@ vortex-btrblocks = { workspace = true }
 vortex-buffer = { workspace = true }
 vortex-dtype = { workspace = true, features = ["arbitrary"] }
 vortex-error = { workspace = true }
-vortex-expr = { workspace = true, features = ["arbitrary"] }
 vortex-file = { workspace = true, features = ["tokio", "zstd"] }
 vortex-io = { workspace = true }
 vortex-layout = { workspace = true, features = ["zstd"] }

fuzz/Cargo.toml

@@ -54,6 +54,7 @@ rand = { workspace = true }
 rstest = { workspace = true, optional = true }
 rstest_reuse = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
+serde = { workspace = true, optional = true, features = ["derive"] }
 simdutf8 = { workspace = true }
 static_assertions = { workspace = true }
 tabled = { workspace = true, optional = true, default-features = false, features = [
@@ -68,6 +69,7 @@ vortex-flatbuffers = { workspace = true, features = ["array"] }
 vortex-io = { workspace = true }
 vortex-mask = { workspace = true }
 vortex-metrics = { workspace = true }
+vortex-proto = { workspace = true, features = ["expr"] }
 vortex-scalar = { workspace = true }
 vortex-session = { workspace = true }
 vortex-utils = { workspace = true }
@@ -82,6 +84,12 @@ arbitrary = [
 canonical_counter = []
 table-display = ["dep:tabled"]
 test-harness = ["dep:goldenfile", "dep:rstest", "dep:rstest_reuse"]
+serde = [
+    "dep:serde",
+    "vortex-dtype/serde",
+    "vortex-error/serde",
+    "vortex-buffer/serde",
+]
 
 [dev-dependencies]
 arrow-cast = { workspace = true }
@@ -126,3 +134,8 @@ harness = false
 [[bench]]
 name = "varbinview_compact"
 harness = false
+
+[[bench]]
+name = "expr_large_struct_pack"
+path = "benches/expr/large_struct_pack.rs"
+harness = false

vortex-array/Cargo.toml

@@ -1,4 +1,10 @@
-# Vortex Expressions
+# Vortex array
+
+TODO
+
+Also contains
+
+## Vortex Expressions
 
 A crate defining serializable predicate expressions. Used predominantly for filter push-down.
 

vortex-expr/README.md vortex-array/README.mdvortex-expr/README.md renamed to vortex-array/README.md

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-use vortex_array::stats::Stat;
 use vortex_dtype::FieldPath;
 
-use crate::Expression;
+use crate::expr::Expression;
+use crate::stats::Stat;
 
 /// A catalog of available stats that are associated with field paths.
 pub trait StatsCatalog {