[arrow-datafusion] branch master updated: MINOR: Move `expr_rewriter.rs` to `datafusion-expr` crate (#2552)

[al...@apache.org]

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

alamb 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 5c89c3b58 MINOR: Move `expr_rewriter.rs` to `datafusion-expr` crate (#2552)
5c89c3b58 is described below

commit 5c89c3b5867b39f593c6c7b83420f85850c50fb4
Author: Andy Grove <ag...@apache.org>
AuthorDate: Tue May 17 05:07:08 2022 -0600

    MINOR: Move `expr_rewriter.rs` to `datafusion-expr` crate (#2552)
    
    * move expr_rewrite to expr crate
    
    * Move expr_rewriter to expr crate
---
 datafusion/core/src/logical_plan/mod.rs                  |  2 +-
 .../{core/src/logical_plan => expr/src}/expr_rewriter.rs | 16 ++++++----------
 datafusion/expr/src/lib.rs                               |  1 +
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/datafusion/core/src/logical_plan/mod.rs b/datafusion/core/src/logical_plan/mod.rs
index 55cd2607d..d4397c4b0 100644
--- a/datafusion/core/src/logical_plan/mod.rs
+++ b/datafusion/core/src/logical_plan/mod.rs
@@ -23,7 +23,6 @@
 
 pub(crate) mod builder;
 mod expr;
-mod expr_rewriter;
 mod expr_simplier;
 pub mod plan;
 mod registry;
@@ -34,6 +33,7 @@ pub use builder::{
 pub use datafusion_common::{DFField, DFSchema, DFSchemaRef, ToDFSchema};
 pub use datafusion_expr::{
     expr_fn::binary_expr,
+    expr_rewriter,
     expr_visitor::{ExprVisitable, ExpressionVisitor, Recursion},
     ExprSchemable, Operator,
 };
diff --git a/datafusion/core/src/logical_plan/expr_rewriter.rs b/datafusion/expr/src/expr_rewriter.rs
similarity index 98%
rename from datafusion/core/src/logical_plan/expr_rewriter.rs
rename to datafusion/expr/src/expr_rewriter.rs
index 1f24556ea..e8cf049dd 100644
--- a/datafusion/core/src/logical_plan/expr_rewriter.rs
+++ b/datafusion/expr/src/expr_rewriter.rs
@@ -17,14 +17,11 @@
 
 //! Expression rewriter
 
-use super::Expr;
-use crate::logical_plan::plan::Aggregate;
-use crate::logical_plan::DFSchema;
-use crate::logical_plan::ExprSchemable;
-use crate::logical_plan::LogicalPlan;
-use datafusion_common::Column;
+use crate::expr::GroupingSet;
+use crate::logical_plan::Aggregate;
+use crate::{Expr, ExprSchemable, LogicalPlan};
 use datafusion_common::Result;
-use datafusion_expr::expr::GroupingSet;
+use datafusion_common::{Column, DFSchema};
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::sync::Arc;
@@ -476,10 +473,9 @@ pub fn unnormalize_cols(exprs: impl IntoIterator<Item = Expr>) -> Vec<Expr> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::logical_plan::DFField;
-    use crate::prelude::{col, lit};
+    use crate::{col, lit};
     use arrow::datatypes::DataType;
-    use datafusion_common::ScalarValue;
+    use datafusion_common::{DFField, DFSchema, ScalarValue};
 
     #[derive(Default)]
     struct RecordingRewriter {
diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
index fdfc62528..87bb77067 100644
--- a/datafusion/expr/src/lib.rs
+++ b/datafusion/expr/src/lib.rs
@@ -34,6 +34,7 @@ mod columnar_value;
 pub mod conditional_expressions;
 pub mod expr;
 pub mod expr_fn;
+pub mod expr_rewriter;
 pub mod expr_schema;
 pub mod expr_visitor;
 pub mod field_util;