wip

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

Author: joseph-isaacs

vortex-array/src/arrays/struct_/vtable/reduce.rs

@@ -16,12 +16,12 @@ use crate::IntoArray;
 use crate::arrays::ExprArray;
 use crate::arrays::StructArray;
 use crate::expr::Expression;
+use crate::expr::analysis::immediate_access::annotate_scope_access;
 use crate::expr::col;
 use crate::expr::root;
 use crate::expr::session::ExprSession;
 use crate::expr::transform::ExprOptimizer;
 use crate::expr::transform::PartitionedExpr;
-use crate::expr::transform::immediate_access::annotate_scope_access;
 use crate::expr::transform::partition;
 use crate::expr::transform::replace;
 use crate::expr::transform::replace_root_fields;

vortex-array/src/expr/analysis/immediate_access.rs

@@ -7,12 +7,12 @@ use vortex_error::VortexExpect;
 use vortex_utils::aliases::hash_set::HashSet;
 
 use crate::expr::Expression;
+use crate::expr::analysis::AnnotationFn;
+use crate::expr::analysis::Annotations;
+use crate::expr::descendent_annotation_union_set;
 use crate::expr::exprs::get_item::GetItem;
 use crate::expr::exprs::root::Root;
 use crate::expr::exprs::select::Select;
-use crate::expr::transform::annotations::AnnotationFn;
-use crate::expr::transform::annotations::Annotations;
-use crate::expr::transform::annotations::descendent_annotations;
 
 pub type FieldAccesses<'a> = Annotations<'a, FieldName>;
 

vortex-array/src/expr/transform/partition.rs

@@ -23,10 +23,6 @@ use crate::expr::exprs::get_item::get_item;
 use crate::expr::exprs::pack::pack;
 use crate::expr::exprs::root::root;
 use crate::expr::transform::ExprOptimizer;
-use crate::expr::transform::annotations::Annotation;
-use crate::expr::transform::annotations::AnnotationFn;
-use crate::expr::transform::annotations::Annotations;
-use crate::expr::transform::annotations::descendent_annotations;
 use crate::expr::traversal::NodeExt;
 use crate::expr::traversal::NodeRewriter;
 use crate::expr::traversal::Transformed;

vortex-layout/src/layouts/struct_/reader.rs

@@ -17,12 +17,12 @@ use vortex_array::expr::ExactExpr;
 use vortex_array::expr::Expression;
 use vortex_array::expr::Merge;
 use vortex_array::expr::Pack;
+use vortex_array::expr::annotate_scope_access;
 use vortex_array::expr::col;
 use vortex_array::expr::root;
 use vortex_array::expr::session::ExprSessionExt;
 use vortex_array::expr::transform::ExprOptimizer;
 use vortex_array::expr::transform::PartitionedExpr;
-use vortex_array::expr::transform::immediate_access::annotate_scope_access;
 use vortex_array::expr::transform::partition;
 use vortex_array::expr::transform::replace;
 use vortex_array::expr::transform::replace_root_fields;

vortex-scan/src/scan_builder.rs

@@ -9,10 +9,10 @@ use futures::future::BoxFuture;
 use itertools::Itertools;
 use vortex_array::ArrayRef;
 use vortex_array::expr::Expression;
+use vortex_array::expr::analysis::immediate_access::immediate_scope_access;
 use vortex_array::expr::root;
 use vortex_array::expr::session::ExprSessionExt;
 use vortex_array::expr::transform::ExprOptimizer;
-use vortex_array::expr::transform::immediate_access::immediate_scope_access;
 use vortex_array::iter::ArrayIterator;
 use vortex_array::iter::ArrayIteratorAdapter;
 use vortex_array::stats::StatsSet;