Add SMALLINT case to setOpType, and remove previous change

Author: AestheticAkhmad

dbcon/execplan/predicateoperator.cpp

@@ -211,6 +211,7 @@ void PredicateOperator::setOpType(Type& l, Type& r)
       case execplan::CalpontSystemCatalog::INT:
       case execplan::CalpontSystemCatalog::MEDINT:
       case execplan::CalpontSystemCatalog::TINYINT:
+      case execplan::CalpontSystemCatalog::SMALLINT:
       case execplan::CalpontSystemCatalog::BIGINT:
       case execplan::CalpontSystemCatalog::UINT:
       case execplan::CalpontSystemCatalog::UMEDINT:
@@ -244,6 +245,7 @@ void PredicateOperator::setOpType(Type& l, Type& r)
       case execplan::CalpontSystemCatalog::INT:
       case execplan::CalpontSystemCatalog::MEDINT:
       case execplan::CalpontSystemCatalog::TINYINT:
+      case execplan::CalpontSystemCatalog::SMALLINT:
       case execplan::CalpontSystemCatalog::BIGINT:
       case execplan::CalpontSystemCatalog::UINT:
       case execplan::CalpontSystemCatalog::UMEDINT:

dbcon/joblist/jlf_execplantojoblist.cpp

@@ -1747,10 +1747,6 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
       {
         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);