rebase

Signed-off-by: jayzhan211 <[email protected]>
apache · Oct 17, 2023 · 86ac3f7 · 86ac3f7
1 parent bc46e29
commit 86ac3f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/datafusion/expr/src/built_in_function.rs b/datafusion/expr/src/built_in_function.rs
@@ -25,7 +25,9 @@ use crate::{
     TypeSignature, Volatility,
 };
 use arrow::datatypes::{DataType, Field, Fields, IntervalUnit, TimeUnit};
-use datafusion_common::{internal_err, not_impl_err, plan_err, DataFusionError, Result, plan_datafusion_err};
+use datafusion_common::{
+    internal_err, plan_datafusion_err, plan_err, DataFusionError, Result,
+};
 use std::collections::HashMap;
 use std::fmt;
 use std::str::FromStr;

diff --git a/datafusion/sql/src/expr/function.rs b/datafusion/sql/src/expr/function.rs
@@ -17,7 +17,8 @@
 
 use crate::planner::{ContextProvider, PlannerContext, SqlToRel};
 use datafusion_common::{
-    not_impl_err, plan_err, DFSchema, DataFusionError, Result, ScalarValue, internal_err, plan_datafusion_err,
+    internal_err, not_impl_err, plan_datafusion_err, plan_err, DFSchema, DataFusionError,
+    Result, ScalarValue,
 };
 use datafusion_expr::expr::{ScalarFunction, ScalarUDF};
 use datafusion_expr::function::suggest_valid_function;