Updates after correcting merge conflicts.

Omega359 · Mar 13, 2024 · 92a1370 · 92a1370
1 parent c2e8b69
commit 92a1370
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 33 deletions.
diff --git a/datafusion/expr/src/built_in_function.rs b/datafusion/expr/src/built_in_function.rs
@@ -361,7 +361,7 @@ impl BuiltinScalarFunction {
             BuiltinScalarFunction::Translate => Volatility::Immutable,
             BuiltinScalarFunction::Trim => Volatility::Immutable,
             BuiltinScalarFunction::Upper => Volatility::Immutable,
-           BuiltinScalarFunction::OverLay => Volatility::Immutable,
+            BuiltinScalarFunction::OverLay => Volatility::Immutable,
             BuiltinScalarFunction::Levenshtein => Volatility::Immutable,
             BuiltinScalarFunction::SubstrIndex => Volatility::Immutable,
             BuiltinScalarFunction::FindInSet => Volatility::Immutable,

diff --git a/datafusion/proto/src/generated/pbjson.rs b/datafusion/proto/src/generated/pbjson.rs
diff --git a/datafusion/proto/src/generated/prost.rs b/datafusion/proto/src/generated/prost.rs
diff --git a/datafusion/proto/src/logical_plan/from_proto.rs b/datafusion/proto/src/logical_plan/from_proto.rs
@@ -50,19 +50,19 @@ use datafusion_expr::{
     acosh, 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_replace, array_replace_all, array_replace_n, array_resize, array_slice,
-    array_union,  ascii, asinh, atan, atan2, atanh,
-    bit_length, btrim, cbrt, ceil, character_length, chr, coalesce, concat_expr,
-    concat_ws_expr, cos, cosh, cot, degrees, digest, ends_with, exp,
+    array_union, ascii, asinh, atan, atan2, atanh, bit_length, btrim, cbrt, ceil,
+    character_length, chr, coalesce, concat_expr, concat_ws_expr, cos, cosh, cot,
+    degrees, digest, ends_with, exp,
     expr::{self, InList, Sort, WindowFunction},
     factorial, find_in_set, floor, gcd, initcap, iszero, lcm, left, levenshtein, ln, log,
     log10, log2,
     logical_plan::{PlanType, StringifiedPlan},
     lower, lpad, ltrim, md5, nanvl, octet_length, overlay, pi, power, radians, random,
     repeat, replace, reverse, right, round, rpad, rtrim, sha224, sha256, sha384, sha512,
-    signum, sin, sinh, split_part, sqrt, starts_with, strpos, substr,
-    substr_index, substring, to_hex, translate, trim, trunc, upper, uuid,
-    AggregateFunction, Between, BinaryExpr, BuiltInWindowFunction, BuiltinScalarFunction,
-    Case, Cast, Expr, GetFieldAccess, GetIndexedField, GroupingSet,
+    signum, sin, sinh, split_part, sqrt, starts_with, strpos, substr, substr_index,
+    substring, to_hex, translate, trim, trunc, upper, uuid, AggregateFunction, Between,
+    BinaryExpr, BuiltInWindowFunction, BuiltinScalarFunction, Case, Cast, Expr,
+    GetFieldAccess, GetIndexedField, GroupingSet,
     GroupingSet::GroupingSets,
     JoinConstraint, JoinType, Like, Operator, TryCast, WindowFrame, WindowFrameBound,
     WindowFrameUnits,
@@ -525,7 +525,7 @@ impl From<&protobuf::ScalarFunction> for BuiltinScalarFunction {
             ScalarFunction::Coalesce => Self::Coalesce,
             ScalarFunction::Pi => Self::Pi,
             ScalarFunction::Power => Self::Power,
-             ScalarFunction::Atan2 => Self::Atan2,
+            ScalarFunction::Atan2 => Self::Atan2,
             ScalarFunction::Nanvl => Self::Nanvl,
             ScalarFunction::Iszero => Self::Iszero,
             ScalarFunction::OverLay => Self::OverLay,