Perform conversion to DECIMAL if constant column has scale > 0

Author: AestheticAkhmad

dbcon/joblist/jlf_execplantojoblist.cpp

@@ -1743,11 +1743,18 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
 
 #else
       bool isNull = cc->isNull();
-
       if (ct.isWideDecimalType())
+      {
         convertValueNum(constval.safeString(""), ct, isNull, rf, jobInfo.timeZone, value128);
+      }
+      else if (cc->resultType().colDataType == CalpontSystemCatalog::DECIMAL && cc->resultType().scale > 0)
+      {
+        convertValueNum(constval.safeString(""), cc->resultType(), isNull, rf, jobInfo.timeZone, value);
+      }
       else
+      {
         convertValueNum(constval.safeString(""), ct, isNull, rf, jobInfo.timeZone, value);
+      }
 
       if (ct.colDataType == CalpontSystemCatalog::FLOAT && !isNull)
       {

mysql-test/columnstore/bugfixes/mcol_4628.result

@@ -50,4 +50,16 @@ UPDATE t1 SET i=d;
 SELECT * FROM t1;
 i	d
 1	1.4
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (i SMALLINT) ENGINE=ColumnStore;
+INSERT INTO t1 VALUES (-762);
+INSERT INTO t1 VALUES  (-761);
+INSERT INTO t1 VALUES (761);
+INSERT INTO t1 VALUES (762);
+SELECT * FROM t1 WHERE i > -762.5;
+i
+-762
+-761
+761
+762
 DROP DATABASE mcol_4628;

mysql-test/columnstore/bugfixes/mcol_4628.test

@@ -61,6 +61,16 @@ INSERT INTO t1 VALUES (0, 1.4);
 UPDATE t1 SET i=d;
 SELECT * FROM t1;
 
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1 (i SMALLINT) ENGINE=ColumnStore;
+INSERT INTO t1 VALUES (-762);
+INSERT INTO t1 VALUES  (-761);
+INSERT INTO t1 VALUES (761);
+INSERT INTO t1 VALUES (762);
+SELECT * FROM t1 WHERE i > -762.5;
+
 --disable_warnings
 DROP DATABASE mcol_4628;
 --enable_warnings