u

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

Author: joseph-isaacs

vortex-array/src/expr/exprs/get_item/transform.rs

@@ -69,7 +69,7 @@ mod tests {
 
         // Create: get_item("x", lit(42)) - not a pack child
         let lit_expr = lit(42);
-        let get_item_expr = get_item("x", lit_expr.clone());
+        let get_item_expr = get_item("x", lit_expr);
 
         let dtype = DType::Primitive(PType::I32, NonNullable);
         let ctx = SimpleRewriteContext { dtype: &dtype };

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

@@ -23,6 +23,7 @@ use crate::expr::exprs::pack::Pack;
 use crate::expr::exprs::root::Root;
 use crate::expr::exprs::select::Select;
 use crate::expr::exprs::select::transform::RemoveSelectRule;
+use crate::expr::transform::TypedRewriteContext;
 use crate::expr::transform::rules::{ParentReduceRule, ReduceRule, RewriteContext};
 use crate::expr::{ExprVTable, VTable};
 
@@ -62,7 +63,7 @@ impl ExprSession {
     where
         V: VTable,
         R: 'static,
-        for<'a> R: ReduceRule<V, &'a dyn crate::expr::transform::TypedRewriteContext>,
+        for<'a> R: ReduceRule<V, &'a dyn TypedRewriteContext>,
     {
         self.rewrite_rules.register_typed_reduce_rule(vtable, rule);
     }
@@ -93,7 +94,7 @@ impl ExprSession {
     where
         V: VTable,
         R: 'static,
-        for<'a> R: ParentReduceRule<V, &'a dyn crate::expr::transform::TypedRewriteContext>,
+        for<'a> R: ParentReduceRule<V, &'a dyn TypedRewriteContext>,
     {
         self.rewrite_rules.register_typed_parent_rule(vtable, rule);
     }

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

@@ -28,21 +28,34 @@ pub(crate) trait DynTypedReduceRule: Send + Sync {
     ) -> VortexResult<Option<Expression>>;
 }
 
-/// Concrete wrapper that implements DynReduceRule for rules with `&dyn RewriteContext` context.
-struct ReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ReduceRule<V, &'a dyn RewriteContext>,
-{
+/// Type-erased wrapper for ParentReduceRule that allows dynamic dispatch.
+pub(crate) trait DynParentReduceRule: Send + Sync {
+    fn reduce_parent_dyn(
+        &self,
+        expr: &Expression,
+        parent: &Expression,
+        child_idx: usize,
+        ctx: &dyn RewriteContext,
+    ) -> VortexResult<Option<Expression>>;
+}
+
+pub(crate) trait DynTypedParentReduceRule: Send + Sync {
+    fn reduce_parent_dyn_typed(
+        &self,
+        expr: &Expression,
+        parent: &Expression,
+        child_idx: usize,
+        ctx: &dyn TypedRewriteContext,
+    ) -> VortexResult<Option<Expression>>;
+}
+
+/// Universal adapter for both ReduceRule and ParentReduceRule with any context type.
+struct RuleAdapter<V: VTable, R> {
     rule: R,
     _phantom: PhantomData<V>,
 }
 
-impl<V, R> ReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ReduceRule<V, &'a dyn RewriteContext>,
-{
+impl<V: VTable, R> RuleAdapter<V, R> {
     fn new(rule: R) -> Self {
         Self {
             rule,
@@ -51,7 +64,8 @@ where
     }
 }
 
-impl<V, R> DynReduceRule for ReduceRuleAdapter<V, R>
+// Implement DynReduceRule for any ReduceRule with RewriteContext
+impl<V, R> DynReduceRule for RuleAdapter<V, R>
 where
     V: VTable,
     for<'a> R: ReduceRule<V, &'a dyn RewriteContext>,
@@ -68,30 +82,8 @@ where
     }
 }
 
-/// Concrete wrapper that implements DynReduceRule for rules with `&dyn TypedRewriteContext` context.
-struct TypedReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ReduceRule<V, &'a dyn TypedRewriteContext>,
-{
-    rule: R,
-    _phantom: PhantomData<V>,
-}
-
-impl<V, R> TypedReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ReduceRule<V, &'a dyn TypedRewriteContext>,
-{
-    fn new(rule: R) -> Self {
-        Self {
-            rule,
-            _phantom: PhantomData,
-        }
-    }
-}
-
-impl<V, R> DynTypedReduceRule for TypedReduceRuleAdapter<V, R>
+// Implement DynTypedReduceRule for any ReduceRule with TypedRewriteContext
+impl<V, R> DynTypedReduceRule for RuleAdapter<V, R>
 where
     V: VTable,
     for<'a> R: ReduceRule<V, &'a dyn TypedRewriteContext>,
@@ -108,41 +100,8 @@ where
     }
 }
 
-/// Type-erased wrapper for ParentReduceRule that allows dynamic dispatch.
-pub(crate) trait DynParentReduceRule: Send + Sync {
-    fn reduce_parent_dyn(
-        &self,
-        expr: &Expression,
-        parent: &Expression,
-        child_idx: usize,
-        ctx: &dyn RewriteContext,
-    ) -> VortexResult<Option<Expression>>;
-}
-
-/// Concrete wrapper that implements DynParentReduceRule for a specific VTable type.
-struct ParentReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ParentReduceRule<V, &'a dyn RewriteContext>,
-{
-    rule: R,
-    _phantom: PhantomData<V>,
-}
-
-impl<V, R> ParentReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ParentReduceRule<V, &'a dyn RewriteContext>,
-{
-    fn new(rule: R) -> Self {
-        Self {
-            rule,
-            _phantom: PhantomData,
-        }
-    }
-}
-
-impl<V, R> DynParentReduceRule for ParentReduceRuleAdapter<V, R>
+// Implement DynParentReduceRule for any ParentReduceRule with RewriteContext
+impl<V, R> DynParentReduceRule for RuleAdapter<V, R>
 where
     V: VTable,
     for<'a> R: ParentReduceRule<V, &'a dyn RewriteContext>,
@@ -161,39 +120,8 @@ where
     }
 }
 
