fix conflict

Signed-off-by: jayzhan211 <[email protected]>

datafusion/optimizer/src/analyzer/rewrite_expr.rs

@@ -29,16 +29,16 @@ use datafusion_common::{utils::list_ndims, DFSchemaRef};
 use datafusion_common::{DFSchema, Result};
 use datafusion_expr::expr_rewriter::rewrite_preserving_name;
 use datafusion_expr::utils::merge_schema;
+use datafusion_expr::BuiltinScalarFunction;
+use datafusion_expr::GetFieldAccess;
+use datafusion_expr::GetIndexedField;
 #[cfg(feature = "array_expressions")]
 use datafusion_expr::{
     expr::ScalarFunction, BinaryExpr, Operator, ScalarFunctionDefinition,
 };
 use datafusion_expr::{Expr, LogicalPlan};
 #[cfg(feature = "array_expressions")]
 use datafusion_functions_array::expr_fn::{array_append, array_concat, array_prepend};
-use datafusion_expr::BuiltinScalarFunction;
-use datafusion_expr::GetFieldAccess;
-use datafusion_expr::GetIndexedField;
 
 #[derive(Default)]
 pub struct OperatorToFunction {}

datafusion/proto/src/logical_plan/from_proto.rs

@@ -47,14 +47,13 @@ use datafusion_common::{
 use datafusion_expr::expr::Unnest;
 use datafusion_expr::window_frame::{check_window_frame, regularize_window_order_by};
 use datafusion_expr::{
-    acosh, array_distinct, array_element,
-    array_except, array_intersect, array_pop_back, array_pop_front, array_position,
-    array_positions, array_remove, array_remove_all, array_remove_n,
-    array_repeat, array_replace, array_replace_all, array_replace_n, array_resize,
-    array_slice, array_sort, array_union, arrow_typeof, ascii, asinh, atan, atan2, atanh,
-    bit_length, btrim, cbrt, ceil, character_length, chr, coalesce, concat_expr,
-    concat_ws_expr, cos, cosh, cot, current_date, current_time, degrees, digest,
-    ends_with, exp,
+    acosh, array_distinct, array_element, array_except, array_intersect, array_pop_back,
+    array_pop_front, array_position, array_positions, array_remove, array_remove_all,
+    array_remove_n, array_repeat, array_replace, array_replace_all, array_replace_n,
+    array_resize, array_slice, array_sort, array_union, arrow_typeof, ascii, asinh, atan,
+    atan2, atanh, bit_length, btrim, cbrt, ceil, character_length, chr, coalesce,
+    concat_expr, concat_ws_expr, cos, cosh, cot, current_date, current_time, degrees,
+    digest, ends_with, exp,
     expr::{self, InList, Sort, WindowFunction},
     factorial, find_in_set, floor, from_unixtime, gcd, initcap, iszero, lcm, left,
     levenshtein, ln, log, log10, log2,