support sqrt,floor,ceil pushdown (#2090)

* support sqrt,floor,ceil pushdown * use else if constexpr * make compiler happy for unusing argument * add test for sqrt,floor,ceil pushdown * use agg for testing sqrt,ceil,floor Co-authored-by: Yu Lei <leiysky@outlook.com>
pingcap · Jun 4, 2021 · 8d5d0b1 · 8d5d0b1
1 parent dc4d437
commit 8d5d0b1
Show file tree

Hide file tree

Showing 5 changed files with 334 additions and 53 deletions.
diff --git a/dbms/src/Flash/Coprocessor/DAGUtils.cpp b/dbms/src/Flash/Coprocessor/DAGUtils.cpp
@@ -522,7 +522,7 @@ std::unordered_map<tipb::ScalarFuncSig, String> scalar_func_map({
     //{tipb::ScalarFuncSig::CastRealAsJson, "cast"},
 
     {tipb::ScalarFuncSig::CastDecimalAsInt, "tidb_cast"},
-    //{tipb::ScalarFuncSig::CastDecimalAsReal, "tidb_cast"},
+    {tipb::ScalarFuncSig::CastDecimalAsReal, "tidb_cast"},
     {tipb::ScalarFuncSig::CastDecimalAsString, "tidb_cast"}, {tipb::ScalarFuncSig::CastDecimalAsDecimal, "tidb_cast"},
     {tipb::ScalarFuncSig::CastDecimalAsTime, "tidb_cast"},
     //{tipb::ScalarFuncSig::CastDecimalAsDuration, "cast"},
@@ -629,11 +629,11 @@ std::unordered_map<tipb::ScalarFuncSig, String> scalar_func_map({
     {tipb::ScalarFuncSig::AbsInt, "abs"}, {tipb::ScalarFuncSig::AbsUInt, "abs"}, {tipb::ScalarFuncSig::AbsReal, "abs"},
     {tipb::ScalarFuncSig::AbsDecimal, "abs"},
 
-    {tipb::ScalarFuncSig::CeilIntToDec, "ceil"}, {tipb::ScalarFuncSig::CeilIntToInt, "ceil"}, {tipb::ScalarFuncSig::CeilDecToInt, "ceil"},
+    {tipb::ScalarFuncSig::CeilIntToDec, "ceil"}, {tipb::ScalarFuncSig::CeilIntToInt, "ceil"}, {tipb::ScalarFuncSig::CeilDecToInt, "ceilDecimalToInt"},
     {tipb::ScalarFuncSig::CeilDecToDec, "ceil"}, {tipb::ScalarFuncSig::CeilReal, "ceil"},
 
     {tipb::ScalarFuncSig::FloorIntToDec, "floor"}, {tipb::ScalarFuncSig::FloorIntToInt, "floor"},
-    {tipb::ScalarFuncSig::FloorDecToInt, "floor"}, {tipb::ScalarFuncSig::FloorDecToDec, "floor"}, {tipb::ScalarFuncSig::FloorReal, "floor"},
+    {tipb::ScalarFuncSig::FloorDecToInt, "floorDecimalToInt"}, {tipb::ScalarFuncSig::FloorDecToDec, "floor"}, {tipb::ScalarFuncSig::FloorReal, "floor"},
 
     {tipb::ScalarFuncSig::RoundReal, "round"}, {tipb::ScalarFuncSig::RoundInt, "round"}, {tipb::ScalarFuncSig::RoundDec, "round"},
     //{tipb::ScalarFuncSig::RoundWithFracReal, "cast"},

diff --git a/dbms/src/Functions/FunctionsRound.cpp b/dbms/src/Functions/FunctionsRound.cpp
@@ -15,6 +15,11 @@ void registerFunctionsRound(FunctionFactory & factory)
     factory.registerFunction<FunctionCeil>("ceil", FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionTrunc>("trunc", FunctionFactory::CaseInsensitive);
 
+    factory.registerFunction<FunctionRoundDecimalToInt>();
+    factory.registerFunction<FunctionCeilDecimalToInt>();
+    factory.registerFunction<FunctionFloorDecimalToInt>();
+    factory.registerFunction<FunctionTruncDecimalToInt>();
+
     /// Compatibility aliases.
     factory.registerFunction<FunctionCeil>("ceiling", FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionTrunc>("truncate", FunctionFactory::CaseInsensitive);