feat: add more case when cases

include/libs/scalar/scalar.h

@@ -43,7 +43,7 @@ int32_t scalarGetOperatorParamNum(EOperatorType type);
 int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type);
 
 int32_t vectorGetConvertType(int32_t type1, int32_t type2);
-int32_t vectorConvertImpl(const SScalarParam *pIn, SScalarParam *pOut, int32_t *overflow);
+int32_t vectorConvertSingleColImpl(const SScalarParam *pIn, SScalarParam *pOut, int32_t *overflow, int32_t startIndex, int32_t numOfRows);
 
 /* Math functions */
 int32_t absFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);

source/libs/scalar/inc/sclInt.h

@@ -60,7 +60,7 @@ typedef struct SScalarCtx {
 #define SCL_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; } return _code; } while (0)
 #define SCL_ERR_JRET(c) do { code = c; if (code != TSDB_CODE_SUCCESS) { terrno = code; goto _return; } } while (0)
 
-int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow);
+int32_t sclConvertValueToSclParam(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow);
 int32_t sclCreateColumnInfoData(SDataType* pType, int32_t numOfRows, SScalarParam* pParam);
 int32_t sclConvertToTsValueNode(int8_t precision, SValueNode* valueNode);
 
@@ -71,6 +71,8 @@ int32_t sclConvertToTsValueNode(int8_t precision, SValueNode* valueNode);
 void sclFreeParam(SScalarParam *param);
 void doVectorCompare(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, 
                      int32_t _ord, int32_t optr);
+void vectorCompareImpl(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, 
+                             int32_t _ord, int32_t optr);                     
 void vectorCompare(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t _ord, int32_t optr);
 
 #ifdef __cplusplus

source/libs/scalar/inc/sclvector.h