-pub(crate) trait DynTypedParentReduceRule: Send + Sync {
-    fn reduce_parent_dyn_typed(
-        &self,
-        expr: &Expression,
-        parent: &Expression,
-        child_idx: usize,
-        ctx: &dyn TypedRewriteContext,
-    ) -> VortexResult<Option<Expression>>;
-}
-
-struct TypedParentReduceRuleAdapter<V: VTable, R>
-where
-    V: VTable,
-    for<'a> R: ParentReduceRule<V, &'a dyn TypedRewriteContext>,
-{
-    rule: R,
-    _phantom: PhantomData<V>,
-}
-
-impl<V, R> TypedParentReduceRuleAdapter<V, R>
-where
-    V: VTable,
-    for<'a> R: ParentReduceRule<V, &'a dyn TypedRewriteContext>,
-{
-    fn new(rule: R) -> Self {
-        Self {
-            rule,
-            _phantom: PhantomData,
-        }
-    }
-}
-
-impl<V, R> DynTypedParentReduceRule for TypedParentReduceRuleAdapter<V, R>
+// Implement DynTypedParentReduceRule for any ParentReduceRule with TypedRewriteContext
+impl<V, R> DynTypedParentReduceRule for RuleAdapter<V, R>
 where
     V: VTable,
     for<'a> R: ParentReduceRule<V, &'a dyn TypedRewriteContext>,
@@ -252,7 +180,7 @@ impl RewriteRuleRegistry {
         for<'a> R: ReduceRule<V, &'a dyn TypedRewriteContext>,
     {
         let id = vtable.id();
-        let adapter = TypedReduceRuleAdapter::new(rule);
+        let adapter = RuleAdapter::new(rule);
         self.typed_reduce_rules
             .entry(id)
             .or_default()
@@ -268,7 +196,7 @@ impl RewriteRuleRegistry {
         for<'a> R: ReduceRule<V, &'a dyn RewriteContext>,
     {
         let id = vtable.id();
-        let adapter = ReduceRuleAdapter::new(rule);
+        let adapter = RuleAdapter::new(rule);
         self.reduce_rules
             .entry(id)
             .or_default()
@@ -282,7 +210,7 @@ impl RewriteRuleRegistry {
         for<'a> R: ParentReduceRule<V, &'a dyn RewriteContext>,
     {
         let id = vtable.id();
-        let adapter = ParentReduceRuleAdapter::new(rule);
+        let adapter = RuleAdapter::new(rule);
         self.parent_rules
             .entry(id)
             .or_default()
@@ -297,7 +225,7 @@ impl RewriteRuleRegistry {
         for<'a> R: ParentReduceRule<V, &'a dyn TypedRewriteContext>,
     {
         let id = vtable.id();
-        let adapter = TypedParentReduceRuleAdapter::new(rule);
+        let adapter = RuleAdapter::new(rule);
         self.typed_parent_rules
             .entry(id)
             .or_default()

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

@@ -110,7 +110,7 @@ mod tests {
         // Test: 0 + x should simplify to x
         let x = col("x");
         let zero = lit(0);
-        let expr = checked_add(zero.clone(), x.clone());
+        let expr = checked_add(zero, x.clone());
 
         let result = simplify(expr, &session).unwrap();
 
@@ -125,8 +125,8 @@ mod tests {
         // Test: 0 + (0 + x) should simplify to 0 + x, then to x
         let x = col("x");
         let zero = lit(0);
-        let zero_plus_x = checked_add(zero.clone(), x.clone());
-        let expr = checked_add(zero.clone(), zero_plus_x);
+        let zero_plus_x = checked_add(lit(0), x.clone());
+        let expr = checked_add(zero, zero_plus_x);
 
         let result = simplify(expr, &session).unwrap();
 
@@ -141,7 +141,7 @@ mod tests {
         // Test: x + 0 should simplify to x
         let x = col("x");
         let zero = lit(0);
-        let expr = checked_add(x.clone(), zero.clone());
+        let expr = checked_add(x.clone(), zero);
 
         let result = simplify(expr, &session).unwrap();
 
@@ -156,8 +156,8 @@ mod tests {
         // Test: (0 + x) + 0 should simplify to x
         let x = col("x");
         let zero = lit(0);
-        let zero_plus_x = checked_add(zero.clone(), x.clone());
-        let expr = checked_add(zero_plus_x, zero.clone());
+        let zero_plus_x = checked_add(lit(0), x.clone());
+        let expr = checked_add(zero_plus_x, zero);
 
         let result = simplify(expr, &session).unwrap();