@@ -24,7 +24,7 @@ use iceberg::spec::Datum;
2424
2525// A datafusion expression could be an Iceberg predicate, column, or literal.
2626enum TransformedResult {
27- Predication ( Predicate ) ,
27+ Predicate ( Predicate ) ,
2828 Column ( Reference ) ,
2929 Literal ( Datum ) ,
3030 NotTransformed ,
@@ -49,7 +49,7 @@ pub fn convert_filters_to_predicate(filters: &[Expr]) -> Option<Predicate> {
4949
5050fn convert_filter_to_predicate ( expr : & Expr ) -> Option < Predicate > {
5151 match to_iceberg_predicate ( expr) {
52- TransformedResult :: Predication ( predicate) => Some ( predicate) ,
52+ TransformedResult :: Predicate ( predicate) => Some ( predicate) ,
5353 TransformedResult :: Column ( _) | TransformedResult :: Literal ( _) => {
5454 unreachable ! ( "Not a valid expression: {:?}" , expr)
5555 }
@@ -60,11 +60,11 @@ fn convert_filter_to_predicate(expr: &Expr) -> Option<Predicate> {
6060fn to_iceberg_predicate ( expr : & Expr ) -> TransformedResult {
6161 match expr {
6262 Expr :: BinaryExpr ( binary) => {
63- let left = to_iceberg_predicate ( & binary. left . clone ( ) ) ;
64- let right = to_iceberg_predicate ( & binary. right . clone ( ) ) ;
63+ let left = to_iceberg_predicate ( & binary. left ) ;
64+ let right = to_iceberg_predicate ( & binary. right ) ;
6565 let op = to_iceberg_operation ( binary. op ) ;
6666 match op {
67- OpTransformedResult :: Operator ( op) => to_iceberg_binary_expr ( left, right, op) ,
67+ OpTransformedResult :: Operator ( op) => to_iceberg_binary_predicate ( left, right, op) ,
6868 OpTransformedResult :: And => to_iceberg_and_predicate ( left, right) ,
6969 OpTransformedResult :: Or => to_iceberg_or_predicate ( left, right) ,
7070 OpTransformedResult :: NotTransformed => TransformedResult :: NotTransformed ,
@@ -73,7 +73,7 @@ fn to_iceberg_predicate(expr: &Expr) -> TransformedResult {
7373 Expr :: Not ( exp) => {
7474 let expr = to_iceberg_predicate ( exp) ;
7575 match expr {
76- TransformedResult :: Predication ( p) => TransformedResult :: Predication ( !p) ,
76+ TransformedResult :: Predicate ( p) => TransformedResult :: Predicate ( !p) ,
7777 _ => TransformedResult :: NotTransformed ,
7878 }
7979 }
@@ -95,16 +95,16 @@ fn to_iceberg_predicate(expr: &Expr) -> TransformedResult {
9595 let expr = to_iceberg_predicate ( & inlist. expr ) ;
9696 match expr {
9797 TransformedResult :: Column ( r) => match inlist. negated {
98- false => TransformedResult :: Predication ( r. is_in ( datums) ) ,
99- true => TransformedResult :: Predication ( r. is_not_in ( datums) ) ,
98+ false => TransformedResult :: Predicate ( r. is_in ( datums) ) ,
99+ true => TransformedResult :: Predicate ( r. is_not_in ( datums) ) ,
100100 } ,
101101 _ => TransformedResult :: NotTransformed ,
102102 }
103103 }
104104 Expr :: IsNull ( expr) => {
105105 let p = to_iceberg_predicate ( expr) ;
106106 match p {
107- TransformedResult :: Column ( r) => TransformedResult :: Predication ( Predicate :: Unary (
107+ TransformedResult :: Column ( r) => TransformedResult :: Predicate ( Predicate :: Unary (
108108 UnaryExpression :: new ( PredicateOperator :: IsNull , r) ,
109109 ) ) ,
110110 _ => TransformedResult :: NotTransformed ,
@@ -113,7 +113,7 @@ fn to_iceberg_predicate(expr: &Expr) -> TransformedResult {
113113 Expr :: IsNotNull ( expr) => {
114114 let p = to_iceberg_predicate ( expr) ;
115115 match p {
116- TransformedResult :: Column ( r) => TransformedResult :: Predication ( Predicate :: Unary (
116+ TransformedResult :: Column ( r) => TransformedResult :: Predicate ( Predicate :: Unary (
117117 UnaryExpression :: new ( PredicateOperator :: NotNull , r) ,
118118 ) ) ,
119119 _ => TransformedResult :: NotTransformed ,
@@ -144,25 +144,25 @@ fn to_iceberg_and_predicate(
144144 right : TransformedResult ,
145145) -> TransformedResult {
146146 match ( left, right) {
147- ( TransformedResult :: Predication ( left) , TransformedResult :: Predication ( right) ) => {
148- TransformedResult :: Predication ( left. and ( right) )
147+ ( TransformedResult :: Predicate ( left) , TransformedResult :: Predicate ( right) ) => {
148+ TransformedResult :: Predicate ( left. and ( right) )
149149 }
150- ( TransformedResult :: Predication ( left) , _) => TransformedResult :: Predication ( left) ,
151- ( _, TransformedResult :: Predication ( right) ) => TransformedResult :: Predication ( right) ,
150+ ( TransformedResult :: Predicate ( left) , _) => TransformedResult :: Predicate ( left) ,
151+ ( _, TransformedResult :: Predicate ( right) ) => TransformedResult :: Predicate ( right) ,
152152 _ => TransformedResult :: NotTransformed ,
153153 }
154154}
155155
156156fn to_iceberg_or_predicate ( left : TransformedResult , right : TransformedResult ) -> TransformedResult {
157157 match ( left, right) {
158- ( TransformedResult :: Predication ( left) , TransformedResult :: Predication ( right) ) => {
159- TransformedResult :: Predication ( left. or ( right) )
158+ ( TransformedResult :: Predicate ( left) , TransformedResult :: Predicate ( right) ) => {
159+ TransformedResult :: Predicate ( left. or ( right) )
160160 }
161161 _ => TransformedResult :: NotTransformed ,
162162 }
163163}
164164
165- fn to_iceberg_binary_expr (
165+ fn to_iceberg_binary_predicate (
166166 left : TransformedResult ,
167167 right : TransformedResult ,
168168 op : PredicateOperator ,
@@ -176,7 +176,7 @@ fn to_iceberg_binary_expr(
176176 }
177177 _ => return TransformedResult :: NotTransformed ,
178178 } ;
179- TransformedResult :: Predication ( Predicate :: Binary ( BinaryExpression :: new ( op, r, d) ) )
179+ TransformedResult :: Predicate ( Predicate :: Binary ( BinaryExpression :: new ( op, r, d) ) )
180180}
181181
182182fn reserve_predicate_operator ( op : PredicateOperator ) -> PredicateOperator {
0 commit comments