fix

Cargo.toml

@@ -192,7 +192,7 @@ databend-enterprise-vacuum-handler = { path = "src/query/ee_features/vacuum_hand
 databend-enterprise-virtual-column = { path = "src/query/ee_features/virtual_column" }
 databend-functions-scalar-arithmetic = { path = "src/query/functions/src/scalars/arithmetic" }
 databend-functions-scalar-datetime = { path = "src/query/functions/src/scalars/timestamp" }
-databend-functions-scalar-decimal-utils = { path = "src/query/functions/src/scalars/decimal" }
+databend-functions-scalar-decimal = { path = "src/query/functions/src/scalars/decimal" }
 databend-functions-scalar-geo = { path = "src/query/functions/src/scalars/geographic" }
 databend-functions-scalar-math = { path = "src/query/functions/src/scalars/mathematics" }
 databend-functions-scalar-numeric-basic-arithmetic = { path = "src/query/functions/src/scalars/numeric_basic_arithmetic" }

src/query/functions/Cargo.toml

@@ -28,10 +28,9 @@ databend-common-openai = { workspace = true }
 databend-common-vector = { workspace = true }
 databend-functions-scalar-arithmetic = { workspace = true }
 databend-functions-scalar-datetime = { workspace = true }
-databend-functions-scalar-decimal-utils = { workspace = true }
+databend-functions-scalar-decimal = { workspace = true }
 databend-functions-scalar-geo = { workspace = true }
 databend-functions-scalar-math = { workspace = true }
-databend-functions-scalar-numeric-basic-arithmetic = { workspace = true }
 ethnum = { workspace = true }
 geo = { workspace = true }
 geohash = { workspace = true }

src/query/functions/src/scalars/arithmetic/Cargo.toml

@@ -5,7 +5,8 @@ edition = "2021"
 
 [dependencies]
 databend-common-expression = { workspace = true }
-databend-functions-scalar-decimal-utils = { workspace = true }
+databend-functions-scalar-decimal = { workspace = true }
+databend-functions-scalar-numeric-basic-arithmetic = { workspace = true }
 ethnum = { workspace = true }
 lexical-core = { workspace = true }
 match-template = { workspace = true }

src/query/functions/src/scalars/arithmetic/src/arithmetic.rs

@@ -59,12 +59,13 @@ use databend_common_expression::FunctionDomain;
 use databend_common_expression::FunctionEval;
 use databend_common_expression::FunctionRegistry;
 use databend_common_expression::FunctionSignature;
-use databend_functions_scalar_decimal_utils::register_decimal_to_float;
-use databend_functions_scalar_decimal_utils::register_decimal_to_int;
-use databend_functions_scalar_decimal_utils::register_decimal_to_string;
+use databend_functions_scalar_decimal::register_decimal_to_float;
+use databend_functions_scalar_decimal::register_decimal_to_int;
+use databend_functions_scalar_decimal::register_decimal_to_string;
 use ethnum::i256;
 use lexical_core::FormattedSize;
 use num_traits::AsPrimitive;
+use databend_functions_scalar_numeric_basic_arithmetic::register_numeric_basic_arithmetic;
 
 pub fn register(registry: &mut FunctionRegistry) {
     registry.register_aliases("plus", &["add"]);
@@ -77,6 +78,8 @@ pub fn register(registry: &mut FunctionRegistry) {
     register_string_to_number(registry);
     register_number_to_string(registry);
     register_number_to_number(registry);
+    // register basic arithmetic operation (+ - * / %)
+    register_numeric_basic_arithmetic(registry);
     register_binary_arithmetic(registry);
     register_unary_arithmetic(registry);
 }

src/query/functions/src/scalars/comparison.rs

@@ -51,7 +51,7 @@ use databend_common_expression::LikePattern;
 use databend_common_expression::Scalar;
 use databend_common_expression::ScalarRef;
 use databend_common_expression::SimpleDomainCmp;
-use databend_functions_scalar_decimal_utils::register_decimal_compare_op;
+use databend_functions_scalar_decimal::register_decimal_compare_op;
 use regex::Regex;
 
 use crate::scalars::string_multi_args::regexp;

src/query/functions/src/scalars/decimal/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "databend-functions-scalar-decimal-utils"
+name = "databend-functions-scalar-decimal"
 version = "0.1.0"
 edition = "2021"
 

src/query/functions/src/scalars/mathematics/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 crc32fast = { workspace = true }
 databend-common-base = { workspace = true }
 databend-common-expression = { workspace = true }
-databend-functions-scalar-decimal-utils = { workspace = true }
+databend-functions-scalar-decimal = { workspace = true }
 match-template = { workspace = true }
 num-traits = { workspace = true }
 

src/query/functions/src/scalars/mathematics/src/math.rs

@@ -31,7 +31,7 @@ use databend_common_expression::with_number_mapped_type;
 use databend_common_expression::FunctionDomain;
 use databend_common_expression::FunctionRegistry;
 use databend_common_expression::Value;
-use databend_functions_scalar_decimal_utils::register_decimal_math;
+use databend_functions_scalar_decimal::register_decimal_math;
 use num_traits::AsPrimitive;
 use num_traits::Float;
 use num_traits::Pow;

src/query/functions/src/scalars/mod.rs

@@ -46,13 +46,10 @@ mod vector;
 
 pub use comparison::ALL_COMP_FUNC_NAMES;
 use databend_functions_scalar_arithmetic::arithmetic;
-use databend_functions_scalar_numeric_basic_arithmetic::register_numeric_basic_arithmetic;
 pub use string::ALL_STRING_FUNC_NAMES;
 
 pub fn register(registry: &mut FunctionRegistry) {
     variant::register(registry);
-    // register basic arithmetic operation (+ - * / %)
-    register_numeric_basic_arithmetic(registry);
     arithmetic::register(registry);
     array::register(registry);
     boolean::register(registry);
@@ -69,7 +66,7 @@ pub fn register(registry: &mut FunctionRegistry) {
     geo_func::geo_h3::register(registry);
     hash::register(registry);
     other::register(registry);
-    databend_functions_scalar_decimal_utils::register_to_decimal(registry);
+    databend_functions_scalar_decimal::register_to_decimal(registry);
     vector::register(registry);
     bitmap::register(registry);
     geo_func::geometry::register(registry);

src/query/functions/src/scalars/numeric_basic_arithmetic/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 databend-common-expression = { workspace = true }
-databend-functions-scalar-decimal-utils = { workspace = true }
+databend-functions-scalar-decimal = { workspace = true }
 match-template = { workspace = true }
 num-traits = { workspace = true }
 strength_reduce = { workspace = true }

src/query/functions/src/scalars/numeric_basic_arithmetic/src/numeric_basic_arithmetic.rs

@@ -28,7 +28,7 @@ use databend_common_expression::with_float_mapped_type;
 use databend_common_expression::with_integer_mapped_type;
 use databend_common_expression::FunctionDomain;
 use databend_common_expression::FunctionRegistry;
-use databend_functions_scalar_decimal_utils::register_decimal_arithmetic;
+use databend_functions_scalar_decimal::register_decimal_arithmetic;
 use num_traits::AsPrimitive;
 
 use crate::arithmetic_modulo::vectorize_modulo;