From 2ff07c8f1e6107fed345accb88337b354ed3ad85 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Sat, 23 Jul 2022 18:15:39 +0800 Subject: [PATCH] restore sclRewriteOperator logic --- source/libs/scalar/src/scalar.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index cfeac04bbd..955c8c074a 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -824,10 +824,14 @@ EDealRes sclRewriteOperator(SNode** pNode, SScalarCtx *ctx) { res->translate = true; - res->node.resType = node->node.resType; if (colDataIsNull_s(output.columnData, 0)) { - res->isNull = true; - res->node.resType = node->node.resType; + if(node->node.resType.type != TSDB_DATA_TYPE_JSON){ + res->node.resType.type = TSDB_DATA_TYPE_NULL; + res->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_NULL].bytes; + } else { + res->isNull = true; + res->node.resType = node->node.resType; + } } else { int32_t type = output.columnData->info.type; if (IS_VAR_DATA_TYPE(type)) { // todo refactor