From b32153eab9307a1895cfebb6039e424712211267 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 18 Sep 2021 10:35:08 +0800
Subject: [PATCH] TD-6129<feature> fix json encode error

---
 src/client/src/tscUtil.c  | 2 +-
 src/query/src/qExecutor.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 3d47973f67..b2f9f25d80 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -5193,7 +5193,7 @@ char* parseTagDatatoJson(void *p){
       ASSERT(jsonVal == TSDB_DATA_BINARY_PLACEHOLDER);
       continue;
     }
-    if (j%2 == 0) { // json key
+    if (j%2 != 0) { // json key
       memset(tagJsonKey, 0, TSDB_MAX_TAGS_LEN);
       int32_t length = taosUcs4ToMbs(varDataVal(val), varDataLen(val), tagJsonKey);
       if (length == 0) {
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index b120565541..aa1131dfa5 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3341,7 +3341,7 @@ static void doSetTagValueInParam(void* pTable, int32_t tagColId, tVariant *tag,
     val = tsdbGetTableName(pTable);
     assert(val != NULL);
   } else {
-    val = tsdbGetTableTagVal(pTable, tagColId, type, bytes);
+    val = tsdbGetTableTagVal(pTable, tagColId, type, bytes);      // todo json
   }
 
   if (val == NULL || isNull(val, type)) {
-- 
GitLab