Expressions

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

vortex-array/src/expr/vtable.rs

@@ -16,7 +16,6 @@ use vortex_dtype::DType;
 use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
-use vortex_error::vortex_ensure;
 use vortex_vector::Datum;
 use vortex_vector::VectorOps;
 

vortex-datafusion/src/convert/exprs.rs

@@ -446,18 +446,18 @@ mod tests {
         let col_expr = df_expr::Column::new("test_column", 0);
         let result = Expression::try_from_df(&col_expr).unwrap();
 
-        assert_snapshot!(result.display_tree().to_string(), @r#"
-        vortex.get_item "test_column"
-        └── input: vortex.root
-        "#);
+        assert_snapshot!(result.display_tree().to_string(), @r"
+        vortex.get_item(test_column)
+        └── input: vortex.root()
+        ");
     }
 
     #[test]
     fn test_expr_from_df_literal() {
         let literal_expr = df_expr::Literal::new(ScalarValue::Int32(Some(42)));
         let result = Expression::try_from_df(&literal_expr).unwrap();
 
-        assert_snapshot!(result.display_tree().to_string(), @"vortex.literal 42i32");
+        assert_snapshot!(result.display_tree().to_string(), @"vortex.literal(42i32)");
     }
 
     #[test]
@@ -469,12 +469,12 @@ mod tests {
 
         let result = Expression::try_from_df(&binary_expr).unwrap();
 
-        assert_snapshot!(result.display_tree().to_string(), @r#"
-        vortex.binary =
-        ├── lhs: vortex.get_item "left"
-        │   └── input: vortex.root
-        └── rhs: vortex.literal 42i32
-        "#);
+        assert_snapshot!(result.display_tree().to_string(), @r"
+        vortex.binary(=)
+        ├── lhs: vortex.get_item(left)
+        │   └── input: vortex.root()
+        └── rhs: vortex.literal(42i32)
+        ");
     }
 
     #[rstest]
@@ -667,11 +667,11 @@ mod tests {
             Arc::new(ConfigOptions::new()),
         );
         let result = Expression::try_from_df(&get_field_expr).unwrap();
-        assert_snapshot!(result.display_tree().to_string(), @r#"
-        vortex.get_item "field1"
-        └── input: vortex.get_item "my_struct"
-            └── input: vortex.root
-        "#);
+        assert_snapshot!(result.display_tree().to_string(), @r"
+        vortex.get_item(field1)
+        └── input: vortex.get_item(my_struct)
+            └── input: vortex.root()
+        ");
     }
 
     #[rstest]