u

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

Author: joseph-isaacs

vortex-array/src/arrays/expr/vtable/array.rs

@@ -27,21 +27,12 @@ impl ArrayVTable<ExprVTable> for ExprVTable {
     fn array_hash<H: std::hash::Hasher>(array: &ExprArray, state: &mut H, precision: Precision) {
         array.child.array_hash(state, precision);
         array.dtype.hash(state);
-        // TODO(joe): fixme
-        array
-            .expr
-            .serialize_metadata()
-            .unwrap_or(None)
-            .unwrap_or_default()
-            .hash(state)
-        // Note: Expression doesn't implement Hash, so we skip it
-        // This is acceptable since expressions are typically transient
+        array.expr.hash(state)
     }
 
     fn array_eq(array: &ExprArray, other: &ExprArray, precision: Precision) -> bool {
         array.child.array_eq(&other.child, precision)
             && array.dtype == other.dtype
-            // TODO(joe): fixme
-            && array.expr.serialize_metadata().unwrap_or(None) == other.expr.serialize_metadata().unwrap_or(None)
+            && array.expr == other.expr
     }
 }

vortex-array/src/arrays/expr/vtable/operator.rs

@@ -53,7 +53,7 @@ mod tests {
 
         let expr = get_item("a", pack([("a", root())], Nullability::NonNullable));
 
-        let expr_array = ExprArray::new_infer_dtype(array.clone().into_array(), expr.clone())?;
+        let expr_array = ExprArray::new_infer_dtype(array.into_array(), expr)?;
 
         // Call reduce - it should optimize pack(a: $).a to just $
         let reduced = expr_array.reduce()?.vortex_expect("reduce failed");

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

@@ -238,7 +238,7 @@ mod tests {
 
         let expr = gt(get_item("a", root()), lit(5));
         let expr_array =
-            ExprArray::new_infer_dtype(struct_array.clone().into_array(), expr.clone())?;
+            ExprArray::new_infer_dtype(struct_array.clone().into_array(), expr)?;
 
         let actual = expr_array.to_canonical().into_array();
         let expected = (0..5)