[arrow-datafusion] branch master updated: remove duplicate or redundant code (#4235)

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git


The following commit(s) were added to refs/heads/master by this push:
     new b7a33c989 remove duplicate or redundant code (#4235)
b7a33c989 is described below

commit b7a33c9897ddf468ea0801fcac5eecb455f8780a
Author: jakevin <ja...@gmail.com>
AuthorDate: Thu Nov 17 00:48:30 2022 +0800

    remove duplicate or redundant code (#4235)
    
    * remove duplicate code
    
    * typo
    
    * remove
    
    * typo
---
 datafusion/optimizer/src/eliminate_filter.rs                   | 10 +++++-----
 datafusion/optimizer/src/filter_push_down.rs                   |  2 +-
 .../optimizer/src/simplify_expressions/expr_simplifier.rs      |  5 -----
 .../optimizer/src/simplify_expressions/simplify_exprs.rs       |  4 ++--
 datafusion/optimizer/src/simplify_expressions/utils.rs         |  4 ++--
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/datafusion/optimizer/src/eliminate_filter.rs b/datafusion/optimizer/src/eliminate_filter.rs
index 04f6f00f8..d5cbcf394 100644
--- a/datafusion/optimizer/src/eliminate_filter.rs
+++ b/datafusion/optimizer/src/eliminate_filter.rs
@@ -87,7 +87,7 @@ mod tests {
     }
 
     #[test]
-    fn fliter_false() {
+    fn filter_false() {
         let filter_expr = Expr::Literal(ScalarValue::Boolean(Some(false)));
 
         let table_scan = test_table_scan().unwrap();
@@ -105,7 +105,7 @@ mod tests {
     }
 
     #[test]
-    fn fliter_false_nested() {
+    fn filter_false_nested() {
         let filter_expr = Expr::Literal(ScalarValue::Boolean(Some(false)));
 
         let table_scan = test_table_scan().unwrap();
@@ -133,7 +133,7 @@ mod tests {
     }
 
     #[test]
-    fn fliter_true() {
+    fn filter_true() {
         let filter_expr = Expr::Literal(ScalarValue::Boolean(Some(true)));
 
         let table_scan = test_table_scan().unwrap();
@@ -151,7 +151,7 @@ mod tests {
     }
 
     #[test]
-    fn fliter_true_nested() {
+    fn filter_true_nested() {
         let filter_expr = Expr::Literal(ScalarValue::Boolean(Some(true)));
 
         let table_scan = test_table_scan().unwrap();
@@ -180,7 +180,7 @@ mod tests {
     }
 
     #[test]
-    fn fliter_from_subquery() {
+    fn filter_from_subquery() {
         // SELECT a FROM (SELECT a FROM test WHERE FALSE) WHERE TRUE
 
         let false_filter = lit(false);
diff --git a/datafusion/optimizer/src/filter_push_down.rs b/datafusion/optimizer/src/filter_push_down.rs
index eed833cf2..7bcd03565 100644
--- a/datafusion/optimizer/src/filter_push_down.rs
+++ b/datafusion/optimizer/src/filter_push_down.rs
@@ -1304,7 +1304,7 @@ mod tests {
             .filter(col("a").lt_eq(lit(1i64)))?
             .build()?;
 
-        let plan = crate::test::user_defined::new(plan);
+        let plan = user_defined::new(plan);
 
         let expected = "\
             TestUserDefined\
diff --git a/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs b/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs
index 40285eedc..b32fc53db 100644
--- a/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs
+++ b/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs
@@ -1001,11 +1001,6 @@ mod tests {
         let expr = call_fn("to_timestamp", vec![col("a")]).unwrap();
         test_evaluate(expr.clone(), expr);
 
-        // check that non foldable arguments are folded
-        // to_timestamp(a) --> to_timestamp(a) [no rewrite possible]
-        let expr = call_fn("to_timestamp", vec![col("a")]).unwrap();
-        test_evaluate(expr.clone(), expr);
-
         // volatile / stable functions should not be evaluated
         // rand() + (1 + 2) --> rand() + 3
         let fun = BuiltinScalarFunction::Random;
diff --git a/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs b/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs
index eaa34c08d..eecda9809 100644
--- a/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs
+++ b/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs
@@ -552,7 +552,7 @@ mod tests {
         let table_scan = test_table_scan();
 
         let ts_string = "2020-09-08T12:05:00+00:00";
-        let time = chrono::Utc.timestamp_nanos(1599566400000000000i64);
+        let time = Utc.timestamp_nanos(1599566400000000000i64);
 
         //  cast(now() as int) < cast(to_timestamp(...) as int) + 50000_i64
         let plan =
@@ -580,7 +580,7 @@ mod tests {
         let table_scan = test_table_scan();
 
         let ts_string = "2020-09-08T12:05:00+00:00";
-        let time = chrono::Utc.timestamp_nanos(1599566400000000000i64);
+        let time = Utc.timestamp_nanos(1599566400000000000i64);
 
         //  now() < cast(to_timestamp(...) as int) + 5000000000
         let schema = table_scan.schema();
diff --git a/datafusion/optimizer/src/simplify_expressions/utils.rs b/datafusion/optimizer/src/simplify_expressions/utils.rs
index 4df3f507d..c6c13c033 100644
--- a/datafusion/optimizer/src/simplify_expressions/utils.rs
+++ b/datafusion/optimizer/src/simplify_expressions/utils.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//! Utitity functions for expression simplification
+//! Utility functions for expression simplification
 
 use arrow::datatypes::DECIMAL128_MAX_PRECISION;
 
@@ -171,7 +171,7 @@ pub fn as_bool_lit(expr: Expr) -> Result<Option<bool>> {
 
 /// negate a Not clause
 /// input is the clause to be negated.(args of Not clause)
-/// For BinaryExpr, use the negator of op instead.
+/// For BinaryExpr, use the negation of op instead.
 ///    not ( A > B) ===> (A <= B)
 /// For BoolExpr, not (A and B) ===> (not A) or (not B)
 ///     not (A or B) ===> (not A) and (not B)