wip

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

Author: joseph-isaacs

…rc/expr/analysis/annotation_union_set.rs …ex-array/src/expr/analysis/annotation.rsvortex-array/src/expr/analysis/annotation_union_set.rs renamed to vortex-array/src/expr/analysis/annotation.rs vortex-array/src/expr/analysis/annotation_union_set.rs renamed to vortex-array/src/expr/analysis/annotation.rs

@@ -35,7 +35,7 @@ pub type Annotations<'a, A> = HashMap<&'a Expression, HashSet<A>>;
 ///
 /// Returns a map of each expression to all annotations that any of its descendent (child)
 /// expressions are annotated with.
-pub fn descendent_annotation_union_set<A: AnnotationFn>(
+pub fn descendent_annotations<A: AnnotationFn>(
     expr: &Expression,
     annotate: A,
 ) -> Annotations<'_, A::Annotation> {

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

@@ -9,7 +9,7 @@ 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::descendent_annotations;
 use crate::expr::exprs::get_item::GetItem;
 use crate::expr::exprs::root::Root;
 use crate::expr::exprs::select::Select;
@@ -47,7 +47,7 @@ pub fn immediate_scope_accesses<'a>(
     expr: &'a Expression,
     scope: &'a StructFields,
 ) -> FieldAccesses<'a> {
-    descendent_annotation_union_set(expr, annotate_scope_access(scope))
+    descendent_annotations(expr, annotate_scope_access(scope))
 }
 
 /// This returns the immediate scope_access (as explained `immediate_scope_accesses`) for `expr`.

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

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-pub mod annotation_union_set;
+pub mod annotation;
 pub mod immediate_access;
 mod labeling;
 mod null_sensitive;
 
-pub use annotation_union_set::*;
+pub use annotation::*;
 pub use immediate_access::*;
 pub use labeling::*;
 pub use null_sensitive::*;

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

@@ -18,7 +18,7 @@ use crate::expr::Expression;
 use crate::expr::analysis::Annotation;
 use crate::expr::analysis::AnnotationFn;
 use crate::expr::analysis::Annotations;
-use crate::expr::analysis::descendent_annotation_union_set;
+use crate::expr::analysis::descendent_annotations;
 use crate::expr::exprs::get_item::get_item;
 use crate::expr::exprs::pack::pack;
 use crate::expr::exprs::root::root;
@@ -50,7 +50,7 @@ where
     FieldName: From<A::Annotation>,
 {
     // Annotate each expression with the annotations that any of its descendent expressions have.
-    let annotations = descendent_annotation_union_set(&expr, annotate_fn);
+    let annotations = descendent_annotations(&expr, annotate_fn);
 
     // Now we split the original expression into sub-expressions based on the annotations, and
     // generate a root expression to re-assemble the results.