feat[vortex-array]: add

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

Author: joseph-isaacs

vortex-array/src/array/session/rewrite.rs

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
+use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::sync::Arc;
 
@@ -11,17 +12,17 @@ use crate::EncodingId;
 use crate::array::ArrayRef;
 use crate::array::transform::context::ArrayRuleContext;
 use crate::array::transform::rules::{
-    AnyParent, ArrayParentMatcher, ArrayParentReduceRule, ArrayReduceRule,
+    AnyArrayParent, ArrayParentMatcher, ArrayParentReduceRule, ArrayReduceRule,
 };
 use crate::vtable::VTable;
 
 /// Dynamic trait for array reduce rules
-pub trait DynArrayReduceRule: std::fmt::Debug + Send + Sync {
+pub trait DynArrayReduceRule: Debug + Send + Sync {
     fn reduce(&self, array: &ArrayRef, ctx: &ArrayRuleContext) -> VortexResult<Option<ArrayRef>>;
 }
 
 /// Dynamic trait for array parent reduce rules
-pub trait DynArrayParentReduceRule: std::fmt::Debug + Send + Sync {
+pub trait DynArrayParentReduceRule: Debug + Send + Sync {
     fn reduce_parent(
         &self,
         array: &ArrayRef,
@@ -118,10 +119,9 @@ impl ArrayRewriteRuleRegistry {
     pub fn register_reduce_rule<V, R>(&self, encoding: &V::Encoding, rule: R)
     where
         V: VTable,
-        R: 'static,
-        R: ArrayReduceRule<V>,
+        R: ArrayReduceRule<V> + 'static,
     {
-        let adapter: ArrayReduceRuleAdapter<V, R> = ArrayReduceRuleAdapter {
+        let adapter = ArrayReduceRuleAdapter {
             rule,
             _phantom: PhantomData,
         };
@@ -142,14 +142,12 @@ impl ArrayRewriteRuleRegistry {
     ) where
         Child: VTable,
         Parent: VTable,
-        R: 'static,
-        R: ArrayParentReduceRule<Child, Parent>,
+        R: ArrayParentReduceRule<Child, Parent> + 'static,
     {
-        let adapter: ArrayParentReduceRuleAdapter<Child, Parent, R> =
-            ArrayParentReduceRuleAdapter {
-                rule,
-                _phantom: PhantomData,
-            };
+        let adapter = ArrayParentReduceRuleAdapter {
+            rule,
+            _phantom: PhantomData,
+        };
         let child_id = Child::id(child_encoding);
         let parent_id = Parent::id(parent_encoding);
         self.inner
@@ -163,14 +161,12 @@ impl ArrayRewriteRuleRegistry {
     pub fn register_any_parent_rule<Child, R>(&self, child_encoding: &Child::Encoding, rule: R)
     where
         Child: VTable,
-        R: 'static,
-        R: ArrayParentReduceRule<Child, AnyParent>,
+        R: ArrayParentReduceRule<Child, AnyArrayParent> + 'static,
     {
-        let adapter: ArrayParentReduceRuleAdapter<Child, AnyParent, R> =
-            ArrayParentReduceRuleAdapter {
-                rule,
-                _phantom: PhantomData,
-            };
+        let adapter = ArrayParentReduceRuleAdapter {
+            rule,
+            _phantom: PhantomData,
+        };
         let child_id = Child::id(child_encoding);
         self.inner
             .any_parent_rules

vortex-array/src/array/transform/mod.rs

@@ -9,4 +9,4 @@ mod tests;
 
 pub use context::ArrayRuleContext;
 pub use optimizer::ArrayOptimizer;
-pub use rules::{AnyParent, ArrayParentMatcher, ArrayParentReduceRule, ArrayReduceRule};
+pub use rules::{AnyArrayParent, ArrayParentMatcher, ArrayParentReduceRule, ArrayReduceRule};

vortex-array/src/array/transform/rules.rs

@@ -19,9 +19,9 @@ pub trait ArrayParentMatcher: Debug + Send + Sync + 'static {
 
 /// Matches any parent type (wildcard matcher)
 #[derive(Debug)]
-pub struct AnyParent;
+pub struct AnyArrayParent;
 
-impl ArrayParentMatcher for AnyParent {
+impl ArrayParentMatcher for AnyArrayParent {
     type View<'a> = &'a ArrayRef;
 
     fn try_match(parent: &ArrayRef) -> Option<Self::View<'_>> {

vortex-array/src/expr/session/rewrite.rs

@@ -156,7 +156,7 @@ impl RewriteRuleRegistry {
         V: VTable,
         R: Debug + Send + Sync + 'static + ReduceRule<V, TypedRuleContext>,
     {
-        let adapter: ReduceRuleAdapter<V, R> = ReduceRuleAdapter {
+        let adapter = ReduceRuleAdapter {
             rule,
             _phantom: PhantomData,
         };
@@ -174,7 +174,7 @@ impl RewriteRuleRegistry {
         V: VTable,
         R: Debug + Send + Sync + 'static + ReduceRule<V, RuleContext>,
     {
-        let adapter: ReduceRuleAdapter<V, R> = ReduceRuleAdapter {
+        let adapter = ReduceRuleAdapter {
             rule,
             _phantom: PhantomData,
         };
@@ -196,7 +196,7 @@ impl RewriteRuleRegistry {
         Parent: VTable,
         R: Debug + Send + Sync + 'static + ParentReduceRule<Child, Parent, RuleContext>,
     {
-        let adapter: ReduceParentRuleAdapter<Child, Parent, R> = ReduceParentRuleAdapter {
+        let adapter = ReduceParentRuleAdapter {
             rule,
             _phantom: PhantomData,
         };
@@ -213,7 +213,7 @@ impl RewriteRuleRegistry {
         Child: VTable,
         R: Debug + Send + Sync + 'static + ParentReduceRule<Child, AnyParent, RuleContext>,
     {
-        let adapter: ReduceParentRuleAdapter<Child, AnyParent, R> = ReduceParentRuleAdapter {
+        let adapter = ReduceParentRuleAdapter {
             rule,
             _phantom: PhantomData,
         };
@@ -235,7 +235,7 @@ impl RewriteRuleRegistry {
         Parent: VTable,
         R: Debug + Send + Sync + 'static + ParentReduceRule<Child, Parent, TypedRuleContext>,
     {
-        let adapter: ReduceParentRuleAdapter<Child, Parent, R> = ReduceParentRuleAdapter {
+        let adapter = ReduceParentRuleAdapter {
             rule,
             _phantom: PhantomData,
         };
@@ -255,7 +255,7 @@ impl RewriteRuleRegistry {
         Child: VTable,
         R: Debug + Send + Sync + 'static + ParentReduceRule<Child, AnyParent, TypedRuleContext>,
     {
-        let adapter: ReduceParentRuleAdapter<Child, AnyParent, R> = ReduceParentRuleAdapter {
+        let adapter = ReduceParentRuleAdapter {
             rule,
             _phantom: PhantomData,
         };

vortex-array/src/lib.rs

@@ -13,6 +13,11 @@
 //! arrays can be [canonicalized](Canonical) into for ease of access in compute functions.
 
 pub use array::*;
+use arrays::{
+    BoolMaskedValidityRule, BoolVTable, DecimalMaskedValidityRule, DecimalVTable,
+    ExprOptimizationRule, ExprVTable, MaskedVTable, PrimitiveMaskedValidityRule, PrimitiveVTable,
+    StructExprPartitionRule, StructVTable,
+};
 pub use canonical::*;
 pub use context::*;
 pub use encoding::*;
@@ -23,7 +28,7 @@ use vortex_session::registry::Registry;
 use vortex_session::{Ref, SessionExt};
 
 use crate::array::session::rewrite::ArrayRewriteRuleRegistry;
-use crate::array::transform::{AnyParent, ArrayOptimizer, ArrayParentReduceRule, ArrayReduceRule};
+use crate::array::transform::{AnyArrayParent, ArrayOptimizer, ArrayParentReduceRule, ArrayReduceRule};
 use crate::arrays::{
     BoolEncoding, ChunkedEncoding, ConstantEncoding, DecimalEncoding, ExtensionEncoding,
     FixedSizeListEncoding, ListEncoding, ListViewEncoding, MaskedEncoding, NullEncoding,
@@ -130,7 +135,7 @@ impl ArraySession {
     pub fn register_any_parent_rule<Child, R>(&self, child_encoding: &Child::Encoding, rule: R)
     where
         Child: VTable,
-        R: 'static + ArrayParentReduceRule<Child, AnyParent>,
+        R: 'static + ArrayParentReduceRule<Child, AnyArrayParent>,
     {
         self.rewrite_rules
             .register_any_parent_rule::<Child, R>(child_encoding, rule);
@@ -173,33 +178,33 @@ impl Default for ArraySession {
             rewrite_rules: ArrayRewriteRuleRegistry::default(),
         };
 
-        session.register_parent_rule::<arrays::BoolVTable, arrays::MaskedVTable, arrays::BoolMaskedValidityRule>(
+        session.register_parent_rule::<BoolVTable, MaskedVTable, BoolMaskedValidityRule>(
             &BoolEncoding,
             &MaskedEncoding,
-            arrays::BoolMaskedValidityRule,
+            BoolMaskedValidityRule,
         );
 
-        session.register_parent_rule::<arrays::PrimitiveVTable, arrays::MaskedVTable, arrays::PrimitiveMaskedValidityRule>(
+        session.register_parent_rule::<PrimitiveVTable, MaskedVTable, PrimitiveMaskedValidityRule>(
             &PrimitiveEncoding,
             &MaskedEncoding,
-            arrays::PrimitiveMaskedValidityRule,
+            PrimitiveMaskedValidityRule,
         );
 
-        session.register_parent_rule::<arrays::DecimalVTable, arrays::MaskedVTable, arrays::DecimalMaskedValidityRule>(
+        session.register_parent_rule::<DecimalVTable, MaskedVTable, DecimalMaskedValidityRule>(
             &DecimalEncoding,
             &MaskedEncoding,
-            arrays::DecimalMaskedValidityRule,
+            DecimalMaskedValidityRule,
         );
 
-        session.register_parent_rule::<arrays::StructVTable, arrays::ExprVTable, arrays::StructExprPartitionRule>(
+        session.register_parent_rule::<StructVTable, ExprVTable, StructExprPartitionRule>(
             &StructEncoding,
             &arrays::ExprEncoding,
-            arrays::StructExprPartitionRule,
+            StructExprPartitionRule,
         );
 
-        session.register_reduce_rule::<arrays::ExprVTable, arrays::ExprOptimizationRule>(
+        session.register_reduce_rule::<ExprVTable, ExprOptimizationRule>(
             &arrays::ExprEncoding,
-            arrays::ExprOptimizationRule,
+            ExprOptimizationRule,
         );
 
         session