From 56ec0a3920dc66f005d381e7dabc90f347747ac2 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 13 Jul 2022 20:42:49 +0800
Subject: [PATCH] fix: json null

---
 source/client/src/tmq.c                | 11 ++++++++---
 source/libs/parser/src/parTranslater.c |  3 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index 2741ea0670..ad47348c22 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -2269,7 +2269,12 @@ static char *processAlterTable(SMqMetaRsp *metaRsp){
       cJSON* tagName = cJSON_CreateString(vAlterTbReq.tagName);
       cJSON_AddItemToObject(json, "colName", tagName);
 
-      if (!vAlterTbReq.isNull){
+      bool isNull = vAlterTbReq.isNull;
+      if(vAlterTbReq.tagType == TSDB_DATA_TYPE_JSON){
+        STag *jsonTag = (STag *)vAlterTbReq.pTagVal;
+        if(jsonTag->nTag == 0) isNull = true;
+      }
+      if (!isNull){
         char* buf = NULL;
 
         if (vAlterTbReq.tagType == TSDB_DATA_TYPE_JSON) {
@@ -2285,8 +2290,8 @@ static char *processAlterTable(SMqMetaRsp *metaRsp){
         taosMemoryFree(buf);
       }
 
-      cJSON* isNull = cJSON_CreateBool(vAlterTbReq.isNull);
-      cJSON_AddItemToObject(json, "colValueNull", isNull);
+      cJSON* isNullCJson = cJSON_CreateBool(isNull);
+      cJSON_AddItemToObject(json, "colValueNull", isNullCJson);
       break;
     }
     default:
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 6654bc26cd..a8fbc8d7ab 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -5872,9 +5872,6 @@ static int32_t buildUpdateTagValReq(STranslateContext* pCxt, SAlterTableStmt* pS
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
-    if(pTag->nTag == 0){
-      pReq->isNull = true;
-    }
     pReq->nTagVal = pTag->len;
     pReq->pTagVal = (uint8_t*)pTag;
     pStmt->pVal->datum.p = (char*)pTag;  // for free