Skip to content

Commit

Permalink
Merge branch 'develop' into ji/traverse-expr
Browse files Browse the repository at this point in the history
# Conflicts:
#	vortex-expr/src/binary.rs
#	vortex-expr/src/like.rs
#	vortex-expr/src/not.rs
#	vortex-expr/src/project.rs
#	vortex-expr/src/pruning.rs
  • Loading branch information
joseph-isaacs committed Jan 7, 2025
1 parent 9b80201 commit 436a554
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion vortex-datafusion/src/memory/plans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use vortex_array::compute::take;
use vortex_array::{ArrayData, IntoArrayVariant, IntoCanonical};
use vortex_dtype::Field;
use vortex_error::{vortex_err, vortex_panic, VortexError};
use vortex_expr::ExprRef;
use vortex_expr::{ExprRef, VortexExprExt};

/// Physical plan operator that applies a set of [filters][Expr] against the input, producing a
/// row mask that can be used downstream to force a take against the corresponding struct array
Expand Down
2 changes: 1 addition & 1 deletion vortex-expr/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub trait VortexExpr: Debug + Send + Sync + PartialEq<dyn Any> + Display {
fn replacing_children(self: Arc<Self>, children: Vec<ExprRef>) -> ExprRef;
}

trait VortexExprExt {
pub trait VortexExprExt {
fn references(&self) -> HashSet<&Field>;
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-file/src/read/layouts/columnar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use vortex_array::validity::Validity;
use vortex_array::{ArrayData, IntoArrayData};
use vortex_dtype::{Field, FieldName, FieldNames};
use vortex_error::{vortex_bail, vortex_err, vortex_panic, VortexExpect, VortexResult};
use vortex_expr::{col, expr_project, RowFilter, Select, VortexExpr};
use vortex_expr::{col, expr_project, RowFilter, Select, VortexExpr, VortexExprExt};
use vortex_flatbuffers::footer;

use crate::read::cache::LazyDType;
Expand Down

0 comments on commit 436a554

Please sign in to comment.