add function tidb_divide (#1458)

* support tidb_divide * fix build * fix build * fix * refine * fix bug * fix * add ut
pingcap · Feb 23, 2021 · c17af8a · c17af8a
1 parent 7e76321
commit c17af8a
Show file tree

Hide file tree

Showing 7 changed files with 1,444 additions and 70 deletions.
diff --git a/dbms/src/Flash/Coprocessor/DAGUtils.cpp b/dbms/src/Flash/Coprocessor/DAGUtils.cpp
@@ -529,8 +529,9 @@ std::unordered_map<tipb::ScalarFuncSig, String> scalar_func_map({
     {tipb::ScalarFuncSig::MultiplyReal, "multiply"}, {tipb::ScalarFuncSig::MultiplyDecimal, "multiply"},
     {tipb::ScalarFuncSig::MultiplyInt, "multiply"},
 
-    {tipb::ScalarFuncSig::DivideReal, "divide"}, {tipb::ScalarFuncSig::DivideDecimal, "divide"},
-    {tipb::ScalarFuncSig::IntDivideInt, "intDiv"}, {tipb::ScalarFuncSig::IntDivideDecimal, "divide"},
+    {tipb::ScalarFuncSig::DivideReal, "tidbDivide"}, {tipb::ScalarFuncSig::DivideDecimal, "tidbDivide"},
+    //{tipb::ScalarFuncSig::IntDivideInt, "intDiv"},
+    //{tipb::ScalarFuncSig::IntDivideDecimal, "divide"},
 
     {tipb::ScalarFuncSig::ModReal, "modulo"}, {tipb::ScalarFuncSig::ModDecimal, "modulo"}, {tipb::ScalarFuncSig::ModInt, "modulo"},
 

diff --git a/dbms/src/Functions/CMakeLists.txt b/dbms/src/Functions/CMakeLists.txt
@@ -6,6 +6,7 @@ generate_function_register(Arithmetic
   FunctionMinus
   FunctionMultiply
   FunctionDivideFloating
+  FunctionTiDBDivideFloating
   FunctionDivideIntegral
   FunctionDivideIntegralOrZero
   FunctionModulo

diff --git a/dbms/src/Functions/FunctionHelpers.h b/dbms/src/Functions/FunctionHelpers.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <Common/typeid_cast.h>
-#include <DataTypes/IDataType.h>
-#include <Columns/IColumn.h>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/IColumn.h>
+#include <Common/typeid_cast.h>
 #include <Core/Block.h>
 #include <Core/ColumnNumbers.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
@@ -40,14 +41,17 @@ bool checkColumn(const IColumn * column)
 
 
 template <typename Type>
-const ColumnConst * checkAndGetColumnConst(const IColumn * column)
+const ColumnConst * checkAndGetColumnConst(const IColumn * column, bool maybe_nullable_column = false)
 {
     if (!column || !column->isColumnConst())
         return {};
 
     const ColumnConst * res = static_cast<const ColumnConst *>(column);
 
-    if (!checkColumn<Type>(&res->getDataColumn()))
+    auto * data_column = &res->getDataColumn();
+    if (maybe_nullable_column && data_column->isColumnNullable())
+        data_column = &typeid_cast<const ColumnNullable *>(data_column)->getNestedColumn();
+    if (!checkColumn<Type>(data_column))
         return {};
 
     return res;