address comments and fix clippy

apache · Aug 20, 2022 · 17d871b · 17d871b
1 parent d3a38d1
commit 17d871b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/datafusion/core/tests/provider_filter_pushdown.rs b/datafusion/core/tests/provider_filter_pushdown.rs
@@ -147,16 +147,16 @@ impl TableProvider for CustomProvider {
         match &filters[0] {
             Expr::BinaryExpr { right, .. } => {
                 let int_value = match &**right {
-                    Expr::Literal(ScalarValue::Int8(i)) => i.unwrap() as i64,
-                    Expr::Literal(ScalarValue::Int16(i)) => i.unwrap() as i64,
-                    Expr::Literal(ScalarValue::Int32(i)) => i.unwrap() as i64,
-                    Expr::Literal(ScalarValue::Int64(i)) => i.unwrap(),
+                    Expr::Literal(ScalarValue::Int8(Some(i))) => i as i64,
+                    Expr::Literal(ScalarValue::Int16(Some(i))) => i as i64,
+                    Expr::Literal(ScalarValue::Int32(Some(i))) => i as i64,
+                    Expr::Literal(ScalarValue::Int64(Some(i))) => i as i64,
                     Expr::Cast { expr, data_type: _ } => match expr.deref() {
                         Expr::Literal(lit_value) => match lit_value {
-                            ScalarValue::Int8(v) => v.unwrap() as i64,
-                            ScalarValue::Int16(v) => v.unwrap() as i64,
-                            ScalarValue::Int32(v) => v.unwrap() as i64,
-                            ScalarValue::Int64(v) => v.unwrap(),
+                            ScalarValue::Int8(Some(v)) => v as i64,
+                            ScalarValue::Int16(Some(v)) => v as i64,
+                            ScalarValue::Int32(Some(v)) => v as i64,
+                            ScalarValue::Int64(Some(v)) => v,
                             _ => unimplemented!(),
                         },
                         _ => unimplemented!(),

diff --git a/datafusion/optimizer/src/pre_cast_lit_in_binary_comparison.rs b/datafusion/optimizer/src/pre_cast_lit_in_binary_comparison.rs
@@ -268,12 +268,12 @@ mod tests {
         // INT64(c2) = INT32(16) => INT64(c2) = INT64(16)
         let c2_eq_lit = col("c2").eq(lit(ScalarValue::Int32(Some(16))));
         let expected = col("c2").eq(lit(ScalarValue::Int64(Some(16))));
-        assert_eq!(optimize_test(c2_eq_lit.clone(), &schema), expected);
+        assert_eq!(optimize_test(c2_eq_lit, &schema), expected);
 
         // INT32(c1) < INT64(NULL) => INT32(c1) < INT32(NULL)
         let c1_lt_lit_null = col("c1").lt(lit(ScalarValue::Int64(None)));
         let expected = col("c1").lt(lit(ScalarValue::Int32(None)));
-        assert_eq!(optimize_test(c1_lt_lit_null.clone(), &schema), expected);
+        assert_eq!(optimize_test(c1_lt_lit_null, &schema), expected);
     }
 
     fn optimize_test(expr: Expr, schema: &DFSchemaRef) -> Expr {