u

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

Author: joseph-isaacs

vortex-array/src/arrays/dict/vtable/rules.rs

@@ -15,6 +15,7 @@ use crate::arrays::DictArray;
 use crate::arrays::DictVTable;
 use crate::arrays::ScalarFnArray;
 use crate::builtins::ArrayBuiltins;
+use crate::expr::Pack;
 use crate::optimizer::ArrayOptimizer;
 use crate::optimizer::rules::ArrayParentReduceRule;
 use crate::optimizer::rules::ParentRuleSet;
@@ -44,9 +45,9 @@ impl ArrayParentReduceRule<DictVTable> for DictionaryScalarFnValuesPushDownRule
         // Check that the scalar function can actually be pushed down.
         let sig = parent.scalar_fn().signature();
 
-        // Don't push down structural expressions since we might want to unpack them in exporters
+        // Don't push down pack expressions since we might want to unpack them in exporters
         // later.
-        if sig.is_structural() {
+        if parent.scalar_fn().is::<Pack>() {
             return Ok(None);
         }
 

vortex-array/src/expr/exprs/between.rs

@@ -209,10 +209,6 @@ impl VTable for Between {
     fn is_null_sensitive(&self, _instance: &Self::Options) -> bool {
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Creates an expression that checks if values are between two bounds.

vortex-array/src/expr/exprs/binary.rs

@@ -312,10 +312,6 @@ impl VTable for Binary {
 
         !infallible
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Create a new [`Binary`] using the [`Eq`](crate::expr::exprs::operators::Operator::Eq) operator.

vortex-array/src/expr/exprs/cast.rs

@@ -151,10 +151,6 @@ impl VTable for Cast {
     fn is_null_sensitive(&self, _instance: &DType) -> bool {
         true
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Creates an expression that casts values to a target data type.

vortex-array/src/expr/exprs/dynamic.rs

@@ -188,10 +188,6 @@ impl VTable for DynamicComparison {
     fn is_null_sensitive(&self, _instance: &Self::Options) -> bool {
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 pub fn dynamic(

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

@@ -233,10 +233,6 @@ impl VTable for GetItem {
         // If this type-checks its infallible.
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Creates an expression that accesses a field from the root array.

vortex-array/src/expr/exprs/is_null.rs

@@ -118,10 +118,6 @@ impl VTable for IsNull {
     fn is_fallible(&self, _instance: &Self::Options) -> bool {
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Creates an expression that checks for null values.

vortex-array/src/expr/exprs/like.rs

@@ -141,10 +141,6 @@ impl VTable for Like {
     fn is_null_sensitive(&self, _instance: &Self::Options) -> bool {
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 pub fn like(child: Expression, pattern: Expression) -> Expression {

vortex-array/src/expr/exprs/list_contains.rs

@@ -202,10 +202,6 @@ impl VTable for ListContains {
     fn is_fallible(&self, _options: &Self::Options) -> bool {
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Creates an expression that checks if a value is contained in a list.

vortex-array/src/expr/exprs/literal.rs

@@ -139,10 +139,6 @@ impl VTable for Literal {
     fn is_fallible(&self, _instance: &Self::Options) -> bool {
         false
     }
-
-    fn is_structural(&self, _options: &Self::Options) -> bool {
-        false
-    }
 }
 
 /// Create a new `Literal` expression from a type that coerces to `Scalar`.