@@ -20,6 +20,15 @@
 extern "C" {
 #endif
 
+typedef struct SSclVectorConvCtx {
+  const SScalarParam* pIn;
+  SScalarParam* pOut;
+  int32_t startIndex; 
+  int32_t endIndex;
+  int16_t inType;
+  int16_t outType;
+} SSclVectorConvCtx;
+
 typedef double (*_getDoubleValue_fn_t)(void *src, int32_t index);
 
 static FORCE_INLINE double getVectorDoubleValue_TINYINT(void *src, int32_t index) {

source/libs/scalar/src/filter.c

@@ -1170,7 +1170,7 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode* tree, SArray *group) {
       SValueNode *valueNode = (SValueNode *)cell->pNode;
       if (valueNode->node.resType.type != type) {
         int32_t overflow = 0;
-        code = doConvertDataType(valueNode, &out, &overflow);
+        code = sclConvertValueToSclParam(valueNode, &out, &overflow);
         if (code) {
   //        fltError("convert from %d to %d failed", in.type, out.type);
           FLT_ERR_RET(code);
@@ -1967,7 +1967,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
       }
 
       // todo refactor the convert
-      int32_t code = doConvertDataType(var, &out, NULL);
+      int32_t code = sclConvertValueToSclParam(var, &out, NULL);
       if (code != TSDB_CODE_SUCCESS) {
         qError("convert value to type[%d] failed", type);
         return TSDB_CODE_TSC_INVALID_OPERATION;

source/libs/scalar/src/scalar.c

@@ -60,7 +60,7 @@ int32_t sclCreateColumnInfoData(SDataType* pType, int32_t numOfRows, SScalarPara
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow) {
+int32_t sclConvertValueToSclParam(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow) {
   SScalarParam in = {.numOfRows = 1};
   int32_t code = sclCreateColumnInfoData(&pValueNode->node.resType, 1, &in);
   if (code != TSDB_CODE_SUCCESS) {
@@ -70,7 +70,7 @@ int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out, int32_t* ov
   colDataAppend(in.columnData, 0, nodesGetValueFromNode(pValueNode), false);
 
   colInfoDataEnsureCapacity(out->columnData, 1);
-  code = vectorConvertImpl(&in, out, overflow);
+  code = vectorConvertSingleColImpl(&in, out, overflow, -1, -1);
   sclFreeParam(&in);
 
   return code;
@@ -131,7 +131,7 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) {
       }
 
       int32_t overflow = 0;
-      code = doConvertDataType(valueNode, &out, &overflow);
+      code = sclConvertValueToSclParam(valueNode, &out, &overflow);
       if (code != TSDB_CODE_SUCCESS) {
 //        sclError("convert data from %d to %d failed", in.type, out.type);
         SCL_ERR_JRET(code);
@@ -584,7 +584,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell*
     SCL_ERR_RET(sclGetNodeRes(pWhenThen->pWhen, ctx, &pWhen));
     SCL_ERR_RET(sclGetNodeRes(pWhenThen->pThen, ctx, &pThen));
     
-    doVectorCompare(pCase, pWhen, pComp, rowIdx, 1, TSDB_ORDER_ASC, OP_TYPE_EQUAL);
+    vectorCompareImpl(pCase, pWhen, pComp, rowIdx, 1, TSDB_ORDER_ASC, OP_TYPE_EQUAL);
     
     bool *equal = (bool*)colDataGetData(pComp->columnData, rowIdx);
     if (*equal) {
@@ -885,7 +885,7 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp
       bool *equal = (bool*)colDataGetData(comp.columnData, (comp.numOfRows > 1 ? i : 0));
       if (*equal) {
         colDataAppend(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)));
-        if (0 == i && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && rowNum > 1) {
+        if (0 == i && 1 == pCase->numOfRows && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && rowNum > 1) {
           SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
           break;
         }
@@ -1207,7 +1207,8 @@ EDealRes sclRewriteCaseWhen(SNode** pNode, SScalarCtx *ctx) {
 
   SNode* tnode = NULL;
   FOREACH(tnode, node->pWhenThenList) {
-    if (!SCL_IS_CONST_NODE(tnode)) {
+    SWhenThenNode* pWhenThen = (SWhenThenNode*)tnode;
+    if (!SCL_IS_CONST_NODE(pWhenThen->pWhen) || !SCL_IS_CONST_NODE(pWhenThen->pThen)) {
       return DEAL_RES_CONTINUE;
     }
   }  
@@ -1265,7 +1266,7 @@ EDealRes sclConstantsRewriter(SNode** pNode, void* pContext) {
     return sclRewriteLogic(pNode, ctx);
   }
 
-  if (QUERY_NODE_CASE_WHEN == nodeType(pNode)) {
+  if (QUERY_NODE_CASE_WHEN == nodeType(*pNode)) {
     return sclRewriteCaseWhen(pNode, ctx);
   }
 

tests/script/tsim/scalar/caseWhen.sim

@@ -3,7 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1
+print ======== prepare data 
+
 sql drop database if exists db1;
 sql create database db1 vgroups 5;
 sql use db1;
@@ -34,6 +35,8 @@ sql insert into tba5 values ('2022-09-30 15:15:02', 1, "0", true);
 sql insert into tba5 values ('2022-09-30 15:15:03', 5, "5", false);
 sql insert into tba5 values ('2022-09-30 15:15:04', null, null, null);
 
+print ======== case when xx
+
 sql select case when 3 then 4 end from tba1;
 if $rows != 4 then 
   return -1 
@@ -583,6 +586,226 @@ if $data30 != NULL then
  return -1
 endi
 
+#select case when f1 < 3 then 1 when f1 >= 3 then 2 else 3 end,sum(f1),count(f1) from tba1 state_window(case when f1 < 3 then 1 when f1 >= 3 then 2 else 3 end);
+
+sql select f1 from tba1 where case when case when f1 <= 0 then 3 when f1 = 1 then 4 when f1 >= 3 then 2 else 1 end > 2 then 1 else 0 end > 0;
+if $rows != 2 then 
+  return -1
+endi
+if $data00 != 0 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+
+sql select case when f1 is not null then case when f1 <= 0 then f1 else f1 * 10 end else -1 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 0 then
+ return -1
+endi
+if $data10 != 10 then
+ return -1
+endi
+if $data20 != 50 then
+ return -1
+endi
+if $data30 != -1 then
+ return -1
+endi
+
+
+print ======== case xx when xx
+
+sql select case 3 when 3 then 4 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 4 then
+ return -1
+endi
+if $data10 != 4 then
+ return -1
+endi
+if $data20 != 4 then
+ return -1
+endi
+if $data30 != 4 then
+ return -1
+endi
+
+sql select case 3 when 1 then 4 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != NULL then
+ return -1
+endi
+if $data10 != NULL then
+ return -1
+endi
+if $data20 != NULL then
+ return -1
+endi
+if $data30 != NULL then
+ return -1
+endi
+
+sql select case 3 when 1 then 4 else 2 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 2 then
+ return -1
+endi
+if $data10 != 2 then
+ return -1
+endi
+if $data20 != 2 then
+ return -1
+endi
+if $data30 != 2 then
+ return -1
+endi
+
+sql select case 3 when null then 4 when '3' then 1 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 1 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+if $data20 != 1 then
+ return -1
+endi
+if $data30 != 1 then
+ return -1
+endi
+
+sql select case '3' when null then 4 when 3 then 1 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 1 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+if $data20 != 1 then
+ return -1
+endi
+if $data30 != 1 then
+ return -1
+endi
+
+sql select case null when null then 4 when 3 then 1 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != NULL then
+ return -1
+endi
+if $data10 != NULL then
+ return -1
+endi
+if $data20 != NULL then
+ return -1
+endi
+if $data30 != NULL then
+ return -1
+endi
+
+sql select case 3.0 when null then 4 when '3' then 1 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 1 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+if $data20 != 1 then
+ return -1
+endi
+if $data30 != 1 then
+ return -1
+endi
+
+sql select case f2 when 'a' then 4 when '0' then 1 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 4 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+if $data20 != NULL then
+ return -1
+endi
+if $data30 != NULL then
+ return -1
+endi
+
+sql select case f2 when f1 then f1 when f1 - 1 then f1 else 99 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 0 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+if $data20 != 5 then
+ return -1
+endi
+if $data30 != 99 then
+ return -1
+endi
+
+sql select case cast(f2 as int) when 0 then f2 when f1 then 11 else ts end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 0 then
+ return -1
+endi
+if $data10 != 1 then
+ return -1
+endi
+if $data20 != 5 then
+ return -1
+endi
+if $data30 != 99 then
+ return -1
+endi
+
+sql select case f1 + 1 when 1 then 1 when 2 then 2 else 3 end from tba1;
+if $rows != 4 then 
+  return -1
+endi
+if $data00 != 1 then
+ return -1
+endi
+if $data10 != 2 then
+ return -1
+endi
+if $data20 != 3 then
+ return -1
+endi
+if $data30 != 3 then
+ return -1
+endi
+
 sql_error select case when sum(f1) then sum(f1)-abs(f1) end from tba1;
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT