Merge pull request #11881 from taosdata/fix/TD-15132

fix(query): fix taosshell crash when arithmetic operation with NULL concstant

source/libs/scalar/inc/sclvector.h

@@ -86,8 +86,10 @@ static FORCE_INLINE _getDoubleValue_fn_t getVectorDoubleValueFn(int32_t srcType)
     p = getVectorDoubleValue_JSON;
   } else if (srcType == TSDB_DATA_TYPE_BOOL) {
     p = getVectorDoubleValue_BOOL;
+  } else if (srcType == TSDB_DATA_TYPE_NULL) {
+    p = NULL;
   } else {
-    assert(0);
+    ASSERT(0);
   }
   return p;
 }

source/libs/scalar/src/scalar.c

@@ -597,9 +597,12 @@ EDealRes sclRewriteOperator(SNode** pNode, SScalarCtx *ctx) {
     return DEAL_RES_ERROR;
   }
 
-  res->node.resType = node->node.resType;
   res->translate = true;
 
+  if (colDataIsNull_s(output.columnData, 0)) {
+    res->node.resType.type = TSDB_DATA_TYPE_NULL;
+  } else {
+    res->node.resType = node->node.resType;
     int32_t type = output.columnData->info.type;
     if (IS_VAR_DATA_TYPE(type)) {  // todo refactor
       res->datum.p = output.columnData->pData;
@@ -607,6 +610,7 @@ EDealRes sclRewriteOperator(SNode** pNode, SScalarCtx *ctx) {
     } else {
       memcpy(nodesGetValueFromNode(res), output.columnData->pData, tDataTypes[type].bytes);
     }
+  }
 
   nodesDestroyNode(*pNode);
   *pNode = (SNode*)res;

source/libs/scalar/src/sclvector.c

@@ -150,34 +150,36 @@ int64_t getVectorBigintValue_JSON(void *src, int32_t index){
 
 _getBigintValue_fn_t getVectorBigintValueFn(int32_t srcType) {
     _getBigintValue_fn_t p = NULL;
-    if(srcType==TSDB_DATA_TYPE_TINYINT) {
+    if (srcType==TSDB_DATA_TYPE_TINYINT) {
       p = getVectorBigintValue_TINYINT;
-    }else if(srcType==TSDB_DATA_TYPE_UTINYINT) {
+    } else if (srcType==TSDB_DATA_TYPE_UTINYINT) {
       p = getVectorBigintValue_UTINYINT;
-    }else if(srcType==TSDB_DATA_TYPE_SMALLINT) {
+    } else if (srcType==TSDB_DATA_TYPE_SMALLINT) {
       p = getVectorBigintValue_SMALLINT;
-    }else if(srcType==TSDB_DATA_TYPE_USMALLINT) {
+    } else if (srcType==TSDB_DATA_TYPE_USMALLINT) {
       p = getVectorBigintValue_USMALLINT;
-    }else if(srcType==TSDB_DATA_TYPE_INT) {
+    } else if (srcType==TSDB_DATA_TYPE_INT) {
       p = getVectorBigintValue_INT;
-    }else if(srcType==TSDB_DATA_TYPE_UINT) {
+    } else if (srcType==TSDB_DATA_TYPE_UINT) {
       p = getVectorBigintValue_UINT;
-    }else if(srcType==TSDB_DATA_TYPE_BIGINT) {
+    } else if (srcType==TSDB_DATA_TYPE_BIGINT) {
       p = getVectorBigintValue_BIGINT;
-    }else if(srcType==TSDB_DATA_TYPE_UBIGINT) {
+    } else if (srcType==TSDB_DATA_TYPE_UBIGINT) {
       p = getVectorBigintValue_UBIGINT;
-    }else if(srcType==TSDB_DATA_TYPE_FLOAT) {
+    } else if (srcType==TSDB_DATA_TYPE_FLOAT) {
       p = getVectorBigintValue_FLOAT;
-    }else if(srcType==TSDB_DATA_TYPE_DOUBLE) {
+    } else if (srcType==TSDB_DATA_TYPE_DOUBLE) {
       p = getVectorBigintValue_DOUBLE;
-    }else if(srcType==TSDB_DATA_TYPE_TIMESTAMP) {
+    } else if (srcType==TSDB_DATA_TYPE_TIMESTAMP) {
       p = getVectorBigintValue_BIGINT;
-    }else if(srcType==TSDB_DATA_TYPE_BOOL) {
+    } else if (srcType==TSDB_DATA_TYPE_BOOL) {
       p = getVectorBigintValue_BOOL;
-    }else if(srcType==TSDB_DATA_TYPE_JSON) {
+    } else if (srcType==TSDB_DATA_TYPE_JSON) {
       p = getVectorBigintValue_JSON;
-    }else {
-        assert(0);
+    } else if (srcType==TSDB_DATA_TYPE_NULL){
+      p = NULL;
+    } else {
+      ASSERT(0);
     }
     return p;
 }
@@ -1594,7 +1596,7 @@ _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binFunctionId) {
     case OP_TYPE_JSON_CONTAINS:
       return vectorJsonContains;
     default:
-      assert(0);
+      ASSERT(0);
       return NULL;
   }
 }