[arrow-datafusion] branch master updated: rename references of expr in logical plan module after datafusion-expr split (#1797)

[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 93aacb6  rename references of expr in logical plan module after datafusion-expr split (#1797)
93aacb6 is described below

commit 93aacb649c1c0c7e965b8bf836934144eb9305bf
Author: Jiayu Liu <Ji...@users.noreply.github.com>
AuthorDate: Thu Feb 10 04:31:36 2022 +0800

    rename references of expr in logical plan module after datafusion-expr split (#1797)
    
    * move expr functions to datafusion-expr expr_fn
    
    * add module level comments
    
    * remove reference to physical plan in logical plan
---
 datafusion/src/logical_plan/expr.rs     | 3 +--
 datafusion/src/logical_plan/registry.rs | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/datafusion/src/logical_plan/expr.rs b/datafusion/src/logical_plan/expr.rs
index ba853ee..f075aaa 100644
--- a/datafusion/src/logical_plan/expr.rs
+++ b/datafusion/src/logical_plan/expr.rs
@@ -22,8 +22,6 @@ pub use super::Operator;
 use crate::error::Result;
 use crate::logical_plan::ExprSchemable;
 use crate::logical_plan::{DFField, DFSchema};
-use crate::physical_plan::udaf::AggregateUDF;
-use crate::physical_plan::udf::ScalarUDF;
 use arrow::datatypes::DataType;
 use datafusion_common::DataFusionError;
 pub use datafusion_common::{Column, ExprSchema};
@@ -33,6 +31,7 @@ use datafusion_expr::BuiltinScalarFunction;
 pub use datafusion_expr::Expr;
 use datafusion_expr::StateTypeFunction;
 pub use datafusion_expr::{lit, lit_timestamp_nano, Literal};
+use datafusion_expr::{AggregateUDF, ScalarUDF};
 use datafusion_expr::{
     ReturnTypeFunction, ScalarFunctionImplementation, Signature, Volatility,
 };
diff --git a/datafusion/src/logical_plan/registry.rs b/datafusion/src/logical_plan/registry.rs
index d9b1839..f439a12 100644
--- a/datafusion/src/logical_plan/registry.rs
+++ b/datafusion/src/logical_plan/registry.rs
@@ -15,11 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::{collections::HashSet, sync::Arc};
-
 use crate::error::Result;
-use crate::physical_plan::udaf::AggregateUDF;
-use crate::physical_plan::udf::ScalarUDF;
+use datafusion_expr::{AggregateUDF, ScalarUDF};
+use std::{collections::HashSet, sync::Arc};
 
 /// A registry knows how to build logical expressions out of user-defined function' names
 pub trait FunctionRegistry {