fix: dont make predicate op pub(crate)"

apache · Mar 22, 2024 · 47270d2 · 47270d2
1 parent 380f4a0
commit 47270d2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/crates/iceberg/src/expr/predicate.rs b/crates/iceberg/src/expr/predicate.rs
@@ -82,7 +82,7 @@ where
 #[derive(PartialEq)]
 pub struct UnaryExpression<T> {
     /// Operator of this predicate, must be single operand operator.
-    pub(crate) op: PredicateOperator,
+    op: PredicateOperator,
     /// Term of this predicate, for example, `a` in `a IS NULL`.
     term: T,
 }
@@ -120,6 +120,10 @@ impl<T> UnaryExpression<T> {
     pub(crate) fn term(&self) -> &T {
         &self.term
     }
+
+    pub(crate) fn op(&self) -> &PredicateOperator {
+        &self.op
+    }
 }
 
 impl UnaryExpression<BoundReference> {
@@ -133,7 +137,7 @@ impl UnaryExpression<BoundReference> {
 #[derive(PartialEq)]
 pub struct BinaryExpression<T> {
     /// Operator of this predicate, must be binary operator, such as `=`, `>`, `<`, etc.
-    pub(crate) op: PredicateOperator,
+    op: PredicateOperator,
     /// Term of this predicate, for example, `a` in `a > 10`.
     term: T,
     /// Literal of this predicate, for example, `10` in `a > 10`.
@@ -159,6 +163,10 @@ impl<T> BinaryExpression<T> {
     pub(crate) fn term(&self) -> &T {
         &self.term
     }
+
+    pub(crate) fn op(&self) -> &PredicateOperator {
+        &self.op
+    }
 }
 
 impl BinaryExpression<BoundReference> {
@@ -191,7 +199,7 @@ impl<T: Bind> Bind for BinaryExpression<T> {
 #[derive(PartialEq)]
 pub struct SetExpression<T> {
     /// Operator of this predicate, must be set operator, such as `IN`, `NOT IN`, etc.
-    pub(crate) op: PredicateOperator,
+    op: PredicateOperator,
     /// Term of this predicate, for example, `a` in `a in (1, 2, 3)`.
     term: T,
     /// Literals of this predicate, for example, `(1, 2, 3)` in `a in (1, 2, 3)`.
@@ -217,6 +225,10 @@ impl<T> SetExpression<T> {
     pub(crate) fn term(&self) -> &T {
         &self.term
     }
+
+    pub(crate) fn op(&self) -> &PredicateOperator {
+        &self.op
+    }
 }
 
 impl SetExpression<BoundReference> {

diff --git a/crates/iceberg/src/scan.rs b/crates/iceberg/src/scan.rs
@@ -378,7 +378,7 @@ impl ManifestEvalVisitor {
                 let pos = expr.term().accessor().position();
                 let field = &partitions[pos];
 
-                match expr.op {
+                match expr.op() {
                     PredicateOperator::IsNull => field.contains_null,
                     PredicateOperator::NotNull => {
                         todo!()
@@ -396,7 +396,7 @@ impl ManifestEvalVisitor {
                 let pos = expr.term().accessor().position();
                 let _field = &partitions[pos];
 
-                match expr.op {
+                match expr.op() {
                     PredicateOperator::LessThan => {
                         todo!()
                     }
@@ -430,7 +430,7 @@ impl ManifestEvalVisitor {
                 let pos = expr.term().accessor().position();
                 let _field = &partitions[pos];
 
-                match expr.op {
+                match expr.op() {
                     PredicateOperator::In => {
                         todo!()
                     }