Expression VTable

fuzz/fuzz_targets/file_io.rs

@@ -42,7 +42,7 @@ fuzz_target!(|fuzz: FuzzFileAction| -> Corpus {
         let filtered = filter(&array_data, &mask).vortex_unwrap();
         projection_expr
             .clone()
-            .unwrap_or_else(|| root())
+            .unwrap_or_else(root)
             .evaluate(&Scope::new(filtered))
             .vortex_unwrap()
     };
@@ -69,7 +69,7 @@ fuzz_target!(|fuzz: FuzzFileAction| -> Corpus {
         .vortex_unwrap()
         .scan()
         .vortex_unwrap()
-        .with_projection(projection_expr.unwrap_or_else(|| root()))
+        .with_projection(projection_expr.unwrap_or_else(root))
         .with_some_filter(filter_expr)
         .into_array_iter(&*RUNTIME)
         .vortex_unwrap()

fuzz/src/file/mod.rs

@@ -4,16 +4,16 @@
 use libfuzzer_sys::arbitrary::{Arbitrary, Unstructured};
 use vortex_array::ArrayRef;
 use vortex_array::arrays::arbitrary::ArbitraryArray;
-use vortex_expr::ExprRef;
+use vortex_expr::Expression;
 use vortex_expr::arbitrary::{filter_expr, projection_expr};
 
 use crate::array::CompressorStrategy;
 
 #[derive(Debug)]
 pub struct FuzzFileAction {
     pub array: ArrayRef,
-    pub projection_expr: Option<ExprRef>,
-    pub filter_expr: Option<ExprRef>,
+    pub projection_expr: Option<Expression>,
+    pub filter_expr: Option<Expression>,
     pub compressor_strategy: CompressorStrategy,
 }
 

java/vortex-jni/src/main/java/dev/vortex/api/expressions/Binary.java

@@ -172,7 +172,7 @@ public static Binary ltEq(Expression left, Expression right) {
 
     @Override
     public String id() {
-        return "binary";
+        return "vortex.binary";
     }
 
     @Override

java/vortex-jni/src/main/java/dev/vortex/api/expressions/GetItem.java

@@ -78,7 +78,7 @@ public String getPath() {
 
     @Override
     public String id() {
-        return "get_item";
+        return "vortex.get_item";
     }
 
     @Override

java/vortex-jni/src/main/java/dev/vortex/api/expressions/Literal.java

@@ -72,7 +72,7 @@ public T getValue() {
 
     @Override
     public String id() {
-        return "literal";
+        return "vortex.literal";
     }
 
     @Override

java/vortex-jni/src/main/java/dev/vortex/api/expressions/Not.java

@@ -63,7 +63,7 @@ public int hashCode() {
 
     @Override
     public String id() {
-        return "not";
+        return "vortex.not";
     }
 
     @Override

java/vortex-jni/src/main/java/dev/vortex/api/expressions/Root.java

@@ -39,7 +39,7 @@ public static Root parse(byte[] _metadata, List<Expression> children) {
 
     @Override
     public String id() {
-        return "root";
+        return "vortex.root";
     }
 
     @Override

java/vortex-jni/src/main/java/dev/vortex/api/proto/Expressions.java

@@ -46,15 +46,15 @@ public static Expression deserialize(ExprProtos.Expr expr) {
                 expr.getChildrenList().stream().map(Expressions::deserialize).collect(Collectors.toList());
 
         switch (expr.getId()) {
-            case "binary":
+            case "vortex.binary":
                 return Binary.parse(metadata, children);
-            case "get_item":
+            case "vortex.get_item":
                 return GetItem.parse(metadata, children);
-            case "root":
+            case "vortex.root":
                 return Root.parse(metadata, children);
-            case "literal":
+            case "vortex.literal":
                 return Literal.parse(metadata, children);
-            case "not":
+            case "vortex.not":
                 return Not.parse(metadata, children);
             default:
                 return new Unknown(expr.getId(), children, expr.getMetadata().toByteArray());

vortex-array/src/compute/between.rs

@@ -262,6 +262,10 @@ impl StrictComparison {
             StrictComparison::NonStrict => Operator::Lte,
         }
     }
+
+    pub const fn is_strict(&self) -> bool {
+        matches!(self, StrictComparison::Strict)
+    }
 }
 
 #[cfg(test)]

vortex-array/src/compute/like.rs

@@ -133,7 +133,7 @@ impl ComputeFnVTable for Like {
 }
 
 /// Options for SQL LIKE function
-#[derive(Default, Debug, Clone, Copy)]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct LikeOptions {
     pub negated: bool,
     pub case_insensitive: bool,

vortex-cxx/src/expr.rs

@@ -2,12 +2,12 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use vortex::dtype::FieldName;
-use vortex::expr::ExprRef;
+use vortex::expr::Expression;
 
 use crate::scalar::Scalar;
 
 pub(crate) struct Expr {
-    pub(crate) inner: ExprRef,
+    pub(crate) inner: Expression,
 }
 
 pub(crate) fn literal(scalar: Box<Scalar>) -> Box<Expr> {