From c9600717ad4dcb7bbaabe041506d4b978ab1516d Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 15:58:59 +0800
Subject: [PATCH] fix compile error and reuse getNullValue

---
 src/common/src/ttypes.c |  7 ++++---
 src/cq/src/cqMain.c     | 27 +++++----------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c
index 8ea4fe906a..eff25e8c93 100644
--- a/src/common/src/ttypes.c
+++ b/src/common/src/ttypes.c
@@ -471,10 +471,11 @@ static uint32_t nullInt = TSDB_DATA_INT_NULL;
 static uint64_t nullBigInt = TSDB_DATA_BIGINT_NULL;
 static uint32_t nullFloat = TSDB_DATA_FLOAT_NULL;
 static uint64_t nullDouble = TSDB_DATA_DOUBLE_NULL;
-static struct {
+
+static union {
   tstr str;
-  int32_t pad;
-} nullBinary = {.str = {.len = 1}, .pad = 0}, nullNchar = {.str = {.len = 4}, .pad = 0};
+  char pad[sizeof(tstr) + 4];
+} nullBinary = {.str = {.len = 1}}, nullNchar = {.str = {.len = 4}};
 
 static void *nullValues[] = {
     &nullBool,  &nullTinyInt, &nullSmallInt, &nullInt,    &nullBigInt,
diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c
index 098d69fcb2..3e7e8525ef 100644
--- a/src/cq/src/cqMain.c
+++ b/src/cq/src/cqMain.c
@@ -256,30 +256,13 @@ static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
   SDataRow trow = (SDataRow)pBlk->data;
   tdInitDataRow(trow, pSchema);
 
-  union {
-    char buf[sizeof(int64_t)];
-    tstr str;
-  } nullVal;
-
   for (int32_t i = 0; i < pSchema->numOfCols; i++) {
     STColumn *c = pSchema->columns + i;
-    char* val = (char*)row[i];
-    if (IS_VAR_DATA_TYPE(c->type)) {
-      if (val == NULL) {
-        val = nullVal.buf;
-        if (c->type == TSDB_DATA_TYPE_BINARY) {
-          setNull(nullVal.str.data, TSDB_DATA_TYPE_BINARY, 1);
-          nullVal.str.len = 1;
-        } else {
-          setNull(nullVal.str.data, TSDB_DATA_TYPE_NCHAR, 4);
-          nullVal.str.len = 4;
-        }
-      } else {
-        val -= sizeof(VarDataLenT);
-      }
-    } else if (val == NULL) {
-      val = nullVal.buf;
-      setNull(val, c->type, c->bytes);
+    void* val = row[i];
+    if (val == NULL) {
+      val = getNullValue(c->type);
+    } else if (IS_VAR_DATA_TYPE(c->type)) {
+      val = ((char*)val) - sizeof(VarDataLenT);
     }
     tdAppendColVal(trow, val, c->type, c->bytes, c->offset);
   }
-- 
GitLab