Merge pull request mariadb-corporation#1678 from tntnatbry/MCOL-4180

MCOL-4180 Add some missing support for wide decimals to dbcon/execplan classes.

Author: drrtuy

datatypes/mcs_decimal.h

@@ -347,12 +347,31 @@ class Decimal: public TSInt128
             return toDouble();
         }
 
+        inline float toFloat() const
+        {
+            int128_t scaleDivisor;
+            getScaleDivisor(scaleDivisor, scale);
+            datatypes::TFloat128 tmpval((__float128) s128Value / scaleDivisor);
+            return static_cast<float>(tmpval);
+        }
+
+        inline operator float() const
+        {
+            return toFloat();
+        }
+
         inline long double toLongDouble() const
         {
-            datatypes::TFloat128 y(s128Value);
-            return static_cast<long double>(y);
+            int128_t scaleDivisor;
+            getScaleDivisor(scaleDivisor, scale);
+            datatypes::TFloat128 tmpval((__float128) s128Value / scaleDivisor);
+            return static_cast<long double>(tmpval);
         }
 
+        inline operator long double() const
+        {
+            return toLongDouble();
+        }
 
         // This method returns integral part as a TSInt128 and
         // fractional part as a TFloat128

datatypes/mcs_float128.h

@@ -102,6 +102,21 @@ class TFloat128
       return toLongDouble();
     }
 
+    inline operator float() const
+    {
+      return toFloat();
+    }
+
+    inline float toFloat() const
+    {
+        if (value > static_cast<__float128>(FLT_MAX))
+            return FLT_MAX;
+        else if (value < -static_cast<__float128>(FLT_MAX))
+            return -FLT_MAX;
+
+        return static_cast<float>(value);
+    }
+
     inline int64_t toTSInt64() const
     {
       if (value > static_cast<__float128>(INT64_MAX))

dbcon/execplan/arithmeticoperator.cpp

@@ -127,7 +127,8 @@ bool ArithmeticOperator::operator!=(const TreeNode* t) const
 
 void ArithmeticOperator::adjustResultType(const CalpontSystemCatalog::ColType& m)
 {
-    if (m.colDataType != CalpontSystemCatalog::DECIMAL)
+    if (m.colDataType != CalpontSystemCatalog::DECIMAL &&
+        m.colDataType != CalpontSystemCatalog::UDECIMAL)
     {
         fResultType = m;
     }

dbcon/execplan/arithmeticoperator.h

@@ -246,11 +246,12 @@ inline void ArithmeticOperator::evaluate(rowgroup::Row& row, bool& isNull, Parse
         case execplan::CalpontSystemCatalog::LONGDOUBLE:
             fResult.longDoubleVal = execute(lop->getLongDoubleVal(row, isNull), rop->getLongDoubleVal(row, isNull), isNull);
             break;
-        // WIP MCOL-641
+
         case execplan::CalpontSystemCatalog::DECIMAL:
         case execplan::CalpontSystemCatalog::UDECIMAL:
             execute(fResult.decimalVal, lop->getDecimalVal(row, isNull), rop->getDecimalVal(row, isNull), isNull);
             break;
+
         default:
         {
             std::ostringstream oss;

dbcon/execplan/treenode.h

@@ -763,7 +763,14 @@ inline uint64_t TreeNode::getUintVal()
         case CalpontSystemCatalog::DECIMAL:
         case CalpontSystemCatalog::UDECIMAL:
         {
-            return (uint64_t)(fResult.decimalVal.value / pow((double)10, fResult.decimalVal.scale));
+            if (fResultType.colWidth == datatypes::MAXDECIMALWIDTH)
+            {
+                return static_cast<uint64_t>(fResult.decimalVal.getIntegralPart());
+            }
+            else
+            {
+                return (uint64_t)(fResult.decimalVal.value / pow((double)10, fResult.decimalVal.scale));
+            }
         }
 
         case CalpontSystemCatalog::DATE:
@@ -829,8 +836,16 @@ inline float TreeNode::getFloatVal()
             return (float)fResult.doubleVal;
 
         case CalpontSystemCatalog::DECIMAL:
+        case CalpontSystemCatalog::UDECIMAL:
         {
-            return (fResult.decimalVal.value / pow((double)10, fResult.decimalVal.scale));
+            if (fResultType.colWidth == datatypes::MAXDECIMALWIDTH)
+            {
+                return static_cast<float>(fResult.decimalVal);
+            }
+            else
+            {
+                return (fResult.decimalVal.value / pow((double)10, fResult.decimalVal.scale));
+            }
         }
 
         case CalpontSystemCatalog::DATE:
@@ -974,8 +989,15 @@ inline long double TreeNode::getLongDoubleVal()
         case CalpontSystemCatalog::DECIMAL:
         case CalpontSystemCatalog::UDECIMAL:
         {
-            // this may not be accurate. if this is problematic, change to pre-calculated power array.
-            return (long double)(fResult.decimalVal.value / pow((long double)10, fResult.decimalVal.scale));
+            if (fResultType.colWidth == datatypes::MAXDECIMALWIDTH)
+            {
+                return static_cast<long double>(fResult.decimalVal);
+            }
+            else
+            {
+                // this may not be accurate. if this is problematic, change to pre-calculated power array.
+                return (long double)(fResult.decimalVal.value / pow((long double)10, fResult.decimalVal.scale));
+            }
         }
 
         case CalpontSystemCatalog::DATE: