Refactor: move simplify_expression.rs and expr_simplifier.rs to a…

… new mod `simplify_expressions` (#3951) * create mod for expr_simpl Signed-off-by: remzi <13716567376yh@gmail.com> * move utility to utils Signed-off-by: remzi <13716567376yh@gmail.com> * create context mod Signed-off-by: remzi <13716567376yh@gmail.com> * add docs for context Signed-off-by: remzi <13716567376yh@gmail.com> * move constEvalutor to expr_simplififer Signed-off-by: remzi <13716567376yh@gmail.com> * move simplifier to expr_simplifier Signed-off-by: remzi <13716567376yh@gmail.com> * fix lints Signed-off-by: remzi <13716567376yh@gmail.com> * fix merge conflict Signed-off-by: remzi <13716567376yh@gmail.com> Signed-off-by: remzi <13716567376yh@gmail.com>
apache · Oct 26, 2022 · 10e64dc · 10e64dc
1 parent 784f10b
commit 10e64dc
Show file tree

Hide file tree

Showing 10 changed files with 1,916 additions and 1,840 deletions.
diff --git a/datafusion-examples/examples/expr_api.rs b/datafusion-examples/examples/expr_api.rs
@@ -17,7 +17,7 @@
 
 use datafusion::arrow::datatypes::{DataType, Field, Schema, TimeUnit};
 use datafusion::error::Result;
-use datafusion::optimizer::expr_simplifier::{ExprSimplifier, SimplifyContext};
+use datafusion::optimizer::simplify_expressions::{ExprSimplifier, SimplifyContext};
 use datafusion::physical_expr::execution_props::ExecutionProps;
 use datafusion::prelude::*;
 use datafusion_common::{ScalarValue, ToDFSchema};

diff --git a/datafusion/core/tests/simplification.rs b/datafusion/core/tests/simplification.rs
@@ -21,7 +21,7 @@ use arrow::datatypes::{DataType, Field, Schema};
 use datafusion::common::DFSchema;
 use datafusion::{error::Result, execution::context::ExecutionProps, prelude::*};
 use datafusion_expr::{Expr, ExprSchemable};
-use datafusion_optimizer::expr_simplifier::{ExprSimplifier, SimplifyInfo};
+use datafusion_optimizer::simplify_expressions::{ExprSimplifier, SimplifyInfo};
 
 /// In order to simplify expressions, DataFusion must have information
 /// about the expressions.

diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
@@ -56,7 +56,9 @@ pub use accumulator::{Accumulator, AggregateState};
 pub use aggregate_function::AggregateFunction;
 pub use built_in_function::BuiltinScalarFunction;
 pub use columnar_value::{ColumnarValue, NullColumnarValue};
-pub use expr::{Between, BinaryExpr, Case, Expr, GetIndexedField, GroupingSet, Like};
+pub use expr::{
+    Between, BinaryExpr, Case, Cast, Expr, GetIndexedField, GroupingSet, Like,
+};
 pub use expr_fn::*;
 pub use expr_schema::ExprSchemable;
 pub use function::{

diff --git a/datafusion/optimizer/src/expr_simplifier.rs b/datafusion/optimizer/src/expr_simplifier.rs
diff --git a/datafusion/optimizer/src/lib.rs b/datafusion/optimizer/src/lib.rs
@@ -20,7 +20,6 @@ pub mod decorrelate_where_exists;
 pub mod decorrelate_where_in;
 pub mod eliminate_filter;
 pub mod eliminate_limit;
-pub mod expr_simplifier;
 pub mod filter_null_join_keys;
 pub mod filter_push_down;
 pub mod inline_table_scan;