Overtime events

Author: gatesn

vortex-expr/Cargo.toml

@@ -22,9 +22,6 @@ workspace = true
 [dependencies]
 arbitrary = { workspace = true, optional = true }
 arcref = { workspace = true }
-async-trait = { workspace = true }
-dyn-hash = { workspace = true }
-futures = { workspace = true }
 itertools = { workspace = true }
 parking_lot = { workspace = true }
 paste = { workspace = true }

vortex-expr/src/v2.rs vortex-expr/src/expression.rsvortex-expr/src/v2.rs renamed to vortex-expr/src/expression.rs

@@ -11,9 +11,9 @@ use vortex_dtype::DType::Bool;
 use vortex_error::{VortexExpect, VortexResult, vortex_bail};
 use vortex_proto::expr as pb;
 
+use crate::expression::Expression;
 use crate::exprs::binary::Binary;
 use crate::exprs::operators::Operator;
-use crate::v2::Expression;
 use crate::{ChildName, ExprId, ExprInstance, StatsCatalog, VTable, VTableExt};
 
 /// An optimized scalar expression to compute whether values fall between two bounds.

vortex-expr/src/exprs/between.rs

@@ -10,9 +10,9 @@ use vortex_dtype::DType;
 use vortex_error::{VortexExpect, VortexResult, vortex_bail};
 use vortex_proto::expr as pb;
 
+use crate::expression::Expression;
 use crate::exprs::literal::lit;
 use crate::exprs::operators::Operator;
-use crate::v2::Expression;
 use crate::{ChildName, ExprId, ExprInstance, StatsCatalog, VTable, VTableExt};
 
 pub struct Binary;

vortex-expr/src/exprs/binary.rs

@@ -11,7 +11,7 @@ use vortex_dtype::{DType, FieldPath};
 use vortex_error::{VortexExpect, VortexResult, vortex_bail, vortex_err};
 use vortex_proto::expr as pb;
 
-use crate::v2::Expression;
+use crate::expression::Expression;
 use crate::{ChildName, ExprId, ExprInstance, StatsCatalog, VTable, VTableExt};
 
 /// A cast expression that converts values to a target data type.

vortex-expr/src/exprs/cast.rs

@@ -8,7 +8,7 @@ use vortex_array::stats::Stat;
 use vortex_dtype::{DType, FieldPath};
 use vortex_error::{VortexExpect, VortexResult, vortex_bail};
 
-use crate::v2::Expression;
+use crate::expression::Expression;
 use crate::{ChildName, ExprId, ExprInstance, StatsCatalog, VTable, VTableExt};
 
 /// An expression that returns the full scope of the expression evaluation.

vortex-expr/src/exprs/root.rs

@@ -11,8 +11,8 @@ use vortex_error::{VortexExpect, VortexResult, vortex_bail, vortex_err};
 use vortex_proto::expr::select_opts::Opts;
 use vortex_proto::expr::{FieldNames as ProtoFieldNames, SelectOpts};
 
+use crate::expression::Expression;
 use crate::field::DisplayFieldNames;
-use crate::v2::Expression;
 use crate::{ChildName, ExprId, ExprInstance, VTable, VTableExt};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]

vortex-expr/src/exprs/select.rs

@@ -22,6 +22,7 @@ mod analysis;
 #[cfg(feature = "arbitrary")]
 pub mod arbitrary;
 pub mod display;
+mod expression;
 mod exprs;
 mod field;
 pub mod forms;
@@ -32,14 +33,13 @@ mod scope_vars;
 pub mod session;
 pub mod transform;
 pub mod traversal;
-mod v2;
 mod vtable;
 
 pub use analysis::*;
+pub use expression::*;
 pub use exprs::*;
 pub use scope::*;
 pub use scope_vars::*;
-pub use v2::*;
 use vortex_dtype::{DType, FieldName};
 use vortex_error::VortexUnwrap;
 use vortex_utils::aliases::hash_set::HashSet;

vortex-expr/src/lib.rs

@@ -12,7 +12,7 @@ use vortex_array::ArrayRef;
 use vortex_dtype::{DType, FieldPath};
 use vortex_error::{VortexExpect, VortexResult, vortex_err};
 
-use crate::v2::{ExprInstance, Expression};
+use crate::expression::{ExprInstance, Expression};
 use crate::{ExprId, StatsCatalog};
 
 /// The vtable trait for a Vortex expression.