From 878e54f143d1c20aa28ea3b360b35050f780ed55 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 31 Mar 2022 22:23:12 +0800
Subject: [PATCH 01/82] fix test error

---
 source/libs/executor/src/tsort.c        |  1 +
 source/libs/executor/test/sortTests.cpp | 13 +++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 7a57d62969..414f3ded6e 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -266,6 +266,7 @@ static int32_t adjustMergeTreeForNextTuple(SExternalMemSource *pSource, SMultiwa
     pSource->src.rowIndex = 0;
 
     if (pHandle->type == SORT_SINGLESOURCE_SORT) {
+      pSource->pageIndex ++;
       if (pSource->pageIndex >= taosArrayGetSize(pSource->pageIdList)) {
         (*numOfCompleted) += 1;
         pSource->src.rowIndex = -1;
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index ecea24135f..5a7edd816b 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -150,7 +150,7 @@ int32_t docomp(const void* p1, const void* p2, void* param) {
 }
 }  // namespace
 
-#if 0
+#if 1
 TEST(testCase, inMem_sort_Test) {
   SArray* pOrderVal = taosArrayInit(4, sizeof(SOrder));
   SOrder o = {.order = TSDB_ORDER_ASC};
@@ -187,20 +187,13 @@ TEST(testCase, inMem_sort_Test) {
 }
 
 TEST(testCase, external_mem_sort_Test) {
-  SArray* pOrderVal = taosArrayInit(4, sizeof(SOrder));
-  SOrder o = {.order = TSDB_ORDER_ASC};
-  o.col.info.colId = 1;
-  o.col.info.type = TSDB_DATA_TYPE_INT;
-  taosArrayPush(pOrderVal, &o);
-
   SBlockOrderInfo oi = {0};
   oi.order = TSDB_ORDER_ASC;
-  oi.colIndex = 0;
+  oi.slotId = 0;
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
-  SSchema s = {.type = TSDB_DATA_TYPE_INT, .colId = 1, .bytes = 4, };
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, false, SORT_SINGLESOURCE_SORT, 1024, 5, &s, 1, "test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 1024, 5, &s, "test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
   _info* pInfo = (_info*) taosMemoryCalloc(1, sizeof(_info));

From 69a5e55a24a7b8429a2fe3984ea7eee10c5278a1 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 1 Apr 2022 10:05:16 +0800
Subject: [PATCH 02/82] [TD-14422]<fix> fix error in sort logic & add test case

---
 source/common/src/tdatablock.c          |  3 ++
 source/libs/executor/src/tsort.c        |  5 ++-
 source/libs/executor/test/sortTests.cpp | 51 ++++++++++++-------------
 source/util/src/tpagedbuf.c             |  7 ++--
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 7f25fd1e80..f22051f1c6 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1201,6 +1201,9 @@ void* blockDataDestroy(SSDataBlock* pBlock) {
 }
 
 SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock) {
+  if(pDataBlock == NULL){
+    return NULL;
+  }
   int32_t numOfCols = pDataBlock->info.numOfCols;
 
   SSDataBlock* pBlock = taosMemoryCalloc(1, sizeof(SSDataBlock));
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 414f3ded6e..0d69ed711c 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -148,7 +148,7 @@ static int32_t doAddToBuf(SSDataBlock* pDataBlock, SSortHandle* pHandle) {
   int32_t start = 0;
 
   if (pHandle->pBuf == NULL) {
-    int32_t code = createDiskbasedBuf(&pHandle->pBuf, pHandle->pageSize, pHandle->numOfPages * pHandle->pageSize, 0, "/tmp");
+    int32_t code = createDiskbasedBuf(&pHandle->pBuf, pHandle->pageSize, pHandle->numOfPages * pHandle->pageSize, "doAddToBuf", "/tmp");
     dBufSetPrintInfo(pHandle->pBuf);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
@@ -212,7 +212,7 @@ static int32_t sortComparInit(SMsortComparParam* cmpParam, SArray* pSources, int
   } else {
     // multi-pass internal merge sort is required
     if (pHandle->pBuf == NULL) {
-      code = createDiskbasedBuf(&pHandle->pBuf, pHandle->pageSize, pHandle->numOfPages * pHandle->pageSize, 0, "/tmp");
+      code = createDiskbasedBuf(&pHandle->pBuf, pHandle->pageSize, pHandle->numOfPages * pHandle->pageSize, "sortComparInit", "/tmp");
       dBufSetPrintInfo(pHandle->pBuf);
       if (code != TSDB_CODE_SUCCESS) {
         return code;
@@ -411,6 +411,7 @@ int32_t msortComparFn(const void *pLeft, const void *pRight, void *param) {
         assert(0);
     }
   }
+  return 0;
 }
 
 static int32_t doInternalMergeSort(SSortHandle* pHandle) {
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 5a7edd816b..1b64182266 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -152,23 +152,24 @@ int32_t docomp(const void* p1, const void* p2, void* param) {
 
 #if 1
 TEST(testCase, inMem_sort_Test) {
-  SArray* pOrderVal = taosArrayInit(4, sizeof(SOrder));
-  SOrder o = {.order = TSDB_ORDER_ASC};
-  o.col.info.colId = 1;
-  o.col.info.type = TSDB_DATA_TYPE_INT;
-  taosArrayPush(pOrderVal, &o);
-
-  int32_t numOfRows = 1000;
   SBlockOrderInfo oi = {0};
   oi.order = TSDB_ORDER_ASC;
-  oi.colIndex = 0;
+  oi.slotId = 0;
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
   SSchema s = {.type = TSDB_DATA_TYPE_INT, .colId = 1, .bytes = 4, };
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, false, SORT_SINGLESOURCE_SORT, 1024, 5, &s, 1, "test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 1024, 5, NULL, "test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
-  tsortAddSource(phandle, &numOfRows);
+
+  _info* pInfo = (_info*) taosMemoryCalloc(1, sizeof(_info));
+  pInfo->startVal = 0;
+  pInfo->pageRows = 100;
+  pInfo->count = 6;
+
+  SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
+  ps->param = pInfo;
+  tsortAddSource(phandle, ps);
 
   int32_t code = tsortOpen(phandle);
   int32_t row = 1;
@@ -180,7 +181,8 @@ TEST(testCase, inMem_sort_Test) {
     }
 
     void* v = tsortGetValue(pTupleHandle, 0);
-    printf("%d: %d\n", row++, *(int32_t*) v);
+    printf("%d: %d\n", row, *(int32_t*) v);
+    ASSERT_EQ(row++, *(int32_t*) v);
 
   }
   tsortDestroySortHandle(phandle);
@@ -193,13 +195,13 @@ TEST(testCase, external_mem_sort_Test) {
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 1024, 5, &s, "test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 32, 6, NULL, "test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
   _info* pInfo = (_info*) taosMemoryCalloc(1, sizeof(_info));
-  pInfo->startVal = 100000;
-  pInfo->pageRows = 1000;
-  pInfo->count = 50;
+  pInfo->startVal = 0;
+  pInfo->pageRows = 100;
+  pInfo->count = 6;
 
   SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
   ps->param = pInfo;
@@ -216,28 +218,22 @@ TEST(testCase, external_mem_sort_Test) {
     }
 
     void* v = tsortGetValue(pTupleHandle, 0);
-    printf("%d: %d\n", row++, *(int32_t*) v);
+    printf("%d: %d\n", row, *(int32_t*) v);
+    ASSERT_EQ(row++, *(int32_t*) v);
 
   }
   tsortDestroySortHandle(phandle);
 }
 
 TEST(testCase, ordered_merge_sort_Test) {
-  SArray* pOrderVal = taosArrayInit(4, sizeof(SOrder));
-  SOrder o = {.order = TSDB_ORDER_ASC};
-  o.col.info.colId = 1;
-  o.col.info.type = TSDB_DATA_TYPE_INT;
-  taosArrayPush(pOrderVal, &o);
-
-  int32_t numOfRows = 1000;
   SBlockOrderInfo oi = {0};
   oi.order = TSDB_ORDER_ASC;
-  oi.colIndex = 0;
+  oi.slotId = 0;
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
   SSchema s = {.type = TSDB_DATA_TYPE_INT, .colId = 1, .bytes = 4};
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, false, SORT_MULTISOURCE_MERGE, 1024, 5, &s, 1,"test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_MULTISOURCE_MERGE, 1024, 5, NULL,"test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
   tsortSetComparFp(phandle, docomp);
 
@@ -246,7 +242,7 @@ TEST(testCase, ordered_merge_sort_Test) {
     _info* c = static_cast<_info*>(taosMemoryCalloc(1, sizeof(_info)));
     c->count    = 1;
     c->pageRows = 1000;
-    c->startVal = 0;
+    c->startVal = i*1000;
 
     p->param = c;
     tsortAddSource(phandle, p);
@@ -262,7 +258,8 @@ TEST(testCase, ordered_merge_sort_Test) {
     }
 
     void* v = tsortGetValue(pTupleHandle, 0);
-    printf("%d: %d\n", row++, *(int32_t*) v);
+    printf("%d: %d\n", row, *(int32_t*) v);
+    ASSERT_EQ(row++, *(int32_t*) v);
 
   }
   tsortDestroySortHandle(phandle);
diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c
index d834263b94..096a16ec94 100644
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
@@ -138,7 +138,7 @@ static char* doFlushPageToDisk(SDiskbasedBuf* pBuf, SPageInfo* pg) {
       pBuf->nextPos += size;
 
       int32_t ret = taosLSeekFile(pBuf->pFile, pg->offset, SEEK_SET);
-      if (ret != 0) {
+      if (ret == -1) {
         terrno = TAOS_SYSTEM_ERROR(errno);
         return NULL;
       }
@@ -169,7 +169,7 @@ static char* doFlushPageToDisk(SDiskbasedBuf* pBuf, SPageInfo* pg) {
 
       // 3. write to disk.
       int32_t ret = taosLSeekFile(pBuf->pFile, pg->offset, SEEK_SET);
-      if (ret != 0) {
+      if (ret == -1) {
         terrno = TAOS_SYSTEM_ERROR(errno);
         return NULL;
       }
@@ -224,7 +224,7 @@ static char* flushPageToDisk(SDiskbasedBuf* pBuf, SPageInfo* pg) {
 // load file block data in disk
 static int32_t loadPageFromDisk(SDiskbasedBuf* pBuf, SPageInfo* pg) {
   int32_t ret = taosLSeekFile(pBuf->pFile, pg->offset, SEEK_SET);
-  if (ret != 0) {
+  if (ret == -1) {
     ret = TAOS_SYSTEM_ERROR(errno);
     return ret;
   }
@@ -371,7 +371,6 @@ int32_t createDiskbasedBuf(SDiskbasedBuf** pBuf, int32_t pagesize, int32_t inMem
   pPBuf->totalBufSize = 0;
   pPBuf->inMemPages = inMemBufSize / pagesize;  // maximum allowed pages, it is a soft limit.
   pPBuf->allocateId = -1;
-  pPBuf->comp     = true;
   pPBuf->pFile    = NULL;
   pPBuf->id       = strdup(id);
   pPBuf->fileSize = 0;

From 12c3a10a9bd06ba87cc0d523180a1d455bc87738 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 2 Apr 2022 14:29:43 +0800
Subject: [PATCH 03/82] fix error in order by logic & fix no return error

---
 cmake/cmake.define                        |  4 +-
 cmake/cmake.platform                      |  2 +-
 include/common/tdatablock.h               | 12 ++---
 source/common/src/tdatablock.c            | 66 ++++++-----------------
 source/common/src/tmsg.c                  |  1 +
 source/dnode/mgmt/dm/src/dmMsg.c          |  1 +
 source/dnode/mgmt/dm/src/dmWorker.c       |  1 +
 source/dnode/mgmt/main/src/dndTransport.c |  1 +
 source/dnode/mnode/impl/src/mndDnode.c    |  1 +
 source/dnode/vnode/src/tsdb/tsdbSma.c     |  5 ++
 source/libs/catalog/src/catalog.c         |  4 +-
 source/libs/executor/inc/executil.h       |  4 +-
 source/libs/executor/src/dataDispatcher.c |  1 +
 source/libs/executor/src/executorimpl.c   | 21 ++++++--
 source/libs/executor/src/tlinearhash.c    |  1 +
 source/libs/executor/src/tsimplehash.c    |  1 +
 source/libs/executor/src/tsort.c          | 63 ++++++++++------------
 source/libs/executor/test/sortTests.cpp   | 24 +++------
 source/libs/index/src/indexFstRegex.c     |  1 +
 source/libs/scalar/src/scalar.c           |  1 -
 source/libs/scalar/src/sclfunc.c          |  3 ++
 source/libs/scalar/src/sclvector.c        |  1 -
 source/libs/scheduler/src/scheduler.c     |  6 ++-
 source/util/src/tcompare.c                | 44 +++++----------
 source/util/src/tpagedbuf.c               |  3 +-
 25 files changed, 116 insertions(+), 156 deletions(-)

diff --git a/cmake/cmake.define b/cmake/cmake.define
index 9c2d5dc04c..298d102b87 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -36,8 +36,8 @@ IF (TD_WINDOWS)
     ENDIF ()
 
 ELSE ()
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -fPIC -gdwarf-2 -g3")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fPIC -gdwarf-2 -g3")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
 
 MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
 IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
diff --git a/cmake/cmake.platform b/cmake/cmake.platform
index dfb79c0fae..0312f92a5b 100644
--- a/cmake/cmake.platform
+++ b/cmake/cmake.platform
@@ -42,7 +42,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
 
         SET(TD_DARWIN TRUE)
         SET(OSTYPE "macOS")
-        ADD_DEFINITIONS("-DDARWIN -Wno-tautological-pointer-compare -Wno-return-type")
+        ADD_DEFINITIONS("-DDARWIN -Wno-tautological-pointer-compare")
 
         MESSAGE("Current system processor is ${CMAKE_SYSTEM_PROCESSOR}.")
         IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 4bbe42bc50..3afdcfba8e 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -113,39 +113,39 @@ static FORCE_INLINE void colDataAppendNULL(SColumnInfoData* pColumnInfoData, uin
   pColumnInfoData->hasNull = true;
 }
 
-static FORCE_INLINE int32_t colDataAppendInt8(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int8_t* v) {
+static FORCE_INLINE void colDataAppendInt8(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int8_t* v) {
   ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_TINYINT ||
          pColumnInfoData->info.type == TSDB_DATA_TYPE_UTINYINT || pColumnInfoData->info.type == TSDB_DATA_TYPE_BOOL);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(int8_t*)p = *(int8_t*)v;
 }
 
-static FORCE_INLINE int32_t colDataAppendInt16(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int16_t* v) {
+static FORCE_INLINE void colDataAppendInt16(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int16_t* v) {
   ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_SMALLINT || pColumnInfoData->info.type == TSDB_DATA_TYPE_USMALLINT);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(int16_t*)p = *(int16_t*)v;
 }
 
-static FORCE_INLINE int32_t colDataAppendInt32(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int32_t* v) {
+static FORCE_INLINE void colDataAppendInt32(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int32_t* v) {
   ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_INT || pColumnInfoData->info.type == TSDB_DATA_TYPE_UINT);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(int32_t*)p = *(int32_t*)v;
 }
 
-static FORCE_INLINE int32_t colDataAppendInt64(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int64_t* v) {
+static FORCE_INLINE void colDataAppendInt64(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int64_t* v) {
   int32_t type = pColumnInfoData->info.type;
   ASSERT(type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_UBIGINT || type == TSDB_DATA_TYPE_TIMESTAMP);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(int64_t*)p = *(int64_t*)v;
 }
 
-static FORCE_INLINE int32_t colDataAppendFloat(SColumnInfoData* pColumnInfoData, uint32_t currentRow, float* v) {
+static FORCE_INLINE void colDataAppendFloat(SColumnInfoData* pColumnInfoData, uint32_t currentRow, float* v) {
   ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_FLOAT);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(float*)p = *(float*)v;
 }
 
-static FORCE_INLINE int32_t colDataAppendDouble(SColumnInfoData* pColumnInfoData, uint32_t currentRow, double* v) {
+static FORCE_INLINE void colDataAppendDouble(SColumnInfoData* pColumnInfoData, uint32_t currentRow, double* v) {
   ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_DOUBLE);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(double*)p = *(double*)v;
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index f22051f1c6..67cc597fdf 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -17,6 +17,7 @@
 #include "tdatablock.h"
 #include "tcompare.h"
 #include "tglobal.h"
+#include "tlog.h"
 
 int32_t taosGetFqdnPortFromEp(const char* ep, SEp* pEp) {
   pEp->port = 0;
@@ -424,7 +425,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
           }
 
           size += sizeof(pColInfoData->varmeta.offset[0]);
-        } else {
+        } else {    // this block is unreached, because hasVarCol = true
           size += pColInfoData->info.bytes;
 
           if (((j - startIndex) & 0x07) == 0) {
@@ -665,23 +666,13 @@ int32_t dataBlockCompar(const void* p1, const void* p2, const void* param) {
     void* left1 = colDataGetData(pColInfoData, left);
     void* right1 = colDataGetData(pColInfoData, right);
 
-    switch (pColInfoData->info.type) {
-      case TSDB_DATA_TYPE_INT: {
-        int32_t leftx = *(int32_t*)left1;
-        int32_t rightx = *(int32_t*)right1;
+    __compar_fn_t fn = getKeyComparFunc(pColInfoData->info.type, pOrder->order);
 
-        if (leftx == rightx) {
-          break;
-        } else {
-          if (pOrder->order == TSDB_ORDER_ASC) {
-            return (leftx < rightx) ? -1 : 1;
-          } else {
-            return (leftx < rightx) ? 1 : -1;
-          }
-        }
-      }
-      default:
-        assert(0);
+    int ret = fn(left1, right1);
+    if (ret == 0) {
+      continue;
+    } else {
+      return ret;
     }
   }
 
@@ -834,17 +825,14 @@ static void copyBackToBlock(SSDataBlock* pDataBlock, SColumnInfoData* pCols) {
 
     if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
       taosMemoryFreeClear(pColInfoData->varmeta.offset);
-      pColInfoData->varmeta = pCols[i].varmeta;
     } else {
       taosMemoryFreeClear(pColInfoData->nullbitmap);
-      pColInfoData->nullbitmap = pCols[i].nullbitmap;
     }
 
     taosMemoryFreeClear(pColInfoData->pData);
-    pColInfoData->pData = pCols[i].pData;
   }
 
-  taosMemoryFreeClear(pCols);
+  colDataDestroy(pCols);
 }
 
 static int32_t* createTupleIndex(size_t rows) {
@@ -862,33 +850,6 @@ static int32_t* createTupleIndex(size_t rows) {
 
 static void destroyTupleIndex(int32_t* index) { taosMemoryFreeClear(index); }
 
-static __compar_fn_t getComparFn(int32_t type, int32_t order) {
-  switch (type) {
-    case TSDB_DATA_TYPE_TINYINT:
-      return order == TSDB_ORDER_ASC ? compareInt8Val : compareInt8ValDesc;
-    case TSDB_DATA_TYPE_SMALLINT:
-      return order == TSDB_ORDER_ASC ? compareInt16Val : compareInt16ValDesc;
-    case TSDB_DATA_TYPE_INT:
-      return order == TSDB_ORDER_ASC ? compareInt32Val : compareInt32ValDesc;
-    case TSDB_DATA_TYPE_BIGINT:
-      return order == TSDB_ORDER_ASC ? compareInt64Val : compareInt64ValDesc;
-    case TSDB_DATA_TYPE_FLOAT:
-      return order == TSDB_ORDER_ASC ? compareFloatVal : compareFloatValDesc;
-    case TSDB_DATA_TYPE_DOUBLE:
-      return order == TSDB_ORDER_ASC ? compareDoubleVal : compareDoubleValDesc;
-    case TSDB_DATA_TYPE_UTINYINT:
-      return order == TSDB_ORDER_ASC ? compareUint8Val : compareUint8ValDesc;
-    case TSDB_DATA_TYPE_USMALLINT:
-      return order == TSDB_ORDER_ASC ? compareUint16Val : compareUint16ValDesc;
-    case TSDB_DATA_TYPE_UINT:
-      return order == TSDB_ORDER_ASC ? compareUint32Val : compareUint32ValDesc;
-    case TSDB_DATA_TYPE_UBIGINT:
-      return order == TSDB_ORDER_ASC ? compareUint64Val : compareUint64ValDesc;
-    default:
-      return order == TSDB_ORDER_ASC ? compareInt32Val : compareInt32ValDesc;
-  }
-}
-
 int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
   ASSERT(pDataBlock != NULL && pOrderInfo != NULL);
   if (pDataBlock->info.rows <= 1) {
@@ -922,11 +883,11 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
 
         int64_t p0 = taosGetTimestampUs();
 
-        __compar_fn_t fn = getComparFn(pColInfoData->info.type, pOrder->order);
+        __compar_fn_t fn = getKeyComparFunc(pColInfoData->info.type, pOrder->order);
         qsort(pColInfoData->pData, pDataBlock->info.rows, pColInfoData->info.bytes, fn);
 
         int64_t p1 = taosGetTimestampUs();
-        printf("sort:%" PRId64 ", rows:%d\n", p1 - p0, pDataBlock->info.rows);
+        uDebug("blockDataSort easy cost:%" PRId64 ", rows:%d\n", p1 - p0, pDataBlock->info.rows);
 
         return TSDB_CODE_SUCCESS;
       } else {  // var data type
@@ -955,6 +916,7 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
 
   SColumnInfoData* pCols = createHelpColInfoData(pDataBlock);
   if (pCols == NULL) {
+    destroyTupleIndex(index);
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return terrno;
   }
@@ -963,6 +925,7 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
 
   int32_t code = blockDataAssign(pCols, pDataBlock, index);
   if (code != TSDB_CODE_SUCCESS) {
+    destroyTupleIndex(index);
     terrno = code;
     return code;
   }
@@ -972,7 +935,7 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
   copyBackToBlock(pDataBlock, pCols);
   int64_t p4 = taosGetTimestampUs();
 
-  printf("sort:%" PRId64 ", create:%" PRId64 ", assign:%" PRId64 ", copyback:%" PRId64 ", rows:%d\n", p1 - p0, p2 - p1,
+  uDebug("blockDataSort complex sort:%" PRId64 ", create:%" PRId64 ", assign:%" PRId64 ", copyback:%" PRId64 ", rows:%d\n", p1 - p0, p2 - p1,
          p3 - p2, p4 - p3, rows);
   destroyTupleIndex(index);
 
@@ -1234,6 +1197,7 @@ void colDataDestroy(SColumnInfoData* pColData) {
   }
 
   taosMemoryFree(pColData->pData);
+  taosMemoryFree(pColData);
 }
 
 int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) {
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index c85184ffba..7a9014dc43 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -2571,6 +2571,7 @@ int32_t tDeserializeSCreateVnodeReq(void *buf, int32_t bufLen, SCreateVnodeReq *
 int32_t tFreeSCreateVnodeReq(SCreateVnodeReq *pReq) {
   taosArrayDestroy(pReq->pRetensions);
   pReq->pRetensions = NULL;
+  return 0;
 }
 
 int32_t tSerializeSDropVnodeReq(void *buf, int32_t bufLen, SDropVnodeReq *pReq) {
diff --git a/source/dnode/mgmt/dm/src/dmMsg.c b/source/dnode/mgmt/dm/src/dmMsg.c
index b301ef478b..b08657d4dc 100644
--- a/source/dnode/mgmt/dm/src/dmMsg.c
+++ b/source/dnode/mgmt/dm/src/dmMsg.c
@@ -95,6 +95,7 @@ int32_t dmProcessStatusRsp(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
   }
 
   pMgmt->statusSent = 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t dmProcessAuthRsp(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
diff --git a/source/dnode/mgmt/dm/src/dmWorker.c b/source/dnode/mgmt/dm/src/dmWorker.c
index 63b9704b78..ca86f42608 100644
--- a/source/dnode/mgmt/dm/src/dmWorker.c
+++ b/source/dnode/mgmt/dm/src/dmWorker.c
@@ -50,6 +50,7 @@ static void *dmThreadRoutine(void *param) {
       lastMonitorTime = curTime;
     }
   }
+  return TSDB_CODE_SUCCESS;
 }
 
 static void dmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
diff --git a/source/dnode/mgmt/main/src/dndTransport.c b/source/dnode/mgmt/main/src/dndTransport.c
index 07ea0309a8..6398af21dc 100644
--- a/source/dnode/mgmt/main/src/dndTransport.c
+++ b/source/dnode/mgmt/main/src/dndTransport.c
@@ -333,6 +333,7 @@ int32_t dndSendReqToDnode(SMgmtWrapper *pWrapper, const SEpSet *pEpSet, SRpcMsg
       taosMsleep(1);
     }
   }
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t dndSendReqToMnode(SMgmtWrapper *pWrapper, SRpcMsg *pReq) {
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 314e70db9b..4149cb5602 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -630,6 +630,7 @@ static int32_t mndProcessConfigDnodeReq(SNodeMsg *pReq) {
 
 static int32_t mndProcessConfigDnodeRsp(SNodeMsg *pRsp) {
   mInfo("app:%p config rsp from dnode", pRsp->rpcMsg.ahandle);
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t mndGetConfigMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index f04f4791b5..9cb444f667 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -331,6 +331,7 @@ int32_t tsdbDestroySmaState(SSmaStat *pSmaStat) {
     }
     taosHashCleanup(pSmaStat->smaStatItems);
   }
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t tsdbCheckAndInitSmaEnv(STsdb *pTsdb, int8_t smaType) {
@@ -433,6 +434,7 @@ static int32_t tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t
     return TSDB_CODE_FAILED;
   }
   tsdbDebug("vgId:%d smaIndex %" PRIi64 " tsKey %" PRIi64 " is put to hash", REPO_ID(pTsdb), indexUid, winSKey);
+  return TSDB_CODE_SUCCESS;
 }
 
 /**
@@ -1051,6 +1053,7 @@ static int32_t tsdbDropTSmaDataImpl(STsdb *pTsdb, int64_t indexUid) {
   }
   // clear sma data files
   // TODO:
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t tsdbSetRSmaDataFile(STSmaWriteH *pSmaH, int32_t fid) {
@@ -1173,6 +1176,7 @@ static int32_t tsdbInitTSmaReadH(STSmaReadH *pSmaH, STsdb *pTsdb, int64_t interv
   pSmaH->interval = tsdbGetIntervalByPrecision(interval, intervalUnit, REPO_CFG(pTsdb)->precision, true);
   pSmaH->storageLevel = tsdbGetSmaStorageLevel(interval, intervalUnit);
   pSmaH->days = tsdbGetTSmaDays(pTsdb, pSmaH->interval, pSmaH->storageLevel);
+  return TSDB_CODE_SUCCESS;
 }
 
 /**
@@ -1192,6 +1196,7 @@ static int32_t tsdbInitTSmaFile(STSmaReadH *pSmaH, int64_t indexUid, TSKEY skey)
   pSmaH->dFile.path = strdup(tSmaFile);
   pSmaH->smaFsIter.iter = 0;
   pSmaH->smaFsIter.fid = fid;
+  return TSDB_CODE_SUCCESS;
 }
 
 /**
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index e87fdba71d..0305d045a9 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -2532,7 +2532,7 @@ _return:
 }
 
 int32_t catalogUpdateVgEpSet(SCatalog* pCtg, const char* dbFName, int32_t vgId, SEpSet *epSet) {
-
+  return 0;
 }
 
 int32_t catalogRemoveTableMeta(SCatalog* pCtg, const SName* pTableName) {
@@ -2599,7 +2599,7 @@ _return:
 }
 
 int32_t catalogGetIndexMeta(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, const SName* pTableName, const char *pIndexName, SIndexMeta** pIndexMeta) {
-
+  return 0;
 }
 
 int32_t catalogGetTableMeta(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, const SName* pTableName, STableMeta** pTableMeta) {
diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index bcbfeb7015..d375299d57 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -128,8 +128,8 @@ static FORCE_INLINE char* getPosInResultPage(struct STaskAttr* pQueryAttr, SFile
                                              int32_t offset) {
   assert(rowOffset >= 0 && pQueryAttr != NULL);
 
-//  int32_t numOfRows = (int32_t)getRowNumForMultioutput(pQueryAttr, pQueryAttr->topBotQuery, pQueryAttr->stableQuery);
-//  return ((char *)page->data) + rowOffset + offset * numOfRows;
+  // int32_t numOfRows = (int32_t)getRowNumForMultioutput(pQueryAttr, pQueryAttr->topBotQuery, pQueryAttr->stableQuery);
+  return ((char *)page->data);  
 }
 
 static FORCE_INLINE char* getPosInResultPage_rv(SFilePage* page, int32_t rowOffset, int32_t offset) {
diff --git a/source/libs/executor/src/dataDispatcher.c b/source/libs/executor/src/dataDispatcher.c
index 34894c235b..0b03613ab5 100644
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
@@ -236,6 +236,7 @@ static int32_t destroyDataSinker(SDataSinkHandle* pHandle) {
   }
   taosCloseQueue(pDispatcher->pDataBlocks);
   taosThreadMutexDestroy(&pDispatcher->mutex);
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t createDataDispatcher(SDataSinkManager* pManager, const SDataSinkNode* pDataSink, DataSinkHandle* pHandle) {
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 2df18f135c..209ffb9101 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -359,6 +359,10 @@ SSDataBlock* createOutputBuf_rv1(SDataBlockDescNode* pNode) {
     idata.info.precision = pDescNode->dataType.precision;
 
     taosArrayPush(pBlock->pDataBlock, &idata);
+
+    if (IS_VAR_DATA_TYPE(idata.info.type)) {
+      pBlock->info.hasVarCol = true;
+    }
   }
 
   return pBlock;
@@ -4924,6 +4928,7 @@ static SSDataBlock* doBlockInfoScan(SOperatorInfo* pOperator, bool* newgroup) {
   pOperator->status = OP_EXEC_DONE;
   return pBlock;
 #endif
+  return TSDB_CODE_SUCCESS;
 }
 
 static void doClearBufferedBlocks(SStreamBlockScanInfo* pInfo) {
@@ -5000,6 +5005,7 @@ int32_t loadRemoteDataCallback(void* param, const SDataBuf* pMsg, int32_t code)
 
   pSourceDataInfo->status = EX_SOURCE_DATA_READY;
   tsem_post(&pSourceDataInfo->pEx->ready);
+  return TSDB_CODE_SUCCESS;
 }
 
 static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) {
@@ -5673,6 +5679,7 @@ static int32_t loadSysTableContentCb(void* param, const SDataBuf* pMsg, int32_t
   }
 
   tsem_post(&pScanResInfo->ready);
+  return TSDB_CODE_SUCCESS;
 }
 
 static SSDataBlock* doFilterResult(SSysTableScanInfo* pInfo) {
@@ -6484,6 +6491,7 @@ static SSDataBlock* doSort(SOperatorInfo* pOperator, bool* newgroup) {
   tsortAddSource(pInfo->pSortHandle, ps);
 
   int32_t code = tsortOpen(pInfo->pSortHandle);
+  taosMemoryFreeClear(ps);
   if (code != TSDB_CODE_SUCCESS) {
     longjmp(pTaskInfo->env, terrno);
   }
@@ -6496,15 +6504,18 @@ SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pR
                                       SExecTaskInfo* pTaskInfo) {
   SSortOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SSortOperatorInfo));
   SOperatorInfo*     pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
-  if (pInfo == NULL || pOperator == NULL) {
+  int32_t rowSize = pResBlock->info.rowSize;
+
+  if (pInfo == NULL || pOperator == NULL || rowSize > 100 * 1024 * 1024) {
     taosMemoryFreeClear(pInfo);
     taosMemoryFreeClear(pOperator);
     terrno = TSDB_CODE_QRY_OUT_OF_MEMORY;
     return NULL;
   }
 
-  pInfo->sortBufSize = 1024 * 16;  // 1MB, TODO dynamic set the available sort buffer
-  pInfo->bufPageSize = 1024;
+  pInfo->bufPageSize = rowSize < 1024 ? 1024 : rowSize;
+
+  pInfo->sortBufSize = pInfo->bufPageSize * 16;  // 1MB, TODO dynamic set the available sort buffer
   pInfo->numOfRowsInRes = 1024;
   pInfo->pDataBlock = pResBlock;
   pInfo->pSortInfo = pSortInfo;
@@ -7590,6 +7601,7 @@ static int32_t initAggInfo(SOptrBasicInfo* pBasicInfo, SAggSupporter* pAggSup, S
   pBasicInfo->capacity = numOfRows;
 
   doInitAggInfoSup(pAggSup, pBasicInfo->pCtx, numOfCols, pkey);
+  return TSDB_CODE_SUCCESS;
 }
 
 static STableQueryInfo* initTableQueryInfo(const STableGroupInfo* pTableGroupInfo) {
@@ -8389,6 +8401,7 @@ static SSDataBlock* doTagScan(SOperatorInfo* pOperator, bool* newgroup) {
   return (pRes->info.rows == 0)? NULL:pInfo->pRes;
 
 #endif
+  return TSDB_CODE_SUCCESS;
 }
 
 SOperatorInfo* createTagScanOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SExprInfo* pExpr, int32_t numOfOutput) {
@@ -8906,6 +8919,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
        return createMultiTableAggOperatorInfo(op, pPhyNode->pTargets, pTaskInfo, pTableGroupInfo);
      }
    }*/
+  return NULL;
 }
 
 static tsdbReaderT createDataReaderImpl(STableScanPhysiNode* pTableScanNode, STableGroupInfo* pGroupInfo,
@@ -9217,6 +9231,7 @@ int32_t createQueryFilter(char* data, uint16_t len, SFilterInfo** pFilters) {
   //  tExprTreeDestroy(expr, NULL);
 
   //  return ret;
+  return TSDB_CODE_SUCCESS;
 }
 
 // int32_t doCreateFilterInfo(SColumnInfo* pCols, int32_t numOfCols, int32_t numOfFilterCols, SSingleColumnFilterInfo**
diff --git a/source/libs/executor/src/tlinearhash.c b/source/libs/executor/src/tlinearhash.c
index 1b55467c85..21fd54b620 100644
--- a/source/libs/executor/src/tlinearhash.c
+++ b/source/libs/executor/src/tlinearhash.c
@@ -409,6 +409,7 @@ char* tHashGet(SLHashObj* pHashObj, const void *key, size_t keyLen) {
 
 int32_t tHashRemove(SLHashObj* pHashObj, const void *key, size_t keyLen) {
   // todo
+  return TSDB_CODE_SUCCESS;
 }
 
 void tHashPrint(const SLHashObj* pHashObj, int32_t type) {
diff --git a/source/libs/executor/src/tsimplehash.c b/source/libs/executor/src/tsimplehash.c
index 981da0415e..eb6a5dcabe 100644
--- a/source/libs/executor/src/tsimplehash.c
+++ b/source/libs/executor/src/tsimplehash.c
@@ -258,6 +258,7 @@ void *tSimpleHashGet(SSHashObj *pHashObj, const void *key) {
 
 int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key) {
   // todo
+  return TSDB_CODE_SUCCESS;
 }
 
 void tSimpleHashClear(SSHashObj *pHashObj) {
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 0d69ed711c..343efb5fbf 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -22,6 +22,7 @@
 #include "tpagedbuf.h"
 #include "tsort.h"
 #include "tutil.h"
+#include "tcompare.h"
 
 struct STupleHandle {
   SSDataBlock* pBlock;
@@ -123,6 +124,7 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
 
 int32_t tsortAddSource(SSortHandle* pSortHandle, void* pSource) {
   taosArrayPush(pSortHandle->pOrderedSource, &pSource);
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t doAddNewExternalMemSource(SDiskbasedBuf *pBuf, SArray* pAllSources, SSDataBlock* pBlock, int32_t* sourceId) {
@@ -164,7 +166,7 @@ static int32_t doAddToBuf(SSDataBlock* pDataBlock, SSortHandle* pHandle) {
     }
 
     int32_t pageId = -1;
-    SFilePage* pPage = getNewBufPage(pHandle->pBuf, pHandle->sourceId, &pageId);
+    void* pPage = getNewBufPage(pHandle->pBuf, pHandle->sourceId, &pageId);
     if (pPage == NULL) {
       return terrno;
     }
@@ -172,7 +174,7 @@ static int32_t doAddToBuf(SSDataBlock* pDataBlock, SSortHandle* pHandle) {
     int32_t size = blockDataGetSize(p) + sizeof(int32_t)  + p->info.numOfCols * sizeof(int32_t);
     assert(size <= getBufPageSize(pHandle->pBuf));
 
-    blockDataToBuf(pPage->data, p);
+    blockDataToBuf(pPage, p);
 
     setBufPageDirty(pPage, true);
     releaseBufPage(pHandle->pBuf, pPage);
@@ -184,10 +186,7 @@ static int32_t doAddToBuf(SSDataBlock* pDataBlock, SSortHandle* pHandle) {
   blockDataCleanup(pDataBlock);
 
   SSDataBlock* pBlock = createOneDataBlock(pDataBlock);
-  int32_t code = doAddNewExternalMemSource(pHandle->pBuf, pHandle->pOrderedSource, pBlock, &pHandle->sourceId);
-  if (code != TSDB_CODE_SUCCESS) {
-    return code;
-  }
+  return doAddNewExternalMemSource(pHandle->pBuf, pHandle->pOrderedSource, pBlock, &pHandle->sourceId);
 }
 
 static int32_t sortComparInit(SMsortComparParam* cmpParam, SArray* pSources, int32_t startIndex, int32_t endIndex, SSortHandle* pHandle) {
@@ -201,8 +200,8 @@ static int32_t sortComparInit(SMsortComparParam* cmpParam, SArray* pSources, int
       SExternalMemSource* pSource = cmpParam->pSources[i];
       SPageInfo*          pPgInfo = *(SPageInfo**)taosArrayGet(pSource->pageIdList, pSource->pageIndex);
 
-      SFilePage* pPage = getBufPage(pHandle->pBuf, getPageId(pPgInfo));
-      code = blockDataFromBuf(pSource->src.pBlock, pPage->data);
+      void* pPage = getBufPage(pHandle->pBuf, getPageId(pPgInfo));
+      code = blockDataFromBuf(pSource->src.pBlock, pPage);
       if (code != TSDB_CODE_SUCCESS) {
         return code;
       }
@@ -236,6 +235,7 @@ static int32_t sortComparClearup(SMsortComparParam* cmpParam) {
   }
 
   cmpParam->numOfSources = 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 static void appendOneRowToDataBlock(SSDataBlock *pBlock, const SSDataBlock* pSource, int32_t* rowIndex) {
@@ -309,6 +309,7 @@ static int32_t adjustMergeTreeForNextTuple(SExternalMemSource *pSource, SMultiwa
   printf("\nafter adjust:\t");
   tMergeTreePrint(pTree);
 #endif
+  return TSDB_CODE_SUCCESS;
 }
 
 static SSDataBlock* getSortedBlockData(SSortHandle* pHandle, SMsortComparParam* cmpParam, int32_t capacity) {
@@ -392,23 +393,13 @@ int32_t msortComparFn(const void *pLeft, const void *pRight, void *param) {
     void* left1  = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex);
     void* right1 = colDataGetData(pRightColInfoData, pRightSource->src.rowIndex);
 
-    switch(pLeftColInfoData->info.type) {
-      case TSDB_DATA_TYPE_INT: {
-        int32_t leftv = *(int32_t*)left1;
-        int32_t rightv = *(int32_t*)right1;
+    __compar_fn_t fn = getKeyComparFunc(pLeftColInfoData->info.type, pOrder->order);
 
-        if (leftv == rightv) {
-          break;
-        } else {
-          if (pOrder->order == TSDB_ORDER_ASC) {
-            return leftv < rightv? -1 : 1;
-          } else {
-            return leftv < rightv? 1 : -1;
-          }
-        }
-      }
-      default:
-        assert(0);
+    int ret = fn(left1, right1);
+    if (ret == 0) {
+      continue;
+    } else {
+      return ret;
     }
   }
   return 0;
@@ -424,13 +415,13 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
   double sortPass = floorl(log2(numOfSources) / log2(pHandle->numOfPages));
 
   pHandle->totalElapsed = taosGetTimestampUs() - pHandle->startTs;
-  qDebug("%s %d rounds mergesort required to complete the sort, first-round sorted data size:%"PRIzu", sort:%"PRId64", total elapsed:%"PRId64,
+  qDebug("%s %d rounds mergesort required to complete the sort, first-round sorted data size:%"PRIzu", sort elapsed:%"PRId64", total elapsed:%"PRId64,
          pHandle->idStr, (int32_t) (sortPass + 1), getTotalBufSize(pHandle->pBuf), pHandle->sortElapsed, pHandle->totalElapsed);
 
   size_t pgSize = pHandle->pageSize;
   int32_t numOfRows = (pgSize - blockDataGetSerialMetaSize(pHandle->pDataBlock))/ blockDataGetSerialRowSize(pHandle->pDataBlock);
 
-  blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows);
+  // blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows); // useless, it is already enough
 
   size_t numOfSorted = taosArrayGetSize(pHandle->pOrderedSource);
   for(int32_t t = 0; t < sortPass; ++t) {
@@ -469,7 +460,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
         }
 
         int32_t pageId = -1;
-        SFilePage* pPage = getNewBufPage(pHandle->pBuf, pHandle->sourceId, &pageId);
+        void* pPage = getNewBufPage(pHandle->pBuf, pHandle->sourceId, &pageId);
         if (pPage == NULL) {
           return terrno;
         }
@@ -477,7 +468,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
         int32_t size = blockDataGetSize(pDataBlock) + sizeof(int32_t) + pDataBlock->info.numOfCols * sizeof(int32_t);
         assert(size <= getBufPageSize(pHandle->pBuf));
 
-        blockDataToBuf(pPage->data, pDataBlock);
+        blockDataToBuf(pPage, pDataBlock);
 
         setBufPageDirty(pPage, true);
         releaseBufPage(pHandle->pBuf, pPage);
@@ -526,7 +517,6 @@ static int32_t createInitialSortedMultiSources(SSortHandle* pHandle) {
   if (pHandle->type == SORT_SINGLESOURCE_SORT) {
     SGenericSource* source = taosArrayGetP(pHandle->pOrderedSource, 0);
     taosArrayClear(pHandle->pOrderedSource);
-
     while (1) {
       SSDataBlock* pBlock = pHandle->fetchfp(source->param);
       if (pBlock == NULL) {
@@ -559,8 +549,13 @@ static int32_t createInitialSortedMultiSources(SSortHandle* pHandle) {
       size_t size = blockDataGetSize(pHandle->pDataBlock);
 
       // Perform the in-memory sort and then flush data in the buffer into disk.
+      int64_t p = taosGetTimestampUs();
+
       blockDataSort(pHandle->pDataBlock, pHandle->pSortInfo);
 
+      int64_t el = taosGetTimestampUs() - p;
+      pHandle->sortElapsed += el;
+
       // All sorted data can fit in memory, external memory sort is not needed. Return to directly
       if (size <= sortBufSize) {
         pHandle->cmpParam.numOfSources = 1;
@@ -573,8 +568,6 @@ static int32_t createInitialSortedMultiSources(SSortHandle* pHandle) {
         doAddToBuf(pHandle->pDataBlock, pHandle);
       }
     }
-
-    taosMemoryFreeClear(source);
   }
 
   return TSDB_CODE_SUCCESS;
@@ -616,22 +609,22 @@ int32_t tsortOpen(SSortHandle* pHandle) {
     return code;
   }
 
-  code = tMergeTreeCreate(&pHandle->pMergeTree, pHandle->cmpParam.numOfSources, &pHandle->cmpParam, pHandle->comparFn);
-  if (code != TSDB_CODE_SUCCESS) {
-    return code;
-  }
+  return tMergeTreeCreate(&pHandle->pMergeTree, pHandle->cmpParam.numOfSources, &pHandle->cmpParam, pHandle->comparFn);
 }
 
 int32_t tsortClose(SSortHandle* pHandle) {
   // do nothing
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t tsortSetFetchRawDataFp(SSortHandle* pHandle, _sort_fetch_block_fn_t fp) {
   pHandle->fetchfp = fp;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t tsortSetComparFp(SSortHandle* pHandle, _sort_merge_compar_fn_t fp) {
   pHandle->comparFn = fp;
+  return TSDB_CODE_SUCCESS;
 }
 
 STupleHandle* tsortNextTuple(SSortHandle* pHandle) {
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 1b64182266..3bff67eb69 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -33,6 +33,7 @@
 #include "tdef.h"
 #include "trpc.h"
 #include "tvariant.h"
+#include "tcompare.h"
 
 namespace {
 typedef struct {
@@ -125,24 +126,13 @@ int32_t docomp(const void* p1, const void* p2, void* param) {
 
     void* left1  = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex);
     void* right1 = colDataGetData(pRightColInfoData, pRightSource->src.rowIndex);
+    __compar_fn_t fn = getKeyComparFunc(pLeftColInfoData->info.type, pOrder->order);
 
-    switch(pLeftColInfoData->info.type) {
-      case TSDB_DATA_TYPE_INT: {
-        int32_t leftv = *(int32_t*)left1;
-        int32_t rightv = *(int32_t*)right1;
-
-        if (leftv == rightv) {
-          break;
-        } else {
-          if (pOrder->order == TSDB_ORDER_ASC) {
-            return leftv < rightv? -1 : 1;
-          } else {
-            return leftv < rightv? 1 : -1;
-          }
-        }
-      }
-      default:
-        assert(0);
+    int ret = fn(left1, right1);
+    if (ret == 0) {
+      continue;
+    } else {
+      return ret;
     }
   }
 
diff --git a/source/libs/index/src/indexFstRegex.c b/source/libs/index/src/indexFstRegex.c
index ec41a7f58e..e89c94079e 100644
--- a/source/libs/index/src/indexFstRegex.c
+++ b/source/libs/index/src/indexFstRegex.c
@@ -26,6 +26,7 @@ FstRegex *regexCreate(const char *str) {
   memcpy(orig, str, sz);
 
   regex->orig = orig;
+  return regex;
 }
 
 void regexSetup(FstRegex *regex, uint32_t size, const char *str) {
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index 1cc259d4da..dd3edcf1a3 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -132,7 +132,6 @@ void sclFreeRes(SHashObj *res) {
 void sclFreeParam(SScalarParam *param) {
   if (param->columnData != NULL) {
     colDataDestroy(param->columnData);
-    taosMemoryFreeClear(param->columnData);
   }
 
   if (param->pHashFilter != NULL) {
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index d8e97e7e12..0486049296 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -385,16 +385,19 @@ bool getTimePseudoFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv
 int32_t qStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
   ASSERT(inputNum == 1);
   colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 0));
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t qEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
   ASSERT(inputNum == 1);
   colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 1));
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t winDurFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
   ASSERT(inputNum == 1);
   colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 2));
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t winStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index f22f9a5c3c..d08352602d 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -476,7 +476,6 @@ static SColumnInfoData* doVectorConvert(SScalarParam* pInput, int32_t* doConvert
 static void doReleaseVec(SColumnInfoData* pCol, int32_t type) {
   if (type == VECTOR_DO_CONVERT) {
     colDataDestroy(pCol);
-    taosMemoryFree(pCol);
   }
 }
 
diff --git a/source/libs/scheduler/src/scheduler.c b/source/libs/scheduler/src/scheduler.c
index 5af13d97ca..86eaa09594 100644
--- a/source/libs/scheduler/src/scheduler.c
+++ b/source/libs/scheduler/src/scheduler.c
@@ -258,6 +258,7 @@ _return:
 
   SCH_JOB_ELOG("invalid job status update, from %s to %s", jobTaskStatusStr(oriStatus), jobTaskStatusStr(newStatus));
   SCH_ERR_RET(code);
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t schBuildTaskRalation(SSchJob *pJob, SHashObj *planToTask) {
@@ -791,7 +792,7 @@ _return:
   SCH_RET(schProcessOnJobFailure(pJob, code));
 }
 
-int32_t schProcessOnDataFetched(SSchJob *job) {
+void schProcessOnDataFetched(SSchJob *job) {
   atomic_val_compare_exchange_32(&job->remoteFetch, 1, 0);
   tsem_post(&job->rspSem);
 }
@@ -1150,6 +1151,7 @@ int32_t schHandleReadyCallback(void *param, const SDataBuf *pMsg, int32_t code)
 int32_t schHandleDropCallback(void *param, const SDataBuf *pMsg, int32_t code) {
   SSchTaskCallbackParam *pParam = (SSchTaskCallbackParam *)param;
   qDebug("QID:%" PRIx64 ",TID:%" PRIx64 " drop task rsp received, code:%x", pParam->queryId, pParam->taskId, code);
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t schHandleHbCallback(void *param, const SDataBuf *pMsg, int32_t code) {
@@ -2029,7 +2031,7 @@ void schDropJobAllTasks(SSchJob *pJob) {
 
 int32_t schCancelJob(SSchJob *pJob) {
   // TODO
-
+  return TSDB_CODE_SUCCESS;
   // TODO MOVE ALL TASKS FROM EXEC LIST TO FAIL LIST
 }
 
diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c
index c98f6eb9be..d4abcb962a 100644
--- a/source/util/src/tcompare.c
+++ b/source/util/src/tcompare.c
@@ -436,7 +436,6 @@ int32_t compareWStrPatternMatch(const void *pLeft, const void *pRight) {
 int32_t compareWStrPatternNotMatch(const void *pLeft, const void *pRight) {
   return compareWStrPatternMatch(pLeft, pRight) ? 0 : 1;
 }
-
 __compar_fn_t getComparFunc(int32_t type, int32_t optr) {
   __compar_fn_t comparFn = NULL;
 
@@ -568,53 +567,36 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) {
 }
 
 __compar_fn_t getKeyComparFunc(int32_t keyType, int32_t order) {
-  __compar_fn_t comparFn = NULL;
-
   switch (keyType) {
     case TSDB_DATA_TYPE_TINYINT:
     case TSDB_DATA_TYPE_BOOL:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareInt8Val : compareInt8ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareInt8Val : compareInt8ValDesc;
     case TSDB_DATA_TYPE_SMALLINT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareInt16Val : compareInt16ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareInt16Val : compareInt16ValDesc;
     case TSDB_DATA_TYPE_INT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareInt32Val : compareInt32ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareInt32Val : compareInt32ValDesc;
     case TSDB_DATA_TYPE_BIGINT:
     case TSDB_DATA_TYPE_TIMESTAMP:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareInt64Val : compareInt64ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareInt64Val : compareInt64ValDesc;
     case TSDB_DATA_TYPE_FLOAT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareFloatVal : compareFloatValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareFloatVal : compareFloatValDesc;
     case TSDB_DATA_TYPE_DOUBLE:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareDoubleVal : compareDoubleValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareDoubleVal : compareDoubleValDesc;
     case TSDB_DATA_TYPE_UTINYINT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareUint8Val : compareUint8ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareUint8Val : compareUint8ValDesc;
     case TSDB_DATA_TYPE_USMALLINT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareUint16Val : compareUint16ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareUint16Val : compareUint16ValDesc;
     case TSDB_DATA_TYPE_UINT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareUint32Val : compareUint32ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareUint32Val : compareUint32ValDesc;
     case TSDB_DATA_TYPE_UBIGINT:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareUint64Val : compareUint64ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareUint64Val : compareUint64ValDesc;
     case TSDB_DATA_TYPE_BINARY:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareLenPrefixedStr : compareLenPrefixedStrDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareLenPrefixedStr : compareLenPrefixedStrDesc;
     case TSDB_DATA_TYPE_NCHAR:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareLenPrefixedWStr : compareLenPrefixedWStrDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareLenPrefixedWStr : compareLenPrefixedWStrDesc;
     default:
-      comparFn = (order == TSDB_ORDER_ASC) ? compareInt32Val : compareInt32ValDesc;
-      break;
+      return (order == TSDB_ORDER_ASC) ? compareInt32Val : compareInt32ValDesc;
   }
-
-  return comparFn;
 }
 
 int32_t doCompare(const char *f1, const char *f2, int32_t type, size_t size) {
diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c
index 096a16ec94..e6bc2787e8 100644
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
@@ -350,8 +350,7 @@ static void lruListMoveToFront(SList* pList, SPageInfo* pi) {
 }
 
 static SPageInfo* getPageInfoFromPayload(void* page) {
-  int32_t offset = offsetof(SPageInfo, pData);
-  char*   p = (char *)page - offset;
+  char*   p = (char *)page - POINTER_BYTES;
 
   SPageInfo* ppi = ((SPageInfo**)p)[0];
   return ppi;

From eba69fdb917e541cb08e133d064e818784f4f2db Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 2 Apr 2022 16:03:48 +0800
Subject: [PATCH 04/82] fix error in order by logic

---
 source/libs/executor/src/tsort.c        |  4 +-
 source/libs/executor/test/sortTests.cpp | 52 +++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 343efb5fbf..ba95aa0a47 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -275,8 +275,8 @@ static int32_t adjustMergeTreeForNextTuple(SExternalMemSource *pSource, SMultiwa
       } else {
         SPageInfo* pPgInfo = *(SPageInfo**)taosArrayGet(pSource->pageIdList, pSource->pageIndex);
 
-        SFilePage* pPage = getBufPage(pHandle->pBuf, getPageId(pPgInfo));
-        int32_t    code = blockDataFromBuf(pSource->src.pBlock, pPage->data);
+        void* pPage = getBufPage(pHandle->pBuf, getPageId(pPgInfo));
+        int32_t    code = blockDataFromBuf(pSource->src.pBlock, pPage);
         if (code != TSDB_CODE_SUCCESS) {
           return code;
         }
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 3bff67eb69..73808f86b2 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -72,6 +72,39 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
   return pBlock;
 }
 
+SSDataBlock* getSingleColStrBlock(void* param) {
+  _info* pInfo = (_info*) param;
+  if (--pInfo->count < 0) {
+    return NULL;
+  }
+
+  SSDataBlock* pBlock = static_cast<SSDataBlock*>(taosMemoryCalloc(1, sizeof(SSDataBlock)));
+  pBlock->pDataBlock = taosArrayInit(4, sizeof(SColumnInfoData));
+
+  SColumnInfoData colInfo = {0};
+  colInfo.info.type = TSDB_DATA_TYPE_NCHAR;
+  colInfo.info.bytes = TSDB_NCHAR_SIZE * 32;
+  colInfo.info.colId = 1;
+  colInfo.varmeta.offset = static_cast<int32_t *>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
+
+  taosArrayPush(pBlock->pDataBlock, &colInfo);
+
+  for (int32_t i = 0; i < pInfo->pageRows; ++i) {
+    SColumnInfoData* pColInfo = static_cast<SColumnInfoData*>(TARRAY_GET_ELEM(pBlock->pDataBlock, 0));
+
+    int32_t size = taosRand() % 32;
+    char str[64] = {0};
+    taosRandStr(varDataVal(str), size);
+    varDataSetLen(str, size);
+    colDataAppend(pColInfo, i, reinterpret_cast<const char*>(str), false);
+  }
+
+  pBlock->info.rows = pInfo->pageRows;
+  pBlock->info.numOfCols = 1;
+  return pBlock;
+}
+
+
 int32_t docomp(const void* p1, const void* p2, void* param) {
   int32_t pLeftIdx  = *(int32_t *)p1;
   int32_t pRightIdx = *(int32_t *)p2;
@@ -210,7 +243,9 @@ TEST(testCase, external_mem_sort_Test) {
     void* v = tsortGetValue(pTupleHandle, 0);
     printf("%d: %d\n", row, *(int32_t*) v);
     ASSERT_EQ(row++, *(int32_t*) v);
-
+    //char        buf[64] = {0};
+    //snprintf(buf, varDataLen(v), "%s", varDataVal(v));
+    //printf("%d: %s\n", row, buf);
   }
   tsortDestroySortHandle(phandle);
 }
@@ -222,8 +257,18 @@ TEST(testCase, ordered_merge_sort_Test) {
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
-  SSchema s = {.type = TSDB_DATA_TYPE_INT, .colId = 1, .bytes = 4};
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_MULTISOURCE_MERGE, 1024, 5, NULL,"test_abc");
+  SSDataBlock* pBlock = static_cast<SSDataBlock*>(taosMemoryCalloc(1, sizeof(SSDataBlock)));
+  pBlock->pDataBlock = taosArrayInit(1, sizeof(SColumnInfoData));
+  pBlock->info.numOfCols = 1;
+  for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
+    SColumnInfoData colInfo = {0};
+    colInfo.info.type = TSDB_DATA_TYPE_INT;
+    colInfo.info.bytes = sizeof(int32_t);
+    colInfo.info.colId = 1;
+    taosArrayPush(pBlock->pDataBlock, &colInfo);
+  }
+
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_MULTISOURCE_MERGE, 1024, 5, pBlock,"test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
   tsortSetComparFp(phandle, docomp);
 
@@ -253,6 +298,7 @@ TEST(testCase, ordered_merge_sort_Test) {
 
   }
   tsortDestroySortHandle(phandle);
+  taosMemoryFree(pBlock);
 }
 
 #endif

From 155b14388b622ad09a68737ae852806040b664b5 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 2 Apr 2022 16:31:19 +0800
Subject: [PATCH 05/82] fix error in order by logic

---
 source/common/src/tdatablock.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 67cc597fdf..67f4f251f2 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -825,14 +825,17 @@ static void copyBackToBlock(SSDataBlock* pDataBlock, SColumnInfoData* pCols) {
 
     if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
       taosMemoryFreeClear(pColInfoData->varmeta.offset);
+      pColInfoData->varmeta = pCols[i].varmeta;
     } else {
       taosMemoryFreeClear(pColInfoData->nullbitmap);
+      pColInfoData->nullbitmap = pCols[i].nullbitmap;
     }
 
     taosMemoryFreeClear(pColInfoData->pData);
+    pColInfoData->pData = pCols[i].pData;
   }
 
-  colDataDestroy(pCols);
+  taosMemoryFreeClear(pCols);
 }
 
 static int32_t* createTupleIndex(size_t rows) {
@@ -1197,7 +1200,6 @@ void colDataDestroy(SColumnInfoData* pColData) {
   }
 
   taosMemoryFree(pColData->pData);
-  taosMemoryFree(pColData);
 }
 
 int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) {

From e7585db216d9a3d4d39b6b12ea5e4b6c56581d84 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 2 Apr 2022 18:52:41 +0800
Subject: [PATCH 06/82] fix error in order by logic

---
 source/libs/executor/src/executorimpl.c | 4 ++--
 source/libs/executor/src/tsort.c        | 6 +++---
 source/libs/executor/test/sortTests.cpp | 8 +++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 209ffb9101..f371103490 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -6513,9 +6513,9 @@ SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pR
     return NULL;
   }
 
-  pInfo->bufPageSize = rowSize < 1024 ? 1024 : rowSize;
+  pInfo->bufPageSize = rowSize < 1024 ? 1024 : rowSize*2;
 
-  pInfo->sortBufSize = pInfo->bufPageSize * 16;  // 1MB, TODO dynamic set the available sort buffer
+  pInfo->sortBufSize = pInfo->bufPageSize * 16;  // TODO dynamic set the available sort buffer
   pInfo->numOfRowsInRes = 1024;
   pInfo->pDataBlock = pResBlock;
   pInfo->pSortInfo = pSortInfo;
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index ba95aa0a47..cc7416bc87 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -141,8 +141,8 @@ static int32_t doAddNewExternalMemSource(SDiskbasedBuf *pBuf, SArray* pAllSource
   (*sourceId) += 1;
 
   int32_t rowSize = blockDataGetSerialRowSize(pSource->src.pBlock);
-  int32_t numOfRows = (getBufPageSize(pBuf) - blockDataGetSerialMetaSize(pBlock))/rowSize;
-
+  int32_t numOfRows = (getBufPageSize(pBuf) - blockDataGetSerialMetaSize(pBlock))/rowSize;  // The value of numOfRows must be greater than 0, which is guaranteed by the previous memory allocation
+  ASSERT(numOfRows > 0);
   return blockDataEnsureCapacity(pSource->src.pBlock, numOfRows);
 }
 
@@ -421,7 +421,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
   size_t pgSize = pHandle->pageSize;
   int32_t numOfRows = (pgSize - blockDataGetSerialMetaSize(pHandle->pDataBlock))/ blockDataGetSerialRowSize(pHandle->pDataBlock);
 
-  // blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows); // useless, it is already enough
+  blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows); // useless, it is already enough
 
   size_t numOfSorted = taosArrayGetSize(pHandle->pOrderedSource);
   for(int32_t t = 0; t < sortPass; ++t) {
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 73808f86b2..229b84b923 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -83,7 +83,7 @@ SSDataBlock* getSingleColStrBlock(void* param) {
 
   SColumnInfoData colInfo = {0};
   colInfo.info.type = TSDB_DATA_TYPE_NCHAR;
-  colInfo.info.bytes = TSDB_NCHAR_SIZE * 32;
+  colInfo.info.bytes = TSDB_NCHAR_SIZE * 16;
   colInfo.info.colId = 1;
   colInfo.varmeta.offset = static_cast<int32_t *>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
 
@@ -92,7 +92,7 @@ SSDataBlock* getSingleColStrBlock(void* param) {
   for (int32_t i = 0; i < pInfo->pageRows; ++i) {
     SColumnInfoData* pColInfo = static_cast<SColumnInfoData*>(TARRAY_GET_ELEM(pBlock->pDataBlock, 0));
 
-    int32_t size = taosRand() % 32;
+    int32_t size = taosRand() % 16;
     char str[64] = {0};
     taosRandStr(varDataVal(str), size);
     varDataSetLen(str, size);
@@ -101,6 +101,8 @@ SSDataBlock* getSingleColStrBlock(void* param) {
 
   pBlock->info.rows = pInfo->pageRows;
   pBlock->info.numOfCols = 1;
+  pBlock->info.hasVarCol = true;
+
   return pBlock;
 }
 
@@ -218,7 +220,7 @@ TEST(testCase, external_mem_sort_Test) {
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 32, 6, NULL, "test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 128, 6, NULL, "test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
   _info* pInfo = (_info*) taosMemoryCalloc(1, sizeof(_info));

From 9f959e17f8b0848cc3e58e2552a9925550207088 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 2 Apr 2022 18:53:13 +0800
Subject: [PATCH 07/82] fix error in order by logic

---
 source/libs/executor/src/tsort.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index cc7416bc87..511cba972c 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -421,7 +421,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
   size_t pgSize = pHandle->pageSize;
   int32_t numOfRows = (pgSize - blockDataGetSerialMetaSize(pHandle->pDataBlock))/ blockDataGetSerialRowSize(pHandle->pDataBlock);
 
-  blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows); // useless, it is already enough
+  blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows);
 
   size_t numOfSorted = taosArrayGetSize(pHandle->pOrderedSource);
   for(int32_t t = 0; t < sortPass; ++t) {

From 411086c81161e29aef6e1546d80e6c28ff9033d5 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sun, 3 Apr 2022 10:42:55 +0800
Subject: [PATCH 08/82] fix error in sort operation

---
 source/common/src/tdatablock.c          | 96 ++++++++++++++-----------
 source/libs/executor/test/sortTests.cpp |  2 +-
 2 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 46aeb83943..772b1f69a3 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -176,6 +176,8 @@ int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, con
 
 static void doBitmapMerge(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, const SColumnInfoData* pSource,
                           int32_t numOfRow2) {
+  if (numOfRow2 <= 0) return;
+
   uint32_t total = numOfRow1 + numOfRow2;
 
   if (BitmapLen(numOfRow1) < BitmapLen(total)) {
@@ -190,22 +192,32 @@ static void doBitmapMerge(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, c
 
   if (remindBits == 0) {  // no need to shift bits of bitmap
     memcpy(pColumnInfoData->nullbitmap + BitmapLen(numOfRow1), pSource->nullbitmap, BitmapLen(numOfRow2));
-  } else {
-    int32_t len = BitmapLen(numOfRow2);
-    int32_t i = 0;
+    return;
+  }
 
-    uint8_t* p = (uint8_t*)pSource->nullbitmap;
-    pColumnInfoData->nullbitmap[BitmapLen(numOfRow1) - 1] |= (p[0] >> remindBits);
+  uint8_t* p = (uint8_t*)pSource->nullbitmap;
+  pColumnInfoData->nullbitmap[BitmapLen(numOfRow1) - 1] |= (p[0] >> remindBits);  // copy remind bits
 
-    uint8_t* start = (uint8_t*)&pColumnInfoData->nullbitmap[BitmapLen(numOfRow1)];
-    while (i < len) {
-      start[i] |= (p[i] << shiftBits);
-      i += 1;
+  if (BitmapLen(numOfRow1) == BitmapLen(total)) {
+    return;
+  }
 
-      if (i > 1) {
-        start[i - 1] |= (p[i] >> remindBits);
-      }
+  int32_t len = BitmapLen(numOfRow2);
+  int32_t i = 0;
+
+  uint8_t* start = (uint8_t*)&pColumnInfoData->nullbitmap[BitmapLen(numOfRow1)];
+  int32_t overCount = BitmapLen(total) - BitmapLen(numOfRow1);
+  while (i < len) { // size limit of pSource->nullbitmap
+    if (i >= 1) {
+      start[i - 1] |= (p[i] >> remindBits); //copy remind bits
     }
+
+    if (i >= overCount) { // size limit of pColumnInfoData->nullbitmap
+      return;
+    }
+
+    start[i] |= (p[i] << shiftBits);  //copy shift bits
+    i += 1;
   }
 }
 
@@ -408,44 +420,44 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
     }
 
     return TSDB_CODE_SUCCESS;
-  } else {
-    // iterate the rows that can be fit in this buffer page
-    int32_t size = (headerSize + colHeaderSize);
+  }
+  // iterate the rows that can be fit in this buffer page
+  int32_t size = (headerSize + colHeaderSize);
 
-    for (int32_t j = startIndex; j < numOfRows; ++j) {
-      for (int32_t i = 0; i < numOfCols; ++i) {
-        SColumnInfoData* pColInfoData = TARRAY_GET_ELEM(pBlock->pDataBlock, i);
-        if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
-          bool isNull = colDataIsNull(pColInfoData, numOfRows, j, NULL);
-          if (isNull) {
-            // do nothing
-          } else {
-            char* p = colDataGetData(pColInfoData, j);
-            size += varDataTLen(p);
-          }
-
-          size += sizeof(pColInfoData->varmeta.offset[0]);
-        } else {    // this block is unreached, because hasVarCol = true
-          size += pColInfoData->info.bytes;
-
-          if (((j - startIndex) & 0x07) == 0) {
-            size += 1;  // the space for null bitmap
-          }
+  for (int32_t j = startIndex; j < numOfRows; ++j) {
+    for (int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData* pColInfoData = TARRAY_GET_ELEM(pBlock->pDataBlock, i);
+      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
+        bool isNull = colDataIsNull(pColInfoData, numOfRows, j, NULL);
+        if (isNull) {
+          // do nothing
+        } else {
+          char* p = colDataGetData(pColInfoData, j);
+          size += varDataTLen(p);
         }
-      }
 
-      if (size > pageSize) {
-        *stopIndex = j - 1;
-        ASSERT(*stopIndex > startIndex);
+        size += sizeof(pColInfoData->varmeta.offset[0]);
+      } else {    // this block is unreached, because hasVarCol = true
+        size += pColInfoData->info.bytes;
 
-        return TSDB_CODE_SUCCESS;
+        if (((j - startIndex) & 0x07) == 0) {
+          size += 1;  // the space for null bitmap
+        }
       }
     }
 
-    // all fit in
-    *stopIndex = numOfRows - 1;
-    return TSDB_CODE_SUCCESS;
+    if (size > pageSize) {
+      *stopIndex = j - 1;
+      ASSERT(*stopIndex > startIndex);
+
+      return TSDB_CODE_SUCCESS;
+    }
   }
+
+  // all fit in
+  *stopIndex = numOfRows - 1;
+  return TSDB_CODE_SUCCESS;
+
 }
 
 SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int32_t rowCount) {
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 229b84b923..7e2fd0fed2 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -83,7 +83,7 @@ SSDataBlock* getSingleColStrBlock(void* param) {
 
   SColumnInfoData colInfo = {0};
   colInfo.info.type = TSDB_DATA_TYPE_NCHAR;
-  colInfo.info.bytes = TSDB_NCHAR_SIZE * 16;
+  colInfo.info.bytes = TSDB_NCHAR_SIZE * 16 + VARSTR_HEADER_SIZE;
   colInfo.info.colId = 1;
   colInfo.varmeta.offset = static_cast<int32_t *>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
 

From ff21ecd3648b7f9c3041722998a9d1bdeb0ca5e9 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 11:43:17 +0800
Subject: [PATCH 09/82] optimize sort logic & fix memory leak

---
 source/common/src/tdatablock.c          | 110 +++---------------------
 source/libs/executor/src/executorimpl.c |  12 +--
 source/libs/executor/src/tsort.c        |  29 ++++---
 source/libs/executor/test/sortTests.cpp |   6 +-
 4 files changed, 38 insertions(+), 119 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 772b1f69a3..caf82924f4 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -131,44 +131,7 @@ int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, con
     memcpy(pColumnInfoData->pData + len, pData, varDataTLen(pData));
     pColumnInfoData->varmeta.length += varDataTLen(pData);
   } else {
-    char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
-    switch (type) {
-      case TSDB_DATA_TYPE_BOOL: {
-        *(bool*)p = *(bool*)pData;
-        break;
-      }
-      case TSDB_DATA_TYPE_TINYINT:
-      case TSDB_DATA_TYPE_UTINYINT: {
-        *(int8_t*)p = *(int8_t*)pData;
-        break;
-      }
-      case TSDB_DATA_TYPE_SMALLINT:
-      case TSDB_DATA_TYPE_USMALLINT: {
-        *(int16_t*)p = *(int16_t*)pData;
-        break;
-      }
-      case TSDB_DATA_TYPE_INT:
-      case TSDB_DATA_TYPE_UINT: {
-        *(int32_t*)p = *(int32_t*)pData;
-        break;
-      }
-      case TSDB_DATA_TYPE_TIMESTAMP:
-      case TSDB_DATA_TYPE_BIGINT:
-      case TSDB_DATA_TYPE_UBIGINT: {
-        *(int64_t*)p = *(int64_t*)pData;
-        break;
-      }
-      case TSDB_DATA_TYPE_FLOAT: {
-        *(float*)p = *(float*)pData;
-        break;
-      }
-      case TSDB_DATA_TYPE_DOUBLE: {
-        *(double*)p = *(double*)pData;
-        break;
-      }
-      default:
-        assert(0);
-    }
+    memcpy(pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow, pData, pColumnInfoData->info.bytes);
   }
 
   return 0;
@@ -562,6 +525,11 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
 
     size_t metaSize = pBlock->info.rows * sizeof(int32_t);
     if (IS_VAR_DATA_TYPE(pCol->info.type)) {
+      char* tmp = taosMemoryRealloc(pCol->varmeta.offset, metaSize);
+      if (tmp == NULL) {
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
+      pCol->varmeta.offset = (int32_t*)tmp;
       memcpy(pCol->varmeta.offset, pStart, metaSize);
       pStart += metaSize;
     } else {
@@ -738,61 +706,12 @@ static int32_t blockDataAssign(SColumnInfoData* pCols, const SSDataBlock* pDataB
         pDst->varmeta.offset[j] = pSrc->varmeta.offset[index[j]];
       }
     } else {
-      switch (pSrc->info.type) {
-        case TSDB_DATA_TYPE_UINT:
-        case TSDB_DATA_TYPE_INT: {
-          for (int32_t j = 0; j < pDataBlock->info.rows; ++j) {
-            int32_t* p = (int32_t*)pDst->pData;
-            int32_t* srclist = (int32_t*)pSrc->pData;
-
-            p[j] = srclist[index[j]];
-            if (colDataIsNull_f(pSrc->nullbitmap, index[j])) {
-              colDataSetNull_f(pDst->nullbitmap, j);
-            }
-          }
-          break;
+      for (int32_t j = 0; j < pDataBlock->info.rows; ++j) {
+        if (colDataIsNull_f(pSrc->nullbitmap, index[j])) {
+          colDataSetNull_f(pDst->nullbitmap, j);
+          continue;
         }
-        case TSDB_DATA_TYPE_UTINYINT:
-        case TSDB_DATA_TYPE_TINYINT: {
-          for (int32_t j = 0; j < pDataBlock->info.rows; ++j) {
-            int32_t* p = (int32_t*)pDst->pData;
-            int32_t* srclist = (int32_t*)pSrc->pData;
-
-            p[j] = srclist[index[j]];
-            if (colDataIsNull_f(pSrc->nullbitmap, index[j])) {
-              colDataSetNull_f(pDst->nullbitmap, j);
-            }
-          }
-          break;
-        }
-        case TSDB_DATA_TYPE_USMALLINT:
-        case TSDB_DATA_TYPE_SMALLINT: {
-          for (int32_t j = 0; j < pDataBlock->info.rows; ++j) {
-            int32_t* p = (int32_t*)pDst->pData;
-            int32_t* srclist = (int32_t*)pSrc->pData;
-
-            p[j] = srclist[index[j]];
-            if (colDataIsNull_f(pSrc->nullbitmap, index[j])) {
-              colDataSetNull_f(pDst->nullbitmap, j);
-            }
-          }
-          break;
-        }
-        case TSDB_DATA_TYPE_UBIGINT:
-        case TSDB_DATA_TYPE_BIGINT: {
-          for (int32_t j = 0; j < pDataBlock->info.rows; ++j) {
-            int32_t* p = (int32_t*)pDst->pData;
-            int32_t* srclist = (int32_t*)pSrc->pData;
-
-            p[j] = srclist[index[j]];
-            if (colDataIsNull_f(pSrc->nullbitmap, index[j])) {
-              colDataSetNull_f(pDst->nullbitmap, j);
-            }
-          }
-          break;
-        }
-        default:
-          assert(0);
+        memcpy(pDst->pData + j * pDst->info.bytes, pSrc->pData + index[j] * pDst->info.bytes, pDst->info.bytes);
       }
     }
   }
@@ -938,12 +857,7 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
 
   int64_t p2 = taosGetTimestampUs();
 
-  int32_t code = blockDataAssign(pCols, pDataBlock, index);
-  if (code != TSDB_CODE_SUCCESS) {
-    destroyTupleIndex(index);
-    terrno = code;
-    return code;
-  }
+  blockDataAssign(pCols, pDataBlock, index);
 
   int64_t p3 = taosGetTimestampUs();
 
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 2ccc92111a..f960993e3e 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -5769,10 +5769,11 @@ static void appendOneRowToDataBlock(SSDataBlock* pBlock, STupleHandle* pTupleHan
   pBlock->info.rows += 1;
 }
 
-static SSDataBlock* getSortedBlockData(SSortHandle* pHandle, SSDataBlock* pDataBlock, bool hasVarCol,
-                                       int32_t capacity) {
+static SSDataBlock* getSortedBlockData(SSortHandle* pHandle, SSDataBlock* pDataBlock, int32_t capacity) {
   blockDataCleanup(pDataBlock);
 
+  blockDataEnsureCapacity(pDataBlock, capacity);
+
   while (1) {
     STupleHandle* pTupleHandle = tsortNextTuple(pHandle);
     if (pTupleHandle == NULL) {
@@ -5971,7 +5972,7 @@ static SSDataBlock* doSortedMerge(SOperatorInfo* pOperator, bool* newgroup) {
   SExecTaskInfo*            pTaskInfo = pOperator->pTaskInfo;
   SSortedMergeOperatorInfo* pInfo = pOperator->info;
   if (pOperator->status == OP_RES_TO_RETURN) {
-    return getSortedBlockData(pInfo->pSortHandle, pInfo->binfo.pRes, pInfo->hasVarCol, pInfo->binfo.capacity);
+    return getSortedBlockData(pInfo->pSortHandle, pInfo->binfo.pRes, pInfo->binfo.capacity);
   }
 
   int32_t numOfBufPage = pInfo->sortBufSize / pInfo->bufPageSize;
@@ -6116,10 +6117,9 @@ static SSDataBlock* doSort(SOperatorInfo* pOperator, bool* newgroup) {
 
   SExecTaskInfo*     pTaskInfo = pOperator->pTaskInfo;
   SSortOperatorInfo* pInfo = pOperator->info;
-  bool               hasVarCol = pInfo->pDataBlock->info.hasVarCol;
 
   if (pOperator->status == OP_RES_TO_RETURN) {
-    return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, hasVarCol, pInfo->numOfRowsInRes);
+    return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, pInfo->numOfRowsInRes);
   }
 
   int32_t numOfBufPage = pInfo->sortBufSize / pInfo->bufPageSize;
@@ -6139,7 +6139,7 @@ static SSDataBlock* doSort(SOperatorInfo* pOperator, bool* newgroup) {
   }
 
   pOperator->status = OP_RES_TO_RETURN;
-  return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, hasVarCol, pInfo->numOfRowsInRes);
+  return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, pInfo->numOfRowsInRes);
 }
 
 SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo,
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 511cba972c..49a99ec284 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -111,6 +111,17 @@ SSortHandle* tsortCreateSortHandle(SArray* pSortInfo, int32_t type, int32_t page
   return pSortHandle;
 }
 
+static int32_t sortComparClearup(SMsortComparParam* cmpParam) {
+  for(int32_t i = 0; i < cmpParam->numOfSources; ++i) {
+    SExternalMemSource* pSource = cmpParam->pSources[i];
+    blockDataDestroy(pSource->src.pBlock);
+    taosMemoryFreeClear(pSource);
+  }
+
+  cmpParam->numOfSources = 0;
+  return TSDB_CODE_SUCCESS;
+}
+
 void tsortDestroySortHandle(SSortHandle* pSortHandle) {
   tsortClose(pSortHandle);
   if (pSortHandle->pMergeTree != NULL) {
@@ -119,6 +130,8 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
 
   destroyDiskbasedBuf(pSortHandle->pBuf);
   taosMemoryFreeClear(pSortHandle->idStr);
+  blockDataDestroy(pSortHandle->pDataBlock);
+  sortComparClearup(&pSortHandle->cmpParam);    // pOrderedSource is in cmpParam
   taosMemoryFreeClear(pSortHandle);
 }
 
@@ -168,6 +181,7 @@ static int32_t doAddToBuf(SSDataBlock* pDataBlock, SSortHandle* pHandle) {
     int32_t pageId = -1;
     void* pPage = getNewBufPage(pHandle->pBuf, pHandle->sourceId, &pageId);
     if (pPage == NULL) {
+      blockDataDestroy(p);
       return terrno;
     }
 
@@ -227,17 +241,6 @@ static int32_t sortComparInit(SMsortComparParam* cmpParam, SArray* pSources, int
   return code;
 }
 
-static int32_t sortComparClearup(SMsortComparParam* cmpParam) {
-  for(int32_t i = 0; i < cmpParam->numOfSources; ++i) {
-    SExternalMemSource* pSource = cmpParam->pSources[i];
-    blockDataDestroy(pSource->src.pBlock);
-    taosMemoryFreeClear(pSource);
-  }
-
-  cmpParam->numOfSources = 0;
-  return TSDB_CODE_SUCCESS;
-}
-
 static void appendOneRowToDataBlock(SSDataBlock *pBlock, const SSDataBlock* pSource, int32_t* rowIndex) {
   for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
     SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, i);
@@ -312,7 +315,7 @@ static int32_t adjustMergeTreeForNextTuple(SExternalMemSource *pSource, SMultiwa
   return TSDB_CODE_SUCCESS;
 }
 
-static SSDataBlock* getSortedBlockData(SSortHandle* pHandle, SMsortComparParam* cmpParam, int32_t capacity) {
+static SSDataBlock* getSortedBlockDataInner(SSortHandle* pHandle, SMsortComparParam* cmpParam, int32_t capacity) {
   blockDataCleanup(pHandle->pDataBlock);
 
   while(1) {
@@ -454,7 +457,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
       }
 
       while (1) {
-        SSDataBlock* pDataBlock = getSortedBlockData(pHandle, &pHandle->cmpParam, numOfRows);
+        SSDataBlock* pDataBlock = getSortedBlockDataInner(pHandle, &pHandle->cmpParam, numOfRows);
         if (pDataBlock == NULL) {
           break;
         }
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 7e2fd0fed2..0674f05f33 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -198,6 +198,7 @@ TEST(testCase, inMem_sort_Test) {
 
   int32_t code = tsortOpen(phandle);
   int32_t row = 1;
+  taosMemoryFreeClear(ps);
 
   while(1) {
     STupleHandle* pTupleHandle = tsortNextTuple(phandle);
@@ -235,6 +236,7 @@ TEST(testCase, external_mem_sort_Test) {
 
   int32_t code = tsortOpen(phandle);
   int32_t row = 1;
+  taosMemoryFreeClear(ps);
 
   while(1) {
     STupleHandle* pTupleHandle = tsortNextTuple(phandle);
@@ -245,8 +247,8 @@ TEST(testCase, external_mem_sort_Test) {
     void* v = tsortGetValue(pTupleHandle, 0);
     printf("%d: %d\n", row, *(int32_t*) v);
     ASSERT_EQ(row++, *(int32_t*) v);
-    //char        buf[64] = {0};
-    //snprintf(buf, varDataLen(v), "%s", varDataVal(v));
+    char        buf[64] = {0};
+    memcpy(buf, varDataVal(v), varDataLen(v));
     //printf("%d: %s\n", row, buf);
   }
   tsortDestroySortHandle(phandle);

From 9b66bb168293a09a1dfe5c2fcea3ab4622cc2524 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 14:32:07 +0800
Subject: [PATCH 10/82] optimize sort logic & fix memory leak

---
 source/libs/executor/test/sortTests.cpp | 225 ++++++++++++++++--------
 1 file changed, 153 insertions(+), 72 deletions(-)

diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 0674f05f33..14d527f302 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -40,8 +40,22 @@ typedef struct {
   int32_t startVal;
   int32_t count;
   int32_t pageRows;
+  int16_t type;
 } _info;
 
+int16_t VARCOUNT = 16;
+
+float rand_f2()
+{
+  unsigned r = taosRand();
+  r &= 0x007fffff;
+  r |= 0x40800000;
+  return *(float*)&r - 6.0;
+}
+
+static const int32_t TEST_NUMBER = 1;
+#define bigendian()     ((*(char *)&TEST_NUMBER) == 0)
+
 SSDataBlock* getSingleColDummyBlock(void* param) {
   _info* pInfo = (_info*) param;
   if (--pInfo->count < 0) {
@@ -52,19 +66,64 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
   pBlock->pDataBlock = taosArrayInit(4, sizeof(SColumnInfoData));
 
   SColumnInfoData colInfo = {0};
-  colInfo.info.type = TSDB_DATA_TYPE_INT;
-  colInfo.info.bytes = sizeof(int32_t);
+  colInfo.info.type = pInfo->type;
+  if (pInfo->type == TSDB_DATA_TYPE_NCHAR){
+    colInfo.info.bytes = TSDB_NCHAR_SIZE * VARCOUNT + VARSTR_HEADER_SIZE;
+    colInfo.varmeta.offset = static_cast<int32_t *>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
+  } else if(pInfo->type == TSDB_DATA_TYPE_BINARY) {
+    colInfo.info.bytes = VARCOUNT + VARSTR_HEADER_SIZE;
+    colInfo.varmeta.offset = static_cast<int32_t *>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
+  } else{
+    colInfo.info.bytes = tDataTypes[pInfo->type].bytes;
+    colInfo.pData = static_cast<char*>(taosMemoryCalloc(pInfo->pageRows, colInfo.info.bytes));
+    colInfo.nullbitmap = static_cast<char*>(taosMemoryCalloc(1, (pInfo->pageRows + 7) / 8));
+  }
   colInfo.info.colId = 1;
-  colInfo.pData = static_cast<char*>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
-  colInfo.nullbitmap = static_cast<char*>(taosMemoryCalloc(1, (pInfo->pageRows + 7) / 8));
 
   taosArrayPush(pBlock->pDataBlock, &colInfo);
 
   for (int32_t i = 0; i < pInfo->pageRows; ++i) {
     SColumnInfoData* pColInfo = static_cast<SColumnInfoData*>(TARRAY_GET_ELEM(pBlock->pDataBlock, 0));
 
-    int32_t v = ++pInfo->startVal;
-    colDataAppend(pColInfo, i, reinterpret_cast<const char*>(&v), false);
+    if (pInfo->type == TSDB_DATA_TYPE_NCHAR){
+      int32_t size = taosRand() % VARCOUNT;
+      char str[128] = {0};
+      char strOri[128] = {0};
+      taosRandStr(strOri, size);
+      int32_t len = 0;
+      bool ret = taosMbsToUcs4(strOri, size, (TdUcs4*)varDataVal(str), 128, &len);
+      if (!ret){
+        printf("error\n");
+        return NULL;
+      }
+      varDataSetLen(str, len);
+      colDataAppend(pColInfo, i, reinterpret_cast<const char*>(str), false);
+      pBlock->info.hasVarCol = true;
+      printf("nchar: %s\n",strOri);
+    } else if(pInfo->type == TSDB_DATA_TYPE_BINARY){
+      int32_t size = taosRand() % VARCOUNT;
+      char str[64] = {0};
+      taosRandStr(varDataVal(str), size);
+      varDataSetLen(str, size);
+      colDataAppend(pColInfo, i, reinterpret_cast<const char*>(str), false);
+      pBlock->info.hasVarCol = true;
+      printf("binary: %s\n", varDataVal(str));
+    } else if(pInfo->type == TSDB_DATA_TYPE_DOUBLE || pInfo->type == TSDB_DATA_TYPE_FLOAT) {
+      double v = rand_f2();
+      colDataAppend(pColInfo, i, reinterpret_cast<const char*>(&v), false);
+      printf("float: %f\n", v);
+    } else{
+      int64_t v = ++pInfo->startVal;
+      char *result = static_cast<char*>(taosMemoryCalloc(tDataTypes[pInfo->type].bytes, 1));
+      if (!bigendian()){
+        memcpy(result, &v, tDataTypes[pInfo->type].bytes);
+      }else{
+        memcpy(result, (char*)(&v) + sizeof(int64_t) - tDataTypes[pInfo->type].bytes, tDataTypes[pInfo->type].bytes);
+      }
+
+      colDataAppend(pColInfo, i, result, false);
+      printf("int: %lld\n", v);
+    }
   }
 
   pBlock->info.rows = pInfo->pageRows;
@@ -72,40 +131,6 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
   return pBlock;
 }
 
-SSDataBlock* getSingleColStrBlock(void* param) {
-  _info* pInfo = (_info*) param;
-  if (--pInfo->count < 0) {
-    return NULL;
-  }
-
-  SSDataBlock* pBlock = static_cast<SSDataBlock*>(taosMemoryCalloc(1, sizeof(SSDataBlock)));
-  pBlock->pDataBlock = taosArrayInit(4, sizeof(SColumnInfoData));
-
-  SColumnInfoData colInfo = {0};
-  colInfo.info.type = TSDB_DATA_TYPE_NCHAR;
-  colInfo.info.bytes = TSDB_NCHAR_SIZE * 16 + VARSTR_HEADER_SIZE;
-  colInfo.info.colId = 1;
-  colInfo.varmeta.offset = static_cast<int32_t *>(taosMemoryCalloc(pInfo->pageRows, sizeof(int32_t)));
-
-  taosArrayPush(pBlock->pDataBlock, &colInfo);
-
-  for (int32_t i = 0; i < pInfo->pageRows; ++i) {
-    SColumnInfoData* pColInfo = static_cast<SColumnInfoData*>(TARRAY_GET_ELEM(pBlock->pDataBlock, 0));
-
-    int32_t size = taosRand() % 16;
-    char str[64] = {0};
-    taosRandStr(varDataVal(str), size);
-    varDataSetLen(str, size);
-    colDataAppend(pColInfo, i, reinterpret_cast<const char*>(str), false);
-  }
-
-  pBlock->info.rows = pInfo->pageRows;
-  pBlock->info.numOfCols = 1;
-  pBlock->info.hasVarCol = true;
-
-  return pBlock;
-}
-
 
 int32_t docomp(const void* p1, const void* p2, void* param) {
   int32_t pLeftIdx  = *(int32_t *)p1;
@@ -183,7 +208,6 @@ TEST(testCase, inMem_sort_Test) {
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
-  SSchema s = {.type = TSDB_DATA_TYPE_INT, .colId = 1, .bytes = 4, };
   SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 1024, 5, NULL, "test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
@@ -191,6 +215,7 @@ TEST(testCase, inMem_sort_Test) {
   pInfo->startVal = 0;
   pInfo->pageRows = 100;
   pInfo->count = 6;
+  pInfo->type = TSDB_DATA_TYPE_USMALLINT;
 
   SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
   ps->param = pInfo;
@@ -207,51 +232,107 @@ TEST(testCase, inMem_sort_Test) {
     }
 
     void* v = tsortGetValue(pTupleHandle, 0);
-    printf("%d: %d\n", row, *(int32_t*) v);
-    ASSERT_EQ(row++, *(int32_t*) v);
+    printf("%d: %d\n", row, *(uint16_t*) v);
+    ASSERT_EQ(row++, *(uint16_t*) v);
 
   }
+  taosArrayDestroy(orderInfo);
   tsortDestroySortHandle(phandle);
 }
 
 TEST(testCase, external_mem_sort_Test) {
-  SBlockOrderInfo oi = {0};
-  oi.order = TSDB_ORDER_ASC;
-  oi.slotId = 0;
-  SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
-  taosArrayPush(orderInfo, &oi);
 
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 128, 6, NULL, "test_abc");
-  tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
+  _info* pInfo = (_info*) taosMemoryCalloc(7, sizeof(_info));
+  pInfo[0].startVal = 0;
+  pInfo[0].pageRows = 10;
+  pInfo[0].count = 6;
+  pInfo[0].type = TSDB_DATA_TYPE_BOOL;
 
-  _info* pInfo = (_info*) taosMemoryCalloc(1, sizeof(_info));
-  pInfo->startVal = 0;
-  pInfo->pageRows = 100;
-  pInfo->count = 6;
+  pInfo[1].startVal = 0;
+  pInfo[1].pageRows = 10;
+  pInfo[1].count = 6;
+  pInfo[1].type = TSDB_DATA_TYPE_TINYINT;
 
-  SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
-  ps->param = pInfo;
+  pInfo[2].startVal = 0;
+  pInfo[2].pageRows = 100;
+  pInfo[2].count = 6;
+  pInfo[2].type = TSDB_DATA_TYPE_USMALLINT;
 
-  tsortAddSource(phandle, ps);
+  pInfo[2].startVal = 0;
+  pInfo[2].pageRows = 100;
+  pInfo[2].count = 6;
+  pInfo[2].type = TSDB_DATA_TYPE_INT;
 
-  int32_t code = tsortOpen(phandle);
-  int32_t row = 1;
-  taosMemoryFreeClear(ps);
+  pInfo[3].startVal = 0;
+  pInfo[3].pageRows = 100;
+  pInfo[3].count = 6;
+  pInfo[3].type = TSDB_DATA_TYPE_UBIGINT;
 
-  while(1) {
-    STupleHandle* pTupleHandle = tsortNextTuple(phandle);
-    if (pTupleHandle == NULL) {
-      break;
+  pInfo[4].startVal = 0;
+  pInfo[4].pageRows = 100;
+  pInfo[4].count = 6;
+  pInfo[4].type = TSDB_DATA_TYPE_DOUBLE;
+
+  pInfo[5].startVal = 0;
+  pInfo[5].pageRows = 50;
+  pInfo[5].count = 6;
+  pInfo[5].type = TSDB_DATA_TYPE_NCHAR;
+
+  pInfo[6].startVal = 0;
+  pInfo[6].pageRows = 100;
+  pInfo[6].count = 6;
+  pInfo[6].type = TSDB_DATA_TYPE_BINARY;
+
+  for (int i = 0; i < 7; i++){
+    SBlockOrderInfo oi = {0};
+    oi.order = TSDB_ORDER_ASC;
+    oi.slotId = 0;
+    SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
+    taosArrayPush(orderInfo, &oi);
+
+    SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 128, 3, NULL, "test_abc");
+    tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
+
+    SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
+    ps->param = &pInfo[i];
+
+    tsortAddSource(phandle, ps);
+
+    int32_t code = tsortOpen(phandle);
+    int32_t row = 1;
+    taosMemoryFreeClear(ps);
+
+    printf("--------start with %s-----------\n", tDataTypes[pInfo[i].type].name);
+    while(1) {
+      STupleHandle* pTupleHandle = tsortNextTuple(phandle);
+      if (pTupleHandle == NULL) {
+        break;
+      }
+
+      void* v = tsortGetValue(pTupleHandle, 0);
+
+      if(pInfo[i].type == TSDB_DATA_TYPE_NCHAR){
+        char        buf[128] = {0};
+        int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(v), varDataLen(v), buf);
+        printf("%d: %s\n", row++, buf);
+      }else if(pInfo[i].type == TSDB_DATA_TYPE_BINARY){
+        char        buf[128] = {0};
+        memcpy(buf, varDataVal(v), varDataLen(v));
+        printf("%d: %s\n", row++, buf);
+      }else{
+        int64_t result = 0;
+        if (!bigendian()){
+          memcpy(&result, v, tDataTypes[pInfo[i].type].bytes);
+        }else{
+          memcpy((char*)(&result) + sizeof(int64_t) - tDataTypes[pInfo[i].type].bytes, v, tDataTypes[pInfo[i].type].bytes);
+        }
+        printf("%d: %lld\n", row++, result);
+      }
     }
-
-    void* v = tsortGetValue(pTupleHandle, 0);
-    printf("%d: %d\n", row, *(int32_t*) v);
-    ASSERT_EQ(row++, *(int32_t*) v);
-    char        buf[64] = {0};
-    memcpy(buf, varDataVal(v), varDataLen(v));
-    //printf("%d: %s\n", row, buf);
+    taosArrayDestroy(orderInfo);
+    tsortDestroySortHandle(phandle);
   }
-  tsortDestroySortHandle(phandle);
+  taosMemoryFree(pInfo);
 }
 
 TEST(testCase, ordered_merge_sort_Test) {

From 78acaed84ebcd5127f8a38c0904f6e51dd3aa4af Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 15:44:14 +0800
Subject: [PATCH 11/82] fix error in sort logic

---
 cmake/cmake.define                      |  8 ++++---
 source/common/src/tdatablock.c          |  6 ++---
 source/libs/executor/src/tsort.c        |  7 +++++-
 source/libs/executor/test/sortTests.cpp | 32 +++++++++++++------------
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/cmake/cmake.define b/cmake/cmake.define
index 298d102b87..03feca37bd 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -36,11 +36,13 @@ IF (TD_WINDOWS)
     ENDIF ()
 
 ELSE ()
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
+    #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
+    #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
 
 MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
-IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
+IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     ADD_DEFINITIONS("-D_TD_ARM_")
 ELSE ()
     ADD_DEFINITIONS("-msse4.2 -mfma")
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index caf82924f4..372ea9a2d7 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -373,9 +373,9 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
   size_t payloadSize = pageSize - (headerSize + colHeaderSize);
 
   // TODO speedup by checking if the whole page can fit in firstly.
-  if (!hasVarCol) {
+  /*if (!hasVarCol) {
     size_t  rowSize = blockDataGetRowSize(pBlock);
-    int32_t capacity = (payloadSize / (rowSize * 8 + bitmapChar * numOfCols)) * 8;
+    int32_t capacity = (payloadSize / (rowSize * 8 + bitmapChar * numOfCols)) * 8; //if pageSize = 128, rowSize = 2, it will core in doAddToBuf:assert(size <= getBufPageSize(pHandle->pBuf));
 
     *stopIndex = startIndex + capacity;
     if (*stopIndex >= numOfRows) {
@@ -383,7 +383,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
     }
 
     return TSDB_CODE_SUCCESS;
-  }
+  }*/
   // iterate the rows that can be fit in this buffer page
   int32_t size = (headerSize + colHeaderSize);
 
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 49a99ec284..e5312921fa 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -131,7 +131,12 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
   destroyDiskbasedBuf(pSortHandle->pBuf);
   taosMemoryFreeClear(pSortHandle->idStr);
   blockDataDestroy(pSortHandle->pDataBlock);
-  sortComparClearup(&pSortHandle->cmpParam);    // pOrderedSource is in cmpParam
+  for (size_t i = 0; i < taosArrayGetSize(pSortHandle->pOrderedSource); i++){
+    SExternalMemSource* pSource = taosArrayGet(pSortHandle->pOrderedSource, i);
+    blockDataDestroy(pSource->src.pBlock);
+    taosMemoryFreeClear(pSource);
+  }
+  taosArrayDestroy(pSortHandle->pOrderedSource);
   taosMemoryFreeClear(pSortHandle);
 }
 
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 14d527f302..9ad16669a4 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -122,7 +122,8 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
       }
 
       colDataAppend(pColInfo, i, result, false);
-      printf("int: %lld\n", v);
+      printf("int: %ld\n", v);
+      taosMemoryFree(result);
     }
   }
 
@@ -238,11 +239,12 @@ TEST(testCase, inMem_sort_Test) {
   }
   taosArrayDestroy(orderInfo);
   tsortDestroySortHandle(phandle);
+  taosMemoryFree(pInfo);
 }
 
 TEST(testCase, external_mem_sort_Test) {
 
-  _info* pInfo = (_info*) taosMemoryCalloc(7, sizeof(_info));
+  _info* pInfo = (_info*) taosMemoryCalloc(8, sizeof(_info));
   pInfo[0].startVal = 0;
   pInfo[0].pageRows = 10;
   pInfo[0].count = 6;
@@ -258,32 +260,32 @@ TEST(testCase, external_mem_sort_Test) {
   pInfo[2].count = 6;
   pInfo[2].type = TSDB_DATA_TYPE_USMALLINT;
 
-  pInfo[2].startVal = 0;
-  pInfo[2].pageRows = 100;
-  pInfo[2].count = 6;
-  pInfo[2].type = TSDB_DATA_TYPE_INT;
-
   pInfo[3].startVal = 0;
   pInfo[3].pageRows = 100;
   pInfo[3].count = 6;
-  pInfo[3].type = TSDB_DATA_TYPE_UBIGINT;
+  pInfo[3].type = TSDB_DATA_TYPE_INT;
 
   pInfo[4].startVal = 0;
   pInfo[4].pageRows = 100;
   pInfo[4].count = 6;
-  pInfo[4].type = TSDB_DATA_TYPE_DOUBLE;
+  pInfo[4].type = TSDB_DATA_TYPE_UBIGINT;
 
   pInfo[5].startVal = 0;
-  pInfo[5].pageRows = 50;
+  pInfo[5].pageRows = 100;
   pInfo[5].count = 6;
-  pInfo[5].type = TSDB_DATA_TYPE_NCHAR;
+  pInfo[5].type = TSDB_DATA_TYPE_DOUBLE;
 
   pInfo[6].startVal = 0;
-  pInfo[6].pageRows = 100;
+  pInfo[6].pageRows = 50;
   pInfo[6].count = 6;
-  pInfo[6].type = TSDB_DATA_TYPE_BINARY;
+  pInfo[6].type = TSDB_DATA_TYPE_NCHAR;
 
-  for (int i = 0; i < 7; i++){
+  pInfo[7].startVal = 0;
+  pInfo[7].pageRows = 100;
+  pInfo[7].count = 6;
+  pInfo[7].type = TSDB_DATA_TYPE_BINARY;
+
+  for (int i = 0; i < 8; i++){
     SBlockOrderInfo oi = {0};
     oi.order = TSDB_ORDER_ASC;
     oi.slotId = 0;
@@ -326,7 +328,7 @@ TEST(testCase, external_mem_sort_Test) {
         }else{
           memcpy((char*)(&result) + sizeof(int64_t) - tDataTypes[pInfo[i].type].bytes, v, tDataTypes[pInfo[i].type].bytes);
         }
-        printf("%d: %lld\n", row++, result);
+        printf("%d: %ld\n", row++, result);
       }
     }
     taosArrayDestroy(orderInfo);

From 865a13c1c2bfa8000f2df1452587c34bdca2da11 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 16:46:26 +0800
Subject: [PATCH 12/82] fix error in sort logic

---
 source/common/src/tdatablock.c          | 2 +-
 source/libs/executor/src/tsort.c        | 6 +++---
 source/libs/executor/test/sortTests.cpp | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 372ea9a2d7..63c095ecf5 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -411,7 +411,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
 
     if (size > pageSize) {
       *stopIndex = j - 1;
-      ASSERT(*stopIndex > startIndex);
+      ASSERT(*stopIndex >= startIndex);
 
       return TSDB_CODE_SUCCESS;
     }
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index e5312921fa..7e01fe0ba8 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -132,9 +132,9 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
   taosMemoryFreeClear(pSortHandle->idStr);
   blockDataDestroy(pSortHandle->pDataBlock);
   for (size_t i = 0; i < taosArrayGetSize(pSortHandle->pOrderedSource); i++){
-    SExternalMemSource* pSource = taosArrayGet(pSortHandle->pOrderedSource, i);
-    blockDataDestroy(pSource->src.pBlock);
-    taosMemoryFreeClear(pSource);
+    SExternalMemSource** pSource = taosArrayGet(pSortHandle->pOrderedSource, i);
+    blockDataDestroy((*pSource)->src.pBlock);
+    taosMemoryFreeClear(*pSource);
   }
   taosArrayDestroy(pSortHandle->pOrderedSource);
   taosMemoryFreeClear(pSortHandle);
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 9ad16669a4..f1891f9c62 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -91,7 +91,7 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
       char strOri[128] = {0};
       taosRandStr(strOri, size);
       int32_t len = 0;
-      bool ret = taosMbsToUcs4(strOri, size, (TdUcs4*)varDataVal(str), 128, &len);
+      bool ret = taosMbsToUcs4(strOri, size, (TdUcs4*)varDataVal(str), size * TSDB_NCHAR_SIZE, &len);
       if (!ret){
         printf("error\n");
         return NULL;
@@ -321,6 +321,10 @@ TEST(testCase, external_mem_sort_Test) {
         char        buf[128] = {0};
         memcpy(buf, varDataVal(v), varDataLen(v));
         printf("%d: %s\n", row++, buf);
+      }else if(pInfo[i].type == TSDB_DATA_TYPE_DOUBLE) {
+        printf("double: %lf\n", *(double*)v);
+      }else if (pInfo[i].type == TSDB_DATA_TYPE_FLOAT) {
+        printf("float: %f\n", *(float*)v);
       }else{
         int64_t result = 0;
         if (!bigendian()){

From f72c983792386b521ab6f4b009b585a4373997f5 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 16:56:13 +0800
Subject: [PATCH 13/82] modify test case

---
 source/common/src/tdatablock.c          |  2 +-
 source/libs/executor/src/executorimpl.c |  2 +-
 source/libs/executor/test/sortTests.cpp | 27 ++++++++++++++++---------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 63c095ecf5..33dc3a2469 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -409,7 +409,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
       }
     }
 
-    if (size > pageSize) {
+    if (size > pageSize) {  // pageSize must be able to hold one row
       *stopIndex = j - 1;
       ASSERT(*stopIndex >= startIndex);
 
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index f960993e3e..b66107b4a7 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -6155,7 +6155,7 @@ SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pR
     return NULL;
   }
 
-  pInfo->bufPageSize = rowSize < 1024 ? 1024 : rowSize*2;
+  pInfo->bufPageSize = rowSize < 1024 ? 1024*2 : rowSize*2; // there are headers, so pageSize = rowSize + header
 
   pInfo->sortBufSize = pInfo->bufPageSize * 16;  // TODO dynamic set the available sort buffer
   pInfo->numOfRowsInRes = 1024;
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index f1891f9c62..a89b76e81e 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -287,7 +287,13 @@ TEST(testCase, external_mem_sort_Test) {
 
   for (int i = 0; i < 8; i++){
     SBlockOrderInfo oi = {0};
-    oi.order = TSDB_ORDER_ASC;
+
+    if(pInfo[i].type == TSDB_DATA_TYPE_NCHAR){
+      oi.order = TSDB_ORDER_DESC;
+    }else{
+      oi.order = TSDB_ORDER_ASC;
+    }
+
     oi.slotId = 0;
     SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
     taosArrayPush(orderInfo, &oi);
@@ -363,15 +369,16 @@ TEST(testCase, ordered_merge_sort_Test) {
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
   tsortSetComparFp(phandle, docomp);
 
+  SGenericSource* p = static_cast<SGenericSource*>(taosMemoryCalloc(10, sizeof(SGenericSource)));
+  _info* c = static_cast<_info*>(taosMemoryCalloc(10, sizeof(_info)));
   for(int32_t i = 0; i < 10; ++i) {
-    SGenericSource* p = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
-    _info* c = static_cast<_info*>(taosMemoryCalloc(1, sizeof(_info)));
-    c->count    = 1;
-    c->pageRows = 1000;
-    c->startVal = i*1000;
+    c[i].count    = 1;
+    c[i].pageRows = 1000;
+    c[i].startVal = i*1000;
+    c[i].type = TSDB_DATA_TYPE_INT;
 
-    p->param = c;
-    tsortAddSource(phandle, p);
+    p[i].param = c;
+    tsortAddSource(phandle, &p[i]);
   }
 
   int32_t code = tsortOpen(phandle);
@@ -388,8 +395,10 @@ TEST(testCase, ordered_merge_sort_Test) {
     ASSERT_EQ(row++, *(int32_t*) v);
 
   }
+  taosMemoryFree(p);
+  taosMemoryFree(c);
   tsortDestroySortHandle(phandle);
-  taosMemoryFree(pBlock);
+  blockDataDestroy(pBlock);
 }
 
 #endif

From 4bc0e507da6e383aa46221ba2743afb24385a3c0 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 17:10:51 +0800
Subject: [PATCH 14/82] modify test case

---
 source/libs/executor/test/sortTests.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index a89b76e81e..e774b8d2e3 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -369,16 +369,17 @@ TEST(testCase, ordered_merge_sort_Test) {
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
   tsortSetComparFp(phandle, docomp);
 
-  SGenericSource* p = static_cast<SGenericSource*>(taosMemoryCalloc(10, sizeof(SGenericSource)));
-  _info* c = static_cast<_info*>(taosMemoryCalloc(10, sizeof(_info)));
+  SGenericSource* p[10] = {0};
+  _info c[10] = {0};
   for(int32_t i = 0; i < 10; ++i) {
+    p[i] = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
     c[i].count    = 1;
     c[i].pageRows = 1000;
     c[i].startVal = i*1000;
     c[i].type = TSDB_DATA_TYPE_INT;
 
-    p[i].param = c;
-    tsortAddSource(phandle, &p[i]);
+    p[i]->param = &c[i];
+    tsortAddSource(phandle, p[i]);
   }
 
   int32_t code = tsortOpen(phandle);
@@ -395,8 +396,9 @@ TEST(testCase, ordered_merge_sort_Test) {
     ASSERT_EQ(row++, *(int32_t*) v);
 
   }
-  taosMemoryFree(p);
-  taosMemoryFree(c);
+  for(int32_t i = 0; i < 10; ++i) {
+    taosMemoryFree(p[i]);
+  }
   tsortDestroySortHandle(phandle);
   blockDataDestroy(pBlock);
 }

From aced34c4387a502895a15b690140afdaac2edcdb Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 18:30:25 +0800
Subject: [PATCH 15/82] fix error in sort operation

---
 source/libs/executor/inc/tsort.h        | 17 ++++++++--------
 source/libs/executor/src/executorimpl.c |  4 ++--
 source/libs/executor/src/tsort.c        | 27 ++++++++++++-------------
 source/libs/executor/test/sortTests.cpp | 19 +++++++++--------
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h
index 8971ee33d3..cc5db32666 100644
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
@@ -34,16 +34,17 @@ typedef struct SMultiMergeSource {
   SSDataBlock *pBlock;
 } SMultiMergeSource;
 
-typedef struct SExternalMemSource {
+typedef struct SSortSource {
   SMultiMergeSource src;
-  SArray*           pageIdList;
-  int32_t           pageIndex;
-} SExternalMemSource;
+  union{
+    struct{
+      SArray*           pageIdList;
+      int32_t           pageIndex;
+    };
+    void             *param;
+  };
 
-typedef struct SGenericSource {
-  SMultiMergeSource src;
-  void             *param;
-} SGenericSource;
+} SSortSource;
 
 typedef struct SMsortComparParam {
   void        **pSources;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index b66107b4a7..c418d78540 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -5982,7 +5982,7 @@ static SSDataBlock* doSortedMerge(SOperatorInfo* pOperator, bool* newgroup) {
   tsortSetFetchRawDataFp(pInfo->pSortHandle, loadNextDataBlock);
 
   for (int32_t i = 0; i < pOperator->numOfDownstream; ++i) {
-    SGenericSource* ps = taosMemoryCalloc(1, sizeof(SGenericSource));
+    SSortSource* ps = taosMemoryCalloc(1, sizeof(SSortSource));
     ps->param = pOperator->pDownstream[i];
     tsortAddSource(pInfo->pSortHandle, ps);
   }
@@ -6128,7 +6128,7 @@ static SSDataBlock* doSort(SOperatorInfo* pOperator, bool* newgroup) {
 
   tsortSetFetchRawDataFp(pInfo->pSortHandle, loadNextDataBlock);
 
-  SGenericSource* ps = taosMemoryCalloc(1, sizeof(SGenericSource));
+  SSortSource* ps = taosMemoryCalloc(1, sizeof(SSortSource));
   ps->param = pOperator->pDownstream[0];
   tsortAddSource(pInfo->pSortHandle, ps);
 
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 7e01fe0ba8..2aa8f6a09d 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -113,7 +113,7 @@ SSortHandle* tsortCreateSortHandle(SArray* pSortInfo, int32_t type, int32_t page
 
 static int32_t sortComparClearup(SMsortComparParam* cmpParam) {
   for(int32_t i = 0; i < cmpParam->numOfSources; ++i) {
-    SExternalMemSource* pSource = cmpParam->pSources[i];
+    SSortSource* pSource = cmpParam->pSources[i];    // NOTICE: pSource may be SGenericSource *, if it is SORT_MULTISOURCE_MERGE
     blockDataDestroy(pSource->src.pBlock);
     taosMemoryFreeClear(pSource);
   }
@@ -132,7 +132,7 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
   taosMemoryFreeClear(pSortHandle->idStr);
   blockDataDestroy(pSortHandle->pDataBlock);
   for (size_t i = 0; i < taosArrayGetSize(pSortHandle->pOrderedSource); i++){
-    SExternalMemSource** pSource = taosArrayGet(pSortHandle->pOrderedSource, i);
+    SSortSource** pSource = taosArrayGet(pSortHandle->pOrderedSource, i);
     blockDataDestroy((*pSource)->src.pBlock);
     taosMemoryFreeClear(*pSource);
   }
@@ -146,7 +146,7 @@ int32_t tsortAddSource(SSortHandle* pSortHandle, void* pSource) {
 }
 
 static int32_t doAddNewExternalMemSource(SDiskbasedBuf *pBuf, SArray* pAllSources, SSDataBlock* pBlock, int32_t* sourceId) {
-  SExternalMemSource* pSource = taosMemoryCalloc(1, sizeof(SExternalMemSource));
+  SSortSource* pSource = taosMemoryCalloc(1, sizeof(SSortSource));
   if (pSource == NULL) {
     return TSDB_CODE_QRY_OUT_OF_MEMORY;
   }
@@ -216,7 +216,7 @@ static int32_t sortComparInit(SMsortComparParam* cmpParam, SArray* pSources, int
 
   if (pHandle->type == SORT_SINGLESOURCE_SORT) {
     for (int32_t i = 0; i < cmpParam->numOfSources; ++i) {
-      SExternalMemSource* pSource = cmpParam->pSources[i];
+      SSortSource* pSource = cmpParam->pSources[i];
       SPageInfo*          pPgInfo = *(SPageInfo**)taosArrayGet(pSource->pageIdList, pSource->pageIndex);
 
       void* pPage = getBufPage(pHandle->pBuf, getPageId(pPgInfo));
@@ -238,7 +238,7 @@ static int32_t sortComparInit(SMsortComparParam* cmpParam, SArray* pSources, int
     }
 
     for (int32_t i = 0; i < cmpParam->numOfSources; ++i) {
-      SGenericSource* pSource = cmpParam->pSources[i];
+      SSortSource* pSource = cmpParam->pSources[i];
       pSource->src.pBlock = pHandle->fetchfp(pSource->param);
     }
   }
@@ -265,7 +265,7 @@ static void appendOneRowToDataBlock(SSDataBlock *pBlock, const SSDataBlock* pSou
   *rowIndex += 1;
 }
 
-static int32_t adjustMergeTreeForNextTuple(SExternalMemSource *pSource, SMultiwayMergeTreeInfo *pTree, SSortHandle *pHandle, int32_t* numOfCompleted) {
+static int32_t adjustMergeTreeForNextTuple(SSortSource *pSource, SMultiwayMergeTreeInfo *pTree, SSortHandle *pHandle, int32_t* numOfCompleted) {
   /*
    * load a new SDataBlock into memory of a given intermediate data-set source,
    * since it's last record in buffer has been chosen to be processed, as the winner of loser-tree
@@ -292,7 +292,7 @@ static int32_t adjustMergeTreeForNextTuple(SExternalMemSource *pSource, SMultiwa
         releaseBufPage(pHandle->pBuf, pPage);
       }
     } else {
-      pSource->src.pBlock = pHandle->fetchfp(((SGenericSource*)pSource)->param);
+      pSource->src.pBlock = pHandle->fetchfp(((SSortSource*)pSource)->param);
       if (pSource->src.pBlock == NULL) {
         (*numOfCompleted) += 1;
         pSource->src.rowIndex = -1;
@@ -330,7 +330,7 @@ static SSDataBlock* getSortedBlockDataInner(SSortHandle* pHandle, SMsortComparPa
 
     int32_t index = tMergeTreeGetChosenIndex(pHandle->pMergeTree);
 
-    SExternalMemSource *pSource = (*cmpParam).pSources[index];
+    SSortSource *pSource = (*cmpParam).pSources[index];
     appendOneRowToDataBlock(pHandle->pDataBlock, pSource->src.pBlock, &pSource->src.rowIndex);
 
     int32_t code = adjustMergeTreeForNextTuple(pSource, pHandle->pMergeTree, pHandle, &pHandle->numOfCompletedSources);
@@ -355,8 +355,8 @@ int32_t msortComparFn(const void *pLeft, const void *pRight, void *param) {
 
   SArray *pInfo = pParam->orderInfo;
 
-  SExternalMemSource* pLeftSource  = pParam->pSources[pLeftIdx];
-  SExternalMemSource* pRightSource = pParam->pSources[pRightIdx];
+  SSortSource* pLeftSource  = pParam->pSources[pLeftIdx];
+  SSortSource* pRightSource = pParam->pSources[pRightIdx];
 
   // this input is exhausted, set the special value to denote this
   if (pLeftSource->src.rowIndex == -1) {
@@ -484,6 +484,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
         blockDataCleanup(pDataBlock);
       }
 
+      sortComparClearup(&pHandle->cmpParam);
       tMergeTreeDestroy(pHandle->pMergeTree);
       pHandle->numOfCompletedSources = 0;
 
@@ -494,8 +495,6 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
       }
     }
 
-    sortComparClearup(&pHandle->cmpParam);
-
     taosArrayClear(pHandle->pOrderedSource);
     taosArrayAddAll(pHandle->pOrderedSource, pResList);
     taosArrayDestroy(pResList);
@@ -523,7 +522,7 @@ static int32_t createInitialSortedMultiSources(SSortHandle* pHandle) {
   size_t sortBufSize = pHandle->numOfPages * pHandle->pageSize;
 
   if (pHandle->type == SORT_SINGLESOURCE_SORT) {
-    SGenericSource* source = taosArrayGetP(pHandle->pOrderedSource, 0);
+    SSortSource* source = taosArrayGetP(pHandle->pOrderedSource, 0);
     taosArrayClear(pHandle->pOrderedSource);
     while (1) {
       SSDataBlock* pBlock = pHandle->fetchfp(source->param);
@@ -652,7 +651,7 @@ STupleHandle* tsortNextTuple(SSortHandle* pHandle) {
   }
 
   int32_t index = tMergeTreeGetChosenIndex(pHandle->pMergeTree);
-  SExternalMemSource *pSource = pHandle->cmpParam.pSources[index];
+  SSortSource *pSource = pHandle->cmpParam.pSources[index];
 
   if (pHandle->needAdjust) {
     int32_t code = adjustMergeTreeForNextTuple(pSource, pHandle->pMergeTree, pHandle, &pHandle->numOfCompletedSources);
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index e774b8d2e3..bf77e30eaa 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -138,12 +138,12 @@ int32_t docomp(const void* p1, const void* p2, void* param) {
   int32_t pRightIdx = *(int32_t *)p2;
 
   SMsortComparParam *pParam = (SMsortComparParam *)param;
-  SGenericSource** px = reinterpret_cast<SGenericSource**>(pParam->pSources);
+  SSortSource** px = reinterpret_cast<SSortSource**>(pParam->pSources);
 
   SArray *pInfo = pParam->orderInfo;
 
-  SGenericSource* pLeftSource  = px[pLeftIdx];
-  SGenericSource* pRightSource = px[pRightIdx];
+  SSortSource* pLeftSource  = px[pLeftIdx];
+  SSortSource* pRightSource = px[pRightIdx];
 
   // this input is exhausted, set the special value to denote this
   if (pLeftSource->src.rowIndex == -1) {
@@ -218,7 +218,7 @@ TEST(testCase, inMem_sort_Test) {
   pInfo->count = 6;
   pInfo->type = TSDB_DATA_TYPE_USMALLINT;
 
-  SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
+  SSortSource* ps = static_cast<SSortSource*>(taosMemoryCalloc(1, sizeof(SSortSource)));
   ps->param = pInfo;
   tsortAddSource(phandle, ps);
 
@@ -301,7 +301,7 @@ TEST(testCase, external_mem_sort_Test) {
     SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 128, 3, NULL, "test_abc");
     tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
-    SGenericSource* ps = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
+    SSortSource* ps = static_cast<SSortSource*>(taosMemoryCalloc(1, sizeof(SSortSource)));
     ps->param = &pInfo[i];
 
     tsortAddSource(phandle, ps);
@@ -369,10 +369,10 @@ TEST(testCase, ordered_merge_sort_Test) {
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
   tsortSetComparFp(phandle, docomp);
 
-  SGenericSource* p[10] = {0};
+  SSortSource* p[10] = {0};
   _info c[10] = {0};
   for(int32_t i = 0; i < 10; ++i) {
-    p[i] = static_cast<SGenericSource*>(taosMemoryCalloc(1, sizeof(SGenericSource)));
+    p[i] = static_cast<SSortSource*>(taosMemoryCalloc(1, sizeof(SSortSource)));
     c[i].count    = 1;
     c[i].pageRows = 1000;
     c[i].startVal = i*1000;
@@ -396,9 +396,8 @@ TEST(testCase, ordered_merge_sort_Test) {
     ASSERT_EQ(row++, *(int32_t*) v);
 
   }
-  for(int32_t i = 0; i < 10; ++i) {
-    taosMemoryFree(p[i]);
-  }
+
+  taosArrayDestroy(orderInfo);
   tsortDestroySortHandle(phandle);
   blockDataDestroy(pBlock);
 }

From c4f67c25fbb05db4f9c6f5703666670f9aef336a Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 18:47:56 +0800
Subject: [PATCH 16/82] fix no return error

---
 source/libs/function/src/builtinsimpl.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index fb6abe3c5d..eb77bce5e5 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -97,6 +97,7 @@ int32_t countFunction(SqlFunctionCtx *pCtx) {
   *((int64_t *)buf) += numOfElem;
 
   SET_VAL(pResInfo, numOfElem, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 #define LIST_ADD_N(_res, _col, _start, _rows, _t, numOfElem)             \
@@ -167,6 +168,7 @@ int32_t sumFunction(SqlFunctionCtx *pCtx) {
 
   // data in the check operation are all null, not output
   SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 bool getSumFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
@@ -435,11 +437,13 @@ int32_t doMinMaxHelper(SqlFunctionCtx *pCtx, int32_t isMinFunc) {
 int32_t minFunction(SqlFunctionCtx *pCtx) {
   int32_t numOfElems = doMinMaxHelper(pCtx, 1);
   SET_VAL(GET_RES_INFO(pCtx), numOfElems, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t maxFunction(SqlFunctionCtx *pCtx) {
   int32_t numOfElems = doMinMaxHelper(pCtx, 0);
   SET_VAL(GET_RES_INFO(pCtx), numOfElems, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 typedef struct STopBotRes {
@@ -589,6 +593,7 @@ int32_t stddevFunction(SqlFunctionCtx* pCtx) {
 
   // data in the check operation are all null, not output
   SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 void stddevFinalize(SqlFunctionCtx* pCtx) {
@@ -716,6 +721,7 @@ int32_t percentileFunction(SqlFunctionCtx *pCtx) {
 
   SET_VAL(pResInfo, notNullElems, 1);
   pResInfo->hasResult = DATA_SET_FLAG;
+  return TSDB_CODE_SUCCESS;
 }
 
 // TODO set the correct parameter.
@@ -783,6 +789,7 @@ int32_t firstFunction(SqlFunctionCtx *pCtx) {
   }
 
   SET_VAL(pResInfo, numOfElems, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t lastFunction(SqlFunctionCtx *pCtx) {
@@ -844,6 +851,7 @@ int32_t lastFunction(SqlFunctionCtx *pCtx) {
   }
 
   SET_VAL(pResInfo, numOfElems, 1);
+  return TSDB_CODE_SUCCESS;
 }
 
 typedef struct SDiffInfo {
@@ -1072,6 +1080,7 @@ int32_t diffFunction(SqlFunctionCtx *pCtx) {
      * 2. current block may be null value
      */
     assert(pCtx->hasNull);
+    return 0;
   } else {
 //    for (int t = 0; t < pCtx->tagInfo.numOfTagCols; ++t) {
 //      SqlFunctionCtx* tagCtx = pCtx->tagInfo.pTagCtxList[t];

From c9de8b3b15ad5d81dca55f25c072c87e1a22f77f Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 19:50:24 +0800
Subject: [PATCH 17/82] fix error in sort logic

---
 source/libs/executor/inc/tsort.h        | 1 -
 source/libs/executor/src/executorimpl.c | 1 +
 source/libs/executor/src/tsort.c        | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h
index cc5db32666..3c7194de6f 100644
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
@@ -50,7 +50,6 @@ typedef struct SMsortComparParam {
   void        **pSources;
   int32_t       numOfSources;
   SArray       *orderInfo;   // SArray<SBlockOrderInfo>
-  bool          nullFirst;
 } SMsortComparParam;
 
 typedef struct SSortHandle SSortHandle;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index f3f52455f0..34f3325a8d 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4144,6 +4144,7 @@ int32_t loadRemoteDataCallback(void* param, const SDataBuf* pMsg, int32_t code)
 
   pSourceDataInfo->status = EX_SOURCE_DATA_READY;
   tsem_post(&pSourceDataInfo->pEx->ready);
+  return TSDB_CODE_SUCCESS;
 }
 
 static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) {
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 2aa8f6a09d..a052cbe846 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -391,11 +391,11 @@ int32_t msortComparFn(const void *pLeft, const void *pRight, void *param) {
     }
 
     if (rightNull) {
-      return pParam->nullFirst? 1:-1;
+      return pOrder->nullFirst? 1:-1;
     }
 
     if (leftNull) {
-      return pParam->nullFirst? -1:1;
+      return pOrder->nullFirst? -1:1;
     }
 
     void* left1  = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex);

From 4cc93f9984bdd8839212b3672e93d5c3c757bb1f Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 19:51:28 +0800
Subject: [PATCH 18/82] fix error in sort logic

---
 source/libs/executor/src/scanoperator.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index f39a18da68..4633300a44 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -576,6 +576,7 @@ static int32_t loadSysTableContentCb(void* param, const SDataBuf* pMsg, int32_t
   }
 
   tsem_post(&pScanResInfo->ready);
+  return TSDB_CODE_SUCCESS;
 }
 
 static SSDataBlock* doFilterResult(SSysTableScanInfo* pInfo) {

From 288b50aef2438c8e72f5a01e78159e163118df9e Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 6 Apr 2022 19:53:17 +0800
Subject: [PATCH 19/82] fix error in sort logic

---
 source/libs/executor/test/sortTests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index bf77e30eaa..5bb184e5b7 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -178,11 +178,11 @@ int32_t docomp(const void* p1, const void* p2, void* param) {
     }
 
     if (rightNull) {
-      return pParam->nullFirst? 1:-1;
+      return pOrder->nullFirst? 1:-1;
     }
 
     if (leftNull) {
-      return pParam->nullFirst? -1:1;
+      return pOrder->nullFirst? -1:1;
     }
 
     void* left1  = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex);

From bb18e3c4850fb146fa936d11d3d485f01b378673 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 7 Apr 2022 17:50:06 +0800
Subject: [PATCH 20/82] fix error in sort logic

---
 source/common/src/tdatablock.c          | 7 +++++--
 source/libs/executor/inc/tsort.h        | 5 +++++
 source/libs/executor/src/executorimpl.c | 7 ++-----
 source/libs/executor/src/tsort.c        | 5 -----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 33dc3a2469..44d261bd31 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -192,6 +192,9 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, uint32_t numOfRow1, co
     return numOfRow1;
   }
 
+  if (pSource->hasNull) {
+    pColumnInfoData->hasNull = pSource->hasNull;
+  }
   if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
     // Handle the bitmap
     char* p = taosMemoryRealloc(pColumnInfoData->varmeta.offset, sizeof(int32_t) * (numOfRow1 + numOfRow2));
@@ -313,9 +316,9 @@ int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock) {
 }
 
 int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc) {
-  assert(pSrc != NULL && pDest != NULL && pDest->info.numOfCols == pSrc->info.numOfCols);
+  assert(pSrc != NULL && pDest != NULL);
 
-  int32_t numOfCols = pSrc->info.numOfCols;
+  int32_t numOfCols = pDest->info.numOfCols;
   for (int32_t i = 0; i < numOfCols; ++i) {
     SColumnInfoData* pCol2 = taosArrayGet(pDest->pDataBlock, i);
     SColumnInfoData* pCol1 = taosArrayGet(pSrc->pDataBlock, i);
diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h
index 3c7194de6f..03bbe8098c 100644
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
@@ -52,6 +52,11 @@ typedef struct SMsortComparParam {
   SArray       *orderInfo;   // SArray<SBlockOrderInfo>
 } SMsortComparParam;
 
+struct STupleHandle {
+  SSDataBlock* pBlock;
+  int32_t      rowIndex;
+};
+
 typedef struct SSortHandle SSortHandle;
 typedef struct STupleHandle STupleHandle;
 
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 4cc1658e64..48b734f3aa 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -302,10 +302,6 @@ SSDataBlock* createOutputBuf_rv1(SDataBlockDescNode* pNode) {
     }
 
     taosArrayPush(pBlock->pDataBlock, &idata);
-
-    if (IS_VAR_DATA_TYPE(idata.info.type)) {
-      pBlock->info.hasVarCol = true;
-    }
   }
 
   return pBlock;
@@ -4748,7 +4744,8 @@ static void appendOneRowToDataBlock(SSDataBlock* pBlock, STupleHandle* pTupleHan
   for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
     SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, i);
 
-    bool isNull = tsortIsNullVal(pTupleHandle, i);
+    SColumnInfoData* pColInfoSrc = taosArrayGet(pTupleHandle->pBlock->pDataBlock, i);
+    bool isNull = colDataIsNull(pColInfoSrc, 0, pTupleHandle->rowIndex, NULL);
     if (isNull) {
       colDataAppend(pColInfo, pBlock->info.rows, NULL, true);
     } else {
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index a052cbe846..b226106e01 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -24,11 +24,6 @@
 #include "tutil.h"
 #include "tcompare.h"
 
-struct STupleHandle {
-  SSDataBlock* pBlock;
-  int32_t      rowIndex;
-};
-
 struct SSortHandle {
   int32_t           type;
 

From b984e12e4ca69eee0f3d0c9506d91436058ae6e0 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 10:24:35 +0800
Subject: [PATCH 21/82] [td-14493] support partition by

---
 include/common/tdatablock.h              |   1 +
 source/common/src/tdatablock.c           |  59 +++++-
 source/libs/executor/inc/executorimpl.h  |  21 ++
 source/libs/executor/src/executorimpl.c  | 126 +++++-------
 source/libs/executor/src/groupoperator.c | 252 +++++++++++++++++------
 source/libs/executor/src/tsort.c         |   4 +-
 6 files changed, 318 insertions(+), 145 deletions(-)

diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 7978430027..98edd9f0a5 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -182,6 +182,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
                            int32_t pageSize);
 int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock);
 int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf);
+int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity);
 
 SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int32_t rowCount);
 
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index fb6640e59e..f8ae82ed67 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -415,10 +415,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
       for (int32_t i = 0; i < numOfCols; ++i) {
         SColumnInfoData* pColInfoData = TARRAY_GET_ELEM(pBlock->pDataBlock, i);
         if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
-          bool isNull = colDataIsNull(pColInfoData, numOfRows, j, NULL);
-          if (isNull) {
-            // do nothing
-          } else {
+          if (pColInfoData->varmeta.offset[j] != -1) {
             char* p = colDataGetData(pColInfoData, j);
             size += varDataTLen(p);
           }
@@ -547,8 +544,8 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
   for (int32_t i = 0; i < numOfCols; ++i) {
     SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, i);
 
-    size_t metaSize = pBlock->info.rows * sizeof(int32_t);
     if (IS_VAR_DATA_TYPE(pCol->info.type)) {
+      size_t metaSize = pBlock->info.rows * sizeof(int32_t);
       memcpy(pCol->varmeta.offset, pStart, metaSize);
       pStart += metaSize;
     } else {
@@ -581,6 +578,49 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity) {
+  pBlock->info.rows = *(int32_t*)buf;
+
+  int32_t     numOfCols = pBlock->info.numOfCols;
+  const char* pStart = buf + sizeof(uint32_t);
+
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, i);
+
+    if (IS_VAR_DATA_TYPE(pCol->info.type)) {
+      size_t metaSize = capacity * sizeof(int32_t);
+      memcpy(pCol->varmeta.offset, pStart, metaSize);
+      pStart += metaSize;
+    } else {
+      memcpy(pCol->nullbitmap, pStart, BitmapLen(capacity));
+      pStart += BitmapLen(capacity);
+    }
+
+    int32_t colLength = *(int32_t*)pStart;
+    pStart += sizeof(int32_t);
+
+    if (IS_VAR_DATA_TYPE(pCol->info.type)) {
+      if (pCol->varmeta.allocLen < colLength) {
+        char* tmp = taosMemoryRealloc(pCol->pData, colLength);
+        if (tmp == NULL) {
+          return TSDB_CODE_OUT_OF_MEMORY;
+        }
+
+        pCol->pData = tmp;
+        pCol->varmeta.allocLen = colLength;
+      }
+
+      pCol->varmeta.length = colLength;
+      ASSERT(pCol->varmeta.length <= pCol->varmeta.allocLen);
+    }
+
+    memcpy(pCol->pData, pStart, colLength);
+    pStart += colLength;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
 size_t blockDataGetRowSize(SSDataBlock* pBlock) {
   ASSERT(pBlock != NULL);
   if (pBlock->info.rowSize == 0) {
@@ -627,6 +667,10 @@ double blockDataGetSerialRowSize(const SSDataBlock* pBlock) {
   return rowSize;
 }
 
+int32_t getAllowedRowsForPage(const SSDataBlock* pBlock, size_t pgSize) {
+  return (int32_t) ((pgSize - blockDataGetSerialMetaSize(pBlock))/ blockDataGetSerialRowSize(pBlock));
+}
+
 typedef struct SSDataBlockSortHelper {
   SArray*      orderInfo;  // SArray<SBlockOrderInfo>
   SSDataBlock* pDataBlock;
@@ -1178,6 +1222,9 @@ int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows)
 
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows) {
   int32_t code = 0;
+  if (numOfRows == 0) {
+    return TSDB_CODE_SUCCESS;
+  }
 
   for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
     SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
@@ -1220,7 +1267,7 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock) {
 }
 
 size_t blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize) {
-  return pageSize / (blockDataGetSerialRowSize(pBlock) + blockDataGetSerialMetaSize(pBlock));
+  return (int32_t) ((pageSize - blockDataGetSerialMetaSize(pBlock))/ blockDataGetSerialRowSize(pBlock));
 }
 
 void colDataDestroy(SColumnInfoData* pColData) {
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 57edc40007..908817f2b8 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -563,6 +563,27 @@ typedef struct SGroupbyOperatorInfo {
   SAggSupporter  aggSup;
 } SGroupbyOperatorInfo;
 
+typedef struct SDataGroupInfo {
+  uint64_t groupId;
+  int64_t  numOfRows;
+  SArray  *pPageList;
+} SDataGroupInfo;
+
+// The sort in partition may be needed later.
+typedef struct SPartitionOperatorInfo {
+  SOptrBasicInfo binfo;
+  SArray*        pGroupCols;
+  SArray*        pGroupColVals; // current group column values, SArray<SGroupKeys>
+  bool           isInit;        // denote if current val is initialized or not
+  char*          keyBuf;        // group by keys for hash
+  int32_t        groupKeyLen;   // total group by column width
+  SHashObj*      pGroupSet;     // quick locate the window object for each result
+  SDiskbasedBuf* pBuf;          // query result buffer based on blocked-wised disk file
+
+  void*          pGroupIter;    // group iterator
+  int32_t        pageIndex;     // page index of current group
+} SPartitionOperatorInfo;
+
 typedef struct SSessionAggOperatorInfo {
   SOptrBasicInfo   binfo;
   SAggSupporter    aggSup;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index c73886b5b0..046049c50e 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -7048,7 +7048,8 @@ static SArray* createSortInfo(SNodeList* pNodeList);
 SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
                                         uint64_t queryId, uint64_t taskId, STableGroupInfo* pTableGroupInfo) {
   if (pPhyNode->pChildren == NULL || LIST_LENGTH(pPhyNode->pChildren) == 0) {
-    if (QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == nodeType(pPhyNode)) {
+    int32_t type = nodeType(pPhyNode);
+    if (QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == type) {
       SScanPhysiNode* pScanPhyNode = (SScanPhysiNode*)pPhyNode;
 
       int32_t     numOfCols = 0;
@@ -7056,11 +7057,11 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
       SArray* pColList = extractColMatchInfo(pScanPhyNode->pScanCols, pScanPhyNode->node.pOutputDataBlockDesc, &numOfCols);
       return createTableScanOperatorInfo(pDataReader, pScanPhyNode->order, numOfCols, pScanPhyNode->count,
                                          pScanPhyNode->reverse, pColList, pScanPhyNode->node.pConditions, pTaskInfo);
-    } else if (QUERY_NODE_PHYSICAL_PLAN_EXCHANGE == nodeType(pPhyNode)) {
+    } else if (QUERY_NODE_PHYSICAL_PLAN_EXCHANGE == type) {
       SExchangePhysiNode* pExchange = (SExchangePhysiNode*)pPhyNode;
       SSDataBlock*        pResBlock = createOutputBuf_rv1(pExchange->node.pOutputDataBlockDesc);
       return createExchangeOperatorInfo(pExchange->pSrcEndPoints, pResBlock, pTaskInfo);
-    } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN == nodeType(pPhyNode)) {
+    } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN == type) {
       SScanPhysiNode* pScanPhyNode = (SScanPhysiNode*)pPhyNode;  // simple child table.
 
       int32_t code = doCreateTableGroup(pHandle->meta, pScanPhyNode->tableType, pScanPhyNode->uid, pTableGroupInfo, queryId, taskId);
@@ -7073,7 +7074,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
       SOperatorInfo* pOperator = createStreamScanOperatorInfo(pHandle->reader, pResBlock, pColList, tableIdList, pTaskInfo);
       taosArrayDestroy(tableIdList);
       return pOperator;
-    } else if (QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN == nodeType(pPhyNode)) {
+    } else if (QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN == type) {
       SSystemTableScanPhysiNode* pSysScanPhyNode = (SSystemTableScanPhysiNode*)pPhyNode;
       SSDataBlock*               pResBlock = createOutputBuf_rv1(pSysScanPhyNode->scan.node.pOutputDataBlockDesc);
 
@@ -7089,13 +7090,14 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     }
   }
 
-  if (QUERY_NODE_PHYSICAL_PLAN_PROJECT == nodeType(pPhyNode)) {
-    size_t size = LIST_LENGTH(pPhyNode->pChildren);
-    assert(size == 1);
+  int32_t type = nodeType(pPhyNode);
+  size_t size = LIST_LENGTH(pPhyNode->pChildren);
+  ASSERT(size == 1);
 
-    SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-    SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+  SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
+  SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
 
+  if (QUERY_NODE_PHYSICAL_PLAN_PROJECT == type) {
     int32_t      num = 0;
     SProjectPhysiNode* pProjPhyNode = (SProjectPhysiNode*) pPhyNode;
     SExprInfo*   pExprInfo = createExprInfo(pProjPhyNode->pProjections, NULL, &num);
@@ -7104,78 +7106,56 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     SLimit limit = {.limit = pProjPhyNode->limit, .offset = pProjPhyNode->offset};
 
     return createProjectOperatorInfo(op, pExprInfo, num, pResBlock, &limit, pTaskInfo);
-  } else if (QUERY_NODE_PHYSICAL_PLAN_AGG == nodeType(pPhyNode)) {
-    size_t size = LIST_LENGTH(pPhyNode->pChildren);
-    assert(size == 1);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_AGG == type) {
+    int32_t num = 0;
 
-    for (int32_t i = 0; i < size; ++i) {
-      SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, i);
-      SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+    SAggPhysiNode* pAggNode = (SAggPhysiNode*)pPhyNode;
+    SExprInfo*     pExprInfo = createExprInfo(pAggNode->pAggFuncs, pAggNode->pGroupKeys, &num);
+    SSDataBlock*   pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
 
-      int32_t num = 0;
-
-      SAggPhysiNode* pAggNode = (SAggPhysiNode*)pPhyNode;
-      SExprInfo*     pExprInfo = createExprInfo(pAggNode->pAggFuncs, pAggNode->pGroupKeys, &num);
-      SSDataBlock*   pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-
-      if (pAggNode->pGroupKeys != NULL) {
-        SArray* pColList = extractColumnInfo(pAggNode->pGroupKeys);
-        return createGroupOperatorInfo(op, pExprInfo, num, pResBlock, pColList, pAggNode->node.pConditions, pTaskInfo, NULL);
-      } else {
-        return createAggregateOperatorInfo(op, pExprInfo, num, pResBlock, pTaskInfo, pTableGroupInfo);
-      }
+    if (pAggNode->pGroupKeys != NULL) {
+      SArray* pColList = extractColumnInfo(pAggNode->pGroupKeys);
+      return createGroupOperatorInfo(op, pExprInfo, num, pResBlock, pColList, pAggNode->node.pConditions, pTaskInfo, NULL);
+    } else {
+      return createAggregateOperatorInfo(op, pExprInfo, num, pResBlock, pTaskInfo, pTableGroupInfo);
     }
-  } else if (QUERY_NODE_PHYSICAL_PLAN_INTERVAL == nodeType(pPhyNode)) {
-    size_t size = LIST_LENGTH(pPhyNode->pChildren);
-    assert(size == 1);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_INTERVAL == type) {
+    SIntervalPhysiNode* pIntervalPhyNode = (SIntervalPhysiNode*)pPhyNode;
 
-    for (int32_t i = 0; i < size; ++i) {
-      SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, i);
-      SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+    int32_t      num = 0;
+    SExprInfo*   pExprInfo = createExprInfo(pIntervalPhyNode->window.pFuncs, NULL, &num);
+    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
 
-      SIntervalPhysiNode* pIntervalPhyNode = (SIntervalPhysiNode*)pPhyNode;
-
-      int32_t      num = 0;
-      SExprInfo*   pExprInfo = createExprInfo(pIntervalPhyNode->window.pFuncs, NULL, &num);
-      SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-
-      SInterval interval = {
-          .interval     = pIntervalPhyNode->interval,
-          .sliding      = pIntervalPhyNode->sliding,
-          .intervalUnit = pIntervalPhyNode->intervalUnit,
-          .slidingUnit  = pIntervalPhyNode->slidingUnit,
-          .offset       = pIntervalPhyNode->offset,
-          .precision    = pIntervalPhyNode->precision
-      };
-
-      int32_t primaryTsSlotId = ((SColumnNode*) pIntervalPhyNode->pTspk)->slotId;
-      return createIntervalOperatorInfo(op, pExprInfo, num, pResBlock, &interval, primaryTsSlotId, pTableGroupInfo, pTaskInfo);
-    }
-  } else if (QUERY_NODE_PHYSICAL_PLAN_SORT == nodeType(pPhyNode)) {
-    size_t size = LIST_LENGTH(pPhyNode->pChildren);
-    assert(size == 1);
-
-    SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-    SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+    SInterval interval = {
+        .interval     = pIntervalPhyNode->interval,
+        .sliding      = pIntervalPhyNode->sliding,
+        .intervalUnit = pIntervalPhyNode->intervalUnit,
+        .slidingUnit  = pIntervalPhyNode->slidingUnit,
+        .offset       = pIntervalPhyNode->offset,
+        .precision    = pIntervalPhyNode->precision
+    };
 
+    int32_t primaryTsSlotId = ((SColumnNode*) pIntervalPhyNode->pTspk)->slotId;
+    return createIntervalOperatorInfo(op, pExprInfo, num, pResBlock, &interval, primaryTsSlotId, pTableGroupInfo, pTaskInfo);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_SORT == type) {
     SSortPhysiNode* pSortPhyNode = (SSortPhysiNode*)pPhyNode;
 
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-    SArray*      info = createSortInfo(pSortPhyNode->pSortKeys);
+
+    SArray* info = createSortInfo(pSortPhyNode->pSortKeys);
     return createSortOperatorInfo(op, pResBlock, info, pTaskInfo);
-  } else if (QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW == nodeType(pPhyNode)) {
-    size_t size = LIST_LENGTH(pPhyNode->pChildren);
-    assert(size == 1);
-
-    SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-    SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
-
+  } else if (QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW == type) {
     SSessionWinodwPhysiNode* pSessionNode = (SSessionWinodwPhysiNode*)pPhyNode;
 
     int32_t      num = 0;
     SExprInfo*   pExprInfo = createExprInfo(pSessionNode->window.pFuncs, NULL, &num);
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
     return createSessionAggOperatorInfo(op, pExprInfo, num, pResBlock, pSessionNode->gap, pTaskInfo);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_PARTITION == type) {
+    SPartitionPhysiNode* pPartNode = (SPartitionPhysiNode*) pPhyNode;
+    SArray* pColList = extractColumnInfo(pPartNode->pPartitionKeys);
+    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    return createPartitionOperatorInfo(op, pResBlock, pColList, pTaskInfo, NULL);
   } else {
     ASSERT(0);
   } /*else if (pPhyNode->info.type == OP_MultiTableAggregate) {
@@ -7258,11 +7238,12 @@ SArray* extractColumnInfo(SNodeList* pNodeList) {
     STargetNode* pNode = (STargetNode*)nodesListGetNode(pNodeList, i);
     SColumnNode* pColNode = (SColumnNode*)pNode->pExpr;
 
+    // todo extract method
     SColumn c = {0};
     c.slotId = pColNode->slotId;
-    c.colId = pColNode->colId;
-    c.type = pColNode->node.resType.type;
-    c.bytes = pColNode->node.resType.bytes;
+    c.colId  = pColNode->colId;
+    c.type   = pColNode->node.resType.type;
+    c.bytes  = pColNode->node.resType.bytes;
     c.precision = pColNode->node.resType.precision;
     c.scale = pColNode->node.resType.scale;
 
@@ -7289,15 +7270,6 @@ SArray* createSortInfo(SNodeList* pNodeList) {
 
     SColumnNode* pColNode = (SColumnNode*)pSortKey->pExpr;
     bi.slotId = pColNode->slotId;
-    //    pColNode->order;
-    //    SColumn c = {0};
-    //    c.slotId = pColNode->slotId;
-    //    c.colId  = pColNode->colId;
-    //    c.type   = pColNode->node.resType.type;
-    //    c.bytes  = pColNode->node.resType.bytes;
-    //    c.precision  = pColNode->node.resType.precision;
-    //    c.scale  = pColNode->node.resType.scale;
-
     taosArrayPush(pList, &bi);
   }
 
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index b3a8e09f16..7295401242 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -25,7 +25,7 @@
 #include "thash.h"
 #include "ttypes.h"
 
-static void destroyGroupbyOperatorInfo(void* param, int32_t numOfOutput) {
+static void destroyGroupOperatorInfo(void* param, int32_t numOfOutput) {
   SGroupbyOperatorInfo* pInfo = (SGroupbyOperatorInfo*)param;
   doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
   taosMemoryFreeClear(pInfo->keyBuf);
@@ -33,44 +33,43 @@ static void destroyGroupbyOperatorInfo(void* param, int32_t numOfOutput) {
   taosArrayDestroy(pInfo->pGroupColVals);
 }
 
-static int32_t initGroupOptrInfo(SGroupbyOperatorInfo* pInfo, SArray* pGroupColList) {
-  pInfo->pGroupColVals = taosArrayInit(4, sizeof(SGroupKeys));
-  if (pInfo->pGroupColVals == NULL) {
+static int32_t initGroupOptrInfo(SArray** pGroupColVals, int32_t* keyLen, char** keyBuf, const SArray* pGroupColList) {
+  *pGroupColVals = taosArrayInit(4, sizeof(SGroupKeys));
+  if ((*pGroupColVals) == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   int32_t numOfGroupCols = taosArrayGetSize(pGroupColList);
   for (int32_t i = 0; i < numOfGroupCols; ++i) {
     SColumn* pCol = taosArrayGet(pGroupColList, i);
-    pInfo->groupKeyLen += pCol->bytes;
+    (*keyLen) += pCol->bytes;
 
     struct SGroupKeys key = {0};
-    key.bytes = pCol->bytes;
-    key.type = pCol->type;
+    key.bytes  = pCol->bytes;
+    key.type   = pCol->type;
     key.isNull = false;
-    key.pData = taosMemoryCalloc(1, pCol->bytes);
+    key.pData  = taosMemoryCalloc(1, pCol->bytes);
     if (key.pData == NULL) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
 
-    taosArrayPush(pInfo->pGroupColVals, &key);
+    taosArrayPush((*pGroupColVals), &key);
   }
 
   int32_t nullFlagSize = sizeof(int8_t) * numOfGroupCols;
-  pInfo->keyBuf = taosMemoryCalloc(1, pInfo->groupKeyLen + nullFlagSize);
 
-  if (pInfo->keyBuf == NULL) {
+  (*keyBuf) = taosMemoryCalloc(1, (*keyLen) + nullFlagSize);
+  if ((*keyBuf) == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-static bool groupKeyCompare(SGroupbyOperatorInfo* pInfo, SSDataBlock* pBlock, int32_t rowIndex,
-                            int32_t numOfGroupCols) {
+static bool groupKeyCompare(SArray* pGroupCols, SArray* pGroupColVals, SSDataBlock* pBlock, int32_t rowIndex, int32_t numOfGroupCols) {
   SColumnDataAgg* pColAgg = NULL;
   for (int32_t i = 0; i < numOfGroupCols; ++i) {
-    SColumn*         pCol = taosArrayGet(pInfo->pGroupCols, i);
+    SColumn*         pCol = taosArrayGet(pGroupCols, i);
     SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, pCol->slotId);
     if (pBlock->pBlockAgg != NULL) {
       pColAgg = &pBlock->pBlockAgg[pCol->slotId];  // TODO is agg data matched?
@@ -78,7 +77,7 @@ static bool groupKeyCompare(SGroupbyOperatorInfo* pInfo, SSDataBlock* pBlock, in
 
     bool isNull = colDataIsNull(pColInfoData, pBlock->info.rows, rowIndex, pColAgg);
 
-    SGroupKeys* pkey = taosArrayGet(pInfo->pGroupColVals, i);
+    SGroupKeys* pkey = taosArrayGet(pGroupColVals, i);
     if (pkey->isNull && isNull) {
       continue;
     }
@@ -106,18 +105,18 @@ static bool groupKeyCompare(SGroupbyOperatorInfo* pInfo, SSDataBlock* pBlock, in
   return true;
 }
 
-static void recordNewGroupKeys(SGroupbyOperatorInfo* pInfo, SSDataBlock* pBlock, int32_t rowIndex, int32_t numOfGroupCols) {
+static void recordNewGroupKeys(SArray* pGroupCols, SArray* pGroupColVals, SSDataBlock* pBlock, int32_t rowIndex, int32_t numOfGroupCols) {
   SColumnDataAgg* pColAgg = NULL;
 
   for (int32_t i = 0; i < numOfGroupCols; ++i) {
-    SColumn*         pCol = taosArrayGet(pInfo->pGroupCols, i);
+    SColumn*         pCol = taosArrayGet(pGroupCols, i);
     SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, pCol->slotId);
 
     if (pBlock->pBlockAgg != NULL) {
       pColAgg = &pBlock->pBlockAgg[pCol->slotId];  // TODO is agg data matched?
     }
 
-    SGroupKeys* pkey = taosArrayGet(pInfo->pGroupColVals, i);
+    SGroupKeys* pkey = taosArrayGet(pGroupColVals, i);
     if (colDataIsNull(pColInfoData, pBlock->info.rows, rowIndex, pColAgg)) {
       pkey->isNull = true;
     } else {
@@ -197,13 +196,13 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
   for (int32_t j = 0; j < pBlock->info.rows; ++j) {
     // Compare with the previous row of this column, and do not set the output buffer again if they are identical.
     if (!pInfo->isInit) {
-      recordNewGroupKeys(pInfo, pBlock, j, numOfGroupCols);
+      recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
       pInfo->isInit = true;
       num++;
       continue;
     }
 
-    bool equal = groupKeyCompare(pInfo, pBlock, j, numOfGroupCols);
+    bool equal = groupKeyCompare(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
     if (equal) {
       num++;
       continue;
@@ -212,7 +211,7 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
     // The first row of a new block does not belongs to the previous existed group
     if (!equal && j == 0) {
       num++;
-      recordNewGroupKeys(pInfo, pBlock, j, numOfGroupCols);
+      recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
       continue;
     }
 
@@ -227,7 +226,7 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
 
     // assign the group keys or user input constant values if required
     doAssignGroupKeys(pCtx, pOperator->numOfOutput, pBlock->info.rows, rowIndex);
-    recordNewGroupKeys(pInfo, pBlock, j, numOfGroupCols);
+    recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
     num = 1;
   }
 
@@ -259,7 +258,7 @@ static SSDataBlock* hashGroupbyAggregate(SOperatorInfo* pOperator, bool* newgrou
     if (pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) {
       pOperator->status = OP_EXEC_DONE;
     }
-    return pRes;
+    return (pRes->info.rows == 0)? NULL:pRes;
   }
 
   int32_t        order = TSDB_ORDER_ASC;
@@ -309,7 +308,7 @@ static SSDataBlock* hashGroupbyAggregate(SOperatorInfo* pOperator, bool* newgrou
     }
   }
 
-  return pInfo->binfo.pRes;
+  return (pRes->info.rows == 0)? NULL:pRes;
 }
 
 SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock, SArray* pGroupColList, SNode* pCondition, SExecTaskInfo* pTaskInfo,
@@ -325,7 +324,7 @@ SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pEx
   initAggInfo(&pInfo->binfo, &pInfo->aggSup, pExprInfo, numOfCols, 4096, pResultBlock, pTaskInfo->id.str);
   initResultRowInfo(&pInfo->binfo.resultRowInfo, 8);
 
-  int32_t code = initGroupOptrInfo(pInfo, pGroupColList);
+  int32_t code = initGroupOptrInfo(&pInfo->pGroupColVals, &pInfo->groupKeyLen, &pInfo->keyBuf, pGroupColList);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
   }
@@ -339,7 +338,7 @@ SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pEx
   pOperator->info         = pInfo;
   pOperator->_openFn      = operatorDummyOpenFn;
   pOperator->getNextFn    = hashGroupbyAggregate;
-  pOperator->closeFn      = destroyGroupbyOperatorInfo;
+  pOperator->closeFn      = destroyGroupOperatorInfo;
 
   code = appendDownstream(pOperator, &downstream, 1);
   return pOperator;
@@ -351,67 +350,202 @@ SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pEx
   return NULL;
 }
 
-static SSDataBlock* doPartitionData(SOperatorInfo* pOperator, bool* newgroup) {
+static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+
+  SPartitionOperatorInfo* pInfo = pOperator->info;
+
+  int32_t numOfGroupCols = taosArrayGetSize(pInfo->pGroupCols);
+  for (int32_t j = 0; j < pBlock->info.rows; ++j) {
+    // Compare with the previous row of this column, and do not set the output buffer again if they are identical.
+    recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
+
+    int32_t len = buildGroupKeys(pInfo->keyBuf, pInfo->pGroupColVals);
+    int32_t numOfRows = blockDataGetCapacityInRow(pInfo->binfo.pRes, 4096);
+
+    SDataGroupInfo* p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
+    void* pPage = NULL;
+
+    if (p == NULL) { // it is a new group
+      SDataGroupInfo gi = {0};
+      gi.pPageList = taosArrayInit(100, sizeof(int32_t));
+      taosHashPut(pInfo->pGroupSet, pInfo->keyBuf, len, &gi, sizeof(SDataGroupInfo));
+
+      p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
+
+      int32_t pageId = 0;
+      pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
+      taosArrayPush(p->pPageList, &pageId);
+
+      *(int32_t *) pPage = 0;
+    } else {
+      int32_t* curId = taosArrayGetLast(p->pPageList);
+      pPage = getBufPage(pInfo->pBuf, *curId);
+
+      int32_t *rows = (int32_t*) pPage;
+      if (*rows >= numOfRows) {
+        // add a new page for current group
+        int32_t pageId = 0;
+        pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
+        taosArrayPush(p->pPageList, &pageId);
+
+        *(int32_t*) pPage = 0;
+      }
+    }
+
+    int32_t* rows = (int32_t*) pPage;
+    (*rows) += 1;
+
+    int32_t* offset = taosMemoryCalloc(pBlock->info.numOfCols, sizeof(int32_t));
+    offset[0] = sizeof(int32_t);
+
+    int32_t numOfCols = pInfo->binfo.pRes->info.numOfCols;
+    for(int32_t i = 0; i < numOfCols - 1; ++i) {
+      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+
+      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
+        offset[i + 1] = pColInfoData->info.bytes * numOfRows + numOfRows * sizeof(int32_t) + sizeof(int32_t) + offset[i];
+      } else {
+        offset[i + 1] = pColInfoData->info.bytes * numOfRows + BitmapLen(numOfRows) + sizeof(int32_t) + offset[i];
+      }
+    }
+
+    for(int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+
+      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
+        // todo
+      } else {
+        char* bitmap = pPage + offset[i];
+        int32_t* lenx = pPage + offset[i] + BitmapLen(numOfRows);
+        char* data = (char*) lenx + sizeof(int32_t);
+
+        (*lenx )+= pColInfoData->info.bytes;
+        bool isNull = colDataIsNull_f(pColInfoData->nullbitmap, j);
+        if (isNull) {
+          colDataSetNull_f(bitmap, (*rows) - 1);
+        } else {
+          memcpy(data + ((*rows) - 1)* pColInfoData->info.bytes, colDataGetData(pColInfoData, j), pColInfoData->info.bytes);
+        }
+      }
+    }
+
+    setBufPageDirty(pPage, true);
+    releaseBufPage(pInfo->pBuf, pPage);
+  }
+
+  // todo set the consistent group id according to the group keys
+}
+
+static SSDataBlock* buildPartitionResult(SOperatorInfo* pOperator) {
+  SPartitionOperatorInfo* pInfo = pOperator->info;
+
+  SDataGroupInfo* pGroupInfo = pInfo->pGroupIter;
+  if (pInfo->pGroupIter == NULL || pInfo->pageIndex >= taosArrayGetSize(pGroupInfo->pPageList)) {
+    // try next group data
+    pInfo->pGroupIter = taosHashIterate(pInfo->pGroupSet, pInfo->pGroupIter);
+    if (pInfo->pGroupIter == NULL) {
+      return NULL;
+    }
+
+    pGroupInfo = pInfo->pGroupIter;
+    pInfo->pageIndex = 0;
+  }
+
+  int32_t* pageId = taosArrayGet(pGroupInfo->pPageList, pInfo->pageIndex);
+  void* page = getBufPage(pInfo->pBuf, *pageId);
+
+  int32_t numOfRows = blockDataGetCapacityInRow(pInfo->binfo.pRes, 4096);
+  blockDataFromBuf1(pInfo->binfo.pRes, page, numOfRows);
+
+  pInfo->pageIndex += 1;
+  return pInfo->binfo.pRes;
+}
+
+static SSDataBlock* hashPartition(SOperatorInfo* pOperator, bool* newgroup) {
   if (pOperator->status == OP_EXEC_DONE) {
     return NULL;
   }
 
-  SExecTaskInfo*     pTaskInfo = pOperator->pTaskInfo;
-  SSortOperatorInfo* pInfo = pOperator->info;
-  bool               hasVarCol = pInfo->pDataBlock->info.hasVarCol;
+  SGroupbyOperatorInfo* pInfo = pOperator->info;
+  SSDataBlock* pRes = pInfo->binfo.pRes;
 
   if (pOperator->status == OP_RES_TO_RETURN) {
-    return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, pInfo->numOfRowsInRes);
+    blockDataCleanup(pRes);
+    return buildPartitionResult(pOperator);
   }
 
-  int32_t numOfBufPage = pInfo->sortBufSize / pInfo->bufPageSize;
-  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, SORT_SINGLESOURCE_SORT, pInfo->bufPageSize, numOfBufPage,
-                                             pInfo->pDataBlock, pTaskInfo->id.str);
+  SOperatorInfo* downstream = pOperator->pDownstream[0];
 
-  tsortSetFetchRawDataFp(pInfo->pSortHandle, loadNextDataBlock);
+  while (1) {
+    publishOperatorProfEvent(downstream, QUERY_PROF_BEFORE_OPERATOR_EXEC);
+    SSDataBlock* pBlock = downstream->getNextFn(downstream, newgroup);
+    publishOperatorProfEvent(downstream, QUERY_PROF_AFTER_OPERATOR_EXEC);
+    if (pBlock == NULL) {
+      break;
+    }
 
-  SGenericSource* ps = taosMemoryCalloc(1, sizeof(SGenericSource));
-  ps->param = pOperator->pDownstream[0];
-  tsortAddSource(pInfo->pSortHandle, ps);
-
-  int32_t code = tsortOpen(pInfo->pSortHandle);
-  if (code != TSDB_CODE_SUCCESS) {
-    longjmp(pTaskInfo->env, terrno);
+    //    setTagValue(pOperator, pRuntimeEnv->current->pTable, pInfo->binfo.pCtx, pOperator->numOfOutput);
+    doHashPartition(pOperator, pBlock);
   }
 
   pOperator->status = OP_RES_TO_RETURN;
-  return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, pInfo->numOfRowsInRes);
+  blockDataEnsureCapacity(pRes, 4096);
+  return buildPartitionResult(pOperator);
 }
 
-SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResultBlock, SArray* pSortInfo, SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo) {
-  SSortOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SSortOperatorInfo));
-  SOperatorInfo*     pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
+static void destroyPartitionOperatorInfo(void* param, int32_t numOfOutput) {
+  SGroupbyOperatorInfo* pInfo = (SGroupbyOperatorInfo*)param;
+  doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
+  taosMemoryFreeClear(pInfo->keyBuf);
+  taosArrayDestroy(pInfo->pGroupCols);
+  taosArrayDestroy(pInfo->pGroupColVals);
+}
+
+SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResultBlock, SArray* pGroupColList,
+                                           SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo) {
+  SPartitionOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SPartitionOperatorInfo));
+  SOperatorInfo*        pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
   if (pInfo == NULL || pOperator == NULL) {
     goto _error;
   }
 
-  pInfo->sortBufSize      = 1024 * 16;  // TODO dynamic set the available sort buffer
-  pInfo->bufPageSize      = 1024;
-  pInfo->numOfRowsInRes   = 1024;
-  pInfo->pDataBlock       = pResultBlock;
-  pInfo->pSortInfo        = pSortInfo;
+  pInfo->pGroupCols = pGroupColList;
+
+  _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+  pInfo->pGroupSet = taosHashInit(100, hashFn, false, HASH_NO_LOCK);
+  if (pInfo->pGroupSet == NULL) {
+    goto _error;
+  }
+
+  int32_t code = createDiskbasedBuf(&pInfo->pBuf, 4096, 4096 * 256, pTaskInfo->id.str, "/tmp/");
+  if (code != TSDB_CODE_SUCCESS) {
+    goto _error;
+  }
+
+  code = initGroupOptrInfo(&pInfo->pGroupColVals, &pInfo->groupKeyLen, &pInfo->keyBuf, pGroupColList);
+  if (code != TSDB_CODE_SUCCESS) {
+    goto _error;
+  }
 
   pOperator->name         = "PartitionOperator";
-  pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_PARTITION;
   pOperator->blockingOptr = true;
   pOperator->status       = OP_NOT_OPENED;
+  pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_PARTITION;
+
+  pInfo->binfo.pRes       = pResultBlock;
+  pOperator->numOfOutput  = pResultBlock->info.numOfCols;
   pOperator->info         = pInfo;
+  pOperator->_openFn      = operatorDummyOpenFn;
+  pOperator->getNextFn    = hashPartition;
+  pOperator->closeFn      = destroyPartitionOperatorInfo;
 
-  pOperator->pTaskInfo    = pTaskInfo;
-  pOperator->getNextFn    = doPartitionData;
-//  pOperator->closeFn      = destroyOrderOperatorInfo;
-
-  int32_t code = appendDownstream(pOperator, &downstream, 1);
+  code = appendDownstream(pOperator, &downstream, 1);
   return pOperator;
 
   _error:
   pTaskInfo->code = TSDB_CODE_OUT_OF_MEMORY;
-  taosMemoryFree(pInfo);
-  taosMemoryFree(pOperator);
+  taosMemoryFreeClear(pInfo);
+  taosMemoryFreeClear(pOperator);
   return NULL;
 }
\ No newline at end of file
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 7a57d62969..5dfda92982 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -425,9 +425,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
   qDebug("%s %d rounds mergesort required to complete the sort, first-round sorted data size:%"PRIzu", sort:%"PRId64", total elapsed:%"PRId64,
          pHandle->idStr, (int32_t) (sortPass + 1), getTotalBufSize(pHandle->pBuf), pHandle->sortElapsed, pHandle->totalElapsed);
 
-  size_t pgSize = pHandle->pageSize;
-  int32_t numOfRows = (pgSize - blockDataGetSerialMetaSize(pHandle->pDataBlock))/ blockDataGetSerialRowSize(pHandle->pDataBlock);
-
+  int32_t numOfRows = blockDataGetCapacityInRow(pHandle->pDataBlock, pHandle->pageSize);
   blockDataEnsureCapacity(pHandle->pDataBlock, numOfRows);
 
   size_t numOfSorted = taosArrayGetSize(pHandle->pOrderedSource);

From 8da690e575574c36d5e533867582ce2f17bafb57 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 8 Apr 2022 10:25:15 +0800
Subject: [PATCH 22/82] adjust threads num

---
 source/common/src/tglobal.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 4ecacb9d9d..b351536839 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -394,7 +394,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddInt32(pCfg, "numOfMnodeReadThreads", tsNumOfMnodeReadThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfVnodeQueryThreads = tsNumOfCores / 2;
-  tsNumOfVnodeQueryThreads = TMIN(tsNumOfVnodeQueryThreads, 1);
+  tsNumOfVnodeQueryThreads = TMAX(tsNumOfVnodeQueryThreads, 1);
   if (cfgAddInt32(pCfg, "numOfVnodeQueryThreads", tsNumOfVnodeQueryThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfVnodeFetchThreads = tsNumOfCores / 2;
@@ -402,11 +402,11 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddInt32(pCfg, "numOfVnodeFetchThreads", tsNumOfVnodeFetchThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfVnodeWriteThreads = tsNumOfCores;
-  tsNumOfVnodeWriteThreads = TMIN(tsNumOfVnodeWriteThreads, 1);
+  tsNumOfVnodeWriteThreads = TMAX(tsNumOfVnodeWriteThreads, 1);
   if (cfgAddInt32(pCfg, "numOfVnodeWriteThreads", tsNumOfVnodeWriteThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfVnodeSyncThreads = tsNumOfCores / 2;
-  tsNumOfVnodeSyncThreads = TMIN(tsNumOfVnodeSyncThreads, 1);
+  tsNumOfVnodeSyncThreads = TMAX(tsNumOfVnodeSyncThreads, 1);
   if (cfgAddInt32(pCfg, "numOfVnodeSyncThreads", tsNumOfVnodeSyncThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfVnodeMergeThreads = tsNumOfCores / 8;
@@ -414,7 +414,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddInt32(pCfg, "numOfVnodeMergeThreads", tsNumOfVnodeMergeThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfQnodeQueryThreads = tsNumOfCores / 2;
-  tsNumOfQnodeQueryThreads = TMIN(tsNumOfQnodeQueryThreads, 1);
+  tsNumOfQnodeQueryThreads = TMAX(tsNumOfQnodeQueryThreads, 1);
   if (cfgAddInt32(pCfg, "numOfQnodeQueryThreads", tsNumOfQnodeQueryThreads, 1, 1024, 0) != 0) return -1;
 
   tsNumOfQnodeFetchThreads = tsNumOfCores / 2;

From f700e4746c1cfa1fcdfc7633f84b4bda69117c1e Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 13:09:44 +0800
Subject: [PATCH 23/82] [td-14393] fix bug.

---
 source/libs/executor/inc/executorimpl.h  |   4 +-
 source/libs/executor/src/executorimpl.c  |   4 +
 source/libs/executor/src/groupoperator.c | 103 ++++++++++++++++-------
 source/util/src/tpagedbuf.c              |   4 +-
 4 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 908817f2b8..b4302787fb 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -574,11 +574,13 @@ typedef struct SPartitionOperatorInfo {
   SOptrBasicInfo binfo;
   SArray*        pGroupCols;
   SArray*        pGroupColVals; // current group column values, SArray<SGroupKeys>
-  bool           isInit;        // denote if current val is initialized or not
   char*          keyBuf;        // group by keys for hash
   int32_t        groupKeyLen;   // total group by column width
   SHashObj*      pGroupSet;     // quick locate the window object for each result
+
   SDiskbasedBuf* pBuf;          // query result buffer based on blocked-wised disk file
+  int32_t        rowCapacity;   // maximum number of rows for each buffer page
+  int32_t*       columnOffset;  // start position for each column data
 
   void*          pGroupIter;    // group iterator
   int32_t        pageIndex;     // page index of current group
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 046049c50e..5fc7e81bd5 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -298,6 +298,10 @@ SSDataBlock* createOutputBuf_rv1(SDataBlockDescNode* pNode) {
     idata.info.precision = pDescNode->dataType.precision;
 
     taosArrayPush(pBlock->pDataBlock, &idata);
+
+    if (IS_VAR_DATA_TYPE(idata.info.type)) {
+      pBlock->info.hasVarCol = true;
+    }
   }
 
   return pBlock;
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 7295401242..e9b0497587 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -25,6 +25,8 @@
 #include "thash.h"
 #include "ttypes.h"
 
+static int32_t* setupColumnOffset(const SSDataBlock* pBlock, int32_t rowCapacity);
+
 static void destroyGroupOperatorInfo(void* param, int32_t numOfOutput) {
   SGroupbyOperatorInfo* pInfo = (SGroupbyOperatorInfo*)param;
   doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
@@ -357,15 +359,13 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
 
   int32_t numOfGroupCols = taosArrayGetSize(pInfo->pGroupCols);
   for (int32_t j = 0; j < pBlock->info.rows; ++j) {
-    // Compare with the previous row of this column, and do not set the output buffer again if they are identical.
     recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
 
     int32_t len = buildGroupKeys(pInfo->keyBuf, pInfo->pGroupColVals);
-    int32_t numOfRows = blockDataGetCapacityInRow(pInfo->binfo.pRes, 4096);
 
     SDataGroupInfo* p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
-    void* pPage = NULL;
 
+    void* pPage = NULL;
     if (p == NULL) { // it is a new group
       SDataGroupInfo gi = {0};
       gi.pPageList = taosArrayInit(100, sizeof(int32_t));
@@ -383,7 +383,7 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
       pPage = getBufPage(pInfo->pBuf, *curId);
 
       int32_t *rows = (int32_t*) pPage;
-      if (*rows >= numOfRows) {
+      if (*rows >= pInfo->rowCapacity) {
         // add a new page for current group
         int32_t pageId = 0;
         pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
@@ -393,43 +393,54 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
       }
     }
 
+    // add one for this group
+    p->numOfRows += 1;
+
     int32_t* rows = (int32_t*) pPage;
-    (*rows) += 1;
-
-    int32_t* offset = taosMemoryCalloc(pBlock->info.numOfCols, sizeof(int32_t));
-    offset[0] = sizeof(int32_t);
-
-    int32_t numOfCols = pInfo->binfo.pRes->info.numOfCols;
-    for(int32_t i = 0; i < numOfCols - 1; ++i) {
-      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
-
-      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
-        offset[i + 1] = pColInfoData->info.bytes * numOfRows + numOfRows * sizeof(int32_t) + sizeof(int32_t) + offset[i];
-      } else {
-        offset[i + 1] = pColInfoData->info.bytes * numOfRows + BitmapLen(numOfRows) + sizeof(int32_t) + offset[i];
-      }
-    }
 
+    size_t numOfCols = pInfo->binfo.pRes->info.numOfCols;
     for(int32_t i = 0; i < numOfCols; ++i) {
       SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
 
-      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
-        // todo
-      } else {
-        char* bitmap = pPage + offset[i];
-        int32_t* lenx = pPage + offset[i] + BitmapLen(numOfRows);
-        char* data = (char*) lenx + sizeof(int32_t);
+      int32_t bytes = pColInfoData->info.bytes;
+      int32_t startOffset = pInfo->columnOffset[i];
+
+      char* columnLen    = NULL;
+      int32_t contentLen = 0;
+
+      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
+        int32_t* offset = pPage + startOffset;
+        columnLen       = pPage + startOffset + sizeof(int32_t) * pInfo->rowCapacity;
+        char*    data   = (char*)(columnLen + sizeof(int32_t));
+
+        if (colDataIsNull_s(pColInfoData, j)) {
+          offset[(*rows)] = -1;
+          contentLen = 0;
+        } else {
+          offset[*rows] = (*columnLen);
+          char* src = colDataGetData(pColInfoData, j);
+          memcpy(data + (*columnLen), src, varDataTLen(src));
+          contentLen = varDataTLen(src);
+        }
+      } else {
+        char* bitmap = pPage + startOffset;
+        columnLen    = pPage + startOffset + BitmapLen(pInfo->rowCapacity);
+        char* data   = (char*) columnLen + sizeof(int32_t);
 
-        (*lenx )+= pColInfoData->info.bytes;
         bool isNull = colDataIsNull_f(pColInfoData->nullbitmap, j);
         if (isNull) {
-          colDataSetNull_f(bitmap, (*rows) - 1);
+          colDataSetNull_f(bitmap, (*rows));
         } else {
-          memcpy(data + ((*rows) - 1)* pColInfoData->info.bytes, colDataGetData(pColInfoData, j), pColInfoData->info.bytes);
+          memcpy(data + (*columnLen), colDataGetData(pColInfoData, j), bytes);
         }
+        contentLen = bytes;
       }
+
+      (*columnLen) += contentLen;
     }
 
+    (*rows) += 1;
+
     setBufPageDirty(pPage, true);
     releaseBufPage(pInfo->pBuf, pPage);
   }
@@ -437,6 +448,30 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
   // todo set the consistent group id according to the group keys
 }
 
+int32_t* setupColumnOffset(const SSDataBlock* pBlock, int32_t rowCapacity) {
+  size_t numOfCols = pBlock->info.numOfCols;
+  int32_t* offset = taosMemoryCalloc(pBlock->info.numOfCols, sizeof(int32_t));
+
+  offset[0] = sizeof(int32_t);  // the number of rows in current page, ref to SSDataBlock paged serialization format
+
+  for(int32_t i = 0; i < numOfCols - 1; ++i) {
+    SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+
+    int32_t bytes = pColInfoData->info.bytes;
+    int32_t payloadLen = bytes * rowCapacity;
+    
+    if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
+      // offset segment + content length + payload
+      offset[i + 1] = rowCapacity * sizeof(int32_t) + sizeof(int32_t) + payloadLen + offset[i];
+    } else {
+      // bitmap + content length + payload
+      offset[i + 1] = BitmapLen(rowCapacity) + sizeof(int32_t) + payloadLen + offset[i];
+    }
+  }
+
+  return offset;
+}
+
 static SSDataBlock* buildPartitionResult(SOperatorInfo* pOperator) {
   SPartitionOperatorInfo* pInfo = pOperator->info;
 
@@ -445,6 +480,7 @@ static SSDataBlock* buildPartitionResult(SOperatorInfo* pOperator) {
     // try next group data
     pInfo->pGroupIter = taosHashIterate(pInfo->pGroupSet, pInfo->pGroupIter);
     if (pInfo->pGroupIter == NULL) {
+      pOperator->status = OP_EXEC_DONE;
       return NULL;
     }
 
@@ -455,8 +491,7 @@ static SSDataBlock* buildPartitionResult(SOperatorInfo* pOperator) {
   int32_t* pageId = taosArrayGet(pGroupInfo->pPageList, pInfo->pageIndex);
   void* page = getBufPage(pInfo->pBuf, *pageId);
 
-  int32_t numOfRows = blockDataGetCapacityInRow(pInfo->binfo.pRes, 4096);
-  blockDataFromBuf1(pInfo->binfo.pRes, page, numOfRows);
+  blockDataFromBuf1(pInfo->binfo.pRes, page, pInfo->rowCapacity);
 
   pInfo->pageIndex += 1;
   return pInfo->binfo.pRes;
@@ -495,11 +530,12 @@ static SSDataBlock* hashPartition(SOperatorInfo* pOperator, bool* newgroup) {
 }
 
 static void destroyPartitionOperatorInfo(void* param, int32_t numOfOutput) {
-  SGroupbyOperatorInfo* pInfo = (SGroupbyOperatorInfo*)param;
+  SPartitionOperatorInfo* pInfo = (SPartitionOperatorInfo*)param;
   doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
-  taosMemoryFreeClear(pInfo->keyBuf);
   taosArrayDestroy(pInfo->pGroupCols);
   taosArrayDestroy(pInfo->pGroupColVals);
+  taosMemoryFree(pInfo->keyBuf);
+  taosMemoryFree(pInfo->columnOffset);
 }
 
 SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResultBlock, SArray* pGroupColList,
@@ -523,6 +559,9 @@ SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBloc
     goto _error;
   }
 
+  pInfo->rowCapacity = blockDataGetCapacityInRow(pResultBlock, getBufPageSize(pInfo->pBuf));
+  pInfo->columnOffset = setupColumnOffset(pResultBlock, pInfo->rowCapacity);
+
   code = initGroupOptrInfo(&pInfo->pGroupColVals, &pInfo->groupKeyLen, &pInfo->keyBuf, pGroupColList);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c
index d834263b94..84a2efb46c 100644
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
@@ -48,10 +48,8 @@ struct SDiskbasedBuf {
 };
 
 static int32_t createDiskFile(SDiskbasedBuf* pBuf) {
-  // pBuf->file = fopen(pBuf->path, "wb+");
-  pBuf->pFile = taosOpenFile(pBuf->path, TD_FILE_CTEATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC);
+  pBuf->pFile = taosOpenFile(pBuf->path, TD_FILE_CTEATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL);
   if (pBuf->pFile == NULL) {
-    //    qError("failed to create tmp file: %s on disk. %s", pBuf->path, strerror(errno));
     return TAOS_SYSTEM_ERROR(errno);
   }
 

From 1f8d2ea4465d58f3a16c24f2fc37f187bcb8a8b3 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 8 Apr 2022 14:17:32 +0800
Subject: [PATCH 24/82] <fix>: fix index map error from table scan to sort
 output

---
 cmake/cmake.define                       |  8 +++---
 include/common/tdatablock.h              |  2 +-
 source/common/src/tdatablock.c           |  8 ++++--
 source/dnode/vnode/src/tsdb/tsdbSma.c    |  2 ++
 source/libs/executor/inc/executorimpl.h  |  3 ++-
 source/libs/executor/inc/tsort.h         |  2 +-
 source/libs/executor/src/executorimpl.c  | 33 +++++++++++++++++++-----
 source/libs/executor/src/groupoperator.c |  4 +--
 source/libs/executor/src/tsort.c         |  6 +++--
 source/libs/executor/test/sortTests.cpp  |  6 ++---
 10 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/cmake/cmake.define b/cmake/cmake.define
index 03feca37bd..639ae9ca3f 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -36,10 +36,10 @@ IF (TD_WINDOWS)
     ENDIF ()
 
 ELSE ()
-    #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
-    #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
+    #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
+    #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
 
 MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
 IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index d6d82875e0..0f9216a541 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -177,7 +177,7 @@ void    colDataTrim(SColumnInfoData* pColumnInfoData);
 size_t blockDataGetNumOfCols(const SSDataBlock* pBlock);
 size_t blockDataGetNumOfRows(const SSDataBlock* pBlock);
 
-int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc);
+int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc, SArray* pIndexMap);
 int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startIndex, int32_t* stopIndex,
                            int32_t pageSize);
 int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock);
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 44d261bd31..abcb4283d2 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -315,13 +315,17 @@ int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock) {
   return 0;
 }
 
-int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc) {
+int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc, SArray* pIndexMap) {
   assert(pSrc != NULL && pDest != NULL);
 
   int32_t numOfCols = pDest->info.numOfCols;
   for (int32_t i = 0; i < numOfCols; ++i) {
+    int32_t mapIndex = i;
+    if(pIndexMap) {
+      mapIndex = *(int32_t*)taosArrayGet(pIndexMap, i);
+    }
     SColumnInfoData* pCol2 = taosArrayGet(pDest->pDataBlock, i);
-    SColumnInfoData* pCol1 = taosArrayGet(pSrc->pDataBlock, i);
+    SColumnInfoData* pCol1 = taosArrayGet(pSrc->pDataBlock, mapIndex);
 
     uint32_t oldLen = colDataGetLength(pCol2, pDest->info.rows);
     uint32_t newLen = colDataGetLength(pCol1, pSrc->info.rows);
diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index 87660e6fe1..ae0befd524 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -1437,6 +1437,7 @@ int32_t tsdbCreateTSma(STsdb *pTsdb, char *pMsg) {
 
   tdDestroyTSma(&vCreateSmaReq.tSma);
   // TODO: return directly or go on follow steps?
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t tsdbDropTSma(STsdb *pTsdb, char *pMsg) {
@@ -1466,6 +1467,7 @@ int32_t tsdbDropTSma(STsdb *pTsdb, char *pMsg) {
   tsdbTSmaSub(pTsdb, 1);  
 
   // TODO: return directly or go on follow steps?
+  return TSDB_CODE_SUCCESS;
 }
 
 #if 0
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 57edc40007..fc59412b75 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -614,6 +614,7 @@ typedef struct SSortOperatorInfo {
   SSDataBlock       *pDataBlock;
   SArray*            pSortInfo;
   SSortHandle       *pSortHandle;
+  SArray*            inputSlotMap;  // for index map from table scan output
   int32_t            bufPageSize;
   int32_t            numOfRowsInRes;
 
@@ -651,7 +652,7 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo*
                                            SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 SOperatorInfo* createMultiTableAggOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t num, SSDataBlock* pResBlock, SLimit* pLimit, SExecTaskInfo* pTaskInfo);
-SOperatorInfo *createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo, SExecTaskInfo* pTaskInfo);
+SOperatorInfo *createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo, SArray* pIndexMap, SExecTaskInfo* pTaskInfo);
 SOperatorInfo* createSortedMergeOperatorInfo(SOperatorInfo** downstream, int32_t numOfDownstream, SExprInfo* pExprInfo, int32_t num, SArray* pSortInfo, SArray* pGroupInfo, SExecTaskInfo* pTaskInfo);
 SOperatorInfo* createSysTableScanOperatorInfo(void* pSysTableReadHandle, SSDataBlock* pResBlock, const SName* pName,
                                               SNode* pCondition, SEpSet epset, SArray* colList, SExecTaskInfo* pTaskInfo, bool showRewrite, int32_t accountId);
diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h
index 03bbe8098c..f012cc2448 100644
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
@@ -68,7 +68,7 @@ typedef int32_t (*_sort_merge_compar_fn_t)(const void* p1, const void* p2, void*
  * @param type
  * @return
  */
-SSortHandle* tsortCreateSortHandle(SArray* pOrderInfo, int32_t type, int32_t pageSize, int32_t numOfPages, SSDataBlock* pBlock, const char* idstr);
+SSortHandle* tsortCreateSortHandle(SArray* pOrderInfo, SArray* pIndexMap, int32_t type, int32_t pageSize, int32_t numOfPages, SSDataBlock* pBlock, const char* idstr);
 
 /**
  *
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 20899098cc..9b2772ddfa 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4953,7 +4953,7 @@ static SSDataBlock* doSortedMerge(SOperatorInfo* pOperator, bool* newgroup) {
   }
 
   int32_t numOfBufPage = pInfo->sortBufSize / pInfo->bufPageSize;
-  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, SORT_MULTISOURCE_MERGE, pInfo->bufPageSize, numOfBufPage,
+  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, NULL, SORT_MULTISOURCE_MERGE, pInfo->bufPageSize, numOfBufPage,
                                              pInfo->binfo.pRes, "GET_TASKID(pTaskInfo)");
 
   tsortSetFetchRawDataFp(pInfo->pSortHandle, loadNextDataBlock);
@@ -5100,7 +5100,7 @@ static SSDataBlock* doSort(SOperatorInfo* pOperator, bool* newgroup) {
   }
 
   int32_t numOfBufPage = pInfo->sortBufSize / pInfo->bufPageSize;
-  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, SORT_SINGLESOURCE_SORT, pInfo->bufPageSize, numOfBufPage,
+  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, pInfo->inputSlotMap, SORT_SINGLESOURCE_SORT, pInfo->bufPageSize, numOfBufPage,
                                              pInfo->pDataBlock, pTaskInfo->id.str);
 
   tsortSetFetchRawDataFp(pInfo->pSortHandle, loadNextDataBlock);
@@ -5119,7 +5119,7 @@ static SSDataBlock* doSort(SOperatorInfo* pOperator, bool* newgroup) {
   return getSortedBlockData(pInfo->pSortHandle, pInfo->pDataBlock, pInfo->numOfRowsInRes);
 }
 
-SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo, SExecTaskInfo* pTaskInfo) {
+SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo, SArray* pIndexMap, SExecTaskInfo* pTaskInfo) {
   SSortOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SSortOperatorInfo));
   SOperatorInfo*     pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
   int32_t rowSize = pResBlock->info.rowSize;
@@ -5137,6 +5137,7 @@ SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pR
   pInfo->numOfRowsInRes = 1024;
   pInfo->pDataBlock = pResBlock;
   pInfo->pSortInfo = pSortInfo;
+  pInfo->inputSlotMap = pIndexMap;
 
   pOperator->name         = "SortOperator";
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_SORT;
@@ -6265,6 +6266,7 @@ static void destroyOrderOperatorInfo(void* param, int32_t numOfOutput) {
   pInfo->pDataBlock = blockDataDestroy(pInfo->pDataBlock);
 
   taosArrayDestroy(pInfo->pSortInfo);
+  taosArrayDestroy(pInfo->inputSlotMap);
 }
 
 void destroyExchangeOperatorInfo(void* param, int32_t numOfOutput) {
@@ -7065,6 +7067,7 @@ static SArray* extractScanColumnId(SNodeList* pNodeList);
 static SArray* extractColumnInfo(SNodeList* pNodeList);
 static SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols);
 static SArray* createSortInfo(SNodeList* pNodeList);
+static SArray* createIndexMap(SNodeList* pNodeList);
 
 SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
                                         uint64_t queryId, uint64_t taskId, STableGroupInfo* pTableGroupInfo) {
@@ -7183,7 +7186,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
 
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
     SArray*      info = createSortInfo(pSortPhyNode->pSortKeys);
-    return createSortOperatorInfo(op, pResBlock, info, pTaskInfo);
+    SArray*      slotMap = createIndexMap(pSortPhyNode->pTargets);
+    return createSortOperatorInfo(op, pResBlock, info, slotMap, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW == nodeType(pPhyNode)) {
     size_t size = LIST_LENGTH(pPhyNode->pChildren);
     assert(size == 1);
@@ -7303,8 +7307,7 @@ SArray* createSortInfo(SNodeList* pNodeList) {
   }
 
   for (int32_t i = 0; i < numOfCols; ++i) {
-    STargetNode*      pNode = (STargetNode*)nodesListGetNode(pNodeList, i);
-    SOrderByExprNode* pSortKey = (SOrderByExprNode*)pNode->pExpr;
+    SOrderByExprNode* pSortKey = (SOrderByExprNode*)nodesListGetNode(pNodeList, i);
     SBlockOrderInfo   bi = {0};
     bi.order = (pSortKey->order == ORDER_ASC) ? TSDB_ORDER_ASC : TSDB_ORDER_DESC;
     bi.nullFirst = (pSortKey->nullOrder == NULL_ORDER_FIRST);
@@ -7326,6 +7329,24 @@ SArray* createSortInfo(SNodeList* pNodeList) {
   return pList;
 }
 
+SArray* createIndexMap(SNodeList* pNodeList) {
+  size_t  numOfCols = LIST_LENGTH(pNodeList);
+  SArray* pList = taosArrayInit(numOfCols, sizeof(int32_t));
+  if (pList == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return pList;
+  }
+
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    STargetNode* pTarget = (STargetNode*)nodesListGetNode(pNodeList, i);
+
+    SColumnNode* pColNode = (SColumnNode*)pTarget->pExpr;
+    taosArrayPush(pList, &pColNode->slotId);
+  }
+
+  return pList;
+}
+
 SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols) {
   size_t  numOfCols = LIST_LENGTH(pNodeList);
   SArray* pList = taosArrayInit(numOfCols, sizeof(SColMatchInfo));
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index b3a8e09f16..7f5935d339 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -365,12 +365,12 @@ static SSDataBlock* doPartitionData(SOperatorInfo* pOperator, bool* newgroup) {
   }
 
   int32_t numOfBufPage = pInfo->sortBufSize / pInfo->bufPageSize;
-  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, SORT_SINGLESOURCE_SORT, pInfo->bufPageSize, numOfBufPage,
+  pInfo->pSortHandle = tsortCreateSortHandle(pInfo->pSortInfo, pInfo->inputSlotMap, SORT_SINGLESOURCE_SORT, pInfo->bufPageSize, numOfBufPage,
                                              pInfo->pDataBlock, pTaskInfo->id.str);
 
   tsortSetFetchRawDataFp(pInfo->pSortHandle, loadNextDataBlock);
 
-  SGenericSource* ps = taosMemoryCalloc(1, sizeof(SGenericSource));
+  SSortSource* ps = taosMemoryCalloc(1, sizeof(SSortSource));
   ps->param = pOperator->pDownstream[0];
   tsortAddSource(pInfo->pSortHandle, ps);
 
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index b226106e01..965cf14400 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -32,6 +32,7 @@ struct SSortHandle {
   SDiskbasedBuf    *pBuf;
 
   SArray           *pSortInfo;
+  SArray           *pIndexMap;
   SArray           *pOrderedSource;
 
   _sort_fetch_block_fn_t  fetchfp;
@@ -85,13 +86,14 @@ static SSDataBlock* createDataBlock_rv(SSchema* pSchema, int32_t numOfCols) {
  * @param type
  * @return
  */
-SSortHandle* tsortCreateSortHandle(SArray* pSortInfo, int32_t type, int32_t pageSize, int32_t numOfPages, SSDataBlock* pBlock, const char* idstr) {
+SSortHandle* tsortCreateSortHandle(SArray* pSortInfo, SArray* pIndexMap, int32_t type, int32_t pageSize, int32_t numOfPages, SSDataBlock* pBlock, const char* idstr) {
   SSortHandle* pSortHandle = taosMemoryCalloc(1, sizeof(SSortHandle));
 
   pSortHandle->type       = type;
   pSortHandle->pageSize   = pageSize;
   pSortHandle->numOfPages = numOfPages;
   pSortHandle->pSortInfo  = pSortInfo;
+  pSortHandle->pIndexMap  = pIndexMap;
   pSortHandle->pDataBlock = createOneDataBlock(pBlock);
 
   pSortHandle->pOrderedSource     = taosArrayInit(4, POINTER_BYTES);
@@ -529,7 +531,7 @@ static int32_t createInitialSortedMultiSources(SSortHandle* pHandle) {
         pHandle->pDataBlock = createOneDataBlock(pBlock);
       }
 
-      int32_t code = blockDataMerge(pHandle->pDataBlock, pBlock);
+      int32_t code = blockDataMerge(pHandle->pDataBlock, pBlock, pHandle->pIndexMap);
       if (code != 0) {
         return code;
       }
diff --git a/source/libs/executor/test/sortTests.cpp b/source/libs/executor/test/sortTests.cpp
index 5bb184e5b7..efa0581fd0 100644
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
@@ -209,7 +209,7 @@ TEST(testCase, inMem_sort_Test) {
   SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
   taosArrayPush(orderInfo, &oi);
 
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 1024, 5, NULL, "test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, NULL, SORT_SINGLESOURCE_SORT, 1024, 5, NULL, "test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
   _info* pInfo = (_info*) taosMemoryCalloc(1, sizeof(_info));
@@ -298,7 +298,7 @@ TEST(testCase, external_mem_sort_Test) {
     SArray* orderInfo = taosArrayInit(1, sizeof(SBlockOrderInfo));
     taosArrayPush(orderInfo, &oi);
 
-    SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_SINGLESOURCE_SORT, 128, 3, NULL, "test_abc");
+    SSortHandle* phandle = tsortCreateSortHandle(orderInfo, NULL, SORT_SINGLESOURCE_SORT, 128, 3, NULL, "test_abc");
     tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
 
     SSortSource* ps = static_cast<SSortSource*>(taosMemoryCalloc(1, sizeof(SSortSource)));
@@ -365,7 +365,7 @@ TEST(testCase, ordered_merge_sort_Test) {
     taosArrayPush(pBlock->pDataBlock, &colInfo);
   }
 
-  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, SORT_MULTISOURCE_MERGE, 1024, 5, pBlock,"test_abc");
+  SSortHandle* phandle = tsortCreateSortHandle(orderInfo, NULL, SORT_MULTISOURCE_MERGE, 1024, 5, pBlock,"test_abc");
   tsortSetFetchRawDataFp(phandle, getSingleColDummyBlock);
   tsortSetComparFp(phandle, docomp);
 

From 65a21314933ba9ec4892b1e5c301d18436591067 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 8 Apr 2022 14:40:02 +0800
Subject: [PATCH 25/82] <fix>: fix index map error from table scan to sort
 output

---
 source/libs/executor/src/executorimpl.c | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 9b2772ddfa..0cc73bb2cd 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -7066,7 +7066,7 @@ static SArray* extractTableIdList(const STableGroupInfo* pTableGroupInfo);
 static SArray* extractScanColumnId(SNodeList* pNodeList);
 static SArray* extractColumnInfo(SNodeList* pNodeList);
 static SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols);
-static SArray* createSortInfo(SNodeList* pNodeList);
+static SArray* createSortInfo(SNodeList* pNodeList, SNodeList* pNodeListTarget);
 static SArray* createIndexMap(SNodeList* pNodeList);
 
 SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
@@ -7185,7 +7185,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     SSortPhysiNode* pSortPhyNode = (SSortPhysiNode*)pPhyNode;
 
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-    SArray*      info = createSortInfo(pSortPhyNode->pSortKeys);
+    SArray*      info = createSortInfo(pSortPhyNode->pSortKeys, pSortPhyNode->pTargets);
     SArray*      slotMap = createIndexMap(pSortPhyNode->pTargets);
     return createSortOperatorInfo(op, pResBlock, info, slotMap, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW == nodeType(pPhyNode)) {
@@ -7298,7 +7298,7 @@ SArray* extractColumnInfo(SNodeList* pNodeList) {
   return pList;
 }
 
-SArray* createSortInfo(SNodeList* pNodeList) {
+SArray* createSortInfo(SNodeList* pNodeList, SNodeList* pNodeListTarget) {
   size_t  numOfCols = LIST_LENGTH(pNodeList);
   SArray* pList = taosArrayInit(numOfCols, sizeof(SBlockOrderInfo));
   if (pList == NULL) {
@@ -7313,16 +7313,22 @@ SArray* createSortInfo(SNodeList* pNodeList) {
     bi.nullFirst = (pSortKey->nullOrder == NULL_ORDER_FIRST);
 
     SColumnNode* pColNode = (SColumnNode*)pSortKey->pExpr;
-    bi.slotId = pColNode->slotId;
-    //    pColNode->order;
-    //    SColumn c = {0};
-    //    c.slotId = pColNode->slotId;
-    //    c.colId  = pColNode->colId;
-    //    c.type   = pColNode->node.resType.type;
-    //    c.bytes  = pColNode->node.resType.bytes;
-    //    c.precision  = pColNode->node.resType.precision;
-    //    c.scale  = pColNode->node.resType.scale;
 
+    bool found = false;
+    for (int32_t j = 0; j < LIST_LENGTH(pNodeListTarget); ++j) {
+      STargetNode* pTarget = (STargetNode*)nodesListGetNode(pNodeListTarget, j);
+
+      SColumnNode* pColNodeT = (SColumnNode*)pTarget->pExpr;
+      if(pColNode->slotId == pColNodeT->slotId){    // to find slotId in PhysiSort OutputDataBlockDesc
+        bi.slotId = pTarget->slotId;
+        found = true;
+        break;
+      }
+    }
+
+    if(!found){
+      qError("sort slot id does not found");
+    }
     taosArrayPush(pList, &bi);
   }
 

From ca7eee7451a3b92443a0e952b20035dea30a96d2 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 8 Apr 2022 14:42:30 +0800
Subject: [PATCH 26/82] add log

---
 include/common/tmsg.h | 1 +
 tests/test/c/tmqSim.c | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 61da9cb213..aeaf5832b9 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2273,6 +2273,7 @@ typedef struct {
   char    cgroup[TSDB_CGROUP_LEN];
 
   int64_t currentOffset;
+  uint64_t reqId;
   char    topic[TSDB_TOPIC_FNAME_LEN];
 } SMqPollReq;
 
diff --git a/tests/test/c/tmqSim.c b/tests/test/c/tmqSim.c
index 22d8c2b735..7372745cb8 100644
--- a/tests/test/c/tmqSim.c
+++ b/tests/test/c/tmqSim.c
@@ -274,17 +274,11 @@ int main(int32_t argc, char *argv[]) {
   
   loop_consume(tmq);
 
-  err = tmq_unsubscribe(tmq);
-  ASSERT(err == TMQ_RESP_ERR__SUCCESS);
-
-
-  #if 0
   err = tmq_unsubscribe(tmq);
   if (err) {
     printf("tmq_unsubscribe() fail, reason: %s\n", tmq_err2str(err));
     exit(-1);
   }
-  #endif
 
   return 0;
 }

From 6df2fae1a231b9d5d7960f5f34be0eb1bb9da758 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 8 Apr 2022 15:26:02 +0800
Subject: [PATCH 27/82] fix compile

---
 source/client/src/tmq.c                    |  5 +++--
 source/dnode/mnode/impl/src/mndSubscribe.c | 20 +++++++++++---------
 source/dnode/vnode/src/tq/tq.c             |  4 ++--
 source/libs/transport/src/transCli.c       |  4 ++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index a6e5fee2d1..5893a14bd5 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -1149,6 +1149,7 @@ SMqPollReq* tmqBuildConsumeReqImpl(tmq_t* tmq, int64_t blockingTime, SMqClientTo
   pReq->consumerId = tmq->consumerId;
   pReq->epoch = tmq->epoch;
   pReq->currentOffset = reqOffset;
+  pReq->reqId = generateRequestId();
 
   pReq->head.vgId = htonl(pVg->vgId);
   pReq->head.contLen = htonl(sizeof(SMqPollReq));
@@ -1279,7 +1280,7 @@ int32_t tmqPollImpl(tmq_t* tmq, int64_t blockingTime) {
           .len = sizeof(SMqPollReq),
           .handle = NULL,
       };
-      sendInfo->requestId = generateRequestId();
+      sendInfo->requestId = pReq->reqId;
       sendInfo->requestObjRefId = 0;
       sendInfo->param = pParam;
       sendInfo->fp = tmqPollCb;
@@ -1288,7 +1289,7 @@ int32_t tmqPollImpl(tmq_t* tmq, int64_t blockingTime) {
       int64_t transporterId = 0;
       /*printf("send poll\n");*/
       atomic_add_fetch_32(&tmq->waitingRequest, 1);
-      tscDebug("consumer %ld send poll: vg %d, epoch %d, req offset %ld", tmq->consumerId, pVg->vgId, tmq->epoch, pVg->currentOffset);
+      tscDebug("consumer %ld send poll to %s : vg %d, epoch %d, req offset %ld, reqId %lu", tmq->consumerId, pTopic->topicName, pVg->vgId, tmq->epoch, pVg->currentOffset, pReq->reqId);
       /*printf("send vg %d %ld\n", pVg->vgId, pVg->currentOffset);*/
       asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &pVg->epSet, &transporterId, sendInfo);
       pVg->pollCnt++;
diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index 8078338238..dbd5e43b6d 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -60,7 +60,7 @@ static int32_t mndProcessResetOffsetReq(SNodeMsg *pMsg);
 static int32_t mndPersistMqSetConnReq(SMnode *pMnode, STrans *pTrans, const SMqTopicObj *pTopic, const char *cgroup,
                                       const SMqConsumerEp *pConsumerEp);
 
-static int32_t mndPersistRebalanceMsg(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp);
+static int32_t mndPersistRebalanceMsg(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp, const char* topicName);
 static int32_t mndPersistCancelConnReq(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp, const char* oldTopicName);
 
 int32_t mndInitSubscribe(SMnode *pMnode) {
@@ -102,12 +102,13 @@ static SMqSubscribeObj *mndCreateSubscription(SMnode *pMnode, const SMqTopicObj
   return pSub;
 }
 
-static int32_t mndBuildRebalanceMsg(void **pBuf, int32_t *pLen, const SMqConsumerEp *pConsumerEp) {
+static int32_t mndBuildRebalanceMsg(void **pBuf, int32_t *pLen, const SMqConsumerEp *pConsumerEp, const char* topicName) {
   SMqMVRebReq req = {
       .vgId = pConsumerEp->vgId,
       .oldConsumerId = pConsumerEp->oldConsumerId,
       .newConsumerId = pConsumerEp->consumerId,
   };
+  req.topic = strdup(topicName);
 
   int32_t tlen = tEncodeSMqMVRebReq(NULL, &req);
   void   *buf = taosMemoryMalloc(sizeof(SMsgHead) + tlen);
@@ -122,6 +123,7 @@ static int32_t mndBuildRebalanceMsg(void **pBuf, int32_t *pLen, const SMqConsume
 
   void *abuf = POINTER_SHIFT(buf, sizeof(SMsgHead));
   tEncodeSMqMVRebReq(&abuf, &req);
+  taosMemoryFree(req.topic);
 
   *pBuf = buf;
   *pLen = tlen;
@@ -129,12 +131,12 @@ static int32_t mndBuildRebalanceMsg(void **pBuf, int32_t *pLen, const SMqConsume
   return 0;
 }
 
-static int32_t mndPersistRebalanceMsg(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp) {
+static int32_t mndPersistRebalanceMsg(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp, const char* topicName) {
   ASSERT(pConsumerEp->oldConsumerId != -1);
 
   void   *buf;
   int32_t tlen;
-  if (mndBuildRebalanceMsg(&buf, &tlen, pConsumerEp) < 0) {
+  if (mndBuildRebalanceMsg(&buf, &tlen, pConsumerEp, topicName) < 0) {
     return -1;
   }
 
@@ -502,10 +504,10 @@ static int32_t mndProcessDoRebalanceMsg(SNodeMsg *pMsg) {
             pConsumerEp->epoch = 0;
             taosArrayPush(pSubConsumer->vgInfo, pConsumerEp);
 
+            char topic[TSDB_TOPIC_FNAME_LEN];
+            char cgroup[TSDB_CGROUP_LEN];
+            mndSplitSubscribeKey(pSub->key, topic, cgroup);
             if (pConsumerEp->oldConsumerId == -1) {
-              char topic[TSDB_TOPIC_FNAME_LEN];
-              char cgroup[TSDB_CGROUP_LEN];
-              mndSplitSubscribeKey(pSub->key, topic, cgroup);
               SMqTopicObj *pTopic = mndAcquireTopic(pMnode, topic);
 
               mInfo("mq set conn: assign vgroup %d of topic %s to consumer %" PRId64 " cgroup: %s", pConsumerEp->vgId,
@@ -517,7 +519,7 @@ static int32_t mndProcessDoRebalanceMsg(SNodeMsg *pMsg) {
               mInfo("mq rebalance: assign vgroup %d, from consumer %" PRId64 " to consumer %" PRId64 "",
                     pConsumerEp->vgId, pConsumerEp->oldConsumerId, pConsumerEp->consumerId);
 
-              mndPersistRebalanceMsg(pMnode, pTrans, pConsumerEp);
+              mndPersistRebalanceMsg(pMnode, pTrans, pConsumerEp, topic);
             }
           }
         }
@@ -849,7 +851,7 @@ static int32_t mndProcessSubscribeReq(SNodeMsg *pMsg) {
                 pConsumerEp->consumerId);
           mndPersistMqSetConnReq(pMnode, pTrans, pTopic, cgroup, pConsumerEp);
         } else {
-          mndPersistRebalanceMsg(pMnode, pTrans, pConsumerEp);
+          mndPersistRebalanceMsg(pMnode, pTrans, pConsumerEp, newTopicName);
         }
         // to trigger rebalance at once, do not set status active
         /*atomic_store_32(&pConsumer->status, MQ_CONSUMER_STATUS__ACTIVE);*/
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index fbb515f29c..71a41c13d6 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -265,7 +265,7 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
     fetchOffset = pReq->currentOffset + 1;
   }
 
-  vDebug("tmq poll: consumer %ld (epoch %d) recv poll req in vg %d, req %ld %ld", consumerId, pReq->epoch, pTq->pVnode->vgId, pReq->currentOffset, fetchOffset);
+  vDebug("tmq poll: consumer %ld (epoch %d) recv poll req in vg %d, offset %ld %ld, reqId %lu", consumerId, pReq->epoch, pTq->pVnode->vgId, pReq->currentOffset, fetchOffset, pReq->reqId);
 
   SMqPollRsp rsp = {
       /*.consumerId = consumerId,*/
@@ -308,7 +308,7 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
     return 0;
   }
 
-  vDebug("poll topic %s from consumer %ld (epoch %d)", pTopic->topicName, consumerId, pReq->epoch);
+  vDebug("poll topic %s from consumer %ld (epoch %d) %s", pTopic->topicName, consumerId, pReq->epoch, pTopic->topicName);
 
   rsp.reqOffset = pReq->currentOffset;
   rsp.skipLogNum = 0;
diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index d9c288a39b..9bd86a2e22 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -943,8 +943,8 @@ void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* p
 
   SCliThrdObj* thrd = ((SCliObj*)pTransInst->tcphandle)->pThreadObj[index];
 
-  tDebug("send request at thread:%d %p, dst: %s:%d", index, pMsg, ip, port);
-  transSendAsync(thrd->asyncPool, &(cliMsg->q));
+  tDebug("send request at thread:%d %p, dst: %s:%d, app:%p", index, pMsg, ip, port, pMsg->ahandle);
+  ASSERT(transSendAsync(thrd->asyncPool, &(cliMsg->q)) == 0);
 }
 
 void transSendRecv(void* shandle, const char* ip, uint32_t port, STransMsg* pReq, STransMsg* pRsp) {

From e77ecba75353ac6b783db605aac65ebee01aeb98 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 15:31:03 +0800
Subject: [PATCH 28/82] [td-14493] fix bug in partition by.

---
 source/common/src/tdatablock.c           |  2 +-
 source/libs/executor/inc/executorimpl.h  |  4 +--
 source/libs/executor/src/executorimpl.c  | 35 ++++++++++++++++++++++--
 source/libs/executor/src/groupoperator.c | 14 ++++++----
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index f8ae82ed67..8f55488e2c 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -615,7 +615,7 @@ int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity)
     }
 
     memcpy(pCol->pData, pStart, colLength);
-    pStart += colLength;
+    pStart += pCol->info.bytes * capacity;
   }
 
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index b4302787fb..35e4ec408c 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -690,8 +690,8 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExp
                                       int32_t fillType, char* fillVal, bool multigroupResult, SExecTaskInfo* pTaskInfo);
 SOperatorInfo* createStatewindowOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExpr, int32_t numOfCols, SSDataBlock* pResBlock, SExecTaskInfo* pTaskInfo);
 
-SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResultBlock, SArray* pSortInfo, SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
-
+SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock, SArray* pGroupColList,
+                                           SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 #if 0
 SOperatorInfo* createTableSeqScanOperatorInfo(void* pTsdbReadHandle, STaskRuntimeEnv* pRuntimeEnv);
 SOperatorInfo* createAllTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorInfo* downstream,
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index c675a59e89..ce276e432e 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -7056,6 +7056,7 @@ static SArray* extractScanColumnId(SNodeList* pNodeList);
 static SArray* extractColumnInfo(SNodeList* pNodeList);
 static SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols);
 static SArray* createSortInfo(SNodeList* pNodeList);
+static SArray* extractPartitionColInfo(SNodeList* pNodeList);
 
 SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
                                         uint64_t queryId, uint64_t taskId, STableGroupInfo* pTableGroupInfo) {
@@ -7165,9 +7166,13 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     return createSessionAggOperatorInfo(op, pExprInfo, num, pResBlock, pSessionNode->gap, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_PARTITION == type) {
     SPartitionPhysiNode* pPartNode = (SPartitionPhysiNode*) pPhyNode;
-    SArray* pColList = extractColumnInfo(pPartNode->pPartitionKeys);
+    SArray* pColList = extractPartitionColInfo(pPartNode->pPartitionKeys);
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-    return createPartitionOperatorInfo(op, pResBlock, pColList, pTaskInfo, NULL);
+
+    int32_t num = 0;
+    SExprInfo* pExprInfo = createExprInfo(pPartNode->pTargets, NULL, &num);
+
+    return createPartitionOperatorInfo(op, pExprInfo, num, pResBlock, pColList, pTaskInfo, NULL);
   } else {
     ASSERT(0);
   } /*else if (pPhyNode->info.type == OP_MultiTableAggregate) {
@@ -7265,6 +7270,32 @@ SArray* extractColumnInfo(SNodeList* pNodeList) {
   return pList;
 }
 
+SArray* extractPartitionColInfo(SNodeList* pNodeList) {
+  size_t  numOfCols = LIST_LENGTH(pNodeList);
+  SArray* pList = taosArrayInit(numOfCols, sizeof(SColumn));
+  if (pList == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumnNode* pColNode = (SColumnNode*)nodesListGetNode(pNodeList, i);
+
+    // todo extract method
+    SColumn c = {0};
+    c.slotId = pColNode->slotId;
+    c.colId  = pColNode->colId;
+    c.type   = pColNode->node.resType.type;
+    c.bytes  = pColNode->node.resType.bytes;
+    c.precision = pColNode->node.resType.precision;
+    c.scale = pColNode->node.resType.scale;
+
+    taosArrayPush(pList, &c);
+  }
+
+  return pList;
+}
+
 SArray* createSortInfo(SNodeList* pNodeList) {
   size_t  numOfCols = LIST_LENGTH(pNodeList);
   SArray* pList = taosArrayInit(numOfCols, sizeof(SBlockOrderInfo));
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index e9b0497587..efba5744d7 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -360,7 +360,6 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
   int32_t numOfGroupCols = taosArrayGetSize(pInfo->pGroupCols);
   for (int32_t j = 0; j < pBlock->info.rows; ++j) {
     recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
-
     int32_t len = buildGroupKeys(pInfo->keyBuf, pInfo->pGroupColVals);
 
     SDataGroupInfo* p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
@@ -398,9 +397,12 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
 
     int32_t* rows = (int32_t*) pPage;
 
-    size_t numOfCols = pInfo->binfo.pRes->info.numOfCols;
+    size_t numOfCols = pOperator->numOfOutput;
     for(int32_t i = 0; i < numOfCols; ++i) {
-      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+      SExprInfo* pExpr = &pOperator->pExpr[i];
+      int32_t slotId = pExpr->base.pParam[0].pCol->slotId;
+
+      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, slotId);
 
       int32_t bytes = pColInfoData->info.bytes;
       int32_t startOffset = pInfo->columnOffset[i];
@@ -538,7 +540,7 @@ static void destroyPartitionOperatorInfo(void* param, int32_t numOfOutput) {
   taosMemoryFree(pInfo->columnOffset);
 }
 
-SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResultBlock, SArray* pGroupColList,
+SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock, SArray* pGroupColList,
                                            SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo) {
   SPartitionOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SPartitionOperatorInfo));
   SOperatorInfo*        pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
@@ -561,7 +563,6 @@ SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBloc
 
   pInfo->rowCapacity = blockDataGetCapacityInRow(pResultBlock, getBufPageSize(pInfo->pBuf));
   pInfo->columnOffset = setupColumnOffset(pResultBlock, pInfo->rowCapacity);
-
   code = initGroupOptrInfo(&pInfo->pGroupColVals, &pInfo->groupKeyLen, &pInfo->keyBuf, pGroupColList);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
@@ -573,7 +574,8 @@ SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SSDataBloc
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_PARTITION;
 
   pInfo->binfo.pRes       = pResultBlock;
-  pOperator->numOfOutput  = pResultBlock->info.numOfCols;
+  pOperator->numOfOutput  = numOfCols;
+  pOperator->pExpr        = pExprInfo;
   pOperator->info         = pInfo;
   pOperator->_openFn      = operatorDummyOpenFn;
   pOperator->getNextFn    = hashPartition;

From f492ae743aadb7a947bac2e0130a12713c74c8a4 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 7 Apr 2022 19:06:01 +0800
Subject: [PATCH 29/82] feat: send monitor information in multi-process mode

---
 include/common/tmsg.h                   |  12 +
 include/common/tmsgdef.h                |   9 +
 include/libs/monitor/monitor.h          | 153 +++++++----
 include/os/osSysinfo.h                  |   4 +-
 source/dnode/mgmt/dm/dmHandle.c         |   3 +
 source/dnode/mgmt/dm/dmMonitor.c        |  34 ++-
 source/dnode/mgmt/dm/dmWorker.c         |   3 +
 source/dnode/mgmt/inc/dmInt.h           |  10 +-
 source/libs/monitor/inc/monInt.h        |  49 ++--
 source/libs/monitor/src/monMsg.c        |  54 ++++
 source/libs/monitor/src/monitor.c       | 326 +++++++++++++++++-------
 source/libs/monitor/test/CMakeLists.txt |   8 +-
 source/libs/monitor/test/monTest.cpp    | 192 ++++++++------
 source/os/src/osSysinfo.c               |  52 +++-
 14 files changed, 649 insertions(+), 260 deletions(-)
 create mode 100644 source/libs/monitor/src/monMsg.c

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index fc7e994cbb..1b24b50ae2 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -679,6 +679,18 @@ typedef struct {
   char    charset[TD_LOCALE_LEN];     // tsCharset
 } SClusterCfg;
 
+typedef struct {
+  int32_t openVnodes;
+  int32_t totalVnodes;
+  int32_t masterNum;
+  int64_t numOfSelectReqs;
+  int64_t numOfInsertReqs;
+  int64_t numOfInsertSuccessReqs;
+  int64_t numOfBatchInsertReqs;
+  int64_t numOfBatchInsertSuccessReqs;
+  int64_t errors;
+} SVnodesStat;
+
 typedef struct {
   int32_t vgId;
   int8_t  role;
diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index 1d4667cda0..bdfe20bfa1 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -216,6 +216,15 @@ enum {
   TD_NEW_MSG_SEG(TDMT_SCH_MSG)
   TD_DEF_MSG_TYPE(TDMT_SCH_LINK_BROKEN, "scheduler-link-broken", NULL, NULL)
   
+  // Monitor info exchange between processes
+  TD_NEW_MSG_SEG(TDMT_MON_MSG)
+  TD_DEF_MSG_TYPE(TDMT_MON_MM_INFO, "monitor-minfo", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MON_VM_INFO, "monitor-vinfo", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MON_QM_INFO, "monitor-qinfo", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MON_SM_INFO, "monitor-sinfo", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MON_BM_INFO, "monitor-binfo", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MON_VM_LOAD, "monitor-vload", NULL, NULL)
+
 #if defined(TD_MSG_NUMBER_)
   TDMT_MAX
 #endif
diff --git a/include/libs/monitor/monitor.h b/include/libs/monitor/monitor.h
index fc7a4bb95d..342796b070 100644
--- a/include/libs/monitor/monitor.h
+++ b/include/libs/monitor/monitor.h
@@ -19,6 +19,7 @@
 #include "tarray.h"
 #include "tdef.h"
 #include "tlog.h"
+#include "tmsg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,6 +30,44 @@ extern "C" {
 #define MON_VER_LEN    12
 #define MON_LOG_LEN    1024
 
+typedef struct {
+  int64_t   ts;
+  ELogLevel level;
+  char      content[MON_LOG_LEN];
+} SMonLogItem;
+
+typedef struct {
+  SArray *logs;  // array of SMonLogItem
+  int32_t numOfErrorLogs;
+  int32_t numOfInfoLogs;
+  int32_t numOfDebugLogs;
+  int32_t numOfTraceLogs;
+} SMonLogs;
+
+typedef struct {
+  char      name[TSDB_FILENAME_LEN];
+  int8_t    level;
+  SDiskSize size;
+} SMonDiskDesc;
+
+typedef struct {
+  double  cpu_engine;
+  double  cpu_system;
+  float   cpu_cores;
+  int64_t mem_engine;     // KB
+  int64_t mem_system;     // KB
+  int64_t mem_total;      // KB
+  int64_t disk_engine;    // Byte
+  int64_t disk_used;      // Byte
+  int64_t disk_total;     // Byte
+  int64_t net_in;         // bytes
+  int64_t net_out;        // bytes
+  int64_t io_read;        // bytes
+  int64_t io_write;       // bytes
+  int64_t io_read_disk;   // bytes
+  int64_t io_write_disk;  // bytes
+} SMonSysInfo;
+
 typedef struct {
   int32_t dnode_id;
   char    dnode_ep[TSDB_EP_LEN];
@@ -36,6 +75,19 @@ typedef struct {
   int32_t protocol;
 } SMonBasicInfo;
 
+typedef struct {
+  float        uptime;  // day
+  int8_t       has_mnode;
+  SMonDiskDesc logdir;
+  SMonDiskDesc tempdir;
+} SMonDnodeInfo;
+
+typedef struct {
+  SMonBasicInfo basic;
+  SMonDnodeInfo dnode;
+  SMonSysInfo   sys;
+} SMonDmInfo;
+
 typedef struct {
   int32_t dnode_id;
   char    dnode_ep[TSDB_EP_LEN];
@@ -87,46 +139,57 @@ typedef struct {
 } SMonGrantInfo;
 
 typedef struct {
-  float   uptime;  // day
-  double  cpu_engine;
-  double  cpu_system;
-  float   cpu_cores;
-  int64_t mem_engine;   // KB
-  int64_t mem_system;   // KB
-  int64_t mem_total;    // KB
-  int64_t disk_engine;  // Byte
-  int64_t disk_used;    // Byte
-  int64_t disk_total;   // Byte
-  int64_t net_in;       // bytes
-  int64_t net_out;      // bytes
-  int64_t io_read;      // bytes
-  int64_t io_write;     // bytes
-  int64_t io_read_disk;   // bytes
-  int64_t io_write_disk;  // bytes
-  int64_t req_select;
-  int64_t req_insert;
-  int64_t req_insert_success;
-  int64_t req_insert_batch;
-  int64_t req_insert_batch_success;
-  int32_t errors;
-  int32_t vnodes_num;
-  int32_t masters;
-  int8_t  has_mnode;
-} SMonDnodeInfo;
+  SMonClusterInfo cluster;
+  SMonVgroupInfo  vgroup;
+  SMonGrantInfo   grant;
+  SMonSysInfo     sys;
+  SMonLogs        logs;
+} SMonMmInfo;
+
+int32_t tSerializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
+int32_t tDeserializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
+void    tFreeSMonMmInfo(SMonMmInfo *pInfo);
 
 typedef struct {
-  char      name[TSDB_FILENAME_LEN];
-  int8_t    level;
-  SDiskSize size;
-} SMonDiskDesc;
-
-typedef struct {
-  SArray      *datadirs;  // array of SMonDiskDesc
-  SMonDiskDesc logdir;
-  SMonDiskDesc tempdir;
+  SArray *datadirs;  // array of SMonDiskDesc
 } SMonDiskInfo;
 
-typedef struct SMonInfo SMonInfo;
+typedef struct {
+  SMonDiskInfo tfs;
+  SVnodesStat  vstat;
+  SMonSysInfo  sys;
+  SMonLogs     logs;
+} SMonVmInfo;
+
+int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
+int32_t tDeserializeSMonVMmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
+void    tFreeSMonVmInfo(SMonVmInfo *pInfo);
+
+typedef struct {
+  SMonSysInfo sys;
+  SMonLogs    logs;
+} SMonQmInfo;
+
+int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
+int32_t tDeserializeSMonQMmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
+void    tFreeSMonQmInfo(SMonQmInfo *pInfo);
+
+typedef struct {
+  SMonSysInfo sys;
+  SMonLogs    logs;
+} SMonSmInfo;
+
+int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
+int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
+void    tFreeSMonSmInfo(SMonSmInfo *pInfo);
+typedef struct {
+  SMonSysInfo sys;
+  SMonLogs    logs;
+} SMonBmInfo;
+
+int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
+int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
+void    tFreeSMonBmInfo(SMonBmInfo *pInfo);
 
 typedef struct {
   const char *server;
@@ -138,16 +201,14 @@ typedef struct {
 int32_t monInit(const SMonCfg *pCfg);
 void    monCleanup();
 void    monRecordLog(int64_t ts, ELogLevel level, const char *content);
-
-SMonInfo *monCreateMonitorInfo();
-void      monSetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo);
-void      monSetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo);
-void      monSetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo);
-void      monSetGrantInfo(SMonInfo *pMonitor, SMonGrantInfo *pInfo);
-void      monSetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo);
-void      monSetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo);
-void      monSendReport(SMonInfo *pMonitor);
-void      monCleanupMonitorInfo(SMonInfo *pMonitor);
+int32_t monGetLogs(SMonLogs *logs);
+void    monSetDmInfo(SMonDmInfo *pInfo);
+void    monSetMmInfo(SMonMmInfo *pInfo);
+void    monSetVmInfo(SMonVmInfo *pInfo);
+void    monSetQmInfo(SMonQmInfo *pInfo);
+void    monSetSmInfo(SMonSmInfo *pInfo);
+void    monSetBmInfo(SMonBmInfo *pInfo);
+void    monSendReport();
 
 #ifdef __cplusplus
 }
diff --git a/include/os/osSysinfo.h b/include/os/osSysinfo.h
index e1cc6f7829..022f11bb0e 100644
--- a/include/os/osSysinfo.h
+++ b/include/os/osSysinfo.h
@@ -44,8 +44,8 @@ int32_t taosGetTotalMemory(int64_t *totalKB);
 int32_t taosGetProcMemory(int64_t *usedKB);
 int32_t taosGetSysMemory(int64_t *usedKB);
 int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize);
-int32_t taosGetProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes);
-int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes);
+void    taosGetProcIODelta(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes);
+void    taosGetCardInfoDelta(int64_t *receive_bytes, int64_t *transmit_bytes);
 
 void    taosKillSystem();
 int32_t taosGetSystemUUID(char *uid, int32_t uidlen);
diff --git a/source/dnode/mgmt/dm/dmHandle.c b/source/dnode/mgmt/dm/dmHandle.c
index cb712bfb48..40d85b2a9a 100644
--- a/source/dnode/mgmt/dm/dmHandle.c
+++ b/source/dnode/mgmt/dm/dmHandle.c
@@ -212,4 +212,7 @@ void dmInitMsgHandle(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_MND_STATUS_RSP, dmProcessStatusMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_GRANT_RSP, dmProcessMgmtMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_AUTH_RSP, dmProcessMgmtMsg, DEFAULT_HANDLE);
+
+  // Monitor info exchange between processes
+  dndSetMsgHandle(pWrapper, TDMT_MON_DISK_INFO, dmProcessStatusMsg, DEFAULT_HANDLE);
 }
diff --git a/source/dnode/mgmt/dm/dmMonitor.c b/source/dnode/mgmt/dm/dmMonitor.c
index 22d9086971..7117bc5d12 100644
--- a/source/dnode/mgmt/dm/dmMonitor.c
+++ b/source/dnode/mgmt/dm/dmMonitor.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndInt.h"
+#include "dmInt.h"
 
 static int32_t dmGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo) {
   tstrncpy(pInfo->logdir.name, tsLogDir, sizeof(pInfo->logdir.name));
@@ -104,4 +104,36 @@ void dmSendMonitorReport(SDnode *pDnode) {
 
   monSendReport(pMonitor);
   monCleanupMonitorInfo(pMonitor);
+}
+
+int32_t dmSetDiskInfo(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
+  SDnode      *pDnode = pMgmt->pDnode;
+  SMonDiskInfo info = {0};
+
+  if (tDeserializeSMonDiskInfo(pMsg->rpcMsg.pCont, pMsg->rpcMsg.contLen, &info) != 0) {
+    dError("failed to parse diskinfo since %s", terrstr());
+    return 0;
+  }
+
+  taosWLockLatch(&pMgmt->latch);
+  memcpy(&pMgmt->diskInfo, &info, sizeof(SMonDiskInfo));
+  taosWUnLockLatch(&pMgmt->latch);
+
+  return 0;
+}
+
+int32_t dmSetVnodeStat(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
+  SDnode      *pDnode = pMgmt->pDnode;
+  SVnodesStat info = {0};
+
+  if (tDeserializeSMonDiskInfo(pMsg->rpcMsg.pCont, pMsg->rpcMsg.contLen, &info) != 0) {
+    dError("failed to parse diskinfo since %s", terrstr());
+    return 0;
+  }
+
+  taosWLockLatch(&pMgmt->latch);
+  memcpy(&pMgmt->diskInfo, &info, sizeof(SMonDiskInfo));
+  taosWUnLockLatch(&pMgmt->latch);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/source/dnode/mgmt/dm/dmWorker.c b/source/dnode/mgmt/dm/dmWorker.c
index ec7392d7e4..1d11c4d25b 100644
--- a/source/dnode/mgmt/dm/dmWorker.c
+++ b/source/dnode/mgmt/dm/dmWorker.c
@@ -78,6 +78,9 @@ static void dmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
     case TDMT_MND_GRANT_RSP:
       code = dmProcessGrantRsp(pMgmt, pMsg);
       break;
+    case TDMT_MON_DISK_INFO_RSP:
+      code = dmSetDiskInfo(pMgmt, pMsg);
+      break;
     default:
       code = dmProcessCDnodeReq(pMgmt->pDnode, pMsg);
       break;
diff --git a/source/dnode/mgmt/inc/dmInt.h b/source/dnode/mgmt/inc/dmInt.h
index 5dcd1be47c..d7358d0ca4 100644
--- a/source/dnode/mgmt/inc/dmInt.h
+++ b/source/dnode/mgmt/inc/dmInt.h
@@ -37,6 +37,11 @@ typedef struct SDnodeMgmt {
   const char   *path;
   SDnode       *pDnode;
   SMgmtWrapper *pWrapper;
+
+  // monitor infos
+  SMonDiskInfo   diskInfo;
+  SMonVnodesStat vnodesStat;
+  SMonVnodesLoad vnodesLoad;
 } SDnodeMgmt;
 
 // dmFile.c
@@ -54,7 +59,10 @@ int32_t dmProcessGrantRsp(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
 int32_t dmProcessCDnodeReq(SDnode *pDnode, SNodeMsg *pMsg);
 
 // dmMonitor.c
-void dmSendMonitorReport(SDnode *pDnode);
+int32_t dmSetDiskInfo(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
+int32_t dmSetVnodesStat(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
+int32_t dmSetVnodesLoad(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
+void    dmSendMonitorReport(SDnode *pDnode);
 
 // dmWorker.c
 int32_t dmStartThread(SDnodeMgmt *pMgmt);
diff --git a/source/libs/monitor/inc/monInt.h b/source/libs/monitor/inc/monInt.h
index 452c38f66b..4b10aacdee 100644
--- a/source/libs/monitor/inc/monInt.h
+++ b/source/libs/monitor/inc/monInt.h
@@ -18,43 +18,32 @@
 
 #include "monitor.h"
 
-#include "tarray.h"
 #include "tjson.h"
 
 typedef struct {
-  int64_t   ts;
-  ELogLevel level;
-  char      content[MON_LOG_LEN];
-} SMonLogItem;
-
-typedef struct {
-  int64_t time;
-  int64_t req_select;
-  int64_t req_insert;
-  int64_t req_insert_batch;
-  int64_t net_in;
-  int64_t net_out;
-  int64_t io_read;
-  int64_t io_write;
-  int64_t io_read_disk;
-  int64_t io_write_disk;
-} SMonState;
-
-typedef struct SMonInfo {
-  int64_t   curTime;
-  SMonState lastState;
-  SArray   *logs;  // array of SMonLogItem
-  SJson    *pJson;
+  int64_t    curTime;
+  int64_t    lastTime;
+  SJson     *pJson;
+  SMonLogs   logs;
+  SMonDmInfo dmInfo;
+  SMonMmInfo mmInfo;
+  SMonVmInfo vmInfo;
+  SMonSmInfo smInfo;
+  SMonQmInfo qmInfo;
+  SMonBmInfo bmInfo;
 } SMonInfo;
 
 typedef struct {
   TdThreadMutex lock;
-  SArray         *logs;  // array of SMonLogItem
-  int32_t         maxLogs;
-  const char     *server;
-  uint16_t        port;
-  bool            comp;
-  SMonState       state;
+  SArray       *logs;  // array of SMonLogItem
+  SMonCfg       cfg;
+  int64_t       lastTime;
+  SMonDmInfo    dmInfo;
+  SMonMmInfo    mmInfo;
+  SMonVmInfo    vmInfo;
+  SMonSmInfo    smInfo;
+  SMonQmInfo    qmInfo;
+  SMonBmInfo    bmInfo;
 } SMonitor;
 
 #ifdef __cplusplus
diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c
new file mode 100644
index 0000000000..27d35d266d
--- /dev/null
+++ b/source/libs/monitor/src/monMsg.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "monInt.h"
+#include "tcoding.h"
+#include "tencode.h"
+
+int32_t tSerializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
+int32_t tDeserializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
+void    tFreeSMonMmInfo(SMonMmInfo *pInfo) {
+  taosArrayDestroy(pInfo->logs.logs);
+  pInfo->logs.logs = NULL;
+}
+
+int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
+int32_t tDeserializeSMonVMmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
+void    tFreeSMonVmInfo(SMonVmInfo *pInfo) {
+  taosArrayDestroy(pInfo->logs.logs);
+  pInfo->logs.logs = NULL;
+}
+
+int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
+int32_t tDeserializeSMonQMmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
+void    tFreeSMonQmInfo(SMonQmInfo *pInfo) {
+  taosArrayDestroy(pInfo->logs.logs);
+  pInfo->logs.logs = NULL;
+}
+
+int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
+int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
+void    tFreeSMonSmInfo(SMonSmInfo *pInfo) {
+  taosArrayDestroy(pInfo->logs.logs);
+  pInfo->logs.logs = NULL;
+}
+
+int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
+int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
+void    tFreeSMonBmInfo(SMonBmInfo *pInfo) {
+  taosArrayDestroy(pInfo->logs.logs);
+  pInfo->logs.logs = NULL;
+}
\ No newline at end of file
diff --git a/source/libs/monitor/src/monitor.c b/source/libs/monitor/src/monitor.c
index b92c08d51c..1938b0d859 100644
--- a/source/libs/monitor/src/monitor.c
+++ b/source/libs/monitor/src/monitor.c
@@ -17,7 +17,6 @@
 #include "monInt.h"
 #include "taoserror.h"
 #include "thttp.h"
-#include "tlog.h"
 #include "ttime.h"
 
 static SMonitor tsMonitor = {0};
@@ -25,7 +24,7 @@ static SMonitor tsMonitor = {0};
 void monRecordLog(int64_t ts, ELogLevel level, const char *content) {
   taosThreadMutexLock(&tsMonitor.lock);
   int32_t size = taosArrayGetSize(tsMonitor.logs);
-  if (size < tsMonitor.maxLogs) {
+  if (size < tsMonitor.cfg.maxLogs) {
     SMonLogItem  item = {.ts = ts, .level = level};
     SMonLogItem *pItem = taosArrayPush(tsMonitor.logs, &item);
     if (pItem != NULL) {
@@ -35,6 +34,68 @@ void monRecordLog(int64_t ts, ELogLevel level, const char *content) {
   taosThreadMutexUnlock(&tsMonitor.lock);
 }
 
+int32_t monGetLogs(SMonLogs *logs) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  logs->logs = taosArrayDup(tsMonitor.logs);
+  logs->numOfInfoLogs = tsNumOfInfoLogs;
+  logs->numOfErrorLogs = tsNumOfErrorLogs;
+  logs->numOfDebugLogs = tsNumOfDebugLogs;
+  logs->numOfTraceLogs = tsNumOfTraceLogs;
+  tsNumOfInfoLogs = 0;
+  tsNumOfErrorLogs = 0;
+  tsNumOfDebugLogs = 0;
+  tsNumOfTraceLogs = 0;
+  taosArrayClear(tsMonitor.logs);
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  if (logs->logs == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+  return 0;
+}
+
+void monSetDmInfo(SMonDmInfo *pInfo) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  memcpy(&tsMonitor.dmInfo, pInfo, sizeof(SMonDmInfo));
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  memset(pInfo, 0, sizeof(SMonDmInfo));
+}
+
+void monSetMmInfo(SMonMmInfo *pInfo) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  memcpy(&tsMonitor.mmInfo, pInfo, sizeof(SMonMmInfo));
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  memset(pInfo, 0, sizeof(SMonMmInfo));
+}
+
+void monSetVmInfo(SMonVmInfo *pInfo) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  memcpy(&tsMonitor.vmInfo, pInfo, sizeof(SMonVmInfo));
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  memset(pInfo, 0, sizeof(SMonVmInfo));
+}
+
+void monSetQmInfo(SMonQmInfo *pInfo) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  memcpy(&tsMonitor.qmInfo, pInfo, sizeof(SMonQmInfo));
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  memset(pInfo, 0, sizeof(SMonQmInfo));
+}
+
+void monSetSmInfo(SMonSmInfo *pInfo) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  memcpy(&tsMonitor.smInfo, pInfo, sizeof(SMonSmInfo));
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  memset(pInfo, 0, sizeof(SMonSmInfo));
+}
+
+void monSetBmInfo(SMonBmInfo *pInfo) {
+  taosThreadMutexLock(&tsMonitor.lock);
+  memcpy(&tsMonitor.bmInfo, pInfo, sizeof(SMonBmInfo));
+  taosThreadMutexUnlock(&tsMonitor.lock);
+  memset(pInfo, 0, sizeof(SMonBmInfo));
+}
+
 int32_t monInit(const SMonCfg *pCfg) {
   tsMonitor.logs = taosArrayInit(16, sizeof(SMonLogItem));
   if (tsMonitor.logs == NULL) {
@@ -42,12 +103,9 @@ int32_t monInit(const SMonCfg *pCfg) {
     return -1;
   }
 
-  tsMonitor.maxLogs = pCfg->maxLogs;
-  tsMonitor.server = pCfg->server;
-  tsMonitor.port = pCfg->port;
-  tsMonitor.comp = pCfg->comp;
+  tsMonitor.cfg = *pCfg;
   tsLogFp = monRecordLog;
-  tsMonitor.state.time = taosGetTimestampMs();
+  tsMonitor.lastTime = taosGetTimestampMs();
   taosThreadMutexInit(&tsMonitor.lock, NULL);
   return 0;
 }
@@ -56,42 +114,65 @@ void monCleanup() {
   tsLogFp = NULL;
   taosArrayDestroy(tsMonitor.logs);
   tsMonitor.logs = NULL;
+  tFreeSMonMmInfo(&tsMonitor.mmInfo);
+  tFreeSMonVmInfo(&tsMonitor.vmInfo);
+  tFreeSMonSmInfo(&tsMonitor.smInfo);
+  tFreeSMonQmInfo(&tsMonitor.qmInfo);
+  tFreeSMonBmInfo(&tsMonitor.bmInfo);
   taosThreadMutexDestroy(&tsMonitor.lock);
 }
 
-SMonInfo *monCreateMonitorInfo() {
+static void monCleanupMonitorInfo(SMonInfo *pMonitor) {
+  tsMonitor.lastTime = pMonitor->curTime;
+  taosArrayDestroy(pMonitor->logs.logs);
+  tFreeSMonMmInfo(&pMonitor->mmInfo);
+  tFreeSMonVmInfo(&pMonitor->vmInfo);
+  tFreeSMonSmInfo(&pMonitor->smInfo);
+  tFreeSMonQmInfo(&pMonitor->qmInfo);
+  tFreeSMonBmInfo(&pMonitor->bmInfo);
+  tjsonDelete(pMonitor->pJson);
+  taosMemoryFree(pMonitor);
+}
+
+static SMonInfo *monCreateMonitorInfo() {
   SMonInfo *pMonitor = taosMemoryCalloc(1, sizeof(SMonInfo));
   if (pMonitor == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return NULL;
   }
 
+  monGetLogs(&pMonitor->logs);
+
   taosThreadMutexLock(&tsMonitor.lock);
-  pMonitor->logs = taosArrayDup(tsMonitor.logs);
-  taosArrayClear(tsMonitor.logs);
+  memcpy(&pMonitor->dmInfo, &tsMonitor.dmInfo, sizeof(SMonDmInfo));
+  memcpy(&pMonitor->mmInfo, &tsMonitor.mmInfo, sizeof(SMonMmInfo));
+  memcpy(&pMonitor->vmInfo, &tsMonitor.vmInfo, sizeof(SMonVmInfo));
+  memcpy(&pMonitor->smInfo, &tsMonitor.smInfo, sizeof(SMonSmInfo));
+  memcpy(&pMonitor->qmInfo, &tsMonitor.qmInfo, sizeof(SMonQmInfo));
+  memcpy(&pMonitor->bmInfo, &tsMonitor.bmInfo, sizeof(SMonBmInfo));
+  memset(&tsMonitor.dmInfo, 0, sizeof(SMonDmInfo));
+  memset(&tsMonitor.mmInfo, 0, sizeof(SMonMmInfo));
+  memset(&tsMonitor.vmInfo, 0, sizeof(SMonVmInfo));
+  memset(&tsMonitor.smInfo, 0, sizeof(SMonSmInfo));
+  memset(&tsMonitor.qmInfo, 0, sizeof(SMonQmInfo));
+  memset(&tsMonitor.bmInfo, 0, sizeof(SMonBmInfo));
   taosThreadMutexUnlock(&tsMonitor.lock);
 
   pMonitor->pJson = tjsonCreateObject();
-  if (pMonitor->pJson == NULL || pMonitor->logs == NULL) {
+  if (pMonitor->pJson == NULL || pMonitor->logs.logs == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     monCleanupMonitorInfo(pMonitor);
     return NULL;
   }
 
   pMonitor->curTime = taosGetTimestampMs();
-  pMonitor->lastState = tsMonitor.state;
+  pMonitor->lastTime = tsMonitor.lastTime;
   return pMonitor;
 }
 
-void monCleanupMonitorInfo(SMonInfo *pMonitor) {
-  tsMonitor.state = pMonitor->lastState;
-  tsMonitor.state.time = pMonitor->curTime;
-  taosArrayDestroy(pMonitor->logs);
-  tjsonDelete(pMonitor->pJson);
-  taosMemoryFree(pMonitor);
-}
+static void monGenBasicJson(SMonInfo *pMonitor) {
+  SMonBasicInfo *pInfo = &pMonitor->dmInfo.basic;
 
-void monSetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo) {
   SJson *pJson = pMonitor->pJson;
   char   buf[40] = {0};
   taosFormatUtcTime(buf, sizeof(buf), pMonitor->curTime, TSDB_TIME_PRECISION_MILLI);
@@ -104,7 +185,9 @@ void monSetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo) {
   tjsonAddDoubleToObject(pJson, "protocol", pInfo->protocol);
 }
 
-void monSetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo) {
+static void monGenClusterJson(SMonInfo *pMonitor) {
+  SMonClusterInfo *pInfo = &pMonitor->mmInfo.cluster;
+
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
   if (tjsonAddItemToObject(pMonitor->pJson, "cluster_info", pJson) != 0) {
@@ -154,7 +237,9 @@ void monSetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo) {
   }
 }
 
-void monSetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo) {
+static void monGenVgroupJson(SMonInfo *pMonitor) {
+  SMonVgroupInfo *pInfo = &pMonitor->mmInfo.vgroup;
+
   SJson *pJson = tjsonAddArrayToObject(pMonitor->pJson, "vgroup_infos");
   if (pJson == NULL) return;
 
@@ -190,7 +275,9 @@ void monSetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo) {
   }
 }
 
-void monSetGrantInfo(SMonInfo *pMonitor, SMonGrantInfo *pInfo) {
+static void monGenGrantJson(SMonInfo *pMonitor) {
+  SMonGrantInfo *pInfo = &pMonitor->mmInfo.grant;
+
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
   if (tjsonAddItemToObject(pMonitor->pJson, "grant_info", pJson) != 0) {
@@ -203,7 +290,11 @@ void monSetGrantInfo(SMonInfo *pMonitor, SMonGrantInfo *pInfo) {
   tjsonAddDoubleToObject(pJson, "timeseries_total", pInfo->timeseries_total);
 }
 
-void monSetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo) {
+static void monGenDnodeJson(SMonInfo *pMonitor) {
+  SMonDnodeInfo *pInfo = &pMonitor->dmInfo.dnode;
+  SMonSysInfo   *pSys = &pMonitor->dmInfo.sys;
+  SVnodesStat   *pStat = &pMonitor->vmInfo.vstat;
+
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
   if (tjsonAddItemToObject(pMonitor->pJson, "dnode_info", pJson) != 0) {
@@ -211,58 +302,83 @@ void monSetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo) {
     return;
   }
 
-  SMonState *pLast = &pMonitor->lastState;
-  double     interval = (pMonitor->curTime - pLast->time) / 1000.0;
-  double     req_select_rate = (pInfo->req_select - pLast->req_select) / interval;
-  double     req_insert_rate = (pInfo->req_insert - pLast->req_insert) / interval;
-  double     req_insert_batch_rate = (pInfo->req_insert_batch - pLast->req_insert_batch) / interval;
-  double     net_in_rate = (pInfo->net_in - pLast->net_in) / interval;
-  double     net_out_rate = (pInfo->net_out - pLast->net_out) / interval;
-  double     io_read_rate = (pInfo->io_read - pLast->io_read) / interval;
-  double     io_write_rate = (pInfo->io_write - pLast->io_write) / interval;
-  double     io_read_disk_rate = (pInfo->io_read_disk - pLast->io_read_disk) / interval;
-  double     io_write_disk_rate = (pInfo->io_write_disk - pLast->io_write_disk) / interval;
-  pLast->req_select = pInfo->req_select;
-  pLast->req_insert = pInfo->req_insert;
-  pLast->req_insert_batch = pInfo->req_insert_batch;
-  pLast->net_in = pInfo->net_in;
-  pLast->net_out = pInfo->net_out;
-  pLast->io_read = pInfo->io_read;
-  pLast->io_write = pInfo->io_write;
-  pLast->io_read_disk = pInfo->io_read_disk;
-  pLast->io_write_disk = pInfo->io_write_disk;
+  double interval = (pMonitor->curTime - pMonitor->lastTime) / 1000.0;
+  if (pMonitor->curTime - pMonitor->lastTime == 0) {
+    interval = 1;
+  }
+
+  double cpu_engine = 0;
+  double mem_engine = 0;
+  double net_in = 0;
+  double net_out = 0;
+  double io_read = 0;
+  double io_write = 0;
+  double io_read_disk = 0;
+  double io_write_disk = 0;
+
+  SMonSysInfo *sysArrays[6];
+  sysArrays[0] = &pMonitor->dmInfo.sys;
+  sysArrays[1] = &pMonitor->mmInfo.sys;
+  sysArrays[2] = &pMonitor->vmInfo.sys;
+  sysArrays[3] = &pMonitor->qmInfo.sys;
+  sysArrays[4] = &pMonitor->smInfo.sys;
+  sysArrays[5] = &pMonitor->bmInfo.sys;
+  for (int32_t i = 0; i < 6; ++i) {
+    cpu_engine += sysArrays[i]->cpu_engine;
+    mem_engine += sysArrays[i]->mem_engine;
+    net_in += sysArrays[i]->net_in;
+    net_out += sysArrays[i]->net_out;
+    io_read += sysArrays[i]->io_read;
+    io_write += sysArrays[i]->io_write;
+    io_read_disk += sysArrays[i]->io_read_disk;
+    io_write_disk += sysArrays[i]->io_write_disk;
+  }
+
+  double req_select_rate = pStat->numOfSelectReqs / interval;
+  double req_insert_rate = pStat->numOfInsertReqs / interval;
+  double req_insert_batch_rate = pStat->numOfBatchInsertReqs / interval;
+  double net_in_rate = net_in / interval;
+  double net_out_rate = net_out / interval;
+  double io_read_rate = io_read / interval;
+  double io_write_rate = io_write / interval;
+  double io_read_disk_rate = io_read_disk / interval;
+  double io_write_disk_rate = io_write_disk / interval;
 
   tjsonAddDoubleToObject(pJson, "uptime", pInfo->uptime);
-  tjsonAddDoubleToObject(pJson, "cpu_engine", pInfo->cpu_engine);
-  tjsonAddDoubleToObject(pJson, "cpu_system", pInfo->cpu_system);
-  tjsonAddDoubleToObject(pJson, "cpu_cores", pInfo->cpu_cores);
-  tjsonAddDoubleToObject(pJson, "mem_engine", pInfo->mem_engine);
-  tjsonAddDoubleToObject(pJson, "mem_system", pInfo->mem_system);
-  tjsonAddDoubleToObject(pJson, "mem_total", pInfo->mem_total);
-  tjsonAddDoubleToObject(pJson, "disk_engine", pInfo->disk_engine);
-  tjsonAddDoubleToObject(pJson, "disk_used", pInfo->disk_used);
-  tjsonAddDoubleToObject(pJson, "disk_total", pInfo->disk_total);
+  tjsonAddDoubleToObject(pJson, "cpu_engine", cpu_engine);
+  tjsonAddDoubleToObject(pJson, "cpu_system", pSys->cpu_system);
+  tjsonAddDoubleToObject(pJson, "cpu_cores", pSys->cpu_cores);
+  tjsonAddDoubleToObject(pJson, "mem_engine", mem_engine);
+  tjsonAddDoubleToObject(pJson, "mem_system", pSys->mem_system);
+  tjsonAddDoubleToObject(pJson, "mem_total", pSys->mem_total);
+  tjsonAddDoubleToObject(pJson, "disk_engine", pSys->disk_engine);
+  tjsonAddDoubleToObject(pJson, "disk_used", pSys->disk_used);
+  tjsonAddDoubleToObject(pJson, "disk_total", pSys->disk_total);
   tjsonAddDoubleToObject(pJson, "net_in", net_in_rate);
   tjsonAddDoubleToObject(pJson, "net_out", net_out_rate);
   tjsonAddDoubleToObject(pJson, "io_read", io_read_rate);
   tjsonAddDoubleToObject(pJson, "io_write", io_write_rate);
   tjsonAddDoubleToObject(pJson, "io_read_disk", io_read_disk_rate);
   tjsonAddDoubleToObject(pJson, "io_write_disk", io_write_disk_rate);
-  tjsonAddDoubleToObject(pJson, "req_select", pInfo->req_select);
+  tjsonAddDoubleToObject(pJson, "req_select", pStat->numOfSelectReqs);
   tjsonAddDoubleToObject(pJson, "req_select_rate", req_select_rate);
-  tjsonAddDoubleToObject(pJson, "req_insert", pInfo->req_insert);
-  tjsonAddDoubleToObject(pJson, "req_insert_success", pInfo->req_insert_success);
+  tjsonAddDoubleToObject(pJson, "req_insert", pStat->numOfInsertReqs);
+  tjsonAddDoubleToObject(pJson, "req_insert_success", pStat->numOfInsertSuccessReqs);
   tjsonAddDoubleToObject(pJson, "req_insert_rate", req_insert_rate);
-  tjsonAddDoubleToObject(pJson, "req_insert_batch", pInfo->req_insert_batch);
-  tjsonAddDoubleToObject(pJson, "req_insert_batch_success", pInfo->req_insert_batch_success);
+  tjsonAddDoubleToObject(pJson, "req_insert_batch", pStat->numOfBatchInsertReqs);
+  tjsonAddDoubleToObject(pJson, "req_insert_batch_success", pStat->numOfBatchInsertSuccessReqs);
   tjsonAddDoubleToObject(pJson, "req_insert_batch_rate", req_insert_batch_rate);
-  tjsonAddDoubleToObject(pJson, "errors", pInfo->errors);
-  tjsonAddDoubleToObject(pJson, "vnodes_num", pInfo->vnodes_num);
-  tjsonAddDoubleToObject(pJson, "masters", pInfo->masters);
+  tjsonAddDoubleToObject(pJson, "errors", pStat->errors);
+  tjsonAddDoubleToObject(pJson, "vnodes_num", pStat->totalVnodes);
+  tjsonAddDoubleToObject(pJson, "masters", pStat->masterNum);
   tjsonAddDoubleToObject(pJson, "has_mnode", pInfo->has_mnode);
 }
 
-void monSetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo) {
+static void monGenDiskJson(SMonInfo *pMonitor) {
+  SMonDiskInfo *pInfo = &pMonitor->vmInfo.tfs;
+  SMonDiskDesc *pLogDesc = &pMonitor->dmInfo.dnode.logdir;
+  SMonDiskDesc *pTempDesc = &pMonitor->dmInfo.dnode.tempdir;
+
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
   if (tjsonAddItemToObject(pMonitor->pJson, "disk_infos", pJson) != 0) {
@@ -290,18 +406,18 @@ void monSetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo) {
   SJson *pLogdirJson = tjsonCreateObject();
   if (pLogdirJson == NULL) return;
   if (tjsonAddItemToObject(pJson, "logdir", pLogdirJson) != 0) return;
-  tjsonAddStringToObject(pLogdirJson, "name", pInfo->logdir.name);
-  tjsonAddDoubleToObject(pLogdirJson, "avail", pInfo->logdir.size.avail);
-  tjsonAddDoubleToObject(pLogdirJson, "used", pInfo->logdir.size.used);
-  tjsonAddDoubleToObject(pLogdirJson, "total", pInfo->logdir.size.total);
+  tjsonAddStringToObject(pLogdirJson, "name", pLogDesc->name);
+  tjsonAddDoubleToObject(pLogdirJson, "avail", pLogDesc->size.avail);
+  tjsonAddDoubleToObject(pLogdirJson, "used", pLogDesc->size.used);
+  tjsonAddDoubleToObject(pLogdirJson, "total", pLogDesc->size.total);
 
   SJson *pTempdirJson = tjsonCreateObject();
   if (pTempdirJson == NULL) return;
   if (tjsonAddItemToObject(pJson, "tempdir", pTempdirJson) != 0) return;
-  tjsonAddStringToObject(pTempdirJson, "name", pInfo->tempdir.name);
-  tjsonAddDoubleToObject(pTempdirJson, "avail", pInfo->tempdir.size.avail);
-  tjsonAddDoubleToObject(pTempdirJson, "used", pInfo->tempdir.size.used);
-  tjsonAddDoubleToObject(pTempdirJson, "total", pInfo->tempdir.size.total);
+  tjsonAddStringToObject(pTempdirJson, "name", pTempDesc->name);
+  tjsonAddDoubleToObject(pTempdirJson, "avail", pTempDesc->size.avail);
+  tjsonAddDoubleToObject(pTempdirJson, "used", pTempDesc->size.used);
+  tjsonAddDoubleToObject(pTempdirJson, "total", pTempDesc->size.total);
 }
 
 static const char *monLogLevelStr(ELogLevel level) {
@@ -319,7 +435,7 @@ static const char *monLogLevelStr(ELogLevel level) {
   }
 }
 
-static void monSetLogInfo(SMonInfo *pMonitor) {
+static void monGenLogJson(SMonInfo *pMonitor) {
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
   if (tjsonAddItemToObject(pMonitor->pJson, "log_infos", pJson) != 0) {
@@ -330,20 +446,41 @@ static void monSetLogInfo(SMonInfo *pMonitor) {
   SJson *pLogsJson = tjsonAddArrayToObject(pJson, "logs");
   if (pLogsJson == NULL) return;
 
-  for (int32_t i = 0; i < taosArrayGetSize(pMonitor->logs); ++i) {
-    SJson *pLogJson = tjsonCreateObject();
-    if (pLogJson == NULL) continue;
+  SMonLogs *logs[6];
+  logs[0] = &pMonitor->logs;
+  logs[1] = &pMonitor->mmInfo.logs;
+  logs[2] = &pMonitor->vmInfo.logs;
+  logs[3] = &pMonitor->smInfo.logs;
+  logs[4] = &pMonitor->qmInfo.logs;
+  logs[5] = &pMonitor->bmInfo.logs;
 
-    SMonLogItem *pLogItem = taosArrayGet(pMonitor->logs, i);
+  int32_t numOfErrorLogs = 0;
+  int32_t numOfInfoLogs = 0;
+  int32_t numOfDebugLogs = 0;
+  int32_t numOfTraceLogs = 0;
 
-    char buf[40] = {0};
-    taosFormatUtcTime(buf, sizeof(buf), pLogItem->ts, TSDB_TIME_PRECISION_MILLI);
+  for (int32_t j = 0; j < 6; j++) {
+    SMonLogs *pLogs = logs[j];
+    numOfErrorLogs += pLogs->numOfErrorLogs;
+    numOfInfoLogs += pLogs->numOfInfoLogs;
+    numOfDebugLogs += pLogs->numOfDebugLogs;
+    numOfTraceLogs += pLogs->numOfTraceLogs;
 
-    tjsonAddStringToObject(pLogJson, "ts", buf);
-    tjsonAddStringToObject(pLogJson, "level", monLogLevelStr(pLogItem->level));
-    tjsonAddStringToObject(pLogJson, "content", pLogItem->content);
+    for (int32_t i = 0; i < taosArrayGetSize(pLogs->logs); ++i) {
+      SJson *pLogJson = tjsonCreateObject();
+      if (pLogJson == NULL) continue;
 
-    if (tjsonAddItemToArray(pLogsJson, pLogJson) != 0) tjsonDelete(pLogJson);
+      SMonLogItem *pLogItem = taosArrayGet(pLogs->logs, i);
+
+      char buf[40] = {0};
+      taosFormatUtcTime(buf, sizeof(buf), pLogItem->ts, TSDB_TIME_PRECISION_MILLI);
+
+      tjsonAddStringToObject(pLogJson, "ts", buf);
+      tjsonAddStringToObject(pLogJson, "level", monLogLevelStr(pLogItem->level));
+      tjsonAddStringToObject(pLogJson, "content", pLogItem->content);
+
+      if (tjsonAddItemToArray(pLogsJson, pLogJson) != 0) tjsonDelete(pLogJson);
+    }
   }
 
   SJson *pSummaryJson = tjsonAddArrayToObject(pJson, "summary");
@@ -352,35 +489,46 @@ static void monSetLogInfo(SMonInfo *pMonitor) {
   SJson *pLogError = tjsonCreateObject();
   if (pLogError == NULL) return;
   tjsonAddStringToObject(pLogError, "level", "error");
-  tjsonAddDoubleToObject(pLogError, "total", tsNumOfErrorLogs);
+  tjsonAddDoubleToObject(pLogError, "total", numOfErrorLogs);
   if (tjsonAddItemToArray(pSummaryJson, pLogError) != 0) tjsonDelete(pLogError);
 
   SJson *pLogInfo = tjsonCreateObject();
   if (pLogInfo == NULL) return;
   tjsonAddStringToObject(pLogInfo, "level", "info");
-  tjsonAddDoubleToObject(pLogInfo, "total", tsNumOfInfoLogs);
+  tjsonAddDoubleToObject(pLogInfo, "total", numOfInfoLogs);
   if (tjsonAddItemToArray(pSummaryJson, pLogInfo) != 0) tjsonDelete(pLogInfo);
 
   SJson *pLogDebug = tjsonCreateObject();
   if (pLogDebug == NULL) return;
   tjsonAddStringToObject(pLogDebug, "level", "debug");
-  tjsonAddDoubleToObject(pLogDebug, "total", tsNumOfDebugLogs);
+  tjsonAddDoubleToObject(pLogDebug, "total", numOfDebugLogs);
   if (tjsonAddItemToArray(pSummaryJson, pLogDebug) != 0) tjsonDelete(pLogDebug);
 
   SJson *pLogTrace = tjsonCreateObject();
   if (pLogTrace == NULL) return;
   tjsonAddStringToObject(pLogTrace, "level", "trace");
-  tjsonAddDoubleToObject(pLogTrace, "total", tsNumOfTraceLogs);
+  tjsonAddDoubleToObject(pLogTrace, "total", numOfTraceLogs);
   if (tjsonAddItemToArray(pSummaryJson, pLogTrace) != 0) tjsonDelete(pLogTrace);
 }
 
-void monSendReport(SMonInfo *pMonitor) {
-  monSetLogInfo(pMonitor);
+void monSendReport() {
+  SMonInfo *pMonitor = monCreateMonitorInfo();
+  if (pMonitor == NULL) return;
+
+  monGenBasicJson(pMonitor);
+  monGenClusterJson(pMonitor);
+  monGenVgroupJson(pMonitor);
+  monGenGrantJson(pMonitor);
+  monGenDnodeJson(pMonitor);
+  monGenDiskJson(pMonitor);
+  monGenLogJson(pMonitor);
 
   char *pCont = tjsonToString(pMonitor->pJson);
   if (pCont != NULL) {
-    EHttpCompFlag flag = tsMonitor.comp ? HTTP_GZIP : HTTP_FLAT;
-    taosSendHttpReport(tsMonitor.server, tsMonitor.port, pCont, strlen(pCont), flag);
+    EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT;
+    taosSendHttpReport(tsMonitor.cfg.server, tsMonitor.cfg.port, pCont, strlen(pCont), flag);
     taosMemoryFree(pCont);
   }
+
+  monCleanupMonitorInfo(pMonitor);
 }
diff --git a/source/libs/monitor/test/CMakeLists.txt b/source/libs/monitor/test/CMakeLists.txt
index e3ab7e7337..cd1b94574d 100644
--- a/source/libs/monitor/test/CMakeLists.txt
+++ b/source/libs/monitor/test/CMakeLists.txt
@@ -1,14 +1,14 @@
 enable_testing()
 
 aux_source_directory(. MONITOR_TEST_SRC)
-add_executable(monitor_test ${MONITOR_TEST_SRC})
+add_executable(monitorTest ${MONITOR_TEST_SRC})
 target_link_libraries(
-  monitor_test
+  monitorTest
   PUBLIC monitor
   PUBLIC gtest_main
 )
 
 add_test(
-    NAME monitor_test
-    COMMAND monitor_test
+    NAME monitorTest
+    COMMAND monitorTest
 )
diff --git a/source/libs/monitor/test/monTest.cpp b/source/libs/monitor/test/monTest.cpp
index 05c9fb8b38..af12297215 100644
--- a/source/libs/monitor/test/monTest.cpp
+++ b/source/libs/monitor/test/monTest.cpp
@@ -22,7 +22,7 @@ class MonitorTest : public ::testing::Test {
     cfg.maxLogs = 2;
     cfg.port = 80;
     cfg.server = "localhost";
-    cfg.comp = 0;
+    cfg.comp = 1;
     monInit(&cfg);
   }
 
@@ -32,24 +32,64 @@ class MonitorTest : public ::testing::Test {
   void SetUp() override {}
   void TearDown() override {}
 
-  void GetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo);
-  void GetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo);
-  void GetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo);
-  void GetGrantInfo(SMonInfo *pMonitor, SMonGrantInfo *pInfo);
-  void GetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo);
-  void GetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo);
+  void GetBasicInfo(SMonBasicInfo *pInfo);
+  void GetDnodeInfo(SMonDnodeInfo *pInfo);
+  void GetSysInfo(SMonSysInfo *pInfo);
+
+  void GetClusterInfo(SMonClusterInfo *pInfo);
+  void GetVgroupInfo(SMonVgroupInfo *pInfo);
+  void GetGrantInfo(SMonGrantInfo *pInfo);
+
+  void GetVnodeStat(SVnodesStat *pStat);
+  void GetDiskInfo(SMonDiskInfo *pInfo);
+
+  void GetLogInfo(SMonLogs *logs);
+
   void AddLogInfo1();
   void AddLogInfo2();
 };
 
-void MonitorTest::GetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo) {
+void MonitorTest::GetBasicInfo(SMonBasicInfo *pInfo) {
   pInfo->dnode_id = 1;
   strcpy(pInfo->dnode_ep, "localhost");
   pInfo->cluster_id = 6980428120398645172;
   pInfo->protocol = 1;
 }
 
-void MonitorTest::GetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo) {
+void MonitorTest::GetDnodeInfo(SMonDnodeInfo *pInfo) {
+  pInfo->uptime = 1.2;
+  pInfo->has_mnode = 1;
+
+  strcpy(pInfo->logdir.name, "/log/dir/d");
+  pInfo->logdir.size.avail = 41;
+  pInfo->logdir.size.total = 42;
+  pInfo->logdir.size.used = 43;
+
+  strcpy(pInfo->tempdir.name, "/data/dir/d");
+  pInfo->tempdir.size.avail = 51;
+  pInfo->tempdir.size.total = 52;
+  pInfo->tempdir.size.used = 53;
+}
+
+void MonitorTest::GetSysInfo(SMonSysInfo *pInfo) {
+  pInfo->cpu_engine = 2.1;
+  pInfo->cpu_system = 2.1;
+  pInfo->cpu_cores = 2;
+  pInfo->mem_engine = 3.1;
+  pInfo->mem_system = 3.2;
+  pInfo->mem_total = 3.3;
+  pInfo->disk_engine = 4.1;
+  pInfo->disk_used = 4.2;
+  pInfo->disk_total = 4.3;
+  pInfo->net_in = 5.1;
+  pInfo->net_out = 5.2;
+  pInfo->io_read = 6.1;
+  pInfo->io_write = 6.2;
+  pInfo->io_read_disk = 7.1;
+  pInfo->io_write_disk = 7.2;
+}
+
+void MonitorTest::GetClusterInfo(SMonClusterInfo *pInfo) {
   strcpy(pInfo->first_ep, "localhost:6030");
   pInfo->first_ep_dnode_id = 1;
   strcpy(pInfo->version, "3.0.0.0");
@@ -86,7 +126,7 @@ void MonitorTest::GetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo) {
   taosArrayPush(pInfo->mnodes, &m2);
 }
 
-void MonitorTest::GetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo) {
+void MonitorTest::GetVgroupInfo(SMonVgroupInfo *pInfo) {
   pInfo->vgroups = taosArrayInit(4, sizeof(SMonVgroupDesc));
 
   SMonVgroupDesc vg1 = {0};
@@ -121,41 +161,24 @@ void MonitorTest::GetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo) {
   taosArrayPush(pInfo->vgroups, &vg3);
 }
 
-void MonitorTest::GetGrantInfo(SMonInfo *pMonitor, SMonGrantInfo *pInfo) {
+void MonitorTest::GetGrantInfo(SMonGrantInfo *pInfo) {
   pInfo->expire_time = 1234567;
   pInfo->timeseries_total = 234567;
   pInfo->timeseries_used = 34567;
 }
 
-void MonitorTest::GetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo) {
-  pInfo->uptime = 1.2;
-  pInfo->cpu_engine = 2.1;
-  pInfo->cpu_system = 2.1;
-  pInfo->cpu_cores = 2;
-  pInfo->mem_engine = 3.1;
-  pInfo->mem_system = 3.2;
-  pInfo->mem_total = 3.3;
-  pInfo->disk_engine = 4.1;
-  pInfo->disk_used = 4.2;
-  pInfo->disk_total = 4.3;
-  pInfo->net_in = 5.1;
-  pInfo->net_out = 5.2;
-  pInfo->io_read = 6.1;
-  pInfo->io_write = 6.2;
-  pInfo->io_read_disk = 7.1;
-  pInfo->io_write_disk = 7.2;
-  pInfo->req_select = 8;
-  pInfo->req_insert = 9;
-  pInfo->req_insert_success = 10;
-  pInfo->req_insert_batch = 11;
-  pInfo->req_insert_batch_success = 12;
+void MonitorTest::GetVnodeStat(SVnodesStat *pInfo) {
+  pInfo->numOfSelectReqs = 8;
+  pInfo->numOfInsertReqs = 9;
+  pInfo->numOfInsertSuccessReqs = 10;
+  pInfo->numOfBatchInsertReqs = 11;
+  pInfo->numOfBatchInsertSuccessReqs = 12;
   pInfo->errors = 4;
-  pInfo->vnodes_num = 5;
-  pInfo->masters = 6;
-  pInfo->has_mnode = 1;
+  pInfo->totalVnodes = 5;
+  pInfo->masterNum = 6;
 }
 
-void MonitorTest::GetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo) {
+void MonitorTest::GetDiskInfo(SMonDiskInfo *pInfo) {
   pInfo->datadirs = taosArrayInit(2, sizeof(SMonDiskDesc));
   SMonDiskDesc d1 = {0};
   strcpy(d1.name, "/t1/d1/d");
@@ -180,16 +203,25 @@ void MonitorTest::GetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo) {
   d3.size.total = 32;
   d3.size.used = 33;
   taosArrayPush(pInfo->datadirs, &d3);
+}
 
-  strcpy(pInfo->logdir.name, "/log/dir/d");
-  pInfo->logdir.size.avail = 41;
-  pInfo->logdir.size.total = 42;
-  pInfo->logdir.size.used = 43;
+void MonitorTest::GetLogInfo(SMonLogs *logs) {
+  logs->logs = taosArrayInit(4, sizeof(SMonLogItem));
 
-  strcpy(pInfo->tempdir.name, "/data/dir/d");
-  pInfo->tempdir.size.avail = 51;
-  pInfo->tempdir.size.total = 52;
-  pInfo->tempdir.size.used = 53;
+  SMonLogItem item1 = {.level = DEBUG_INFO};
+  item1.ts = taosGetTimestampMs();
+  strcpy(item1.content, "log test1");
+  taosArrayPush(logs->logs, &item1);
+
+  SMonLogItem item2 = {.level = DEBUG_ERROR};
+  item2.ts = taosGetTimestampMs();
+  strcpy(item2.content, "log test2");
+  taosArrayPush(logs->logs, &item2);
+
+  logs->numOfErrorLogs = 1;
+  logs->numOfInfoLogs = 2;
+  logs->numOfDebugLogs = 3;
+  logs->numOfTraceLogs = 4;
 }
 
 void MonitorTest::AddLogInfo1() {
@@ -206,46 +238,52 @@ void MonitorTest::AddLogInfo2() {
 TEST_F(MonitorTest, 01_Full) {
   AddLogInfo1();
 
-  SMonInfo *pMonitor = monCreateMonitorInfo();
-  if (pMonitor == NULL) return;
+  SMonDmInfo dmInfo = {0};
+  GetBasicInfo(&dmInfo.basic);
+  GetDnodeInfo(&dmInfo.dnode);
+  GetSysInfo(&dmInfo.sys);
 
-  SMonBasicInfo basicInfo = {0};
-  GetBasicInfo(pMonitor, &basicInfo);
-  monSetBasicInfo(pMonitor, &basicInfo);
+  SMonMmInfo mmInfo = {0};
+  GetClusterInfo(&mmInfo.cluster);
+  GetVgroupInfo(&mmInfo.vgroup);
+  GetGrantInfo(&mmInfo.grant);
+  GetSysInfo(&mmInfo.sys);
+  GetLogInfo(&mmInfo.logs);
 
-  SMonClusterInfo clusterInfo = {0};
-  SMonVgroupInfo  vgroupInfo = {0};
-  SMonGrantInfo   grantInfo = {0};
-  GetClusterInfo(pMonitor, &clusterInfo);
-  GetVgroupInfo(pMonitor, &vgroupInfo);
-  GetGrantInfo(pMonitor, &grantInfo);
-  monSetClusterInfo(pMonitor, &clusterInfo);
-  monSetVgroupInfo(pMonitor, &vgroupInfo);
-  monSetGrantInfo(pMonitor, &grantInfo);
+  SMonVmInfo vmInfo = {0};
+  GetDiskInfo(&vmInfo.tfs);
+  GetVnodeStat(&vmInfo.vstat);
+  GetSysInfo(&vmInfo.sys);
+  GetLogInfo(&vmInfo.logs);
 
-  SMonDnodeInfo dnodeInfo = {0};
-  GetDnodeInfo(pMonitor, &dnodeInfo);
-  monSetDnodeInfo(pMonitor, &dnodeInfo);
+  SMonQmInfo qmInfo = {0};
+  GetSysInfo(&qmInfo.sys);
+  GetLogInfo(&qmInfo.logs);
 
-  SMonDiskInfo diskInfo = {0};
-  GetDiskInfo(pMonitor, &diskInfo);
-  monSetDiskInfo(pMonitor, &diskInfo);
+  SMonSmInfo smInfo = {0};
+  GetSysInfo(&smInfo.sys);
+  GetLogInfo(&smInfo.logs);
 
-  monSendReport(pMonitor);
-  monCleanupMonitorInfo(pMonitor);
+  SMonBmInfo bmInfo = {0};
+  GetSysInfo(&bmInfo.sys);
+  GetLogInfo(&bmInfo.logs);
 
-  taosArrayDestroy(clusterInfo.dnodes);
-  taosArrayDestroy(clusterInfo.mnodes);
-  taosArrayDestroy(vgroupInfo.vgroups);
-  taosArrayDestroy(diskInfo.datadirs);
+  monSetDmInfo(&dmInfo);
+  monSetMmInfo(&mmInfo);
+  monSetVmInfo(&vmInfo);
+  monSetQmInfo(&qmInfo);
+  monSetSmInfo(&smInfo);
+  monSetBmInfo(&bmInfo);
+
+  tFreeSMonMmInfo(&mmInfo);
+  tFreeSMonVmInfo(&vmInfo);
+  tFreeSMonSmInfo(&smInfo);
+  tFreeSMonQmInfo(&qmInfo);
+  tFreeSMonBmInfo(&bmInfo);
+  monSendReport();
 }
 
 TEST_F(MonitorTest, 02_Log) {
   AddLogInfo2();
-
-  SMonInfo *pMonitor = monCreateMonitorInfo();
-  if (pMonitor == NULL) return;
-
-  monSendReport(pMonitor);
-  monCleanupMonitorInfo(pMonitor);
+  monSendReport();
 }
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index eb5712d2e5..5e71505658 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -129,14 +129,12 @@ static void taosGetProcIOnfos() {
 static int32_t taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
   TdFilePtr pFile = taosOpenFile(tsSysCpuFile, TD_FILE_READ | TD_FILE_STREAM);
   if (pFile == NULL) {
-    // printf("open file:%s failed", tsSysCpuFile);
     return -1;
   }
 
   char   *line = NULL;
   ssize_t _bytes = taosGetLineFile(pFile, &line);
   if ((_bytes < 0) || (line == NULL)) {
-    // printf("read file:%s failed", tsSysCpuFile);
     taosCloseFile(&pFile);
     return -1;
   }
@@ -153,14 +151,12 @@ static int32_t taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
 static int32_t taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
   TdFilePtr pFile = taosOpenFile(tsProcCpuFile, TD_FILE_READ | TD_FILE_STREAM);
   if (pFile == NULL) {
-    // printf("open file:%s failed", tsProcCpuFile);
     return -1;
   }
 
   char   *line = NULL;
   ssize_t _bytes = taosGetLineFile(pFile, &line);
   if ((_bytes < 0) || (line == NULL)) {
-    // printf("read file:%s failed", tsProcCpuFile);
     taosCloseFile(&pFile);
     return -1;
   }
@@ -182,12 +178,12 @@ static int32_t taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
 #endif
 
 bool taosCheckSystemIsSmallEnd() {
-    union check{
-        int16_t i;
-        char ch[2];
-    }c;
-    c.i=1;
-    return c.ch[0]==1;
+  union check {
+    int16_t i;
+    char    ch[2];
+  } c;
+  c.i = 1;
+  return c.ch[0] == 1;
 }
 
 void taosGetSystemInfo() {
@@ -617,6 +613,28 @@ int32_t taosGetProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int
 #endif
 }
 
+void taosGetProcIODelta(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
+  static int64_t last_rchars = 0;
+  static int64_t last_wchars = 0;
+  static int64_t last_read_bytes = 0;
+  static int64_t last_write_bytes = 0;
+
+  static int64_t cur_rchars = 0;
+  static int64_t cur_wchars = 0;
+  static int64_t cur_read_bytes = 0;
+  static int64_t cur_write_bytes = 0;
+  if (taosGetProcIO(&cur_rchars, &cur_wchars, &cur_read_bytes, &cur_write_bytes) != 0) {
+    *rchars = cur_rchars - last_rchars;
+    *wchars = cur_wchars - last_wchars;
+    *read_bytes = cur_read_bytes - last_read_bytes;
+    *write_bytes = cur_write_bytes - last_write_bytes;
+    last_rchars = cur_rchars;
+    last_wchars = cur_wchars;
+    last_read_bytes = cur_read_bytes;
+    last_write_bytes = cur_write_bytes;
+  }
+}
+
 int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   *receive_bytes = 0;
@@ -672,6 +690,20 @@ int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
 #endif
 }
 
+void taosGetCardInfoDelta(int64_t *receive_bytes, int64_t *transmit_bytes) {
+  static int64_t last_receive_bytes = 0;
+  static int64_t last_transmit_bytes = 0;
+
+  static int64_t cur_receive_bytes = 0;
+  static int64_t cur_transmit_bytes = 0;
+  if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) != 0) {
+    *receive_bytes = cur_receive_bytes - last_receive_bytes;
+    *transmit_bytes = cur_transmit_bytes - last_transmit_bytes;
+    last_receive_bytes = cur_receive_bytes;
+    last_transmit_bytes = cur_transmit_bytes;
+  }
+}
+
 void taosKillSystem() {
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   printf("function taosKillSystem, exit!");

From e84abcfb7986e11a69eb9d0bd684e007e2bfc05b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 8 Apr 2022 16:06:35 +0800
Subject: [PATCH 30/82] feat: send monitor information in multi-process mode

---
 source/libs/monitor/src/{monitor.c => monMain.c} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename source/libs/monitor/src/{monitor.c => monMain.c} (100%)

diff --git a/source/libs/monitor/src/monitor.c b/source/libs/monitor/src/monMain.c
similarity index 100%
rename from source/libs/monitor/src/monitor.c
rename to source/libs/monitor/src/monMain.c

From 471522d9b9a7c61430edb859d3be3655189004ab Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 8 Apr 2022 16:43:01 +0800
Subject: [PATCH 31/82] add log

---
 source/dnode/vnode/src/tq/tq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 71a41c13d6..9a4e655b4c 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -345,9 +345,10 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
           ASSERT(false);
         }
         if (pDataBlock == NULL) {
-          /*pos = fetchOffset % TQ_BUFFER_SIZE;*/
+          vDebug("tmq poll: consumer %ld (epoch %d) iter log, vg %d, exec task over, no more data, time passed: %lu", consumerId, pReq->epoch, pTq->pVnode->vgId, ts);
           break;
         }
+        vDebug("tmq poll: consumer %ld (epoch %d) iter log, vg %d, exec task over", consumerId, pReq->epoch, pTq->pVnode->vgId);
 
         taosArrayPush(pRes, pDataBlock);
       }

From 460d43f22c4c16321cf371e6a4d79ee3accd3092 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 8 Apr 2022 16:53:09 +0800
Subject: [PATCH 32/82] <fix>: fix index map error from table scan to sort
 output

---
 source/common/src/tdatablock.c          | 12 +++++++-----
 source/libs/executor/inc/tsort.h        |  5 -----
 source/libs/executor/src/executorimpl.c |  3 +--
 source/libs/executor/src/tsort.c        |  8 +++++++-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index abcb4283d2..111dfc7377 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -315,6 +315,7 @@ int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock) {
   return 0;
 }
 
+// if pIndexMap = NULL, merger one column by on column
 int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc, SArray* pIndexMap) {
   assert(pSrc != NULL && pDest != NULL);
 
@@ -380,17 +381,18 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
   size_t payloadSize = pageSize - (headerSize + colHeaderSize);
 
   // TODO speedup by checking if the whole page can fit in firstly.
-  /*if (!hasVarCol) {
+  if (!hasVarCol) {
     size_t  rowSize = blockDataGetRowSize(pBlock);
-    int32_t capacity = (payloadSize / (rowSize * 8 + bitmapChar * numOfCols)) * 8; //if pageSize = 128, rowSize = 2, it will core in doAddToBuf:assert(size <= getBufPageSize(pHandle->pBuf));
+    int32_t capacity = payloadSize / (rowSize + numOfCols * bitmapChar / 8.0);
+    ASSERT(capacity > 0);
 
-    *stopIndex = startIndex + capacity;
+    *stopIndex = startIndex + capacity - 1;
     if (*stopIndex >= numOfRows) {
       *stopIndex = numOfRows - 1;
     }
 
     return TSDB_CODE_SUCCESS;
-  }*/
+  }
   // iterate the rows that can be fit in this buffer page
   int32_t size = (headerSize + colHeaderSize);
 
@@ -532,7 +534,7 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
 
     size_t metaSize = pBlock->info.rows * sizeof(int32_t);
     if (IS_VAR_DATA_TYPE(pCol->info.type)) {
-      char* tmp = taosMemoryRealloc(pCol->varmeta.offset, metaSize);
+      char* tmp = taosMemoryRealloc(pCol->varmeta.offset, metaSize);    // preview calloc is too small
       if (tmp == NULL) {
         return TSDB_CODE_OUT_OF_MEMORY;
       }
diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h
index f012cc2448..c584df05dd 100644
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
@@ -52,11 +52,6 @@ typedef struct SMsortComparParam {
   SArray       *orderInfo;   // SArray<SBlockOrderInfo>
 } SMsortComparParam;
 
-struct STupleHandle {
-  SSDataBlock* pBlock;
-  int32_t      rowIndex;
-};
-
 typedef struct SSortHandle SSortHandle;
 typedef struct STupleHandle STupleHandle;
 
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 0cc73bb2cd..a8857dbc1d 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4734,8 +4734,7 @@ static void appendOneRowToDataBlock(SSDataBlock* pBlock, STupleHandle* pTupleHan
   for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
     SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, i);
 
-    SColumnInfoData* pColInfoSrc = taosArrayGet(pTupleHandle->pBlock->pDataBlock, i);
-    bool isNull = colDataIsNull(pColInfoSrc, 0, pTupleHandle->rowIndex, NULL);
+    bool isNull = tsortIsNullVal(pTupleHandle, i);
     if (isNull) {
       colDataAppend(pColInfo, pBlock->info.rows, NULL, true);
     } else {
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 965cf14400..3155b69a86 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -24,6 +24,11 @@
 #include "tutil.h"
 #include "tcompare.h"
 
+struct STupleHandle {
+  SSDataBlock* pBlock;
+  int32_t      rowIndex;
+};
+
 struct SSortHandle {
   int32_t           type;
 
@@ -678,7 +683,8 @@ STupleHandle* tsortNextTuple(SSortHandle* pHandle) {
 }
 
 bool tsortIsNullVal(STupleHandle* pVHandle, int32_t colIndex) {
-  return false;
+  SColumnInfoData* pColInfoSrc = taosArrayGet(pVHandle->pBlock->pDataBlock, colIndex);
+  return colDataIsNull(pColInfoSrc, 0, pVHandle->rowIndex, NULL);
 }
 
 void* tsortGetValue(STupleHandle* pVHandle, int32_t colIndex) {

From cf9e0be1c96acf8fe3e8216911b1a23fd97a4682 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 17:37:57 +0800
Subject: [PATCH 33/82] [td-14493] support slimit/soffset

---
 include/common/tcommon.h                 |  2 +-
 source/libs/executor/inc/executorimpl.h  |  8 ++-
 source/libs/executor/src/executorimpl.c  | 43 ++++++++++--
 source/libs/executor/src/groupoperator.c | 88 +++++++++++++++---------
 4 files changed, 103 insertions(+), 38 deletions(-)

diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index f2fec58d8f..bf6a804e7f 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -71,7 +71,7 @@ typedef struct SDataBlockInfo {
     int64_t uid;
     int64_t blockId;
   };
-  int64_t groupId;  // no need to serialize
+  uint64_t    groupId;  // no need to serialize
 } SDataBlockInfo;
 
 typedef struct SSDataBlock {
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 35e4ec408c..35a4b93a88 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -511,6 +511,12 @@ typedef struct SProjectOperatorInfo {
   SSDataBlock   *existDataBlock;
   SArray        *pPseudoColInfo;
   SLimit         limit;
+  SLimit         slimit;
+
+  uint64_t       groupId;
+  int64_t        curSOffset;
+  int64_t        curGroupOutput;
+
   int64_t        curOffset;
   int64_t        curOutput;
 } SProjectOperatorInfo;
@@ -673,7 +679,7 @@ SOperatorInfo* createTableScanOperatorInfo(void* pTsdbReadHandle, int32_t order,
 SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock,
                                            SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 SOperatorInfo* createMultiTableAggOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
-SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t num, SSDataBlock* pResBlock, SLimit* pLimit, SExecTaskInfo* pTaskInfo);
+SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t num, SSDataBlock* pResBlock, SLimit* pLimit, SLimit* pSlimit, SExecTaskInfo* pTaskInfo);
 SOperatorInfo *createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo, SExecTaskInfo* pTaskInfo);
 SOperatorInfo* createSortedMergeOperatorInfo(SOperatorInfo** downstream, int32_t numOfDownstream, SExprInfo* pExprInfo, int32_t num, SArray* pSortInfo, SArray* pGroupInfo, SExecTaskInfo* pTaskInfo);
 SOperatorInfo* createSysTableScanOperatorInfo(void* pSysTableReadHandle, SSDataBlock* pResBlock, const SName* pName,
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index ce276e432e..b6f4f5a405 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1263,6 +1263,7 @@ static void setPseudoOutputColInfo(SSDataBlock* pResult, SqlFunctionCtx* pCtx, S
 static void projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSDataBlock* pSrcBlock, SqlFunctionCtx* pCtx,
                                   int32_t numOfOutput, SArray* pPseudoList) {
   setPseudoOutputColInfo(pResult, pCtx, pPseudoList);
+  pResult->info.groupId = pSrcBlock->info.groupId;
 
   for (int32_t k = 0; k < numOfOutput; ++k) {
     if (pExpr[k].pExpr->nodeType == QUERY_NODE_COLUMN) {  // it is a project query
@@ -5426,7 +5427,6 @@ static SSDataBlock* doProjectOperation(SOperatorInfo* pOperator, bool* newgroup)
     publishOperatorProfEvent(downstream, QUERY_PROF_AFTER_OPERATOR_EXEC);
 
     if (pBlock == NULL) {
-      assert(*newgroup == false);
       *newgroup = prevVal;
       setTaskStatus(pOperator->pTaskInfo, TASK_COMPLETED);
       break;
@@ -5454,6 +5454,38 @@ static SSDataBlock* doProjectOperation(SOperatorInfo* pOperator, bool* newgroup)
 
     projectApplyFunctions(pOperator->pExpr, pInfo->pRes, pBlock, pInfo->pCtx, pOperator->numOfOutput, pProjectInfo->pPseudoColInfo);
 
+    if (pProjectInfo->curSOffset > 0) {
+      if (pProjectInfo->groupId == 0) {  // it is the first group
+        pProjectInfo->groupId = pBlock->info.groupId;
+        blockDataCleanup(pInfo->pRes);
+        continue;
+      } else if (pProjectInfo->groupId != pBlock->info.groupId) {
+        pProjectInfo->curSOffset -= 1;
+
+        // ignore data block in current group
+        if (pProjectInfo->curSOffset > 0) {
+          blockDataCleanup(pInfo->pRes);
+          continue;
+        }
+      }
+
+      pProjectInfo->groupId = pBlock->info.groupId;
+    }
+
+    if (pProjectInfo->groupId != 0 && pProjectInfo->groupId != pBlock->info.groupId) {
+      pProjectInfo->curGroupOutput += 1;
+      if ((pProjectInfo->slimit.limit > 0) && (pProjectInfo->slimit.limit <= pProjectInfo->curGroupOutput)) {
+        pOperator->status = OP_EXEC_DONE;
+        return NULL;
+      }
+
+      // reset the value for a new group data
+      pProjectInfo->curOffset = 0;
+      pProjectInfo->curOutput = 0;
+    }
+
+    pProjectInfo->groupId = pBlock->info.groupId;
+
     // todo extract method
     if (pProjectInfo->curOffset < pInfo->pRes->info.rows && pProjectInfo->curOffset > 0) {
       blockDataTrimFirstNRows(pInfo->pRes, pProjectInfo->curOffset);
@@ -6321,7 +6353,7 @@ static SArray* setRowTsColumnOutputInfo(SqlFunctionCtx* pCtx, int32_t numOfCols)
 }
 
 SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t num,
-                                         SSDataBlock* pResBlock, SLimit* pLimit, SExecTaskInfo* pTaskInfo) {
+                                         SSDataBlock* pResBlock, SLimit* pLimit, SLimit* pSlimit, SExecTaskInfo* pTaskInfo) {
   SProjectOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SProjectOperatorInfo));
   SOperatorInfo*        pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
   if (pInfo == NULL || pOperator == NULL) {
@@ -6329,7 +6361,10 @@ SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* p
   }
 
   pInfo->limit      = *pLimit;
+  pInfo->slimit     = *pSlimit;
   pInfo->curOffset  = pLimit->offset;
+  pInfo->curSOffset = pSlimit->offset;
+
   pInfo->binfo.pRes = pResBlock;
 
   int32_t numOfCols = num;
@@ -7117,8 +7152,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
 
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
     SLimit limit = {.limit = pProjPhyNode->limit, .offset = pProjPhyNode->offset};
-
-    return createProjectOperatorInfo(op, pExprInfo, num, pResBlock, &limit, pTaskInfo);
+    SLimit slimit = {.limit = pProjPhyNode->slimit, .offset = pProjPhyNode->soffset};
+    return createProjectOperatorInfo(op, pExprInfo, num, pResBlock, &limit, &slimit, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_AGG == type) {
     int32_t num = 0;
 
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index efba5744d7..86c2ad4f21 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -26,6 +26,8 @@
 #include "ttypes.h"
 
 static int32_t* setupColumnOffset(const SSDataBlock* pBlock, int32_t rowCapacity);
+static void* getCurrentDataGroupInfo(const SPartitionOperatorInfo* pInfo, SDataGroupInfo** pGroupInfo, int32_t len);
+static uint64_t calcGroupId(char* pData, int32_t len);
 
 static void destroyGroupOperatorInfo(void* param, int32_t numOfOutput) {
   SGroupbyOperatorInfo* pInfo = (SGroupbyOperatorInfo*)param;
@@ -353,7 +355,7 @@ SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pEx
 }
 
 static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
-  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+//  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
   SPartitionOperatorInfo* pInfo = pOperator->info;
 
@@ -362,39 +364,14 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
     recordNewGroupKeys(pInfo->pGroupCols, pInfo->pGroupColVals, pBlock, j, numOfGroupCols);
     int32_t len = buildGroupKeys(pInfo->keyBuf, pInfo->pGroupColVals);
 
-    SDataGroupInfo* p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
+    SDataGroupInfo* pGInfo = NULL;
+    void *pPage = getCurrentDataGroupInfo(pInfo, &pGInfo, len);
 
-    void* pPage = NULL;
-    if (p == NULL) { // it is a new group
-      SDataGroupInfo gi = {0};
-      gi.pPageList = taosArrayInit(100, sizeof(int32_t));
-      taosHashPut(pInfo->pGroupSet, pInfo->keyBuf, len, &gi, sizeof(SDataGroupInfo));
-
-      p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
-
-      int32_t pageId = 0;
-      pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
-      taosArrayPush(p->pPageList, &pageId);
-
-      *(int32_t *) pPage = 0;
-    } else {
-      int32_t* curId = taosArrayGetLast(p->pPageList);
-      pPage = getBufPage(pInfo->pBuf, *curId);
-
-      int32_t *rows = (int32_t*) pPage;
-      if (*rows >= pInfo->rowCapacity) {
-        // add a new page for current group
-        int32_t pageId = 0;
-        pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
-        taosArrayPush(p->pPageList, &pageId);
-
-        *(int32_t*) pPage = 0;
-      }
+    pGInfo->numOfRows += 1;
+    if (pGInfo->groupId == 0) {
+      pGInfo->groupId = calcGroupId(pInfo->keyBuf, len);
     }
 
-    // add one for this group
-    p->numOfRows += 1;
-
     int32_t* rows = (int32_t*) pPage;
 
     size_t numOfCols = pOperator->numOfOutput;
@@ -446,8 +423,53 @@ static void doHashPartition(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
     setBufPageDirty(pPage, true);
     releaseBufPage(pInfo->pBuf, pPage);
   }
+}
 
-  // todo set the consistent group id according to the group keys
+void* getCurrentDataGroupInfo(const SPartitionOperatorInfo* pInfo, SDataGroupInfo** pGroupInfo, int32_t len) {
+  SDataGroupInfo* p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
+
+  void* pPage = NULL;
+  if (p == NULL) { // it is a new group
+    SDataGroupInfo gi = {0};
+    gi.pPageList = taosArrayInit(100, sizeof(int32_t));
+    taosHashPut(pInfo->pGroupSet, pInfo->keyBuf, len, &gi, sizeof(SDataGroupInfo));
+
+    p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
+
+    int32_t pageId = 0;
+    pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
+    taosArrayPush(p->pPageList, &pageId);
+
+    *(int32_t *) pPage = 0;
+  } else {
+    int32_t* curId = taosArrayGetLast(p->pPageList);
+    pPage = getBufPage(pInfo->pBuf, *curId);
+
+    int32_t *rows = (int32_t*) pPage;
+    if (*rows >= pInfo->rowCapacity) {
+      // add a new page for current group
+      int32_t pageId = 0;
+      pPage = getNewBufPage(pInfo->pBuf, 0, &pageId);
+      taosArrayPush(p->pPageList, &pageId);
+
+      *(int32_t*) pPage = 0;
+    }
+  }
+
+  *pGroupInfo = p;
+  return pPage;
+}
+
+uint64_t calcGroupId(char* pData, int32_t len) {
+  T_MD5_CTX context;
+  tMD5Init(&context);
+  tMD5Update(&context, (uint8_t*)pData, len);
+  tMD5Final(&context);
+
+  // NOTE: only extract the initial 8 bytes of the final MD5 digest
+  uint64_t id = 0;
+  memcpy(&id, context.digest, sizeof(uint64_t));
+  return id;
 }
 
 int32_t* setupColumnOffset(const SSDataBlock* pBlock, int32_t rowCapacity) {
@@ -496,6 +518,8 @@ static SSDataBlock* buildPartitionResult(SOperatorInfo* pOperator) {
   blockDataFromBuf1(pInfo->binfo.pRes, page, pInfo->rowCapacity);
 
   pInfo->pageIndex += 1;
+
+  pInfo->binfo.pRes->info.groupId = pGroupInfo->groupId;
   return pInfo->binfo.pRes;
 }
 

From 2e6b9c7b99a1fafff72cd923c37587e870bf3572 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 8 Apr 2022 17:43:48 +0800
Subject: [PATCH 34/82] [transport]<fix> cannot transport by hostname

---
 source/libs/transport/src/transCli.c | 65 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index d9c288a39b..8bebd626c4 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -130,9 +130,9 @@ static SCliThrdObj* createThrdObj();
 static void         destroyThrdObj(SCliThrdObj* pThrd);
 
 #define CONN_HOST_THREAD_INDEX(conn) (conn ? ((SCliConn*)conn)->hThrdIdx : -1)
-#define CONN_PERSIST_TIME(para) (para * 1000 * 10)
-#define CONN_GET_HOST_THREAD(conn) (conn ? ((SCliConn*)conn)->hostThrd : NULL)
-#define CONN_GET_INST_LABEL(conn) (((STrans*)(((SCliThrdObj*)(conn)->hostThrd)->pTransInst))->label)
+#define CONN_PERSIST_TIME(para)      (para * 1000 * 10)
+#define CONN_GET_HOST_THREAD(conn)   (conn ? ((SCliConn*)conn)->hostThrd : NULL)
+#define CONN_GET_INST_LABEL(conn)    (((STrans*)(((SCliThrdObj*)(conn)->hostThrd)->pTransInst))->label)
 #define CONN_SHOULD_RELEASE(conn, head)                                                  \
   do {                                                                                   \
     if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) {                       \
@@ -154,20 +154,20 @@ static void         destroyThrdObj(SCliThrdObj* pThrd);
     }                                                                                    \
   } while (0)
 
-#define CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle)                    \
-  do {                                                               \
-    int i = 0, sz = transQueueSize(&conn->cliMsgs);                  \
-    for (; i < sz; i++) {                                            \
-      pMsg = transQueueGet(&conn->cliMsgs, i);                       \
+#define CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle)                                         \
+  do {                                                                                    \
+    int i = 0, sz = transQueueSize(&conn->cliMsgs);                                       \
+    for (; i < sz; i++) {                                                                 \
+      pMsg = transQueueGet(&conn->cliMsgs, i);                                            \
       if (pMsg != NULL && pMsg->ctx != NULL && (uint64_t)pMsg->ctx->ahandle == ahandle) { \
-        break;                                                       \
-      }                                                              \
-    }                                                                \
-    if (i == sz) {                                                   \
-      pMsg = NULL;                                                   \
-    } else {                                                         \
-      pMsg = transQueueRm(&conn->cliMsgs, i);                        \
-    }                                                                \
+        break;                                                                            \
+      }                                                                                   \
+    }                                                                                     \
+    if (i == sz) {                                                                        \
+      pMsg = NULL;                                                                        \
+    } else {                                                                              \
+      pMsg = transQueueRm(&conn->cliMsgs, i);                                             \
+    }                                                                                     \
   } while (0)
 #define CONN_GET_NEXT_SENDMSG(conn)                 \
   do {                                              \
@@ -205,12 +205,10 @@ static void         destroyThrdObj(SCliThrdObj* pThrd);
       transRefCliHandle(conn);        \
     }                                 \
   } while (0)
-#define CONN_NO_PERSIST_BY_APP(conn) \
-  (((conn)->status == ConnNormal || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
-#define CONN_RELEASE_BY_SERVER(conn) \
-  (((conn)->status == ConnRelease || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
-#define REQUEST_NO_RESP(msg) ((msg)->noResp == 1)
-#define REQUEST_PERSIS_HANDLE(msg) ((msg)->persistHandle == 1)
+#define CONN_NO_PERSIST_BY_APP(conn) (((conn)->status == ConnNormal || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
+#define CONN_RELEASE_BY_SERVER(conn) (((conn)->status == ConnRelease || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
+#define REQUEST_NO_RESP(msg)         ((msg)->noResp == 1)
+#define REQUEST_PERSIS_HANDLE(msg)   ((msg)->persistHandle == 1)
 #define REQUEST_RELEASE_HANDLE(cmsg) ((cmsg)->type == Release)
 
 static void* cliWorkThread(void* arg);
@@ -281,9 +279,8 @@ void cliHandleResp(SCliConn* conn) {
     tDebug("%s cli conn %p ref by app", CONN_GET_INST_LABEL(conn), conn);
   }
 
-  tDebug("%s cli conn %p %s received from %s:%d, local info: %s:%d, msg size: %d", pTransInst->label, conn,
-         TMSG_INFO(pHead->msgType), taosInetNtoa(conn->addr.sin_addr), ntohs(conn->addr.sin_port),
-         taosInetNtoa(conn->locaddr.sin_addr), ntohs(conn->locaddr.sin_port), transMsg.contLen);
+  tDebug("%s cli conn %p %s received from %s:%d, local info: %s:%d, msg size: %d", pTransInst->label, conn, TMSG_INFO(pHead->msgType),
+         taosInetNtoa(conn->addr.sin_addr), ntohs(conn->addr.sin_port), taosInetNtoa(conn->locaddr.sin_addr), ntohs(conn->locaddr.sin_port), transMsg.contLen);
 
   conn->secured = pHead->secured;
 
@@ -349,12 +346,10 @@ void cliHandleExcept(SCliConn* pConn) {
 
     if (pMsg == NULL && !CONN_NO_PERSIST_BY_APP(pConn)) {
       transMsg.ahandle = transCtxDumpVal(&pConn->ctx, transMsg.msgType);
-      tDebug("%s cli conn %p construct ahandle %p by %s", CONN_GET_INST_LABEL(pConn), pConn, transMsg.ahandle,
-             TMSG_INFO(transMsg.msgType));
+      tDebug("%s cli conn %p construct ahandle %p by %s", CONN_GET_INST_LABEL(pConn), pConn, transMsg.ahandle, TMSG_INFO(transMsg.msgType));
       if (transMsg.ahandle == NULL) {
         transMsg.ahandle = transCtxDumpBrokenlinkVal(&pConn->ctx, (int32_t*)&(transMsg.msgType));
-        tDebug("%s cli conn %p construct ahandle %p due to brokenlink", CONN_GET_INST_LABEL(pConn), pConn,
-               transMsg.ahandle);
+        tDebug("%s cli conn %p construct ahandle %p due to brokenlink", CONN_GET_INST_LABEL(pConn), pConn, transMsg.ahandle);
       }
     } else {
       transMsg.ahandle = pCtx ? pCtx->ahandle : NULL;
@@ -628,9 +623,8 @@ void cliSend(SCliConn* pConn) {
   pHead->release = REQUEST_RELEASE_HANDLE(pCliMsg) ? 1 : 0;
 
   uv_buf_t wb = uv_buf_init((char*)pHead, msgLen);
-  tDebug("%s cli conn %p %s is send to %s:%d, local info %s:%d", CONN_GET_INST_LABEL(pConn), pConn,
-         TMSG_INFO(pHead->msgType), taosInetNtoa(pConn->addr.sin_addr), ntohs(pConn->addr.sin_port),
-         taosInetNtoa(pConn->locaddr.sin_addr), ntohs(pConn->locaddr.sin_port));
+  tDebug("%s cli conn %p %s is send to %s:%d, local info %s:%d", CONN_GET_INST_LABEL(pConn), pConn, TMSG_INFO(pHead->msgType),
+         taosInetNtoa(pConn->addr.sin_addr), ntohs(pConn->addr.sin_port), taosInetNtoa(pConn->locaddr.sin_addr), ntohs(pConn->locaddr.sin_port));
 
   if (pHead->persist == 1) {
     CONN_SET_PERSIST_BY_APP(pConn);
@@ -740,8 +734,13 @@ void cliHandleReq(SCliMsg* pMsg, SCliThrdObj* pThrd) {
     if (ret) {
       tError("%s cli conn %p failed to set conn option, errmsg %s", pTransInst->label, conn, uv_err_name(ret));
     }
+
     struct sockaddr_in addr;
-    uv_ip4_addr(pMsg->ctx->ip, pMsg->ctx->port, &addr);
+
+    addr.sin_family = AF_INET;
+    addr.sin_addr.s_addr = taosGetIpv4FromFqdn(conn->ip);
+    addr.sin_port = (uint16_t)htons((uint16_t)conn->port);
+    // uv_ip4_addr(pMsg->ctx->ip, pMsg->ctx->port, &addr);
     // handle error in callback if fail to connect
     tTrace("%s cli conn %p try to connect to %s:%d", pTransInst->label, conn, pMsg->ctx->ip, pMsg->ctx->port);
     uv_tcp_connect(&conn->connReq, (uv_tcp_t*)(conn->stream), (const struct sockaddr*)&addr, cliConnCb);

From 32cc09ae8caf9174aab9109d6114fa4297c9fe38 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 8 Apr 2022 17:52:24 +0800
Subject: [PATCH 35/82] remove bdb

---
 ...db_CMakeLists.txt.in => bdb_CMakeLists.txt.in.bak} |  0
 cmake/cmake.options                                   | 11 -----------
 contrib/CMakeLists.txt                                |  6 +++---
 contrib/test/CMakeLists.txt                           |  6 +++---
 source/dnode/vnode/CMakeLists.txt                     |  2 +-
 source/dnode/vnode/src/tq/tqRead.c                    |  4 ++--
 6 files changed, 9 insertions(+), 20 deletions(-)
 rename cmake/{bdb_CMakeLists.txt.in => bdb_CMakeLists.txt.in.bak} (100%)

diff --git a/cmake/bdb_CMakeLists.txt.in b/cmake/bdb_CMakeLists.txt.in.bak
similarity index 100%
rename from cmake/bdb_CMakeLists.txt.in
rename to cmake/bdb_CMakeLists.txt.in.bak
diff --git a/cmake/cmake.options b/cmake/cmake.options
index 946eb5d258..b51f096185 100644
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -55,17 +55,6 @@ option(
     OFF
 )
 
-IF(${TD_WINDOWS})
-    MESSAGE("Not build BDB on Windows")
-ELSE ()
-    option(
-            BUILD_WITH_BDB
-            "If build with BerkleyDB"
-            ON
-          )
-
-ENDIF ()
-
 option(
     BUILD_WITH_LUCENE 
     "If build with lucene" 
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 575a0e6274..377e3fbccc 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -63,9 +63,9 @@ if(${BUILD_WITH_UV})
 endif(${BUILD_WITH_UV})
 
 # bdb
-if(${BUILD_WITH_BDB})
-    cat("${CMAKE_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif(${BUILD_WITH_BDB})
+#if(${BUILD_WITH_BDB})
+    #cat("${CMAKE_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+#endif(${BUILD_WITH_BDB})
 
 # sqlite
 if(${BUILD_WITH_SQLITE})
diff --git a/contrib/test/CMakeLists.txt b/contrib/test/CMakeLists.txt
index eacaeb9524..740488b39b 100644
--- a/contrib/test/CMakeLists.txt
+++ b/contrib/test/CMakeLists.txt
@@ -7,9 +7,9 @@ if(${BUILD_WITH_LUCENE})
     add_subdirectory(lucene)
 endif(${BUILD_WITH_LUCENE})
 
-if(${BUILD_WITH_BDB})
-    add_subdirectory(bdb)
-endif(${BUILD_WITH_BDB})
+#if(${BUILD_WITH_BDB})
+    #add_subdirectory(bdb)
+#endif(${BUILD_WITH_BDB})
 
 if(${BUILD_WITH_SQLITE})
     add_subdirectory(sqlite)
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 28e19dc017..b5fe7d460f 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -68,7 +68,7 @@ target_link_libraries(
     PUBLIC executor
     PUBLIC scheduler
     PUBLIC tdb
-    PUBLIC bdb
+    #PUBLIC bdb
     PUBLIC transport
     PUBLIC stream
 )
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index a18374015b..fee8bdf27e 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -167,8 +167,8 @@ SArray* tqRetrieveDataBlock(STqReadHandle* pHandle) {
       if (!tdSTSRowIterNext(&iter, pColData->info.colId, pColData->info.type, &sVal)) {
         break;
       }
-      if (colDataAppend(pColData, curRow, sVal.val, false) < 0) {
-        /*if (colDataAppend(pColData, curRow, sVal.val, sVal.valType == TD_VTYPE_NULL) < 0) {*/
+      /*if (colDataAppend(pColData, curRow, sVal.val, false) < 0) {*/
+      if (colDataAppend(pColData, curRow, sVal.val, sVal.valType == TD_VTYPE_NULL) < 0) {
         taosArrayDestroyEx(pArray, (void (*)(void*))tDeleteSSDataBlock);
         return NULL;
       }

From 99d6fda66a516b7db4864d10153524384d7ad386 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 8 Apr 2022 18:34:11 +0800
Subject: [PATCH 36/82] feature/qnode

---
 include/common/tmsg.h                       | 18 +++++++
 include/common/tmsgdef.h                    |  1 +
 include/util/taoserror.h                    |  1 +
 include/util/tdef.h                         |  6 +++
 source/common/src/tmsg.c                    | 58 +++++++++++++++++++++
 source/dnode/mgmt/mm/mmHandle.c             |  1 +
 source/dnode/mnode/impl/src/mndDb.c         | 46 ++++++++++++++++
 source/dnode/mnode/impl/src/mndInfoSchema.c | 11 ++--
 source/dnode/mnode/impl/src/mndSma.c        | 34 ++++++++++++
 source/util/src/terror.c                    |  1 +
 10 files changed, 172 insertions(+), 5 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 4efb68d490..3fd5f31c24 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2293,6 +2293,24 @@ static FORCE_INLINE void* tDecodeTSmaWrapper(void* buf, STSmaWrapper* pSW) {
   return buf;
 }
 
+typedef struct {
+  char indexFName[TSDB_INDEX_FNAME_LEN];
+} SUserIndexReq;
+
+int32_t tSerializeSUserIndexReq(void* buf, int32_t bufLen, SUserIndexReq* pReq);
+int32_t tDeserializeSUserIndexReq(void* buf, int32_t bufLen, SUserIndexReq* pReq);
+
+typedef struct {
+  char dbFName[TSDB_DB_FNAME_LEN];
+  char tblFName[TSDB_TABLE_FNAME_LEN];
+  char colName[TSDB_COL_NAME_LEN];
+  char indexType[TSDB_INDEX_TYPE_LEN];
+  char indexExts[TSDB_INDEX_EXTS_LEN];
+} SUserIndexRsp;
+
+int32_t tSerializeSUserIndexRsp(void* buf, int32_t bufLen, const SUserIndexRsp* pRsp);
+int32_t tDeserializeSUserIndexRsp(void* buf, int32_t bufLen, SUserIndexRsp* pRsp);
+
 typedef struct {
   int8_t  mqMsgType;
   int32_t code;
diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index 63d1fc5014..4314612c1f 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -156,6 +156,7 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_MND_ALTER_STREAM, "mnode-alter-stream", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_DROP_STREAM, "mnode-drop-stream", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_GET_DB_CFG, "mnode-get-db-cfg", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_GET_INDEX, "mnode-get-index", NULL, NULL)
 
   // Requests handled by VNODE
   TD_NEW_MSG_SEG(TDMT_VND_MSG)
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index ed90628bda..ec9812fa04 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -217,6 +217,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_INVALID_DB_OPTION         TAOS_DEF_ERROR_CODE(0, 0x0385)
 #define TSDB_CODE_MND_INVALID_DB_ACCT           TAOS_DEF_ERROR_CODE(0, 0x0386)
 #define TSDB_CODE_MND_DB_OPTION_UNCHANGED       TAOS_DEF_ERROR_CODE(0, 0x0387)
+#define TSDB_CODE_MND_DB_INDEX_NOT_EXIST        TAOS_DEF_ERROR_CODE(0, 0x0388)
 
 // mnode-vgroup
 #define TSDB_CODE_MND_VGROUP_NOT_EXIST          TAOS_DEF_ERROR_CODE(0, 0x0390)
diff --git a/include/util/tdef.h b/include/util/tdef.h
index 2a634e2327..98fbe94d66 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -109,6 +109,9 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_INS_TABLE_USER_USERS             "user_users"
 #define TSDB_INS_TABLE_VGROUPS                "vgroups"
 
+#define TSDB_INDEX_TYPE_SMA      "SMA"
+#define TSDB_INDEX_TYPE_FULLTEXT "FULLTEXT"
+
 #define TSDB_INS_USER_STABLES_DBNAME_COLID    2
 
 #define TSDB_TICK_PER_SECOND(precision)                      \
@@ -213,6 +216,9 @@ typedef enum ELogicConditionType {
 #define TSDB_FUNC_MAX_RETRIEVE   1024
 
 #define TSDB_INDEX_NAME_LEN      65  // 64 + 1 '\0'
+#define TSDB_INDEX_TYPE_LEN      10
+#define TSDB_INDEX_EXTS_LEN      256
+#define TSDB_INDEX_FNAME_LEN     (TSDB_DB_FNAME_LEN + TSDB_INDEX_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
 #define TSDB_TYPE_STR_MAX_LEN    32
 #define TSDB_TABLE_FNAME_LEN     (TSDB_DB_FNAME_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
 #define TSDB_TOPIC_FNAME_LEN     TSDB_TABLE_FNAME_LEN
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 57a8953253..a22b5c0dd4 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -2033,6 +2033,64 @@ int32_t tDeserializeSDbCfgRsp(void* buf, int32_t bufLen, SDbCfgRsp* pRsp) {
   return 0;
 }
 
+int32_t tSerializeSUserIndexReq(void* buf, int32_t bufLen, SUserIndexReq* pReq) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeCStr(&encoder, pReq->indexFName) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSUserIndexReq(void* buf, int32_t bufLen, SUserIndexReq* pReq) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pReq->indexFName) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
+int32_t tSerializeSUserIndexRsp(void* buf, int32_t bufLen, const SUserIndexRsp* pRsp) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeCStr(&encoder, pRsp->dbFName) < 0) return -1;
+  if (tEncodeCStr(&encoder, pRsp->tblFName) < 0) return -1;
+  if (tEncodeCStr(&encoder, pRsp->colName) < 0) return -1;
+  if (tEncodeCStr(&encoder, pRsp->indexType) < 0) return -1;
+  if (tEncodeCStr(&encoder, pRsp->indexExts) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSUserIndexRsp(void* buf, int32_t bufLen, SUserIndexRsp* pRsp) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pRsp->dbFName) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pRsp->tblFName) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pRsp->colName) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pRsp->indexType) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pRsp->indexExts) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
 
 int32_t tSerializeSShowReq(void *buf, int32_t bufLen, SShowReq *pReq) {
   SCoder encoder = {0};
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index e5495c7e1d..ffeeeecd17 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -147,6 +147,7 @@ void mmInitMsgHandle(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_MND_CREATE_STREAM, mmProcessWriteMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_VND_TASK_DEPLOY_RSP, mmProcessWriteMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_GET_DB_CFG, mmProcessReadMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MND_GET_INDEX, mmProcessReadMsg, DEFAULT_HANDLE);
 
   // Requests handled by VNODE
   dndSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CONN_RSP, mmProcessWriteMsg, DEFAULT_HANDLE);
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index ff2ea162fb..ef992b4549 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -58,6 +58,7 @@ int32_t mndInitDb(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_SYNC_DB, mndProcessSyncDbReq);
   mndSetMsgHandle(pMnode, TDMT_MND_COMPACT_DB, mndProcessCompactDbReq);
   mndSetMsgHandle(pMnode, TDMT_MND_GET_DB_CFG, mndProcessGetDbCfgReq);
+  mndSetMsgHandle(pMnode, TDMT_MND_GET_INDEX, mndProcessGetIndexReq);
 
   mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_DB, mndGetDbMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_DB, mndRetrieveDbs);
@@ -1661,3 +1662,48 @@ static void mndCancelGetNextDb(SMnode *pMnode, void *pIter) {
   SSdb *pSdb = pMnode->pSdb;
   sdbCancelFetch(pSdb, pIter);
 }
+
+static int32_t mndProcessGetIndexReq(SNodeMsg *pReq) {
+  SUserIndexReq indexReq = {0};
+  SMnode      *pMnode = pReq->pNode;
+  int32_t      code = -1;
+  SUserIndexRsp rsp = {0};
+  bool exist = false;
+
+  if (tDeserializeSUserIndexReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &indexReq) != 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    goto _OVER;
+  }
+
+  code = mndProcessGetSmaReq(pMnode, &indexReq, &rsp, &exist);
+  if (code) {
+    goto _OVER;
+  }
+
+  if (!exist) {
+    //TODO GET INDEX FROM FULLTEXT
+  } else {
+    int32_t contLen = tSerializeSUserIndexRsp(NULL, 0, &rsp);
+    void   *pRsp = rpcMallocCont(contLen);
+    if (pRsp == NULL) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = -1;
+      goto _OVER;
+    }
+    
+    tSerializeSUserIndexRsp(pRsp, contLen, &rsp);
+    
+    pReq->pRsp = pRsp;
+    pReq->rspLen = contLen;
+
+    code = 0;
+  }
+
+_OVER:
+  if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("failed to get index %s since %s", indexReq.indexFName, terrstr());
+  }
+
+  return code;
+}
+
diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c
index aadd914439..71ee0baaae 100644
--- a/source/dnode/mnode/impl/src/mndInfoSchema.c
+++ b/source/dnode/mnode/impl/src/mndInfoSchema.c
@@ -18,6 +18,7 @@
 
 #define SYSTABLE_SCH_TABLE_NAME_LEN ((TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
 #define SYSTABLE_SCH_DB_NAME_LEN    ((TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
+#define SYSTABLE_SCH_COL_NAME_LEN    ((TSDB_COL_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
 
 //!!!! Note: only APPEND columns in below tables, NO insert !!!!
 static const SInfosTableSchema dnodesSchema[] = {
@@ -79,11 +80,11 @@ static const SInfosTableSchema userFuncSchema[] = {
     {.name = "status", .bytes = 10, .type = TSDB_DATA_TYPE_BINARY},
 };
 static const SInfosTableSchema userIdxSchema[] = {
-    {.name = "db_name", .bytes = 32, .type = TSDB_DATA_TYPE_BINARY},
-    {.name = "table_name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
-    {.name = "index_database", .bytes = 32, .type = TSDB_DATA_TYPE_BINARY},
-    {.name = "index_name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
-    {.name = "column_name", .bytes = 64, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "db_name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "table_name", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "index_database", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "index_name", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "column_name", .bytes = SYSTABLE_SCH_COL_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "index_type", .bytes = 10, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "index_extensions", .bytes = 256, .type = TSDB_DATA_TYPE_BINARY},
 };
diff --git a/source/dnode/mnode/impl/src/mndSma.c b/source/dnode/mnode/impl/src/mndSma.c
index 94114a96bf..7badd3031d 100644
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
@@ -689,6 +689,40 @@ _OVER:
   return code;
 }
 
+static int32_t mndProcessGetSmaReq(SMnode      *pMnode, SUserIndexReq *indexReq, SUserIndexRsp *rsp, bool *exist) {
+  int32_t      code = -1;
+  SSmaObj     *pSma = NULL;
+
+  pSma = mndAcquireSma(pMnode, indexReq.indexFName);
+  if (pSma == NULL) {
+    //TODO TRY TO GET INDEX FROM FULLTEXT
+    *exist = false;
+    return 0;
+  }
+
+  memcpy(rsp->dbFName, pSma->db, sizeof(pSma->db));
+  memcpy(rsp->tblFName, pSma->stb, sizeof(pSma->stb));
+  strcpy(rsp->indexType, TSDB_INDEX_TYPE_SMA);
+
+  SNodeList *pList = NULL;
+  int32_t extOffset = 0;
+  code = nodesStringToList(pSma->expr, &pList);
+  if (0 == code) {
+    SNode *node = NULL;
+    FOREACH(node, pList) {
+      SFunctionNode *pFunc = (SFunctionNode *)node;
+      extOffset += snprintf(rsp->indexExts + extOffset, sizeof(rsp->indexExts) - extOffset - 1, "%s%s", (extOffset ? ",":""), pFunc->functionName);
+    }
+
+    *exist = true;
+  }
+
+  mndReleaseSma(pMnode, pSma);
+
+  return code;
+}
+
+
 static int32_t mndProcessVDropSmaRsp(SNodeMsg *pRsp) {
   mndTransProcessRsp(pRsp);
   return 0;
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index 6d4de2f575..e02310aab3 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -224,6 +224,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB,               "Invalid database name
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION,        "Invalid database options")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_ACCT,          "Invalid database account")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_OPTION_UNCHANGED,      "Database options not changed")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_INDEX_NOT_EXIST,       "Index not exist")
 
 // mnode-vgroup
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_VGROUP_ALREADY_IN_DNODE,  "Vgroup already in dnode")

From abf827ed63ca7283be67b52e47be6ec5295ea093 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 8 Apr 2022 18:37:42 +0800
Subject: [PATCH 37/82] feature/qnode

---
 source/dnode/mnode/impl/inc/mndSma.h | 1 +
 source/dnode/mnode/impl/src/mndDb.c  | 2 ++
 source/dnode/mnode/impl/src/mndSma.c | 5 ++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/dnode/mnode/impl/inc/mndSma.h b/source/dnode/mnode/impl/inc/mndSma.h
index 4a80f619d3..91c6e24e28 100644
--- a/source/dnode/mnode/impl/inc/mndSma.h
+++ b/source/dnode/mnode/impl/inc/mndSma.h
@@ -26,6 +26,7 @@ int32_t  mndInitSma(SMnode *pMnode);
 void     mndCleanupSma(SMnode *pMnode);
 SSmaObj *mndAcquireSma(SMnode *pMnode, char *smaName);
 void     mndReleaseSma(SMnode *pMnode, SSmaObj *pSma);
+int32_t mndProcessGetSmaReq(SMnode       *pMnode, SUserIndexReq *indexReq, SUserIndexRsp *rsp, bool *exist);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index ef992b4549..bd12897827 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -22,6 +22,7 @@
 #include "mndTrans.h"
 #include "mndUser.h"
 #include "mndVgroup.h"
+#include "mndSma.h"
 
 #define TSDB_DB_VER_NUMBER   1
 #define TSDB_DB_RESERVE_SIZE 64
@@ -41,6 +42,7 @@ static int32_t  mndGetDbMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMe
 static int32_t  mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextDb(SMnode *pMnode, void *pIter);
 static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq);
+static int32_t mndProcessGetIndexReq(SNodeMsg *pReq);
 
 int32_t mndInitDb(SMnode *pMnode) {
   SSdbTable table = {.sdbType = SDB_DB,
diff --git a/source/dnode/mnode/impl/src/mndSma.c b/source/dnode/mnode/impl/src/mndSma.c
index 7badd3031d..e5e591b4d2 100644
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
@@ -689,13 +689,12 @@ _OVER:
   return code;
 }
 
-static int32_t mndProcessGetSmaReq(SMnode      *pMnode, SUserIndexReq *indexReq, SUserIndexRsp *rsp, bool *exist) {
+int32_t mndProcessGetSmaReq(SMnode      *pMnode, SUserIndexReq *indexReq, SUserIndexRsp *rsp, bool *exist) {
   int32_t      code = -1;
   SSmaObj     *pSma = NULL;
 
-  pSma = mndAcquireSma(pMnode, indexReq.indexFName);
+  pSma = mndAcquireSma(pMnode, indexReq->indexFName);
   if (pSma == NULL) {
-    //TODO TRY TO GET INDEX FROM FULLTEXT
     *exist = false;
     return 0;
   }

From 0936b8666034cca915cc14a276b66f171d640359 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 8 Apr 2022 18:49:34 +0800
Subject: [PATCH 38/82] [transport]<fix> cannot transport by hostname

---
 source/libs/transport/src/transCli.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index dfcb333c9b..db66102cab 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -206,10 +206,8 @@ static void         destroyThrdObj(SCliThrdObj* pThrd);
     }                                 \
   } while (0)
 
-#define CONN_NO_PERSIST_BY_APP(conn) \
-  (((conn)->status == ConnNormal || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
-#define CONN_RELEASE_BY_SERVER(conn) \
-  (((conn)->status == ConnRelease || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
+#define CONN_NO_PERSIST_BY_APP(conn) (((conn)->status == ConnNormal || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
+#define CONN_RELEASE_BY_SERVER(conn) (((conn)->status == ConnRelease || (conn)->status == ConnInPool) && T_REF_VAL_GET(conn) == 1)
 
 #define REQUEST_NO_RESP(msg)         ((msg)->noResp == 1)
 #define REQUEST_PERSIS_HANDLE(msg)   ((msg)->persistHandle == 1)

From f98ceb04bec417a6f6e6a14cb6f7083524d96b7e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 8 Apr 2022 16:43:20 +0800
Subject: [PATCH 39/82] feat: send monitor information in multi-process mode

---
 include/libs/monitor/monitor.h        |  12 +-
 source/dnode/mgmt/bm/bmHandle.c       |   7 +
 source/dnode/mgmt/dm/dmHandle.c       |  15 +-
 source/dnode/mgmt/dm/dmMonitor.c      | 404 +++++++++++++++------
 source/dnode/mgmt/dm/dmWorker.c       |  21 +-
 source/dnode/mgmt/inc/dmInt.h         |  17 +-
 source/dnode/mgmt/inc/dndInt.h        |  24 +-
 source/dnode/mgmt/inc/vmInt.h         |   1 +
 source/dnode/mgmt/main/dndTransport.c |   6 +-
 source/dnode/mgmt/mm/mmHandle.c       |  10 +-
 source/dnode/mgmt/mm/mmInt.c          |   5 -
 source/dnode/mgmt/qm/qmHandle.c       |   7 +
 source/dnode/mgmt/sm/smHandle.c       |   7 +
 source/dnode/mgmt/vm/vmHandle.c       |  22 ++
 source/dnode/mgmt/vm/vmInt.c          |  45 +--
 source/libs/monitor/src/monMsg.c      | 499 +++++++++++++++++++++++++-
 16 files changed, 912 insertions(+), 190 deletions(-)

diff --git a/include/libs/monitor/monitor.h b/include/libs/monitor/monitor.h
index 342796b070..3cecb139e1 100644
--- a/include/libs/monitor/monitor.h
+++ b/include/libs/monitor/monitor.h
@@ -162,7 +162,7 @@ typedef struct {
 } SMonVmInfo;
 
 int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
-int32_t tDeserializeSMonVMmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
+int32_t tDeserializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
 void    tFreeSMonVmInfo(SMonVmInfo *pInfo);
 
 typedef struct {
@@ -171,7 +171,7 @@ typedef struct {
 } SMonQmInfo;
 
 int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
-int32_t tDeserializeSMonQMmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
+int32_t tDeserializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
 void    tFreeSMonQmInfo(SMonQmInfo *pInfo);
 
 typedef struct {
@@ -191,6 +191,14 @@ int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
 int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
 void    tFreeSMonBmInfo(SMonBmInfo *pInfo);
 
+typedef struct {
+  SArray *pVloads;  // SVnodeLoad
+} SMonVloadInfo;
+
+int32_t tSerializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo);
+int32_t tDeserializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo);
+void    tFreeSMonVloadInfo(SMonVloadInfo *pInfo);
+
 typedef struct {
   const char *server;
   uint16_t    port;
diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index 2ae9b3817f..8abfa8955c 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -16,6 +16,13 @@
 #define _DEFAULT_SOURCE
 #include "bmInt.h"
 
+void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo) {
+  if (pWrapper->procType == PROC_CHILD) {
+    dmGetMonitorSysInfo(&bmInfo->sys);
+    monGetLogs(&bmInfo->logs);
+  }
+}
+
 int32_t bmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
diff --git a/source/dnode/mgmt/dm/dmHandle.c b/source/dnode/mgmt/dm/dmHandle.c
index 40d85b2a9a..c0175fed10 100644
--- a/source/dnode/mgmt/dm/dmHandle.c
+++ b/source/dnode/mgmt/dm/dmHandle.c
@@ -42,8 +42,9 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
 
   SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, VNODES);
   if (pWrapper != NULL) {
-    req.pVloads = taosArrayInit(TSDB_MAX_VNODES, sizeof(SVnodeLoad));
-    vmMonitorVnodeLoads(pWrapper, req.pVloads);
+    SMonVloadInfo info = {0};
+    dmGetVnodeLoads(pWrapper, &info);
+    req.pVloads = info.pVloads;
     dndReleaseWrapper(pWrapper);
   }
 
@@ -117,7 +118,6 @@ int32_t dmProcessConfigReq(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
   return TSDB_CODE_OPS_NOT_SUPPORT;
 }
 
-
 static int32_t dmProcessCreateNodeMsg(SDnode *pDnode, EDndType ntype, SNodeMsg *pMsg) {
   SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, ntype);
   if (pWrapper != NULL) {
@@ -209,10 +209,15 @@ void dmInitMsgHandle(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_DND_NETWORK_TEST, dmProcessMgmtMsg, DEFAULT_HANDLE);
 
   // Requests handled by MNODE
-  dndSetMsgHandle(pWrapper, TDMT_MND_STATUS_RSP, dmProcessStatusMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MND_STATUS_RSP, dmProcessMonitorMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_GRANT_RSP, dmProcessMgmtMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_AUTH_RSP, dmProcessMgmtMsg, DEFAULT_HANDLE);
 
   // Monitor info exchange between processes
-  dndSetMsgHandle(pWrapper, TDMT_MON_DISK_INFO, dmProcessStatusMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_MM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_VM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_QM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_SM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_BM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_VM_LOAD, dmProcessMonitorMsg, DEFAULT_HANDLE);
 }
diff --git a/source/dnode/mgmt/dm/dmMonitor.c b/source/dnode/mgmt/dm/dmMonitor.c
index 7117bc5d12..b9199efac2 100644
--- a/source/dnode/mgmt/dm/dmMonitor.c
+++ b/source/dnode/mgmt/dm/dmMonitor.c
@@ -16,20 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "dmInt.h"
 
-static int32_t dmGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo) {
-  tstrncpy(pInfo->logdir.name, tsLogDir, sizeof(pInfo->logdir.name));
-  pInfo->logdir.size = tsLogSpace.size;
-  tstrncpy(pInfo->tempdir.name, tsTempDir, sizeof(pInfo->tempdir.name));
-  pInfo->tempdir.size = tsTempSpace.size;
-
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, VNODES);
-  if (pWrapper != NULL) {
-    vmMonitorTfsInfo(pWrapper, pInfo);
-    dndReleaseWrapper(pWrapper);
-  }
-  return 0;
-}
-
 static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) {
   pInfo->protocol = 1;
   pInfo->dnode_id = pDnode->dnodeId;
@@ -39,6 +25,305 @@ static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) {
 
 static void dmGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
   pInfo->uptime = (taosGetTimestampMs() - pDnode->rebootTime) / (86400000.0f);
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, MNODE);
+  if (pWrapper != NULL) {
+    pInfo->has_mnode = pWrapper->required;
+    dndReleaseWrapper(pWrapper);
+  }
+  tstrncpy(pInfo->logdir.name, tsLogDir, sizeof(pInfo->logdir.name));
+  pInfo->logdir.size = tsLogSpace.size;
+  tstrncpy(pInfo->tempdir.name, tsTempDir, sizeof(pInfo->tempdir.name));
+  pInfo->tempdir.size = tsTempSpace.size;
+}
+
+static void dmGetMonitorInfo(SDnode *pDnode, SMonDmInfo *pInfo) {
+  dmGetMonitorBasicInfo(pDnode, &pInfo->basic);
+  dmGetMonitorSysInfo(&pInfo->sys);
+  dmGetMonitorDnodeInfo(pDnode, &pInfo->dnode);
+}
+
+void dmSendMonitorReport(SDnode *pDnode) {
+  if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return;
+  dTrace("send monitor report to %s:%u", tsMonitorFqdn, tsMonitorPort);
+
+  SMonDmInfo dmInfo = {0};
+  SMonMmInfo mmInfo = {0};
+  SMonVmInfo vmInfo = {0};
+  SMonQmInfo qmInfo = {0};
+  SMonSmInfo smInfo = {0};
+  SMonBmInfo bmInfo = {0};
+
+  SRpcMsg req = {0};
+  SRpcMsg rsp;
+  SEpSet  epset = {.inUse = 0, .numOfEps = 1};
+  tstrncpy(epset.eps[0].fqdn, tsLocalFqdn, TSDB_FQDN_LEN);
+  epset.eps[0].port = tsServerPort;
+
+  dmGetMonitorInfo(pDnode, &dmInfo);
+
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, MNODE);
+  if (pWrapper != NULL) {
+    if (!tsMultiProcess) {
+      mmGetMonitorInfo(pWrapper, &mmInfo);
+    } else {
+      req.msgType = TDMT_MON_MM_INFO;
+      dndSendRecv(pDnode, &epset, &req, &rsp);
+      tDeserializeSMonMmInfo(rsp.pCont, rsp.contLen, &mmInfo);
+      rpcFreeCont(rsp.pCont);
+    }
+    dndReleaseWrapper(pWrapper);
+  }
+
+  pWrapper = dndAcquireWrapper(pDnode, VNODES);
+  if (pWrapper != NULL) {
+    if (!tsMultiProcess) {
+      vmGetMonitorInfo(pWrapper, &vmInfo);
+    } else {
+      req.msgType = TDMT_MON_VM_INFO;
+      dndSendRecv(pDnode, &epset, &req, &rsp);
+      dndReleaseWrapper(pWrapper);
+      tDeserializeSMonVmInfo(rsp.pCont, rsp.contLen, &vmInfo);
+      rpcFreeCont(rsp.pCont);
+    }
+  }
+
+  pWrapper = dndAcquireWrapper(pDnode, QNODE);
+  if (pWrapper != NULL) {
+    if (!tsMultiProcess) {
+      qmGetMonitorInfo(pWrapper, &qmInfo);
+    } else {
+      req.msgType = TDMT_MON_QM_INFO;
+      dndSendRecv(pDnode, &epset, &req, &rsp);
+      dndReleaseWrapper(pWrapper);
+      tDeserializeSMonQmInfo(rsp.pCont, rsp.contLen, &qmInfo);
+      rpcFreeCont(rsp.pCont);
+    }
+    dndReleaseWrapper(pWrapper);
+  }
+
+  pWrapper = dndAcquireWrapper(pDnode, SNODE);
+  if (pWrapper != NULL) {
+    if (!tsMultiProcess) {
+      smGetMonitorInfo(pWrapper, &smInfo);
+    } else {
+      req.msgType = TDMT_MON_SM_INFO;
+      dndSendRecv(pDnode, &epset, &req, &rsp);
+      dndReleaseWrapper(pWrapper);
+      tDeserializeSMonSmInfo(rsp.pCont, rsp.contLen, &smInfo);
+      rpcFreeCont(rsp.pCont);
+    }
+    dndReleaseWrapper(pWrapper);
+  }
+
+  pWrapper = dndAcquireWrapper(pDnode, BNODE);
+  if (pWrapper != NULL) {
+    if (!tsMultiProcess) {
+      bmGetMonitorInfo(pWrapper, &bmInfo);
+    } else {
+      req.msgType = TDMT_MON_BM_INFO;
+      dndSendRecv(pDnode, &epset, &req, &rsp);
+      dndReleaseWrapper(pWrapper);
+      tDeserializeSMonBmInfo(rsp.pCont, rsp.contLen, &bmInfo);
+      rpcFreeCont(rsp.pCont);
+    }
+    dndReleaseWrapper(pWrapper);
+  }
+
+  monSetDmInfo(&dmInfo);
+  monSetMmInfo(&mmInfo);
+  monSetVmInfo(&vmInfo);
+  monSetQmInfo(&qmInfo);
+  monSetSmInfo(&smInfo);
+  monSetBmInfo(&bmInfo);
+  tFreeSMonMmInfo(&mmInfo);
+  tFreeSMonVmInfo(&vmInfo);
+  tFreeSMonQmInfo(&qmInfo);
+  tFreeSMonSmInfo(&smInfo);
+  tFreeSMonBmInfo(&bmInfo);
+  monSendReport();
+}
+
+int32_t dmProcessGetMonMmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, MNODE);
+  if (pWrapper == NULL) return -1;
+
+  SMonMmInfo mmInfo = {0};
+  mmGetMonitorInfo(pWrapper, &mmInfo);
+  dndReleaseWrapper(pWrapper);
+
+  int32_t rspLen = tSerializeSMonMmInfo(NULL, 0, &mmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonMmInfo(pRsp, rspLen, &mmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonMmInfo(&mmInfo);
+  return 0;
+}
+
+int32_t dmProcessGetMonVmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, VNODES);
+  if (pWrapper == NULL) return -1;
+
+  SMonVmInfo vmInfo = {0};
+  vmGetMonitorInfo(pWrapper, &vmInfo);
+  dndReleaseWrapper(pWrapper);
+
+  int32_t rspLen = tSerializeSMonVmInfo(NULL, 0, &vmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonVmInfo(pRsp, rspLen, &vmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonVmInfo(&vmInfo);
+  return 0;
+}
+
+int32_t dmProcessGetMonQmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, QNODE);
+  if (pWrapper == NULL) return -1;
+
+  SMonQmInfo qmInfo = {0};
+  qmGetMonitorInfo(pWrapper, &qmInfo);
+  dndReleaseWrapper(pWrapper);
+
+  int32_t rspLen = tSerializeSMonQmInfo(NULL, 0, &qmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonQmInfo(pRsp, rspLen, &qmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonQmInfo(&qmInfo);
+  return 0;
+}
+
+int32_t dmProcessGetMonSmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, SNODE);
+  if (pWrapper == NULL) return -1;
+
+  SMonSmInfo smInfo = {0};
+  smGetMonitorInfo(pWrapper, &smInfo);
+  dndReleaseWrapper(pWrapper);
+
+  int32_t rspLen = tSerializeSMonSmInfo(NULL, 0, &smInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonSmInfo(pRsp, rspLen, &smInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonSmInfo(&smInfo);
+  return 0;
+}
+
+int32_t dmProcessGetMonBmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, BNODE);
+  if (pWrapper == NULL) return -1;
+
+  SMonBmInfo bmInfo = {0};
+  bmGetMonitorInfo(pWrapper, &bmInfo);
+  dndReleaseWrapper(pWrapper);
+
+  int32_t rspLen = tSerializeSMonBmInfo(NULL, 0, &bmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonBmInfo(pRsp, rspLen, &bmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonBmInfo(&bmInfo);
+  return 0;
+}
+
+int32_t dmProcessGetVnodeLoadsReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
+  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, VNODES);
+  if (pWrapper == NULL) return -1;
+
+  SMonVloadInfo vloads = {0};
+  vmGetVnodeLoads(pWrapper, &vloads);
+  dndReleaseWrapper(pWrapper);
+
+  int32_t rspLen = tSerializeSMonVloadInfo(NULL, 0, &vloads);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonVloadInfo(pRsp, rspLen, &vloads);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonVloadInfo(&vloads);
+  return 0;
+}
+
+void dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) {
+  if (!tsMultiProcess) {
+    vmGetVnodeLoads(pWrapper, pInfo);
+  } else {
+    SRpcMsg req = {.msgType = TDMT_MON_VM_LOAD};
+    SRpcMsg rsp = {0};
+    SEpSet  epset = {.inUse = 0, .numOfEps = 1};
+    tstrncpy(epset.eps[0].fqdn, tsLocalFqdn, TSDB_FQDN_LEN);
+    epset.eps[0].port = tsServerPort;
+
+    dndSendRecv(pWrapper->pDnode, &epset, &req, &rsp);
+    if (rsp.code == 0) {
+      tDeserializeSMonVloadInfo(rsp.pCont, rsp.contLen, pInfo);
+    }
+    rpcFreeCont(rsp.pCont);
+  }
+}
+
+void dmGetMonitorSysInfo(SMonSysInfo *pInfo) {
   taosGetCpuUsage(&pInfo->cpu_engine, &pInfo->cpu_system);
   taosGetCpuCores(&pInfo->cpu_cores);
   taosGetProcMemory(&pInfo->mem_engine);
@@ -47,93 +332,6 @@ static void dmGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
   pInfo->disk_engine = 0;
   pInfo->disk_used = tsDataSpace.size.used;
   pInfo->disk_total = tsDataSpace.size.total;
-  taosGetCardInfo(&pInfo->net_in, &pInfo->net_out);
-  taosGetProcIO(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk);
-
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, VNODES);
-  if (pWrapper != NULL) {
-    vmMonitorVnodeReqs(pWrapper, pInfo);
-    dndReleaseWrapper(pWrapper);
-  }
-
-  pWrapper = dndAcquireWrapper(pDnode, MNODE);
-  if (pWrapper != NULL) {
-    pInfo->has_mnode = pWrapper->required;
-    dndReleaseWrapper(pWrapper);
-  }
+  taosGetCardInfoDelta(&pInfo->net_in, &pInfo->net_out);
+  taosGetProcIODelta(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk);
 }
-
-void dmSendMonitorReport(SDnode *pDnode) {
-  if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return;
-  dTrace("send monitor report to %s:%u", tsMonitorFqdn, tsMonitorPort);
-
-  SMonInfo *pMonitor = monCreateMonitorInfo();
-  if (pMonitor == NULL) return;
-
-  SMonBasicInfo basicInfo = {0};
-  dmGetMonitorBasicInfo(pDnode, &basicInfo);
-  monSetBasicInfo(pMonitor, &basicInfo);
-
-  SMonClusterInfo clusterInfo = {0};
-  SMonVgroupInfo  vgroupInfo = {0};
-  SMonGrantInfo   grantInfo = {0};
-
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, MNODE);
-  if (pWrapper != NULL) {
-    if (mmMonitorMnodeInfo(pWrapper, &clusterInfo, &vgroupInfo, &grantInfo) == 0) {
-      monSetClusterInfo(pMonitor, &clusterInfo);
-      monSetVgroupInfo(pMonitor, &vgroupInfo);
-      monSetGrantInfo(pMonitor, &grantInfo);
-    }
-    dndReleaseWrapper(pWrapper);
-  }
-
-  SMonDnodeInfo dnodeInfo = {0};
-  dmGetMonitorDnodeInfo(pDnode, &dnodeInfo);
-  monSetDnodeInfo(pMonitor, &dnodeInfo);
-
-  SMonDiskInfo diskInfo = {0};
-  if (dmGetMonitorDiskInfo(pDnode, &diskInfo) == 0) {
-    monSetDiskInfo(pMonitor, &diskInfo);
-  }
-
-  taosArrayDestroy(clusterInfo.dnodes);
-  taosArrayDestroy(clusterInfo.mnodes);
-  taosArrayDestroy(vgroupInfo.vgroups);
-  taosArrayDestroy(diskInfo.datadirs);
-
-  monSendReport(pMonitor);
-  monCleanupMonitorInfo(pMonitor);
-}
-
-int32_t dmSetDiskInfo(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
-  SDnode      *pDnode = pMgmt->pDnode;
-  SMonDiskInfo info = {0};
-
-  if (tDeserializeSMonDiskInfo(pMsg->rpcMsg.pCont, pMsg->rpcMsg.contLen, &info) != 0) {
-    dError("failed to parse diskinfo since %s", terrstr());
-    return 0;
-  }
-
-  taosWLockLatch(&pMgmt->latch);
-  memcpy(&pMgmt->diskInfo, &info, sizeof(SMonDiskInfo));
-  taosWUnLockLatch(&pMgmt->latch);
-
-  return 0;
-}
-
-int32_t dmSetVnodeStat(SDnodeMgmt *pMgmt, SNodeMsg *pMsg) {
-  SDnode      *pDnode = pMgmt->pDnode;
-  SVnodesStat info = {0};
-
-  if (tDeserializeSMonDiskInfo(pMsg->rpcMsg.pCont, pMsg->rpcMsg.contLen, &info) != 0) {
-    dError("failed to parse diskinfo since %s", terrstr());
-    return 0;
-  }
-
-  taosWLockLatch(&pMgmt->latch);
-  memcpy(&pMgmt->diskInfo, &info, sizeof(SMonDiskInfo));
-  taosWUnLockLatch(&pMgmt->latch);
-
-  return 0;
-}
\ No newline at end of file
diff --git a/source/dnode/mgmt/dm/dmWorker.c b/source/dnode/mgmt/dm/dmWorker.c
index 1d11c4d25b..7b2a3c7015 100644
--- a/source/dnode/mgmt/dm/dmWorker.c
+++ b/source/dnode/mgmt/dm/dmWorker.c
@@ -78,8 +78,23 @@ static void dmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
     case TDMT_MND_GRANT_RSP:
       code = dmProcessGrantRsp(pMgmt, pMsg);
       break;
-    case TDMT_MON_DISK_INFO_RSP:
-      code = dmSetDiskInfo(pMgmt, pMsg);
+    case TDMT_MON_MM_INFO:
+      code = dmProcessGetMonMmInfoReq(pMgmt, pMsg);
+      break;
+    case TDMT_MON_VM_INFO:
+      code = dmProcessGetMonVmInfoReq(pMgmt, pMsg);
+      break;
+    case TDMT_MON_QM_INFO:
+      code = dmProcessGetMonQmInfoReq(pMgmt, pMsg);
+      break;
+    case TDMT_MON_SM_INFO:
+      code = dmProcessGetMonSmInfoReq(pMgmt, pMsg);
+      break;
+    case TDMT_MON_BM_INFO:
+      code = dmProcessGetMonBmInfoReq(pMgmt, pMsg);
+      break;
+    case TDMT_MON_VM_LOAD:
+      code = dmProcessGetVnodeLoadsReq(pMgmt, pMsg);
       break;
     default:
       code = dmProcessCDnodeReq(pMgmt->pDnode, pMsg);
@@ -134,7 +149,7 @@ int32_t dmProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   return 0;
 }
 
-int32_t dmProcessStatusMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
+int32_t dmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnodeMgmt    *pMgmt = pWrapper->pMgmt;
   SSingleWorker *pWorker = &pMgmt->statusWorker;
 
diff --git a/source/dnode/mgmt/inc/dmInt.h b/source/dnode/mgmt/inc/dmInt.h
index d7358d0ca4..eee529757e 100644
--- a/source/dnode/mgmt/inc/dmInt.h
+++ b/source/dnode/mgmt/inc/dmInt.h
@@ -37,11 +37,6 @@ typedef struct SDnodeMgmt {
   const char   *path;
   SDnode       *pDnode;
   SMgmtWrapper *pWrapper;
-
-  // monitor infos
-  SMonDiskInfo   diskInfo;
-  SMonVnodesStat vnodesStat;
-  SMonVnodesLoad vnodesLoad;
 } SDnodeMgmt;
 
 // dmFile.c
@@ -59,9 +54,13 @@ int32_t dmProcessGrantRsp(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
 int32_t dmProcessCDnodeReq(SDnode *pDnode, SNodeMsg *pMsg);
 
 // dmMonitor.c
-int32_t dmSetDiskInfo(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
-int32_t dmSetVnodesStat(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
-int32_t dmSetVnodesLoad(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
+int32_t dmProcessGetVnodeLoadsReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
+int32_t dmProcessGetMonMmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
+int32_t dmProcessGetMonVmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
+int32_t dmProcessGetMonQmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
+int32_t dmProcessGetMonSmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
+int32_t dmProcessGetMonBmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
+void    dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo);
 void    dmSendMonitorReport(SDnode *pDnode);
 
 // dmWorker.c
@@ -69,7 +68,7 @@ int32_t dmStartThread(SDnodeMgmt *pMgmt);
 int32_t dmStartWorker(SDnodeMgmt *pMgmt);
 void    dmStopWorker(SDnodeMgmt *pMgmt);
 int32_t dmProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
-int32_t dmProcessStatusMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t dmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mgmt/inc/dndInt.h b/source/dnode/mgmt/inc/dndInt.h
index 5659becb20..7faf1e4276 100644
--- a/source/dnode/mgmt/inc/dndInt.h
+++ b/source/dnode/mgmt/inc/dndInt.h
@@ -169,6 +169,7 @@ void     dndCleanupTrans(SDnode *pDnode);
 SMsgCb   dndCreateMsgcb(SMgmtWrapper *pWrapper);
 SProcCfg dndGenProcCfg(SMgmtWrapper *pWrapper);
 int32_t  dndInitMsgHandle(SDnode *pDnode);
+void     dndSendRecv(SDnode *pDnode, SEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
 
 // mgmt
 void dmSetMgmtFp(SMgmtWrapper *pWrapper);
@@ -182,22 +183,13 @@ void dmGetMnodeEpSet(SDnodeMgmt *pMgmt, SEpSet *pEpSet);
 void dmUpdateMnodeEpSet(SDnodeMgmt *pMgmt, SEpSet *pEpSet);
 void dmSendRedirectRsp(SDnodeMgmt *pMgmt, const SRpcMsg *pMsg);
 
-typedef struct {
-  int32_t openVnodes;
-  int32_t totalVnodes;
-  int32_t masterNum;
-  int64_t numOfSelectReqs;
-  int64_t numOfInsertReqs;
-  int64_t numOfInsertSuccessReqs;
-  int64_t numOfBatchInsertReqs;
-  int64_t numOfBatchInsertSuccessReqs;
-} SVnodesStat;
-
-void    vmMonitorVnodeLoads(SMgmtWrapper *pWrapper, SArray *pLoads);
-int32_t vmMonitorTfsInfo(SMgmtWrapper *pWrapper, SMonDiskInfo *pInfo);
-void    vmMonitorVnodeReqs(SMgmtWrapper *pWrapper, SMonDnodeInfo *pInfo);
-int32_t mmMonitorMnodeInfo(SMgmtWrapper *pWrapper, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
-                           SMonGrantInfo *pGrantInfo);
+void dmGetMonitorSysInfo(SMonSysInfo *pInfo);
+void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo);
+void mmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonMmInfo *mmInfo);
+void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo);
+void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo);
+void smGetMonitorInfo(SMgmtWrapper *pWrapper, SMonSmInfo *smInfo);
+void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mgmt/inc/vmInt.h b/source/dnode/mgmt/inc/vmInt.h
index 889ad7c164..ca210d62c6 100644
--- a/source/dnode/mgmt/inc/vmInt.h
+++ b/source/dnode/mgmt/inc/vmInt.h
@@ -28,6 +28,7 @@ typedef struct SVnodesMgmt {
   SHashObj     *hash;
   SRWLatch      latch;
   SVnodesStat   state;
+  SVnodesStat   lastState;
   STfs         *pTfs;
   SQWorkerPool  queryPool;
   SQWorkerPool  fetchPool;
diff --git a/source/dnode/mgmt/main/dndTransport.c b/source/dnode/mgmt/main/dndTransport.c
index e76633bb1f..3b0aca4b39 100644
--- a/source/dnode/mgmt/main/dndTransport.c
+++ b/source/dnode/mgmt/main/dndTransport.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-  
+
 #define _DEFAULT_SOURCE
 #include "dndInt.h"
 
@@ -482,4 +482,8 @@ SProcCfg dndGenProcCfg(SMgmtWrapper *pWrapper) {
                   .parent = pWrapper,
                   .name = pWrapper->name};
   return cfg;
+}
+
+void dndSendRecv(SDnode *pDnode, SEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp) {
+  rpcSendRecv(pDnode->trans.clientRpc, pEpSet, pReq, pRsp);
 }
\ No newline at end of file
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index acf83d4ba8..a8d7590d59 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -16,6 +16,15 @@
 #define _DEFAULT_SOURCE
 #include "mmInt.h"
 
+void mmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonMmInfo *mmInfo) {
+  SMnodeMgmt *pMgmt = pWrapper->pMgmt;
+  mndGetMonitorInfo(pMgmt->pMnode, &mmInfo->cluster, &mmInfo->vgroup, &mmInfo->grant);
+  if (pWrapper->procType == PROC_CHILD) {
+    dmGetMonitorSysInfo(&mmInfo->sys);
+    monGetLogs(&mmInfo->logs);
+  }
+}
+
 int32_t mmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
@@ -161,5 +170,4 @@ void mmInitMsgHandle(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_VND_FETCH, mmProcessQueryMsg, MNODE_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_VND_DROP_TASK, mmProcessQueryMsg, MNODE_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_VND_QUERY_HEARTBEAT, mmProcessQueryMsg, MNODE_HANDLE);
-
 }
diff --git a/source/dnode/mgmt/mm/mmInt.c b/source/dnode/mgmt/mm/mmInt.c
index cd6ea1499f..8d4ac80e72 100644
--- a/source/dnode/mgmt/mm/mmInt.c
+++ b/source/dnode/mgmt/mm/mmInt.c
@@ -241,8 +241,3 @@ void mmSetMgmtFp(SMgmtWrapper *pWrapper) {
   pWrapper->fp = mgmtFp;
 }
 
-int32_t mmMonitorMnodeInfo(SMgmtWrapper *pWrapper, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
-                           SMonGrantInfo *pGrantInfo) {
-  SMnodeMgmt *pMgmt = pWrapper->pMgmt;
-  return mndGetMonitorInfo(pMgmt->pMnode, pClusterInfo, pVgroupInfo, pGrantInfo);
-}
diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/qm/qmHandle.c
index 77a9db1175..7f1164bda8 100644
--- a/source/dnode/mgmt/qm/qmHandle.c
+++ b/source/dnode/mgmt/qm/qmHandle.c
@@ -16,6 +16,13 @@
 #define _DEFAULT_SOURCE
 #include "qmInt.h"
 
+void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo) {
+  if (pWrapper->procType == PROC_CHILD) {
+    dmGetMonitorSysInfo(&qmInfo->sys);
+    monGetLogs(&qmInfo->logs);
+  }
+}
+
 int32_t qmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index a1fa41a686..1e275d016b 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -16,6 +16,13 @@
 #define _DEFAULT_SOURCE
 #include "smInt.h"
 
+void smGetMonitorInfo(SMgmtWrapper *pWrapper, SMonSmInfo *smInfo) {
+  if (pWrapper->procType == PROC_CHILD) {
+    dmGetMonitorSysInfo(&smInfo->sys);
+    monGetLogs(&smInfo->logs);
+  }
+}
+
 int32_t smProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
diff --git a/source/dnode/mgmt/vm/vmHandle.c b/source/dnode/mgmt/vm/vmHandle.c
index bcb9ef9e5a..6391fe3570 100644
--- a/source/dnode/mgmt/vm/vmHandle.c
+++ b/source/dnode/mgmt/vm/vmHandle.c
@@ -16,6 +16,28 @@
 #define _DEFAULT_SOURCE
 #include "vmInt.h"
 
+void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo) {
+  SVnodesMgmt *pMgmt = pWrapper->pMgmt;
+  tfsGetMonitorInfo(pMgmt->pTfs, &vmInfo->tfs);
+
+  taosWLockLatch(&pMgmt->latch);
+  vmInfo->vstat.totalVnodes = pMgmt->state.totalVnodes;
+  vmInfo->vstat.masterNum = pMgmt->state.masterNum;
+  vmInfo->vstat.numOfSelectReqs = pMgmt->state.numOfSelectReqs - pMgmt->lastState.numOfSelectReqs;
+  vmInfo->vstat.numOfInsertReqs = pMgmt->state.numOfInsertReqs - pMgmt->lastState.numOfInsertReqs;
+  vmInfo->vstat.numOfInsertSuccessReqs = pMgmt->state.numOfInsertSuccessReqs - pMgmt->lastState.numOfInsertSuccessReqs;
+  vmInfo->vstat.numOfBatchInsertReqs = pMgmt->state.numOfBatchInsertReqs - pMgmt->lastState.numOfBatchInsertReqs;
+  vmInfo->vstat.numOfBatchInsertSuccessReqs =
+      pMgmt->state.numOfBatchInsertSuccessReqs - pMgmt->lastState.numOfBatchInsertSuccessReqs;
+  pMgmt->lastState = pMgmt->state;
+  taosWUnLockLatch(&pMgmt->latch);
+
+  if (pWrapper->procType == PROC_CHILD) {
+    dmGetMonitorSysInfo(&vmInfo->sys);
+    monGetLogs(&vmInfo->logs);
+  }
+}
+
 static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
   pCfg->vgId = pCreate->vgId;
   pCfg->wsize = pCreate->cacheBlockSize;
diff --git a/source/dnode/mgmt/vm/vmInt.c b/source/dnode/mgmt/vm/vmInt.c
index b3390ba31c..6a1a5c3987 100644
--- a/source/dnode/mgmt/vm/vmInt.c
+++ b/source/dnode/mgmt/vm/vmInt.c
@@ -344,38 +344,21 @@ void vmSetMgmtFp(SMgmtWrapper *pWrapper) {
   pWrapper->fp = mgmtFp;
 }
 
-int32_t vmMonitorTfsInfo(SMgmtWrapper *pWrapper, SMonDiskInfo *pInfo) {
-  SVnodesMgmt *pMgmt = pWrapper->pMgmt;
-  if (pMgmt == NULL) return -1;
-
-  return tfsGetMonitorInfo(pMgmt->pTfs, pInfo);
-}
-
-void vmMonitorVnodeReqs(SMgmtWrapper *pWrapper, SMonDnodeInfo *pInfo) {
-  SVnodesMgmt *pMgmt = pWrapper->pMgmt;
-  if (pMgmt == NULL) return;
-
-  SVnodesStat *pStat = &pMgmt->state;
-  pInfo->req_select = pStat->numOfSelectReqs;
-  pInfo->req_insert = pStat->numOfInsertReqs;
-  pInfo->req_insert_success = pStat->numOfInsertSuccessReqs;
-  pInfo->req_insert_batch = pStat->numOfBatchInsertReqs;
-  pInfo->req_insert_batch_success = pStat->numOfBatchInsertSuccessReqs;
-  pInfo->errors = tsNumOfErrorLogs;
-  pInfo->vnodes_num = pStat->totalVnodes;
-  pInfo->masters = pStat->masterNum;
-}
-
-void vmMonitorVnodeLoads(SMgmtWrapper *pWrapper, SArray *pLoads) {
+void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) {
   SVnodesMgmt *pMgmt = pWrapper->pMgmt;
   SVnodesStat *pStat = &pMgmt->state;
-  int32_t      totalVnodes = 0;
-  int32_t      masterNum = 0;
-  int64_t      numOfSelectReqs = 0;
-  int64_t      numOfInsertReqs = 0;
-  int64_t      numOfInsertSuccessReqs = 0;
-  int64_t      numOfBatchInsertReqs = 0;
-  int64_t      numOfBatchInsertSuccessReqs = 0;
+  SArray      *pLoads = taosArrayInit(pMgmt->state.totalVnodes, sizeof(SVnodeLoad));
+
+  int32_t totalVnodes = 0;
+  int32_t masterNum = 0;
+  int64_t numOfSelectReqs = 0;
+  int64_t numOfInsertReqs = 0;
+  int64_t numOfInsertSuccessReqs = 0;
+  int64_t numOfBatchInsertReqs = 0;
+  int64_t numOfBatchInsertSuccessReqs = 0;
+
+  pInfo->pVloads = pLoads;
+  if (pLoads == NULL) return;
 
   taosRLockLatch(&pMgmt->latch);
 
@@ -402,6 +385,7 @@ void vmMonitorVnodeLoads(SMgmtWrapper *pWrapper, SArray *pLoads) {
 
   taosRUnLockLatch(&pMgmt->latch);
 
+  taosWLockLatch(&pMgmt->latch);
   pStat->totalVnodes = totalVnodes;
   pStat->masterNum = masterNum;
   pStat->numOfSelectReqs = numOfSelectReqs;
@@ -409,4 +393,5 @@ void vmMonitorVnodeLoads(SMgmtWrapper *pWrapper, SArray *pLoads) {
   pStat->numOfInsertSuccessReqs = numOfInsertSuccessReqs;
   pStat->numOfBatchInsertReqs = numOfBatchInsertReqs;
   pStat->numOfBatchInsertSuccessReqs = numOfBatchInsertSuccessReqs;
+  taosWUnLockLatch(&pMgmt->latch);
 }
\ No newline at end of file
diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c
index 27d35d266d..e58179e394 100644
--- a/source/libs/monitor/src/monMsg.c
+++ b/source/libs/monitor/src/monMsg.c
@@ -18,37 +18,506 @@
 #include "tcoding.h"
 #include "tencode.h"
 
-int32_t tSerializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
-int32_t tDeserializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
-void    tFreeSMonMmInfo(SMonMmInfo *pInfo) {
+static int32_t tEncodeSMonSysInfo(SCoder *encoder, const SMonSysInfo *pInfo) {
+  if (tEncodeDouble(encoder, pInfo->cpu_engine) < 0) return -1;
+  if (tEncodeDouble(encoder, pInfo->cpu_system) < 0) return -1;
+  if (tEncodeFloat(encoder, pInfo->cpu_cores) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->mem_engine) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->mem_system) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->mem_total) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->disk_engine) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->disk_used) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->disk_total) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->net_in) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->net_out) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->io_read) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->io_write) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->io_read_disk) < 0) return -1;
+  if (tEncodeI64(encoder, pInfo->io_write_disk) < 0) return -1;
+  return 0;
+}
+
+static int32_t tDecodeSMonSysInfo(SCoder *decoder, SMonSysInfo *pInfo) {
+  if (tDecodeDouble(decoder, &pInfo->cpu_engine) < 0) return -1;
+  if (tDecodeDouble(decoder, &pInfo->cpu_system) < 0) return -1;
+  if (tDecodeFloat(decoder, &pInfo->cpu_cores) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->mem_engine) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->mem_system) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->mem_total) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->disk_engine) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->disk_used) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->disk_total) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->net_in) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->net_out) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->io_read) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->io_write) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->io_read_disk) < 0) return -1;
+  if (tDecodeI64(decoder, &pInfo->io_write_disk) < 0) return -1;
+  return 0;
+}
+
+int32_t tEncodeSMonLogs(SCoder *encoder, const SMonLogs *pInfo) {
+  if (tEncodeI32(encoder, pInfo->numOfErrorLogs) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->numOfInfoLogs) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->numOfDebugLogs) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->numOfTraceLogs) < 0) return -1;
+  if (tEncodeI32(encoder, taosArrayGetSize(pInfo->logs)) < 0) return -1;
+  for (int32_t i = 0; i < taosArrayGetSize(pInfo->logs); ++i) {
+    SMonLogItem *pLog = taosArrayGet(pInfo->logs, i);
+    if (tEncodeI64(encoder, pLog->ts) < 0) return -1;
+    if (tEncodeI8(encoder, pLog->level) < 0) return -1;
+    if (tEncodeCStr(encoder, pLog->content) < 0) return -1;
+  }
+  return 0;
+}
+
+static int32_t tDecodeSMonLogs(SCoder *decoder, SMonLogs *pInfo) {
+  if (tDecodeI32(decoder, &pInfo->numOfErrorLogs) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->numOfInfoLogs) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->numOfDebugLogs) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->numOfTraceLogs) < 0) return -1;
+
+  int32_t arraySize = 0;
+  if (tDecodeI32(decoder, &arraySize) < 0) return -1;
+
+  pInfo->logs = taosArrayInit(arraySize, sizeof(SMonLogItem));
+  if (pInfo->logs != NULL) return -1;
+
+  for (int32_t i = 0; i < arraySize; ++i) {
+    SMonLogItem desc = {0};
+    if (tDecodeI64(decoder, &desc.ts) < 0) return -1;
+    int8_t level = 0;
+    if (tDecodeI8(decoder, &level) < 0) return -1;
+    desc.level = level;
+    if (tDecodeCStrTo(decoder, desc.content) < 0) return -1;
+    taosArrayPush(pInfo->logs, &desc);
+  }
+
+  return 0;
+}
+
+int32_t tEncodeSMonClusterInfo(SCoder *encoder, const SMonClusterInfo *pInfo) {
+  if (tEncodeCStr(encoder, pInfo->first_ep) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->first_ep_dnode_id) < 0) return -1;
+  if (tEncodeCStr(encoder, pInfo->version) < 0) return -1;
+  if (tEncodeFloat(encoder, pInfo->master_uptime) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->monitor_interval) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->vgroups_total) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->vgroups_alive) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->vnodes_total) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->vnodes_alive) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->connections_total) < 0) return -1;
+  if (tEncodeI32(encoder, taosArrayGetSize(pInfo->dnodes)) < 0) return -1;
+  if (tEncodeI32(encoder, taosArrayGetSize(pInfo->mnodes)) < 0) return -1;
+  for (int32_t i = 0; i < taosArrayGetSize(pInfo->dnodes); ++i) {
+    SMonDnodeDesc *pDesc = taosArrayGet(pInfo->dnodes, i);
+    if (tEncodeI32(encoder, pDesc->dnode_id) < 0) return -1;
+    if (tEncodeCStr(encoder, pDesc->dnode_ep) < 0) return -1;
+    if (tEncodeCStr(encoder, pDesc->status) < 0) return -1;
+  }
+  for (int32_t i = 0; i < taosArrayGetSize(pInfo->mnodes); ++i) {
+    SMonMnodeDesc *pDesc = taosArrayGet(pInfo->mnodes, i);
+    if (tEncodeI32(encoder, pDesc->mnode_id) < 0) return -1;
+    if (tEncodeCStr(encoder, pDesc->mnode_ep) < 0) return -1;
+    if (tEncodeCStr(encoder, pDesc->role) < 0) return -1;
+  }
+  return 0;
+}
+
+int32_t tDecodeSMonClusterInfo(SCoder *decoder, SMonClusterInfo *pInfo) {
+  if (tDecodeCStrTo(decoder, pInfo->first_ep) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->first_ep_dnode_id) < 0) return -1;
+  if (tDecodeCStrTo(decoder, pInfo->version) < 0) return -1;
+  if (tDecodeFloat(decoder, &pInfo->master_uptime) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->monitor_interval) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->vgroups_total) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->vgroups_alive) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->vnodes_total) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->vnodes_alive) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->connections_total) < 0) return -1;
+
+  int32_t dnodesSize = 0;
+  int32_t mnodesSize = 0;
+  if (tDecodeI32(decoder, &dnodesSize) < 0) return -1;
+  if (tDecodeI32(decoder, &mnodesSize) < 0) return -1;
+
+  pInfo->dnodes = taosArrayInit(dnodesSize, sizeof(SMonDnodeDesc));
+  pInfo->mnodes = taosArrayInit(mnodesSize, sizeof(SMonMnodeDesc));
+  if (pInfo->dnodes != NULL || pInfo->mnodes != NULL) return -1;
+
+  for (int32_t i = 0; i < dnodesSize; ++i) {
+    SMonDnodeDesc desc = {0};
+    if (tDecodeI32(decoder, &desc.dnode_id) < 0) return -1;
+    if (tDecodeCStrTo(decoder, desc.dnode_ep) < 0) return -1;
+    if (tDecodeCStrTo(decoder, desc.status) < 0) return -1;
+    taosArrayPush(pInfo->dnodes, &desc);
+  }
+
+  for (int32_t i = 0; i < mnodesSize; ++i) {
+    SMonMnodeDesc desc = {0};
+    if (tDecodeI32(decoder, &desc.mnode_id) < 0) return -1;
+    if (tDecodeCStrTo(decoder, desc.mnode_ep) < 0) return -1;
+    if (tDecodeCStrTo(decoder, desc.role) < 0) return -1;
+    taosArrayPush(pInfo->mnodes, &desc);
+  }
+  return 0;
+}
+
+int32_t tEncodeSMonVgroupInfo(SCoder *encoder, const SMonVgroupInfo *pInfo) {
+  if (tEncodeI32(encoder, taosArrayGetSize(pInfo->vgroups)) < 0) return -1;
+  for (int32_t i = 0; i < taosArrayGetSize(pInfo->vgroups); ++i) {
+    SMonVgroupDesc *pDesc = taosArrayGet(pInfo->vgroups, i);
+    if (tEncodeI32(encoder, pDesc->vgroup_id) < 0) return -1;
+    if (tEncodeI32(encoder, pDesc->tables_num) < 0) return -1;
+    if (tEncodeCStr(encoder, pDesc->database_name) < 0) return -1;
+    if (tEncodeCStr(encoder, pDesc->status) < 0) return -1;
+    for (int32_t j = 0; j < TSDB_MAX_REPLICA; ++j) {
+      SMonVnodeDesc *pVDesc = &pDesc->vnodes[j];
+      if (tEncodeI32(encoder, pVDesc->dnode_id) < 0) return -1;
+      if (tEncodeCStr(encoder, pVDesc->vnode_role) < 0) return -1;
+    }
+  }
+  return 0;
+}
+
+int32_t tDecodeSMonVgroupInfo(SCoder *decoder, SMonVgroupInfo *pInfo) {
+  int32_t arraySize = 0;
+  if (tDecodeI32(decoder, &arraySize) < 0) return -1;
+
+  pInfo->vgroups = taosArrayInit(arraySize, sizeof(SMonVgroupDesc));
+  if (pInfo->vgroups != NULL) return -1;
+
+  for (int32_t i = 0; i < arraySize; ++i) {
+    SMonVgroupDesc desc = {0};
+    if (tDecodeI32(decoder, &desc.vgroup_id) < 0) return -1;
+    if (tDecodeI32(decoder, &desc.tables_num) < 0) return -1;
+    if (tDecodeCStrTo(decoder, desc.database_name) < 0) return -1;
+    if (tDecodeCStrTo(decoder, desc.status) < 0) return -1;
+    for (int32_t j = 0; j < TSDB_MAX_REPLICA; ++j) {
+      SMonVnodeDesc vdesc = {0};
+      if (tDecodeI32(decoder, &vdesc.dnode_id) < 0) return -1;
+      if (tDecodeCStrTo(decoder, vdesc.vnode_role) < 0) return -1;
+    }
+    taosArrayPush(pInfo->vgroups, &desc);
+  }
+  return 0;
+}
+
+int32_t tEncodeSMonGrantInfo(SCoder *encoder, const SMonGrantInfo *pInfo) {
+  if (tEncodeI32(encoder, pInfo->expire_time) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->timeseries_used) < 0) return -1;
+  if (tEncodeI32(encoder, pInfo->timeseries_total) < 0) return -1;
+  return 0;
+}
+
+int32_t tDecodeSMonGrantInfo(SCoder *decoder, SMonGrantInfo *pInfo) {
+  if (tDecodeI32(decoder, &pInfo->expire_time) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->timeseries_used) < 0) return -1;
+  if (tDecodeI32(decoder, &pInfo->timeseries_total) < 0) return -1;
+  return 0;
+}
+
+int32_t tSerializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeSMonClusterInfo(&encoder, &pInfo->cluster) < 0) return -1;
+  if (tEncodeSMonVgroupInfo(&encoder, &pInfo->vgroup) < 0) return -1;
+  if (tEncodeSMonGrantInfo(&encoder, &pInfo->grant) < 0) return -1;
+  if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeSMonClusterInfo(&decoder, &pInfo->cluster) < 0) return -1;
+  if (tDecodeSMonVgroupInfo(&decoder, &pInfo->vgroup) < 0) return -1;
+  if (tDecodeSMonGrantInfo(&decoder, &pInfo->grant) < 0) return -1;
+  if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
+void tFreeSMonMmInfo(SMonMmInfo *pInfo) {
   taosArrayDestroy(pInfo->logs.logs);
   pInfo->logs.logs = NULL;
 }
 
-int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
-int32_t tDeserializeSMonVMmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
-void    tFreeSMonVmInfo(SMonVmInfo *pInfo) {
+int32_t tEncodeSMonDiskDesc(SCoder *encoder, const SMonDiskDesc *pDesc) {
+  if (tEncodeCStr(encoder, pDesc->name) < 0) return -1;
+  if (tEncodeI8(encoder, pDesc->level) < 0) return -1;
+  if (tEncodeI64(encoder, pDesc->size.total) < 0) return -1;
+  if (tEncodeI64(encoder, pDesc->size.used) < 0) return -1;
+  if (tEncodeI64(encoder, pDesc->size.avail) < 0) return -1;
+}
+
+static int32_t tDecodeSMonDiskDesc(SCoder *decoder, SMonDiskDesc *pDesc) {
+  if (tDecodeCStrTo(decoder, pDesc->name) < 0) return -1;
+  if (tDecodeI8(decoder, &pDesc->level) < 0) return -1;
+  if (tDecodeI64(decoder, &pDesc->size.total) < 0) return -1;
+  if (tDecodeI64(decoder, &pDesc->size.used) < 0) return -1;
+  if (tDecodeI64(decoder, &pDesc->size.avail) < 0) return -1;
+  return 0;
+}
+
+int32_t tEncodeSMonDiskInfo(SCoder *encoder, const SMonDiskInfo *pInfo) {
+  if (tEncodeI32(encoder, taosArrayGetSize(pInfo->datadirs)) < 0) return -1;
+  for (int32_t i = 0; i < taosArrayGetSize(pInfo->datadirs); ++i) {
+    SMonDiskDesc *pDesc = taosArrayGet(pInfo->datadirs, i);
+    if (tEncodeSMonDiskDesc(encoder, pDesc) < 0) return -1;
+  }
+  return 0;
+}
+
+static int32_t tDecodeSMonDiskInfo(SCoder *decoder, SMonDiskInfo *pInfo) {
+  int32_t arraySize = 0;
+  if (tDecodeI32(decoder, &arraySize) < 0) return -1;
+
+  pInfo->datadirs = taosArrayInit(arraySize, sizeof(SMonDiskDesc));
+  if (pInfo->datadirs != NULL) return -1;
+
+  for (int32_t i = 0; i < arraySize; ++i) {
+    SMonDiskDesc desc = {0};
+    if (tDecodeSMonDiskDesc(decoder, &desc) < 0) return -1;
+    taosArrayPush(pInfo->datadirs, &desc);
+  }
+
+  return 0;
+}
+
+int32_t tEncodeSVnodesStat(SCoder *encoder, const SVnodesStat *pStat) {
+  if (tEncodeI32(encoder, pStat->openVnodes) < 0) return -1;
+  if (tEncodeI32(encoder, pStat->totalVnodes) < 0) return -1;
+  if (tEncodeI32(encoder, pStat->masterNum) < 0) return -1;
+  if (tEncodeI64(encoder, pStat->numOfSelectReqs) < 0) return -1;
+  if (tEncodeI64(encoder, pStat->numOfInsertReqs) < 0) return -1;
+  if (tEncodeI64(encoder, pStat->numOfInsertSuccessReqs) < 0) return -1;
+  if (tEncodeI64(encoder, pStat->numOfBatchInsertReqs) < 0) return -1;
+  if (tEncodeI64(encoder, pStat->numOfBatchInsertSuccessReqs) < 0) return -1;
+  if (tEncodeI64(encoder, pStat->errors) < 0) return -1;
+  return 0;
+}
+
+static int32_t tDecodeSVnodesStat(SCoder *decoder, SVnodesStat *pStat) {
+  if (tDecodeI32(decoder, &pStat->openVnodes) < 0) return -1;
+  if (tDecodeI32(decoder, &pStat->totalVnodes) < 0) return -1;
+  if (tDecodeI32(decoder, &pStat->masterNum) < 0) return -1;
+  if (tDecodeI64(decoder, &pStat->numOfSelectReqs) < 0) return -1;
+  if (tDecodeI64(decoder, &pStat->numOfInsertReqs) < 0) return -1;
+  if (tDecodeI64(decoder, &pStat->numOfInsertSuccessReqs) < 0) return -1;
+  if (tDecodeI64(decoder, &pStat->numOfBatchInsertReqs) < 0) return -1;
+  if (tDecodeI64(decoder, &pStat->numOfBatchInsertSuccessReqs) < 0) return -1;
+  if (tDecodeI64(decoder, &pStat->errors) < 0) return -1;
+  return 0;
+}
+
+int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeSMonDiskInfo(&encoder, &pInfo->tfs) < 0) return -1;
+  if (tEncodeSVnodesStat(&encoder, &pInfo->vstat) < 0) return -1;
+  if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeSMonDiskInfo(&decoder, &pInfo->tfs) < 0) return -1;
+  if (tDecodeSVnodesStat(&decoder, &pInfo->vstat) < 0) return -1;
+  if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
+void tFreeSMonVmInfo(SMonVmInfo *pInfo) {
   taosArrayDestroy(pInfo->logs.logs);
   pInfo->logs.logs = NULL;
 }
 
-int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
-int32_t tDeserializeSMonQMmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
-void    tFreeSMonQmInfo(SMonQmInfo *pInfo) {
+int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
+void tFreeSMonQmInfo(SMonQmInfo *pInfo) {
   taosArrayDestroy(pInfo->logs.logs);
   pInfo->logs.logs = NULL;
 }
 
-int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
-int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
-void    tFreeSMonSmInfo(SMonSmInfo *pInfo) {
+int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
+void tFreeSMonSmInfo(SMonSmInfo *pInfo) {
   taosArrayDestroy(pInfo->logs.logs);
   pInfo->logs.logs = NULL;
 }
 
-int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
-int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
-void    tFreeSMonBmInfo(SMonBmInfo *pInfo) {
+int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tCoderClear(&decoder);
+  return 0;
+}
+
+void tFreeSMonBmInfo(SMonBmInfo *pInfo) {
   taosArrayDestroy(pInfo->logs.logs);
   pInfo->logs.logs = NULL;
+}
+
+int32_t tSerializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo) {
+  SCoder encoder = {0};
+  tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeI32(&encoder, taosArrayGetSize(pInfo->pVloads)) < 0) return -1;
+  for (int32_t i = 0; i < taosArrayGetSize(pInfo->pVloads); ++i) {
+    SVnodeLoad *pLoad = taosArrayGet(pInfo->pVloads, i);
+    if (tEncodeI32(&encoder, pLoad->vgId) < 0) return -1;
+    if (tEncodeI8(&encoder, pLoad->role) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfTables) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfTimeSeries) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->totalStorage) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->compStorage) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->pointsWritten) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfSelectReqs) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfInsertReqs) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfInsertSuccessReqs) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfBatchInsertReqs) < 0) return -1;
+    if (tEncodeI64(&encoder, pLoad->numOfBatchInsertSuccessReqs) < 0) return -1;
+  }
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tCoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo) {
+  SCoder decoder = {0};
+  tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+
+  int32_t arraySize = 0;
+  if (tDecodeI32(&decoder, &arraySize) < 0) return -1;
+
+  pInfo->pVloads = taosArrayInit(arraySize, sizeof(SVnodeLoad));
+  if (pInfo->pVloads != NULL) return -1;
+
+  for (int32_t i = 0; i < arraySize; ++i) {
+    SVnodeLoad load = {0};
+    if (tDecodeI32(&decoder, &load.vgId) < 0) return -1;
+    if (tDecodeI8(&decoder, &load.role) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfTables) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfTimeSeries) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.totalStorage) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.compStorage) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.pointsWritten) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfSelectReqs) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfInsertReqs) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfInsertSuccessReqs) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfBatchInsertReqs) < 0) return -1;
+    if (tDecodeI64(&decoder, &load.numOfBatchInsertSuccessReqs) < 0) return -1;
+    taosArrayPush(pInfo->pVloads, &load);
+  }
+
+  tEndDecode(&decoder);
+  tCoderClear(&decoder);
+  return 0;
+}
+
+void tFreeSMonVloadInfo(SMonVloadInfo *pInfo) {
+  taosArrayDestroy(pInfo->pVloads);
+  pInfo->pVloads = NULL;
 }
\ No newline at end of file

From 8a62f5fa73baa619aef1771d3828b3a4217acf63 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 19:41:55 +0800
Subject: [PATCH 40/82] <fix>[query]: fix filter caused taosd crash.td-14566.

---
 source/libs/executor/src/executorimpl.c  | 19 +++++++++----------
 source/libs/executor/src/groupoperator.c |  1 +
 source/libs/scalar/src/filter.c          |  8 +++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index b6f4f5a405..3f7999b076 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4604,22 +4604,21 @@ SOperatorInfo* createExchangeOperatorInfo(const SNodeList* pSources, SSDataBlock
     goto _error;
   }
 
-  size_t size = pBlock->info.numOfCols;
-  pInfo->pResult = pBlock;
+  pInfo->pResult     = pBlock;
   pInfo->seqLoadData = true;
 
   tsem_init(&pInfo->ready, 0, 0);
 
-  pOperator->name = "ExchangeOperator";
+  pOperator->name         = "ExchangeOperator";
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_EXCHANGE;
   pOperator->blockingOptr = false;
-  pOperator->status = OP_NOT_OPENED;
-  pOperator->info = pInfo;
-  pOperator->numOfOutput = size;
-  pOperator->pTaskInfo = pTaskInfo;
-  pOperator->_openFn = prepareLoadRemoteData;  // assign a dummy function.
-  pOperator->getNextFn = doLoadRemoteData;
-  pOperator->closeFn = destroyExchangeOperatorInfo;
+  pOperator->status       = OP_NOT_OPENED;
+  pOperator->info         = pInfo;
+  pOperator->numOfOutput  = pBlock->info.numOfCols;
+  pOperator->pTaskInfo    = pTaskInfo;
+  pOperator->_openFn      = prepareLoadRemoteData;  // assign a dummy function.
+  pOperator->getNextFn    = doLoadRemoteData;
+  pOperator->closeFn      = destroyExchangeOperatorInfo;
 
 #if 1
   {  // todo refactor
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 86c2ad4f21..35191ccc8d 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -124,6 +124,7 @@ static void recordNewGroupKeys(SArray* pGroupCols, SArray* pGroupColVals, SSData
     if (colDataIsNull(pColInfoData, pBlock->info.rows, rowIndex, pColAgg)) {
       pkey->isNull = true;
     } else {
+      pkey->isNull = false;
       char* val = colDataGetData(pColInfoData, rowIndex);
       if (IS_VAR_DATA_TYPE(pkey->type)) {
         memcpy(pkey->pData, val, varDataTLen(val));
diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 393f143e5f..d40df7a45e 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -1787,12 +1787,14 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
       // fi->data = null;  use fi->desc as data, because json value is variable, so use tVariant (fi->desc)
     }
 
-    if(type != TSDB_DATA_TYPE_JSON){
+    if(type != TSDB_DATA_TYPE_JSON) {
       if (dType->type == type) {
         assignVal(fi->data, nodesGetValueFromNode(var), dType->bytes, type);
       } else {
         SScalarParam out = {.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData))};
         out.columnData->info.type = type;
+        out.columnData->info.bytes = tDataTypes[type].bytes;
+        ASSERT(!IS_VAR_DATA_TYPE(type));
 
         // todo refactor the convert
         int32_t code = doConvertDataType(var, &out);
@@ -2946,8 +2948,8 @@ bool filterExecuteImplRange(void *pinfo, int32_t numOfRows, int8_t** p, SColumnD
   
   for (int32_t i = 0; i < numOfRows; ++i) {    
     void *colData = colDataGetData((SColumnInfoData *)info->cunits[0].colData, i);
-
-    if (colData == NULL || colDataIsNull((SColumnInfoData *)info->cunits[0].colData, 0, i, NULL)) {
+    SColumnInfoData* pData = info->cunits[0].colData;
+    if (colData == NULL || colDataIsNull_s(pData, i)) {
       all = false;
       continue;
     }

From 8ef6b184f2a41b0ba5d6708a8854c34a2a68ef1d Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Fri, 8 Apr 2022 19:44:15 +0800
Subject: [PATCH 41/82] first(*)/last(*) rewrite

---
 include/libs/nodes/nodes.h             |  16 +++-
 source/libs/nodes/src/nodesUtilFuncs.c |  45 ++++++++-
 source/libs/parser/src/parTranslater.c | 124 ++++++++++++++++++++-----
 3 files changed, 157 insertions(+), 28 deletions(-)

diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h
index 28e5483552..39448ceef3 100644
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -30,11 +30,19 @@ extern "C" {
 #define FOREACH(node, list)	\
   for (SListCell* cell = (NULL != (list) ? (list)->pHead : NULL); (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false)); cell = cell->pNext)
 
-// only be use in FOREACH
-#define ERASE_NODE(list) cell = nodesListErase(list, cell);
-
 #define REPLACE_NODE(newNode) cell->pNode = (SNode*)(newNode)
 
+#define INSERT_LIST(target, src) nodesListInsertList((target), cell, src)
+
+#define WHERE_EACH(node, list) \
+  SListCell* cell = (NULL != (list) ? (list)->pHead : NULL); \
+  while (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false))
+
+#define WHERE_NEXT cell = cell->pNext
+
+// only be use in WHERE_EACH
+#define ERASE_NODE(list) cell = nodesListErase((list), cell)
+
 #define FORBOTH(node1, list1, node2, list2) \
   for (SListCell* cell1 = (NULL != (list1) ? (list1)->pHead : NULL), *cell2 = (NULL != (list2) ? (list2)->pHead : NULL); \
     (NULL == cell1 ? (node1 = NULL, false) : (node1 = cell1->pNode, true)), (NULL == cell2 ? (node2 = NULL, false) : (node2 = cell2->pNode, true)), (node1 != NULL && node2 != NULL); \
@@ -202,7 +210,9 @@ int32_t nodesListStrictAppend(SNodeList* pList, SNodeptr pNode);
 int32_t nodesListMakeAppend(SNodeList** pList, SNodeptr pNode);
 int32_t nodesListAppendList(SNodeList* pTarget, SNodeList* pSrc);
 int32_t nodesListStrictAppendList(SNodeList* pTarget, SNodeList* pSrc);
+int32_t nodesListPushFront(SNodeList* pList, SNodeptr pNode);
 SListCell* nodesListErase(SNodeList* pList, SListCell* pCell);
+void nodesListInsertList(SNodeList* pTarget, SListCell* pPos, SNodeList* pSrc);
 SNodeptr nodesListGetNode(SNodeList* pList, int32_t index);
 void nodesDestroyList(SNodeList* pList);
 // Only clear the linked list structure, without releasing the elements inside
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index 95a3280fc2..074ec4dcae 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -644,7 +644,7 @@ SNodeList* nodesMakeList() {
 
 int32_t nodesListAppend(SNodeList* pList, SNodeptr pNode) {
   if (NULL == pList || NULL == pNode) {
-    return TSDB_CODE_SUCCESS;
+    return TSDB_CODE_FAILED;
   }
   SListCell* p = taosMemoryCalloc(1, sizeof(SListCell));
   if (NULL == p) {
@@ -688,7 +688,7 @@ int32_t nodesListMakeAppend(SNodeList** pList, SNodeptr pNode) {
 
 int32_t nodesListAppendList(SNodeList* pTarget, SNodeList* pSrc) {
   if (NULL == pTarget || NULL == pSrc) {
-    return TSDB_CODE_SUCCESS;
+    return TSDB_CODE_FAILED;
   }
 
   if (NULL == pTarget->pHead) {
@@ -717,11 +717,34 @@ int32_t nodesListStrictAppendList(SNodeList* pTarget, SNodeList* pSrc) {
   return code;
 }
 
+int32_t nodesListPushFront(SNodeList* pList, SNodeptr pNode) {
+  if (NULL == pList || NULL == pNode) {
+    return TSDB_CODE_FAILED;
+  }
+  SListCell* p = taosMemoryCalloc(1, sizeof(SListCell));
+  if (NULL == p) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  p->pNode = pNode;
+  if (NULL != pList->pHead) {
+    pList->pHead->pPrev = p;
+    p->pNext = pList->pHead;
+  }
+  pList->pHead = p;
+  ++(pList->length);
+  return TSDB_CODE_SUCCESS;
+}
+
 SListCell* nodesListErase(SNodeList* pList, SListCell* pCell) {
   if (NULL == pCell->pPrev) {
     pList->pHead = pCell->pNext;
   } else {
     pCell->pPrev->pNext = pCell->pNext;
+  }
+  if (NULL == pCell->pNext) {
+    pList->pTail = pCell->pPrev;
+  } else {
     pCell->pNext->pPrev = pCell->pPrev;
   }
   SListCell* pNext = pCell->pNext;
@@ -731,6 +754,24 @@ SListCell* nodesListErase(SNodeList* pList, SListCell* pCell) {
   return pNext;
 }
 
+void nodesListInsertList(SNodeList* pTarget, SListCell* pPos, SNodeList* pSrc) {
+  if (NULL == pTarget || NULL == pPos || NULL == pSrc) {
+    return;
+  }
+
+  if (NULL == pPos->pPrev) {
+    pTarget->pHead = pSrc->pHead;
+  } else {
+    pPos->pPrev->pNext = pSrc->pHead;
+  }
+  pSrc->pHead->pPrev = pPos->pPrev;
+  pSrc->pTail->pNext = pPos;
+  pPos->pPrev = pSrc->pTail;
+
+  pTarget->length += pSrc->length;
+  taosMemoryFreeClear(pSrc);
+}
+
 SNodeptr nodesListGetNode(SNodeList* pList, int32_t index) {
   SNode* node;
   FOREACH(node, pList) {
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 88c3d5b549..cad6de719e 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -743,24 +743,99 @@ static int32_t translateTable(STranslateContext* pCxt, SNode* pTable) {
   return code;
 }
 
-static int32_t translateStar(STranslateContext* pCxt, SSelectStmt* pSelect, bool* pIsSelectStar) {
+static int32_t createAllColumns(STranslateContext* pCxt, SNodeList** pCols) {
+  *pCols = nodesMakeList();
+  if (NULL == *pCols) {
+    return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_OUT_OF_MEMORY);
+  }
+  SArray* pTables = taosArrayGetP(pCxt->pNsLevel, pCxt->currLevel);
+  size_t nums = taosArrayGetSize(pTables);
+  for (size_t i = 0; i < nums; ++i) {
+    STableNode* pTable = taosArrayGetP(pTables, i);
+    int32_t code = createColumnNodeByTable(pCxt, pTable, *pCols);
+    if (TSDB_CODE_SUCCESS != code) {
+      return code;
+    }
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static bool isFirstLastFunc(SFunctionNode* pFunc) {
+  return (FUNCTION_TYPE_FIRST == pFunc->funcType || FUNCTION_TYPE_LAST == pFunc->funcType);
+}
+
+static bool isFirstLastStar(SNode* pNode) {
+  if (QUERY_NODE_FUNCTION != nodeType(pNode) || !isFirstLastFunc((SFunctionNode*)pNode)) {
+    return false;
+  }
+  SNodeList* pParameterList = ((SFunctionNode*)pNode)->pParameterList;
+  if (LIST_LENGTH(pParameterList) != 1) {
+    return false;
+  }
+  SNode* pParam = nodesListGetNode(pParameterList, 0);
+  return (QUERY_NODE_COLUMN == nodeType(pParam) ? 0 == strcmp(((SColumnNode*)pParam)->colName, "*") : false);
+}
+
+static SNode* createFirstLastFunc(SFunctionNode* pSrcFunc, SColumnNode* pCol) {
+  SFunctionNode* pFunc = nodesMakeNode(QUERY_NODE_FUNCTION);
+  if (NULL == pFunc) {
+    return NULL;
+  }
+  pFunc->pParameterList = nodesMakeList();
+  if (NULL == pFunc->pParameterList || TSDB_CODE_SUCCESS != nodesListAppend(pFunc->pParameterList, pCol)) {
+    nodesDestroyNode(pFunc);
+    return NULL;
+  }
+
+  pFunc->node.resType = pCol->node.resType;
+  pFunc->funcId = pSrcFunc->funcId;
+  pFunc->funcType = pSrcFunc->funcType;
+  strcpy(pFunc->functionName, pSrcFunc->functionName);
+  snprintf(pFunc->node.aliasName, sizeof(pFunc->node.aliasName), (FUNCTION_TYPE_FIRST == pSrcFunc->funcType ? "first(%s)" : "last(%s)"), pCol->colName);
+
+  return (SNode*)pFunc;
+}
+
+static int32_t createFirstLastAllCols(STranslateContext* pCxt, SFunctionNode* pSrcFunc, SNodeList** pOutput) {
+  SNodeList* pCols = NULL;
+  if (TSDB_CODE_SUCCESS != createAllColumns(pCxt, &pCols)) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
+  SNodeList* pFuncs = nodesMakeList();
+  if (NULL == pFuncs) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  SNode* pCol = NULL;
+  FOREACH(pCol, pCols) {
+    if (TSDB_CODE_SUCCESS != nodesListStrictAppend(pFuncs, createFirstLastFunc(pSrcFunc, (SColumnNode*)pCol))) {
+      nodesDestroyNode(pFuncs);
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+
+  *pOutput = pFuncs;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t translateStar(STranslateContext* pCxt, SSelectStmt* pSelect) {
   if (NULL == pSelect->pProjectionList) { // select * ...
-    SArray* pTables = taosArrayGetP(pCxt->pNsLevel, pCxt->currLevel);
-    size_t nums = taosArrayGetSize(pTables);
-    pSelect->pProjectionList = nodesMakeList();
-    if (NULL == pSelect->pProjectionList) {
-      return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_OUT_OF_MEMORY);
-    }
-    for (size_t i = 0; i < nums; ++i) {
-      STableNode* pTable = taosArrayGetP(pTables, i);
-      int32_t code = createColumnNodeByTable(pCxt, pTable, pSelect->pProjectionList);
-      if (TSDB_CODE_SUCCESS != code) {
-        return code;
-      }
-    }
-    *pIsSelectStar = true;
+    return createAllColumns(pCxt, &pSelect->pProjectionList);
   } else {
     // todo : t.*
+    SNode* pNode = NULL;
+    WHERE_EACH(pNode, pSelect->pProjectionList) {
+      if (isFirstLastStar(pNode)) {
+        SNodeList* pFuncs = NULL;
+        if (TSDB_CODE_SUCCESS != createFirstLastAllCols(pCxt, (SFunctionNode*)pNode, &pFuncs)) {
+          return TSDB_CODE_OUT_OF_MEMORY;
+        }
+        INSERT_LIST(pSelect->pProjectionList, pFuncs);
+        ERASE_NODE(pSelect->pProjectionList);
+        continue;
+      }
+      WHERE_NEXT;
+    }
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -797,8 +872,8 @@ static int32_t getPositionValue(const SValueNode* pVal) {
 
 static int32_t translateOrderByPosition(STranslateContext* pCxt, SNodeList* pProjectionList, SNodeList* pOrderByList, bool* pOther) {
   *pOther = false;
-  SNode* pNode;
-  FOREACH(pNode, pOrderByList) {
+  SNode* pNode = NULL;
+  WHERE_EACH(pNode, pOrderByList) {
     SNode* pExpr = ((SOrderByExprNode*)pNode)->pExpr;
     if (QUERY_NODE_VALUE == nodeType(pExpr)) {
       SValueNode* pVal = (SValueNode*)pExpr;
@@ -823,6 +898,7 @@ static int32_t translateOrderByPosition(STranslateContext* pCxt, SNodeList* pPro
     } else {
       *pOther = true;
     }
+    WHERE_NEXT;
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -845,11 +921,10 @@ static int32_t translateOrderBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
 }
 
 static int32_t translateSelectList(STranslateContext* pCxt, SSelectStmt* pSelect) {
-  bool isSelectStar = false;
-  int32_t code = translateStar(pCxt, pSelect, &isSelectStar);
-  if (TSDB_CODE_SUCCESS == code && !isSelectStar) {
-    pCxt->currClause = SQL_CLAUSE_SELECT;
-    code = translateExprList(pCxt, pSelect->pProjectionList);
+  pCxt->currClause = SQL_CLAUSE_SELECT;
+  int32_t code = translateExprList(pCxt, pSelect->pProjectionList);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = translateStar(pCxt, pSelect);
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = checkExprListForGroupBy(pCxt, pSelect->pProjectionList);
@@ -1829,10 +1904,13 @@ static int32_t getSmaIndexBuildAst(STranslateContext* pCxt, SCreateIndexStmt* pS
   pSelect->pFromTable = (SNode*)pTable;
 
   pSelect->pProjectionList = nodesCloneList(pStmt->pOptions->pFuncs);
-  if (NULL == pTable) {
+  SFunctionNode* pFunc = nodesMakeNode(QUERY_NODE_FUNCTION);
+  if (NULL == pSelect->pProjectionList || NULL == pFunc) {
     nodesDestroyNode(pSelect);
     return TSDB_CODE_OUT_OF_MEMORY;
   }
+  strcpy(pFunc->functionName, "_wstartts");
+  nodesListPushFront(pSelect->pProjectionList, pFunc);
   SNode* pProject = NULL;
   FOREACH(pProject, pSelect->pProjectionList) {
     sprintf(((SExprNode*)pProject)->aliasName, "#sma_%p", pProject);

From b34ea72a04fe644324b14818aa9c6344c453e178 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 8 Apr 2022 19:59:10 +0800
Subject: [PATCH 42/82] feat[cluster]: send monitor information in
 multi-process mode

---
 include/libs/monitor/monitor.h       | 10 +++---
 source/dnode/mgmt/bm/bmHandle.c      |  2 +-
 source/dnode/mgmt/dm/dmWorker.c      | 10 +++---
 source/dnode/mgmt/inc/dmInt.h        |  2 +-
 source/dnode/mgmt/mm/mmHandle.c      |  2 +-
 source/dnode/mgmt/qm/qmHandle.c      |  2 +-
 source/dnode/mgmt/sm/smHandle.c      |  2 +-
 source/dnode/mgmt/vm/vmHandle.c      |  2 +-
 source/libs/monitor/inc/monInt.h     |  2 +-
 source/libs/monitor/src/monMain.c    | 32 +++++++++----------
 source/libs/monitor/src/monMsg.c     | 48 ++++++++++++++++------------
 source/libs/monitor/test/monTest.cpp | 10 +++---
 source/os/src/osSysinfo.c            |  4 +--
 13 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/include/libs/monitor/monitor.h b/include/libs/monitor/monitor.h
index 3cecb139e1..f5080fbe7b 100644
--- a/include/libs/monitor/monitor.h
+++ b/include/libs/monitor/monitor.h
@@ -143,7 +143,7 @@ typedef struct {
   SMonVgroupInfo  vgroup;
   SMonGrantInfo   grant;
   SMonSysInfo     sys;
-  SMonLogs        logs;
+  SMonLogs        log;
 } SMonMmInfo;
 
 int32_t tSerializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo);
@@ -158,7 +158,7 @@ typedef struct {
   SMonDiskInfo tfs;
   SVnodesStat  vstat;
   SMonSysInfo  sys;
-  SMonLogs     logs;
+  SMonLogs     log;
 } SMonVmInfo;
 
 int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo);
@@ -167,7 +167,7 @@ void    tFreeSMonVmInfo(SMonVmInfo *pInfo);
 
 typedef struct {
   SMonSysInfo sys;
-  SMonLogs    logs;
+  SMonLogs    log;
 } SMonQmInfo;
 
 int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo);
@@ -176,7 +176,7 @@ void    tFreeSMonQmInfo(SMonQmInfo *pInfo);
 
 typedef struct {
   SMonSysInfo sys;
-  SMonLogs    logs;
+  SMonLogs    log;
 } SMonSmInfo;
 
 int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
@@ -184,7 +184,7 @@ int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo);
 void    tFreeSMonSmInfo(SMonSmInfo *pInfo);
 typedef struct {
   SMonSysInfo sys;
-  SMonLogs    logs;
+  SMonLogs    log;
 } SMonBmInfo;
 
 int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo);
diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index 8abfa8955c..4ab000cb4e 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -19,7 +19,7 @@
 void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo) {
   if (pWrapper->procType == PROC_CHILD) {
     dmGetMonitorSysInfo(&bmInfo->sys);
-    monGetLogs(&bmInfo->logs);
+    monGetLogs(&bmInfo->log);
   }
 }
 
diff --git a/source/dnode/mgmt/dm/dmWorker.c b/source/dnode/mgmt/dm/dmWorker.c
index 7b2a3c7015..a6d0f4491a 100644
--- a/source/dnode/mgmt/dm/dmWorker.c
+++ b/source/dnode/mgmt/dm/dmWorker.c
@@ -119,9 +119,9 @@ int32_t dmStartWorker(SDnodeMgmt *pMgmt) {
     return -1;
   }
 
-  SSingleWorkerCfg scfg = {.min = 1, .max = 1, .name = "dnode-status", .fp = (FItem)dmProcessQueue, .param = pMgmt};
-  if (tSingleWorkerInit(&pMgmt->statusWorker, &scfg) != 0) {
-    dError("failed to start dnode status worker since %s", terrstr());
+  SSingleWorkerCfg scfg = {.min = 1, .max = 1, .name = "dnode-monitor", .fp = (FItem)dmProcessQueue, .param = pMgmt};
+  if (tSingleWorkerInit(&pMgmt->monitorWorker, &scfg) != 0) {
+    dError("failed to start dnode monitor worker since %s", terrstr());
     return -1;
   }
 
@@ -131,7 +131,7 @@ int32_t dmStartWorker(SDnodeMgmt *pMgmt) {
 
 void dmStopWorker(SDnodeMgmt *pMgmt) {
   tSingleWorkerCleanup(&pMgmt->mgmtWorker);
-  tSingleWorkerCleanup(&pMgmt->statusWorker);
+  tSingleWorkerCleanup(&pMgmt->monitorWorker);
 
   if (pMgmt->threadId != NULL) {
     taosDestoryThread(pMgmt->threadId);
@@ -151,7 +151,7 @@ int32_t dmProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
 
 int32_t dmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnodeMgmt    *pMgmt = pWrapper->pMgmt;
-  SSingleWorker *pWorker = &pMgmt->statusWorker;
+  SSingleWorker *pWorker = &pMgmt->monitorWorker;
 
   dTrace("msg:%p, put into worker %s", pMsg, pWorker->name);
   taosWriteQitem(pWorker->queue, pMsg);
diff --git a/source/dnode/mgmt/inc/dmInt.h b/source/dnode/mgmt/inc/dmInt.h
index eee529757e..6d37f59595 100644
--- a/source/dnode/mgmt/inc/dmInt.h
+++ b/source/dnode/mgmt/inc/dmInt.h
@@ -32,7 +32,7 @@ typedef struct SDnodeMgmt {
   TdThread     *threadId;
   SRWLatch      latch;
   SSingleWorker mgmtWorker;
-  SSingleWorker statusWorker;
+  SSingleWorker monitorWorker;
   SMsgCb        msgCb;
   const char   *path;
   SDnode       *pDnode;
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index eb7edd21d1..1ebcfdcda9 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -21,7 +21,7 @@ void mmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonMmInfo *mmInfo) {
   mndGetMonitorInfo(pMgmt->pMnode, &mmInfo->cluster, &mmInfo->vgroup, &mmInfo->grant);
   if (pWrapper->procType == PROC_CHILD) {
     dmGetMonitorSysInfo(&mmInfo->sys);
-    monGetLogs(&mmInfo->logs);
+    monGetLogs(&mmInfo->log);
   }
 }
 
diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/qm/qmHandle.c
index 7f1164bda8..3c29bd717b 100644
--- a/source/dnode/mgmt/qm/qmHandle.c
+++ b/source/dnode/mgmt/qm/qmHandle.c
@@ -19,7 +19,7 @@
 void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo) {
   if (pWrapper->procType == PROC_CHILD) {
     dmGetMonitorSysInfo(&qmInfo->sys);
-    monGetLogs(&qmInfo->logs);
+    monGetLogs(&qmInfo->log);
   }
 }
 
diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index 1e275d016b..214dc581b8 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -19,7 +19,7 @@
 void smGetMonitorInfo(SMgmtWrapper *pWrapper, SMonSmInfo *smInfo) {
   if (pWrapper->procType == PROC_CHILD) {
     dmGetMonitorSysInfo(&smInfo->sys);
-    monGetLogs(&smInfo->logs);
+    monGetLogs(&smInfo->log);
   }
 }
 
diff --git a/source/dnode/mgmt/vm/vmHandle.c b/source/dnode/mgmt/vm/vmHandle.c
index 2c7063b6f6..0433846ca1 100644
--- a/source/dnode/mgmt/vm/vmHandle.c
+++ b/source/dnode/mgmt/vm/vmHandle.c
@@ -34,7 +34,7 @@ void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo) {
 
   if (pWrapper->procType == PROC_CHILD) {
     dmGetMonitorSysInfo(&vmInfo->sys);
-    monGetLogs(&vmInfo->logs);
+    monGetLogs(&vmInfo->log);
   }
 }
 
diff --git a/source/libs/monitor/inc/monInt.h b/source/libs/monitor/inc/monInt.h
index 4b10aacdee..ae1af4ba62 100644
--- a/source/libs/monitor/inc/monInt.h
+++ b/source/libs/monitor/inc/monInt.h
@@ -24,7 +24,7 @@ typedef struct {
   int64_t    curTime;
   int64_t    lastTime;
   SJson     *pJson;
-  SMonLogs   logs;
+  SMonLogs   log;
   SMonDmInfo dmInfo;
   SMonMmInfo mmInfo;
   SMonVmInfo vmInfo;
diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c
index 1938b0d859..c012911e8b 100644
--- a/source/libs/monitor/src/monMain.c
+++ b/source/libs/monitor/src/monMain.c
@@ -124,7 +124,7 @@ void monCleanup() {
 
 static void monCleanupMonitorInfo(SMonInfo *pMonitor) {
   tsMonitor.lastTime = pMonitor->curTime;
-  taosArrayDestroy(pMonitor->logs.logs);
+  taosArrayDestroy(pMonitor->log.logs);
   tFreeSMonMmInfo(&pMonitor->mmInfo);
   tFreeSMonVmInfo(&pMonitor->vmInfo);
   tFreeSMonSmInfo(&pMonitor->smInfo);
@@ -141,7 +141,7 @@ static SMonInfo *monCreateMonitorInfo() {
     return NULL;
   }
 
-  monGetLogs(&pMonitor->logs);
+  monGetLogs(&pMonitor->log);
 
   taosThreadMutexLock(&tsMonitor.lock);
   memcpy(&pMonitor->dmInfo, &tsMonitor.dmInfo, sizeof(SMonDmInfo));
@@ -159,7 +159,7 @@ static SMonInfo *monCreateMonitorInfo() {
   taosThreadMutexUnlock(&tsMonitor.lock);
 
   pMonitor->pJson = tjsonCreateObject();
-  if (pMonitor->pJson == NULL || pMonitor->logs.logs == NULL) {
+  if (pMonitor->pJson == NULL || pMonitor->log.logs == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     monCleanupMonitorInfo(pMonitor);
     return NULL;
@@ -447,12 +447,12 @@ static void monGenLogJson(SMonInfo *pMonitor) {
   if (pLogsJson == NULL) return;
 
   SMonLogs *logs[6];
-  logs[0] = &pMonitor->logs;
-  logs[1] = &pMonitor->mmInfo.logs;
-  logs[2] = &pMonitor->vmInfo.logs;
-  logs[3] = &pMonitor->smInfo.logs;
-  logs[4] = &pMonitor->qmInfo.logs;
-  logs[5] = &pMonitor->bmInfo.logs;
+  logs[0] = &pMonitor->log;
+  logs[1] = &pMonitor->mmInfo.log;
+  logs[2] = &pMonitor->vmInfo.log;
+  logs[3] = &pMonitor->smInfo.log;
+  logs[4] = &pMonitor->qmInfo.log;
+  logs[5] = &pMonitor->bmInfo.log;
 
   int32_t numOfErrorLogs = 0;
   int32_t numOfInfoLogs = 0;
@@ -460,17 +460,17 @@ static void monGenLogJson(SMonInfo *pMonitor) {
   int32_t numOfTraceLogs = 0;
 
   for (int32_t j = 0; j < 6; j++) {
-    SMonLogs *pLogs = logs[j];
-    numOfErrorLogs += pLogs->numOfErrorLogs;
-    numOfInfoLogs += pLogs->numOfInfoLogs;
-    numOfDebugLogs += pLogs->numOfDebugLogs;
-    numOfTraceLogs += pLogs->numOfTraceLogs;
+    SMonLogs *pLog = logs[j];
+    numOfErrorLogs += pLog->numOfErrorLogs;
+    numOfInfoLogs += pLog->numOfInfoLogs;
+    numOfDebugLogs += pLog->numOfDebugLogs;
+    numOfTraceLogs += pLog->numOfTraceLogs;
 
-    for (int32_t i = 0; i < taosArrayGetSize(pLogs->logs); ++i) {
+    for (int32_t i = 0; i < taosArrayGetSize(pLog->logs); ++i) {
       SJson *pLogJson = tjsonCreateObject();
       if (pLogJson == NULL) continue;
 
-      SMonLogItem *pLogItem = taosArrayGet(pLogs->logs, i);
+      SMonLogItem *pLogItem = taosArrayGet(pLog->logs, i);
 
       char buf[40] = {0};
       taosFormatUtcTime(buf, sizeof(buf), pLogItem->ts, TSDB_TIME_PRECISION_MILLI);
diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c
index e58179e394..78a99b1066 100644
--- a/source/libs/monitor/src/monMsg.c
+++ b/source/libs/monitor/src/monMsg.c
@@ -226,7 +226,7 @@ int32_t tSerializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo) {
   if (tEncodeSMonVgroupInfo(&encoder, &pInfo->vgroup) < 0) return -1;
   if (tEncodeSMonGrantInfo(&encoder, &pInfo->grant) < 0) return -1;
   if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
-  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->log) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -243,7 +243,7 @@ int32_t tDeserializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo) {
   if (tDecodeSMonVgroupInfo(&decoder, &pInfo->vgroup) < 0) return -1;
   if (tDecodeSMonGrantInfo(&decoder, &pInfo->grant) < 0) return -1;
   if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
-  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->log) < 0) return -1;
   tEndDecode(&decoder);
 
   tCoderClear(&decoder);
@@ -251,8 +251,14 @@ int32_t tDeserializeSMonMmInfo(void *buf, int32_t bufLen, SMonMmInfo *pInfo) {
 }
 
 void tFreeSMonMmInfo(SMonMmInfo *pInfo) {
-  taosArrayDestroy(pInfo->logs.logs);
-  pInfo->logs.logs = NULL;
+  taosArrayDestroy(pInfo->log.logs);
+  taosArrayDestroy(pInfo->cluster.mnodes);
+  taosArrayDestroy(pInfo->cluster.dnodes);
+  taosArrayDestroy(pInfo->vgroup.vgroups);
+  pInfo->cluster.mnodes = NULL;
+  pInfo->cluster.dnodes = NULL;
+  pInfo->vgroup.vgroups = NULL;
+  pInfo->log.logs = NULL;
 }
 
 int32_t tEncodeSMonDiskDesc(SCoder *encoder, const SMonDiskDesc *pDesc) {
@@ -331,7 +337,7 @@ int32_t tSerializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo) {
   if (tEncodeSMonDiskInfo(&encoder, &pInfo->tfs) < 0) return -1;
   if (tEncodeSVnodesStat(&encoder, &pInfo->vstat) < 0) return -1;
   if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
-  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->log) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -347,7 +353,7 @@ int32_t tDeserializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo) {
   if (tDecodeSMonDiskInfo(&decoder, &pInfo->tfs) < 0) return -1;
   if (tDecodeSVnodesStat(&decoder, &pInfo->vstat) < 0) return -1;
   if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
-  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->log) < 0) return -1;
   tEndDecode(&decoder);
 
   tCoderClear(&decoder);
@@ -355,8 +361,10 @@ int32_t tDeserializeSMonVmInfo(void *buf, int32_t bufLen, SMonVmInfo *pInfo) {
 }
 
 void tFreeSMonVmInfo(SMonVmInfo *pInfo) {
-  taosArrayDestroy(pInfo->logs.logs);
-  pInfo->logs.logs = NULL;
+  taosArrayDestroy(pInfo->log.logs);
+  taosArrayDestroy(pInfo->tfs.datadirs);
+  pInfo->log.logs = NULL;
+  pInfo->tfs.datadirs = NULL;
 }
 
 int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo) {
@@ -365,7 +373,7 @@ int32_t tSerializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo) {
 
   if (tStartEncode(&encoder) < 0) return -1;
   if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
-  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->log) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -379,7 +387,7 @@ int32_t tDeserializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo) {
 
   if (tStartDecode(&decoder) < 0) return -1;
   if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
-  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->log) < 0) return -1;
   tEndDecode(&decoder);
 
   tCoderClear(&decoder);
@@ -387,8 +395,8 @@ int32_t tDeserializeSMonQmInfo(void *buf, int32_t bufLen, SMonQmInfo *pInfo) {
 }
 
 void tFreeSMonQmInfo(SMonQmInfo *pInfo) {
-  taosArrayDestroy(pInfo->logs.logs);
-  pInfo->logs.logs = NULL;
+  taosArrayDestroy(pInfo->log.logs);
+  pInfo->log.logs = NULL;
 }
 
 int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo) {
@@ -397,7 +405,7 @@ int32_t tSerializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo) {
 
   if (tStartEncode(&encoder) < 0) return -1;
   if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
-  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->log) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -411,7 +419,7 @@ int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo) {
 
   if (tStartDecode(&decoder) < 0) return -1;
   if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
-  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->log) < 0) return -1;
   tEndDecode(&decoder);
 
   tCoderClear(&decoder);
@@ -419,8 +427,8 @@ int32_t tDeserializeSMonSmInfo(void *buf, int32_t bufLen, SMonSmInfo *pInfo) {
 }
 
 void tFreeSMonSmInfo(SMonSmInfo *pInfo) {
-  taosArrayDestroy(pInfo->logs.logs);
-  pInfo->logs.logs = NULL;
+  taosArrayDestroy(pInfo->log.logs);
+  pInfo->log.logs = NULL;
 }
 
 int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo) {
@@ -429,7 +437,7 @@ int32_t tSerializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo) {
 
   if (tStartEncode(&encoder) < 0) return -1;
   if (tEncodeSMonSysInfo(&encoder, &pInfo->sys) < 0) return -1;
-  if (tEncodeSMonLogs(&encoder, &pInfo->logs) < 0) return -1;
+  if (tEncodeSMonLogs(&encoder, &pInfo->log) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -443,7 +451,7 @@ int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo) {
 
   if (tStartDecode(&decoder) < 0) return -1;
   if (tDecodeSMonSysInfo(&decoder, &pInfo->sys) < 0) return -1;
-  if (tDecodeSMonLogs(&decoder, &pInfo->logs) < 0) return -1;
+  if (tDecodeSMonLogs(&decoder, &pInfo->log) < 0) return -1;
   tEndDecode(&decoder);
 
   tCoderClear(&decoder);
@@ -451,8 +459,8 @@ int32_t tDeserializeSMonBmInfo(void *buf, int32_t bufLen, SMonBmInfo *pInfo) {
 }
 
 void tFreeSMonBmInfo(SMonBmInfo *pInfo) {
-  taosArrayDestroy(pInfo->logs.logs);
-  pInfo->logs.logs = NULL;
+  taosArrayDestroy(pInfo->log.logs);
+  pInfo->log.logs = NULL;
 }
 
 int32_t tSerializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo) {
diff --git a/source/libs/monitor/test/monTest.cpp b/source/libs/monitor/test/monTest.cpp
index af12297215..ceb9805e3d 100644
--- a/source/libs/monitor/test/monTest.cpp
+++ b/source/libs/monitor/test/monTest.cpp
@@ -248,25 +248,25 @@ TEST_F(MonitorTest, 01_Full) {
   GetVgroupInfo(&mmInfo.vgroup);
   GetGrantInfo(&mmInfo.grant);
   GetSysInfo(&mmInfo.sys);
-  GetLogInfo(&mmInfo.logs);
+  GetLogInfo(&mmInfo.log);
 
   SMonVmInfo vmInfo = {0};
   GetDiskInfo(&vmInfo.tfs);
   GetVnodeStat(&vmInfo.vstat);
   GetSysInfo(&vmInfo.sys);
-  GetLogInfo(&vmInfo.logs);
+  GetLogInfo(&vmInfo.log);
 
   SMonQmInfo qmInfo = {0};
   GetSysInfo(&qmInfo.sys);
-  GetLogInfo(&qmInfo.logs);
+  GetLogInfo(&qmInfo.log);
 
   SMonSmInfo smInfo = {0};
   GetSysInfo(&smInfo.sys);
-  GetLogInfo(&smInfo.logs);
+  GetLogInfo(&smInfo.log);
 
   SMonBmInfo bmInfo = {0};
   GetSysInfo(&bmInfo.sys);
-  GetLogInfo(&bmInfo.logs);
+  GetLogInfo(&bmInfo.log);
 
   monSetDmInfo(&dmInfo);
   monSetMmInfo(&mmInfo);
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 5e71505658..26de26ab67 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -623,7 +623,7 @@ void taosGetProcIODelta(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, i
   static int64_t cur_wchars = 0;
   static int64_t cur_read_bytes = 0;
   static int64_t cur_write_bytes = 0;
-  if (taosGetProcIO(&cur_rchars, &cur_wchars, &cur_read_bytes, &cur_write_bytes) != 0) {
+  if (taosGetProcIO(&cur_rchars, &cur_wchars, &cur_read_bytes, &cur_write_bytes) == 0) {
     *rchars = cur_rchars - last_rchars;
     *wchars = cur_wchars - last_wchars;
     *read_bytes = cur_read_bytes - last_read_bytes;
@@ -696,7 +696,7 @@ void taosGetCardInfoDelta(int64_t *receive_bytes, int64_t *transmit_bytes) {
 
   static int64_t cur_receive_bytes = 0;
   static int64_t cur_transmit_bytes = 0;
-  if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) != 0) {
+  if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) == 0) {
     *receive_bytes = cur_receive_bytes - last_receive_bytes;
     *transmit_bytes = cur_transmit_bytes - last_transmit_bytes;
     last_receive_bytes = cur_receive_bytes;

From fce5d488351854a94094d78b91d5d399eb916186 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 20:04:17 +0800
Subject: [PATCH 43/82] <fix>[query]: reset the null value bitmap before fetch
 next data block from tsdb. TD-14581.

---
 include/common/tcommon.h               |  1 +
 include/common/tdatablock.h            |  3 +++
 source/common/src/tdatablock.c         | 22 +++++++++++++---------
 source/dnode/vnode/src/tsdb/tsdbRead.c |  5 +++++
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index bf6a804e7f..ae873bbfa8 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -67,6 +67,7 @@ typedef struct SDataBlockInfo {
   int32_t     rowSize;
   int16_t     numOfCols;
   int16_t     hasVarCol;
+  int16_t     capacity;
   union {
     int64_t uid;
     int64_t blockId;
diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 98edd9f0a5..49af7da44b 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -196,7 +196,10 @@ int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullF
 
 int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows);
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
+
+int32_t colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows);
 void    blockDataCleanup(SSDataBlock* pDataBlock);
+
 size_t  blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
 void*   blockDataDestroy(SSDataBlock* pBlock);
 
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 8f55488e2c..647d69aabb 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1171,15 +1171,9 @@ int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullF
 
 void blockDataCleanup(SSDataBlock* pDataBlock) {
   pDataBlock->info.rows = 0;
-
-  if (pDataBlock->info.hasVarCol) {
-    for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
-      SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
-
-      if (IS_VAR_DATA_TYPE(p->info.type)) {
-        p->varmeta.length = 0;
-      }
-    }
+  for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
+    SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
+    colInfoDataCleanup(p, pDataBlock->info.capacity);
   }
 }
 
@@ -1220,12 +1214,22 @@ int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows)
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows) {
+  if (IS_VAR_DATA_TYPE(pColumn->info.type)) {
+    pColumn->varmeta.length = 0;
+  } else {
+    memset(pColumn->nullbitmap, 0, BitmapLen(numOfRows));
+  }
+}
+
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows) {
   int32_t code = 0;
   if (numOfRows == 0) {
     return TSDB_CODE_SUCCESS;
   }
 
+  pDataBlock->info.capacity = numOfRows;
+
   for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
     SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
     code = colInfoDataEnsureCapacity(p, numOfRows);
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 144aa7fcdc..84bc6e66ad 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -3254,6 +3254,11 @@ SArray* tsdbRetrieveDataBlock(tsdbReaderT* pTsdbReadHandle, SArray* pIdList) {
    */
   STsdbReadHandle* pHandle = (STsdbReadHandle*)pTsdbReadHandle;
 
+  for(int32_t i = 0; i < taosArrayGetSize(pHandle->pColumns); ++i) {
+    SColumnInfoData* pColInfo = taosArrayGet(pHandle->pColumns, i);
+    colInfoDataCleanup(pColInfo, pHandle->outputCapacity);
+  }
+
   if (pHandle->cur.fid == INT32_MIN) {
     return pHandle->pColumns;
   } else {

From 743649e1b7b19295fb8e99e7091ad8d8c13f3599 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 8 Apr 2022 20:37:57 +0800
Subject: [PATCH 44/82] <fix>[query]: fix length/char_length data block pointer
 with proper offset

TD-14572
---
 source/libs/scalar/src/sclfunc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index df9e1bf36d..8fa417306b 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -295,11 +295,11 @@ static int32_t doLengthFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
   SColumnInfoData *pInputData  = pInput->columnData;
   SColumnInfoData *pOutputData = pOutput->columnData;
 
-  char *in = pInputData->pData;
+  char *in = pInputData->pData + pInputData->varmeta.offset[0];
   int16_t *out = (int16_t *)pOutputData->pData;
 
   for (int32_t i = 0; i < pInput->numOfRows; ++i) {
-    if (colDataIsNull_f(pInputData->nullbitmap, i)) {
+    if (colDataIsNull_s(pInputData, i)) {
       colDataSetNull_f(pOutputData->nullbitmap, i);
       continue;
     }

From da2d8efc96101948a2ca2b43f8bb5f2eaf952aff Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 8 Apr 2022 20:37:57 +0800
Subject: [PATCH 45/82] <fix>[query]: fix length/char_length data block pointer
 with proper offset

TD-14572
---
 source/libs/scalar/src/sclfunc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 8fa417306b..7ce7b422ac 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -357,7 +357,7 @@ int32_t concatFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu
   }
   for (int32_t i = 0; i < inputNum; ++i) {
     pInputData[i] = pInput[i].columnData;
-    input[i] = pInputData[i]->pData;
+    input[i] = pInputData[i]->pData + pInputData[i]->varmeta.offset[0];
     int32_t factor = 1;
     if (hasNcharCol && (GET_PARAM_TYPE(&pInput[i]) == TSDB_DATA_TYPE_VARCHAR)) {
       factor = TSDB_NCHAR_SIZE;
@@ -438,7 +438,7 @@ int32_t concatWsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p
   }
   for (int32_t i = 0; i < inputNum; ++i) {
     pInputData[i] = pInput[i].columnData;
-    input[i] = pInputData[i]->pData;
+    input[i] = pInputData[i]->pData + pInputData[i]->varmeta.offset[0];
     int32_t factor = 1;
     if (hasNcharCol && (GET_PARAM_TYPE(&pInput[i]) == TSDB_DATA_TYPE_VARCHAR)) {
       factor = TSDB_NCHAR_SIZE;
@@ -509,7 +509,7 @@ static int32_t doCaseConvFunction(SScalarParam *pInput, int32_t inputNum, SScala
   SColumnInfoData *pInputData  = pInput->columnData;
   SColumnInfoData *pOutputData = pOutput->columnData;
 
-  char *input  = pInputData->pData;
+  char *input  = pInputData->pData + pInputData->varmeta.offset[0];
   char *output = NULL;
 
   int32_t outputLen = pInputData->varmeta.length;
@@ -554,7 +554,7 @@ static int32_t doTrimFunction(SScalarParam *pInput, int32_t inputNum, SScalarPar
   SColumnInfoData *pInputData  = pInput->columnData;
   SColumnInfoData *pOutputData = pOutput->columnData;
 
-  char *input  = pInputData->pData;
+  char *input  = pInputData->pData + pInputData->varmeta.offset[0];
   char *output = NULL;
 
   int32_t outputLen = pInputData->varmeta.length;
@@ -606,7 +606,7 @@ int32_t substrFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu
   SColumnInfoData *pInputData  = pInput->columnData;
   SColumnInfoData *pOutputData = pOutput->columnData;
 
-  char *input  = pInputData->pData;
+  char *input  = pInputData->pData + pInputData->varmeta.offset[0];
   char *output = NULL;
 
   int32_t outputLen = pInputData->varmeta.length * pInput->numOfRows;

From 951ee6136cb470f61033866bb3c148e2674d8b32 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 8 Apr 2022 20:30:36 +0800
Subject: [PATCH 46/82] feat[cluster]: send monitor information in
 multi-process mode

---
 source/dnode/mgmt/bm/bmHandle.c   |  27 +++-
 source/dnode/mgmt/bm/bmWorker.c   |  52 ++++++-
 source/dnode/mgmt/dm/dmHandle.c   |   8 -
 source/dnode/mgmt/dm/dmMonitor.c  | 246 +++++++-----------------------
 source/dnode/mgmt/dm/dmWorker.c   |  18 ---
 source/dnode/mgmt/inc/bmInt.h     |   4 +
 source/dnode/mgmt/inc/dmInt.h     |  10 +-
 source/dnode/mgmt/inc/mmInt.h     |   3 +
 source/dnode/mgmt/inc/qmInt.h     |   3 +
 source/dnode/mgmt/inc/smInt.h     |   3 +
 source/dnode/mgmt/inc/vmInt.h     |   4 +
 source/dnode/mgmt/mm/mmHandle.c   |  25 +++
 source/dnode/mgmt/mm/mmWorker.c   |  28 +++-
 source/dnode/mgmt/qm/qmHandle.c   |  25 +++
 source/dnode/mgmt/qm/qmWorker.c   |  46 ++++++
 source/dnode/mgmt/sm/smHandle.c   |  25 +++
 source/dnode/mgmt/sm/smWorker.c   |  46 ++++++
 source/dnode/mgmt/vm/vmHandle.c   |  49 ++++++
 source/dnode/mgmt/vm/vmWorker.c   |  25 +++
 source/libs/monitor/src/monMain.c |   3 +
 source/util/src/tconfig.c         |   2 +-
 21 files changed, 414 insertions(+), 238 deletions(-)

diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index 4ab000cb4e..3021c2798f 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -23,6 +23,29 @@ void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo) {
   }
 }
 
+int32_t bmProcessGetMonBmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
+  SMonBmInfo bmInfo = {0};
+  bmGetMonitorInfo(pWrapper, &bmInfo);
+
+  int32_t rspLen = tSerializeSMonBmInfo(NULL, 0, &bmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonBmInfo(pRsp, rspLen, &bmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonBmInfo(&bmInfo);
+  return 0;
+}
+
 int32_t bmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
@@ -61,4 +84,6 @@ int32_t bmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 }
 
-void bmInitMsgHandle(SMgmtWrapper *pWrapper) {}
+void bmInitMsgHandle(SMgmtWrapper *pWrapper) {
+  dndSetMsgHandle(pWrapper, TDMT_MON_BM_INFO, bmProcessMonitorMsg, DEFAULT_HANDLE);
+}
diff --git a/source/dnode/mgmt/bm/bmWorker.c b/source/dnode/mgmt/bm/bmWorker.c
index a5a97f6af0..a08d390d43 100644
--- a/source/dnode/mgmt/bm/bmWorker.c
+++ b/source/dnode/mgmt/bm/bmWorker.c
@@ -33,7 +33,34 @@ static void bmSendErrorRsps(SMgmtWrapper *pWrapper, STaosQall *qall, int32_t num
   }
 }
 
-static void bmProcessQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
+static void bmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
+  SBnodeMgmt *pMgmt = pInfo->ahandle;
+
+  dTrace("msg:%p, get from bnode monitor queue", pMsg);
+  SRpcMsg *pRpc = &pMsg->rpcMsg;
+  int32_t  code = -1;
+
+  if (pMsg->rpcMsg.msgType == TDMT_MON_BM_INFO) {
+    code = bmProcessGetMonBmInfoReq(pMgmt->pWrapper, pMsg);
+  }
+
+  if (pRpc->msgType & 1U) {
+    if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      if (code != 0) {
+        code = terrno;
+        dError("msg:%p, failed to process since %s", pMsg, terrstr());
+      }
+      SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
+      tmsgSendRsp(&rsp);
+    }
+  }
+
+  dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
+  rpcFreeCont(pRpc->pCont);
+  taosFreeQitem(pMsg);
+}
+
+static void bmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
   SBnodeMgmt   *pMgmt = pInfo->ahandle;
   SMgmtWrapper *pWrapper = pMgmt->pWrapper;
 
@@ -72,18 +99,37 @@ int32_t bmProcessWriteMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   return 0;
 }
 
+int32_t bmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
+  SBnodeMgmt    *pMgmt = pWrapper->pMgmt;
+  SSingleWorker *pWorker = &pMgmt->monitorWorker;
+
+  dTrace("msg:%p, put into worker:%s", pMsg, pWorker->name);
+  taosWriteQitem(pWorker->queue, pMsg);
+  return 0;
+}
+
 int32_t bmStartWorker(SBnodeMgmt *pMgmt) {
-  SMultiWorkerCfg cfg = {.max = 1, .name = "bnode-write", .fp = (FItems)bmProcessQueue, .param = pMgmt};
+  SMultiWorkerCfg cfg = {.max = 1, .name = "bnode-write", .fp = (FItems)bmProcessWriteQueue, .param = pMgmt};
   if (tMultiWorkerInit(&pMgmt->writeWorker, &cfg) != 0) {
-    dError("failed to start bnode write worker since %s", terrstr());
+    dError("failed to start bnode-write worker since %s", terrstr());
     return -1;
   }
 
+  if (tsMultiProcess) {
+    SSingleWorkerCfg sCfg = {
+        .min = 1, .max = 1, .name = "bnode-monitor", .fp = (FItem)bmProcessMonQueue, .param = pMgmt};
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+      dError("failed to start bnode-monitor worker since %s", terrstr());
+      return -1;
+    }
+  }
+
   dDebug("bnode workers are initialized");
   return 0;
 }
 
 void bmStopWorker(SBnodeMgmt *pMgmt) {
+  tSingleWorkerCleanup(&pMgmt->monitorWorker);
   tMultiWorkerCleanup(&pMgmt->writeWorker);
   dDebug("bnode workers are closed");
 }
diff --git a/source/dnode/mgmt/dm/dmHandle.c b/source/dnode/mgmt/dm/dmHandle.c
index c0175fed10..685958aaf0 100644
--- a/source/dnode/mgmt/dm/dmHandle.c
+++ b/source/dnode/mgmt/dm/dmHandle.c
@@ -212,12 +212,4 @@ void dmInitMsgHandle(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_MND_STATUS_RSP, dmProcessMonitorMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_GRANT_RSP, dmProcessMgmtMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_MND_AUTH_RSP, dmProcessMgmtMsg, DEFAULT_HANDLE);
-
-  // Monitor info exchange between processes
-  dndSetMsgHandle(pWrapper, TDMT_MON_MM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
-  dndSetMsgHandle(pWrapper, TDMT_MON_VM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
-  dndSetMsgHandle(pWrapper, TDMT_MON_QM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
-  dndSetMsgHandle(pWrapper, TDMT_MON_SM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
-  dndSetMsgHandle(pWrapper, TDMT_MON_BM_INFO, dmProcessMonitorMsg, DEFAULT_HANDLE);
-  dndSetMsgHandle(pWrapper, TDMT_MON_VM_LOAD, dmProcessMonitorMsg, DEFAULT_HANDLE);
 }
diff --git a/source/dnode/mgmt/dm/dmMonitor.c b/source/dnode/mgmt/dm/dmMonitor.c
index b9199efac2..ff5225e580 100644
--- a/source/dnode/mgmt/dm/dmMonitor.c
+++ b/source/dnode/mgmt/dm/dmMonitor.c
@@ -59,74 +59,92 @@ void dmSendMonitorReport(SDnode *pDnode) {
   tstrncpy(epset.eps[0].fqdn, tsLocalFqdn, TSDB_FQDN_LEN);
   epset.eps[0].port = tsServerPort;
 
+  SMgmtWrapper *pWrapper = NULL;
   dmGetMonitorInfo(pDnode, &dmInfo);
 
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pDnode, MNODE);
-  if (pWrapper != NULL) {
-    if (!tsMultiProcess) {
+  pWrapper = &pDnode->wrappers[MNODE];
+  if (!tsMultiProcess) {
+    if (dndMarkWrapper(pWrapper) != 0) {
       mmGetMonitorInfo(pWrapper, &mmInfo);
-    } else {
+      dndReleaseWrapper(pWrapper);
+    }
+  } else {
+    if (pWrapper->required) {
       req.msgType = TDMT_MON_MM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      tDeserializeSMonMmInfo(rsp.pCont, rsp.contLen, &mmInfo);
+      if (rsp.code == 0) {
+        tDeserializeSMonMmInfo(rsp.pCont, rsp.contLen, &mmInfo);
+      }
       rpcFreeCont(rsp.pCont);
     }
-    dndReleaseWrapper(pWrapper);
   }
 
-  pWrapper = dndAcquireWrapper(pDnode, VNODES);
-  if (pWrapper != NULL) {
-    if (!tsMultiProcess) {
+  pWrapper = &pDnode->wrappers[VNODES];
+  if (!tsMultiProcess) {
+    if (dndMarkWrapper(pWrapper) != 0) {
       vmGetMonitorInfo(pWrapper, &vmInfo);
-    } else {
+      dndReleaseWrapper(pWrapper);
+    }
+  } else {
+    if (pWrapper->required) {
       req.msgType = TDMT_MON_VM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      dndReleaseWrapper(pWrapper);
-      tDeserializeSMonVmInfo(rsp.pCont, rsp.contLen, &vmInfo);
+      if (rsp.code == 0) {
+        tDeserializeSMonVmInfo(rsp.pCont, rsp.contLen, &vmInfo);
+      }
       rpcFreeCont(rsp.pCont);
     }
   }
 
-  pWrapper = dndAcquireWrapper(pDnode, QNODE);
-  if (pWrapper != NULL) {
-    if (!tsMultiProcess) {
+  pWrapper = &pDnode->wrappers[QNODE];
+  if (!tsMultiProcess) {
+    if (dndMarkWrapper(pWrapper) != 0) {
       qmGetMonitorInfo(pWrapper, &qmInfo);
-    } else {
+      dndReleaseWrapper(pWrapper);
+    }
+  } else {
+    if (pWrapper->required) {
       req.msgType = TDMT_MON_QM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      dndReleaseWrapper(pWrapper);
-      tDeserializeSMonQmInfo(rsp.pCont, rsp.contLen, &qmInfo);
+      if (rsp.code == 0) {
+        tDeserializeSMonQmInfo(rsp.pCont, rsp.contLen, &qmInfo);
+      }
       rpcFreeCont(rsp.pCont);
     }
-    dndReleaseWrapper(pWrapper);
   }
 
-  pWrapper = dndAcquireWrapper(pDnode, SNODE);
-  if (pWrapper != NULL) {
-    if (!tsMultiProcess) {
+  pWrapper = &pDnode->wrappers[SNODE];
+  if (!tsMultiProcess) {
+    if (dndMarkWrapper(pWrapper) != 0) {
       smGetMonitorInfo(pWrapper, &smInfo);
-    } else {
+      dndReleaseWrapper(pWrapper);
+    }
+  } else {
+    if (pWrapper->required) {
       req.msgType = TDMT_MON_SM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      dndReleaseWrapper(pWrapper);
-      tDeserializeSMonSmInfo(rsp.pCont, rsp.contLen, &smInfo);
+      if (rsp.code == 0) {
+        tDeserializeSMonSmInfo(rsp.pCont, rsp.contLen, &smInfo);
+      }
       rpcFreeCont(rsp.pCont);
     }
-    dndReleaseWrapper(pWrapper);
   }
 
-  pWrapper = dndAcquireWrapper(pDnode, BNODE);
-  if (pWrapper != NULL) {
-    if (!tsMultiProcess) {
+  pWrapper = &pDnode->wrappers[BNODE];
+  if (!tsMultiProcess) {
+    if (dndMarkWrapper(pWrapper) != 0) {
       bmGetMonitorInfo(pWrapper, &bmInfo);
-    } else {
+      dndReleaseWrapper(pWrapper);
+    }
+  } else {
+    if (pWrapper->required) {
       req.msgType = TDMT_MON_BM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      dndReleaseWrapper(pWrapper);
-      tDeserializeSMonBmInfo(rsp.pCont, rsp.contLen, &bmInfo);
+      if (rsp.code == 0) {
+        tDeserializeSMonBmInfo(rsp.pCont, rsp.contLen, &bmInfo);
+      }
       rpcFreeCont(rsp.pCont);
     }
-    dndReleaseWrapper(pWrapper);
   }
 
   monSetDmInfo(&dmInfo);
@@ -143,168 +161,6 @@ void dmSendMonitorReport(SDnode *pDnode) {
   monSendReport();
 }
 
-int32_t dmProcessGetMonMmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, MNODE);
-  if (pWrapper == NULL) return -1;
-
-  SMonMmInfo mmInfo = {0};
-  mmGetMonitorInfo(pWrapper, &mmInfo);
-  dndReleaseWrapper(pWrapper);
-
-  int32_t rspLen = tSerializeSMonMmInfo(NULL, 0, &mmInfo);
-  if (rspLen < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
-
-  void *pRsp = rpcMallocCont(rspLen);
-  if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  tSerializeSMonMmInfo(pRsp, rspLen, &mmInfo);
-  pReq->pRsp = pRsp;
-  pReq->rspLen = rspLen;
-  tFreeSMonMmInfo(&mmInfo);
-  return 0;
-}
-
-int32_t dmProcessGetMonVmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, VNODES);
-  if (pWrapper == NULL) return -1;
-
-  SMonVmInfo vmInfo = {0};
-  vmGetMonitorInfo(pWrapper, &vmInfo);
-  dndReleaseWrapper(pWrapper);
-
-  int32_t rspLen = tSerializeSMonVmInfo(NULL, 0, &vmInfo);
-  if (rspLen < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
-
-  void *pRsp = rpcMallocCont(rspLen);
-  if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  tSerializeSMonVmInfo(pRsp, rspLen, &vmInfo);
-  pReq->pRsp = pRsp;
-  pReq->rspLen = rspLen;
-  tFreeSMonVmInfo(&vmInfo);
-  return 0;
-}
-
-int32_t dmProcessGetMonQmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, QNODE);
-  if (pWrapper == NULL) return -1;
-
-  SMonQmInfo qmInfo = {0};
-  qmGetMonitorInfo(pWrapper, &qmInfo);
-  dndReleaseWrapper(pWrapper);
-
-  int32_t rspLen = tSerializeSMonQmInfo(NULL, 0, &qmInfo);
-  if (rspLen < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
-
-  void *pRsp = rpcMallocCont(rspLen);
-  if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  tSerializeSMonQmInfo(pRsp, rspLen, &qmInfo);
-  pReq->pRsp = pRsp;
-  pReq->rspLen = rspLen;
-  tFreeSMonQmInfo(&qmInfo);
-  return 0;
-}
-
-int32_t dmProcessGetMonSmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, SNODE);
-  if (pWrapper == NULL) return -1;
-
-  SMonSmInfo smInfo = {0};
-  smGetMonitorInfo(pWrapper, &smInfo);
-  dndReleaseWrapper(pWrapper);
-
-  int32_t rspLen = tSerializeSMonSmInfo(NULL, 0, &smInfo);
-  if (rspLen < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
-
-  void *pRsp = rpcMallocCont(rspLen);
-  if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  tSerializeSMonSmInfo(pRsp, rspLen, &smInfo);
-  pReq->pRsp = pRsp;
-  pReq->rspLen = rspLen;
-  tFreeSMonSmInfo(&smInfo);
-  return 0;
-}
-
-int32_t dmProcessGetMonBmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, BNODE);
-  if (pWrapper == NULL) return -1;
-
-  SMonBmInfo bmInfo = {0};
-  bmGetMonitorInfo(pWrapper, &bmInfo);
-  dndReleaseWrapper(pWrapper);
-
-  int32_t rspLen = tSerializeSMonBmInfo(NULL, 0, &bmInfo);
-  if (rspLen < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
-
-  void *pRsp = rpcMallocCont(rspLen);
-  if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  tSerializeSMonBmInfo(pRsp, rspLen, &bmInfo);
-  pReq->pRsp = pRsp;
-  pReq->rspLen = rspLen;
-  tFreeSMonBmInfo(&bmInfo);
-  return 0;
-}
-
-int32_t dmProcessGetVnodeLoadsReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq) {
-  SMgmtWrapper *pWrapper = dndAcquireWrapper(pMgmt->pDnode, VNODES);
-  if (pWrapper == NULL) return -1;
-
-  SMonVloadInfo vloads = {0};
-  vmGetVnodeLoads(pWrapper, &vloads);
-  dndReleaseWrapper(pWrapper);
-
-  int32_t rspLen = tSerializeSMonVloadInfo(NULL, 0, &vloads);
-  if (rspLen < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
-
-  void *pRsp = rpcMallocCont(rspLen);
-  if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  tSerializeSMonVloadInfo(pRsp, rspLen, &vloads);
-  pReq->pRsp = pRsp;
-  pReq->rspLen = rspLen;
-  tFreeSMonVloadInfo(&vloads);
-  return 0;
-}
-
 void dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) {
   if (!tsMultiProcess) {
     vmGetVnodeLoads(pWrapper, pInfo);
diff --git a/source/dnode/mgmt/dm/dmWorker.c b/source/dnode/mgmt/dm/dmWorker.c
index a6d0f4491a..41b38c8bb7 100644
--- a/source/dnode/mgmt/dm/dmWorker.c
+++ b/source/dnode/mgmt/dm/dmWorker.c
@@ -78,24 +78,6 @@ static void dmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
     case TDMT_MND_GRANT_RSP:
       code = dmProcessGrantRsp(pMgmt, pMsg);
       break;
-    case TDMT_MON_MM_INFO:
-      code = dmProcessGetMonMmInfoReq(pMgmt, pMsg);
-      break;
-    case TDMT_MON_VM_INFO:
-      code = dmProcessGetMonVmInfoReq(pMgmt, pMsg);
-      break;
-    case TDMT_MON_QM_INFO:
-      code = dmProcessGetMonQmInfoReq(pMgmt, pMsg);
-      break;
-    case TDMT_MON_SM_INFO:
-      code = dmProcessGetMonSmInfoReq(pMgmt, pMsg);
-      break;
-    case TDMT_MON_BM_INFO:
-      code = dmProcessGetMonBmInfoReq(pMgmt, pMsg);
-      break;
-    case TDMT_MON_VM_LOAD:
-      code = dmProcessGetVnodeLoadsReq(pMgmt, pMsg);
-      break;
     default:
       code = dmProcessCDnodeReq(pMgmt->pDnode, pMsg);
       break;
diff --git a/source/dnode/mgmt/inc/bmInt.h b/source/dnode/mgmt/inc/bmInt.h
index 919b1d2c7c..84a6a53e99 100644
--- a/source/dnode/mgmt/inc/bmInt.h
+++ b/source/dnode/mgmt/inc/bmInt.h
@@ -17,6 +17,7 @@
 #define _TD_DND_BNODE_INT_H_
 
 #include "dndInt.h"
+
 #include "bnode.h"
 
 #ifdef __cplusplus
@@ -29,6 +30,7 @@ typedef struct SBnodeMgmt {
   SMgmtWrapper *pWrapper;
   const char   *path;
   SMultiWorker  writeWorker;
+  SSingleWorker monitorWorker;
 } SBnodeMgmt;
 
 // bmInt.c
@@ -39,11 +41,13 @@ int32_t bmDrop(SMgmtWrapper *pWrapper);
 void    bmInitMsgHandle(SMgmtWrapper *pWrapper);
 int32_t bmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t bmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t bmProcessGetMonBmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq);
 
 // bmWorker.c
 int32_t bmStartWorker(SBnodeMgmt *pMgmt);
 void    bmStopWorker(SBnodeMgmt *pMgmt);
 int32_t bmProcessWriteMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t bmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mgmt/inc/dmInt.h b/source/dnode/mgmt/inc/dmInt.h
index 6d37f59595..a671368f06 100644
--- a/source/dnode/mgmt/inc/dmInt.h
+++ b/source/dnode/mgmt/inc/dmInt.h
@@ -54,14 +54,8 @@ int32_t dmProcessGrantRsp(SDnodeMgmt *pMgmt, SNodeMsg *pMsg);
 int32_t dmProcessCDnodeReq(SDnode *pDnode, SNodeMsg *pMsg);
 
 // dmMonitor.c
-int32_t dmProcessGetVnodeLoadsReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
-int32_t dmProcessGetMonMmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
-int32_t dmProcessGetMonVmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
-int32_t dmProcessGetMonQmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
-int32_t dmProcessGetMonSmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
-int32_t dmProcessGetMonBmInfoReq(SDnodeMgmt *pMgmt, SNodeMsg *pReq);
-void    dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo);
-void    dmSendMonitorReport(SDnode *pDnode);
+void dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo);
+void dmSendMonitorReport(SDnode *pDnode);
 
 // dmWorker.c
 int32_t dmStartThread(SDnodeMgmt *pMgmt);
diff --git a/source/dnode/mgmt/inc/mmInt.h b/source/dnode/mgmt/inc/mmInt.h
index d09d15255d..df63e22059 100644
--- a/source/dnode/mgmt/inc/mmInt.h
+++ b/source/dnode/mgmt/inc/mmInt.h
@@ -32,6 +32,7 @@ typedef struct SMnodeMgmt {
   SSingleWorker readWorker;
   SSingleWorker writeWorker;
   SSingleWorker syncWorker;
+  SSingleWorker monitorWorker;
   SReplica      replicas[TSDB_MAX_REPLICA];
   int8_t        replica;
   int8_t        selfIndex;
@@ -51,6 +52,7 @@ void    mmInitMsgHandle(SMgmtWrapper *pWrapper);
 int32_t mmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t mmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t mmProcessAlterReq(SMnodeMgmt *pMgmt, SNodeMsg *pMsg);
+int32_t mmProcessGetMonMmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq);
 
 // mmWorker.c
 int32_t mmStartWorker(SMnodeMgmt *pMgmt);
@@ -59,6 +61,7 @@ int32_t mmProcessWriteMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t mmProcessSyncMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t mmProcessReadMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t mmProcessQueryMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t mmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t mmPutMsgToQueryQueue(SMgmtWrapper *pWrapper, SRpcMsg *pRpc);
 int32_t mmPutMsgToReadQueue(SMgmtWrapper *pWrapper, SRpcMsg *pRpc);
 int32_t mmPutMsgToWriteQueue(SMgmtWrapper *pWrapper, SRpcMsg *pRpc);
diff --git a/source/dnode/mgmt/inc/qmInt.h b/source/dnode/mgmt/inc/qmInt.h
index 02905413ab..012869d637 100644
--- a/source/dnode/mgmt/inc/qmInt.h
+++ b/source/dnode/mgmt/inc/qmInt.h
@@ -30,6 +30,7 @@ typedef struct SQnodeMgmt {
   const char   *path;
   SSingleWorker queryWorker;
   SSingleWorker fetchWorker;
+  SSingleWorker monitorWorker;
 } SQnodeMgmt;
 
 // qmInt.c
@@ -40,6 +41,7 @@ int32_t qmDrop(SMgmtWrapper *pWrapper);
 void    qmInitMsgHandle(SMgmtWrapper *pWrapper);
 int32_t qmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t qmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t qmProcessGetMonQmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq);
 
 // qmWorker.c
 int32_t qmPutMsgToQueryQueue(SMgmtWrapper *pWrapper, SRpcMsg *pMsg);
@@ -50,6 +52,7 @@ int32_t qmStartWorker(SQnodeMgmt *pMgmt);
 void    qmStopWorker(SQnodeMgmt *pMgmt);
 int32_t qmProcessQueryMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t qmProcessFetchMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t qmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mgmt/inc/smInt.h b/source/dnode/mgmt/inc/smInt.h
index 285ec84942..039dea2491 100644
--- a/source/dnode/mgmt/inc/smInt.h
+++ b/source/dnode/mgmt/inc/smInt.h
@@ -32,6 +32,7 @@ typedef struct SSnodeMgmt {
   int8_t        uniqueWorkerInUse;
   SArray       *uniqueWorkers;  // SArray<SMultiWorker*>
   SSingleWorker sharedWorker;
+  SSingleWorker monitorWorker;
 } SSnodeMgmt;
 
 // smInt.c
@@ -42,6 +43,7 @@ int32_t smDrop(SMgmtWrapper *pWrapper);
 void    smInitMsgHandle(SMgmtWrapper *pWrapper);
 int32_t smProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t smProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t smProcessGetMonSmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq);
 
 // smWorker.c
 int32_t smStartWorker(SSnodeMgmt *pMgmt);
@@ -50,6 +52,7 @@ int32_t smProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t smProcessUniqueMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t smProcessSharedMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t smProcessExecMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
+int32_t smProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mgmt/inc/vmInt.h b/source/dnode/mgmt/inc/vmInt.h
index ca210d62c6..f8466fe4f2 100644
--- a/source/dnode/mgmt/inc/vmInt.h
+++ b/source/dnode/mgmt/inc/vmInt.h
@@ -39,6 +39,7 @@ typedef struct SVnodesMgmt {
   SDnode       *pDnode;
   SMgmtWrapper *pWrapper;
   SSingleWorker mgmtWorker;
+  SSingleWorker monitorWorker;
 } SVnodesMgmt;
 
 typedef struct {
@@ -92,6 +93,8 @@ int32_t vmProcessAlterVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq);
 int32_t vmProcessDropVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq);
 int32_t vmProcessSyncVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq);
 int32_t vmProcessCompactVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq);
+int32_t vmProcessGetMonVmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq);
+int32_t vmProcessGetVnodeLoadsReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq);
 
 // vmFile.c
 int32_t     vmGetVnodesFromFile(SVnodesMgmt *pMgmt, SWrapperCfg **ppCfgs, int32_t *numOfVnodes);
@@ -115,6 +118,7 @@ int32_t vmProcessQueryMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t vmProcessFetchMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t vmProcessMergeMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 int32_t vmProcessMgmtMsg(SMgmtWrapper *pWrappert, SNodeMsg *pMsg);
+int32_t vmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index 1ebcfdcda9..b5aff12992 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -25,6 +25,29 @@ void mmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonMmInfo *mmInfo) {
   }
 }
 
+int32_t mmProcessGetMonMmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
+  SMonMmInfo mmInfo = {0};
+  mmGetMonitorInfo(pWrapper, &mmInfo);
+
+  int32_t rspLen = tSerializeSMonMmInfo(NULL, 0, &mmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonMmInfo(pRsp, rspLen, &mmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonMmInfo(&mmInfo);
+  return 0;
+}
+
 int32_t mmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
@@ -83,6 +106,8 @@ int32_t mmProcessAlterReq(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) {
 }
 
 void mmInitMsgHandle(SMgmtWrapper *pWrapper) {
+  dndSetMsgHandle(pWrapper, TDMT_MON_MM_INFO, mmProcessMonitorMsg, DEFAULT_HANDLE);
+
   // Requests handled by DNODE
   dndSetMsgHandle(pWrapper, TDMT_DND_CREATE_MNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_DND_ALTER_MNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE);
diff --git a/source/dnode/mgmt/mm/mmWorker.c b/source/dnode/mgmt/mm/mmWorker.c
index 735ef53b37..85aa265904 100644
--- a/source/dnode/mgmt/mm/mmWorker.c
+++ b/source/dnode/mgmt/mm/mmWorker.c
@@ -23,11 +23,13 @@ static void mmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SRpcMsg *pRpc = &pMsg->rpcMsg;
   int32_t  code = -1;
 
-  if (pMsg->rpcMsg.msgType != TDMT_DND_ALTER_MNODE) {
+  if (pMsg->rpcMsg.msgType == TDMT_DND_ALTER_MNODE) {
+    code = mmProcessAlterReq(pMgmt, pMsg);
+  } else if (pMsg->rpcMsg.msgType == TDMT_MON_MM_INFO) {
+    code = mmProcessGetMonMmInfoReq(pMgmt->pWrapper, pMsg);
+  } else {
     pMsg->pNode = pMgmt->pMnode;
     code = mndProcessMsg(pMsg);
-  } else {
-    code = mmProcessAlterReq(pMgmt, pMsg);
   }
 
   if (pRpc->msgType & 1U) {
@@ -98,6 +100,15 @@ int32_t mmProcessQueryMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   return 0;
 }
 
+int32_t mmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
+  SMnodeMgmt    *pMgmt = pWrapper->pMgmt;
+  SSingleWorker *pWorker = &pMgmt->monitorWorker;
+
+  dTrace("msg:%p, put into worker:%s", pMsg, pWorker->name);
+  taosWriteQitem(pWorker->queue, pMsg);
+  return 0;
+}
+
 static int32_t mmPutRpcMsgToWorker(SSingleWorker *pWorker, SRpcMsg *pRpc) {
   SNodeMsg *pMsg = taosAllocateQitem(sizeof(SNodeMsg));
   if (pMsg == NULL) return -1;
@@ -157,15 +168,24 @@ int32_t mmStartWorker(SMnodeMgmt *pMgmt) {
 
   SSingleWorkerCfg sCfg = {.min = 1, .max = 1, .name = "mnode-sync", .fp = (FItem)mmProcessQueue, .param = pMgmt};
   if (tSingleWorkerInit(&pMgmt->syncWorker, &sCfg) != 0) {
-    dError("failed to start mnode sync-worker since %s", terrstr());
+    dError("failed to start mnode mnode-sync worker since %s", terrstr());
     return -1;
   }
 
+  if (tsMultiProcess) {
+    SSingleWorkerCfg sCfg = {.min = 1, .max = 1, .name = "mnode-monitor", .fp = (FItem)mmProcessQueue, .param = pMgmt};
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+      dError("failed to start mnode mnode-monitor worker since %s", terrstr());
+      return -1;
+    }
+  }
+
   dDebug("mnode workers are initialized");
   return 0;
 }
 
 void mmStopWorker(SMnodeMgmt *pMgmt) {
+  tSingleWorkerCleanup(&pMgmt->monitorWorker);
   tSingleWorkerCleanup(&pMgmt->queryWorker);
   tSingleWorkerCleanup(&pMgmt->readWorker);
   tSingleWorkerCleanup(&pMgmt->writeWorker);
diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/qm/qmHandle.c
index 3c29bd717b..c96b396691 100644
--- a/source/dnode/mgmt/qm/qmHandle.c
+++ b/source/dnode/mgmt/qm/qmHandle.c
@@ -23,6 +23,29 @@ void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo) {
   }
 }
 
+int32_t qmProcessGetMonQmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
+  SMonQmInfo qmInfo = {0};
+  qmGetMonitorInfo(pWrapper, &qmInfo);
+
+  int32_t rspLen = tSerializeSMonQmInfo(NULL, 0, &qmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonQmInfo(pRsp, rspLen, &qmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonQmInfo(&qmInfo);
+  return 0;
+}
+
 int32_t qmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
@@ -62,6 +85,8 @@ int32_t qmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
 }
 
 void qmInitMsgHandle(SMgmtWrapper *pWrapper) {
+  dndSetMsgHandle(pWrapper, TDMT_MON_QM_INFO, qmProcessMonitorMsg, DEFAULT_HANDLE);
+
   // Requests handled by VNODE
   dndSetMsgHandle(pWrapper, TDMT_VND_QUERY, qmProcessQueryMsg, QNODE_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_VND_QUERY_CONTINUE, qmProcessQueryMsg, QNODE_HANDLE);
diff --git a/source/dnode/mgmt/qm/qmWorker.c b/source/dnode/mgmt/qm/qmWorker.c
index db0752949d..e9d1173f20 100644
--- a/source/dnode/mgmt/qm/qmWorker.c
+++ b/source/dnode/mgmt/qm/qmWorker.c
@@ -21,6 +21,33 @@ static void qmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
   tmsgSendRsp(&rsp);
 }
 
+static void qmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
+  SQnodeMgmt *pMgmt = pInfo->ahandle;
+
+  dTrace("msg:%p, get from qnode monitor queue", pMsg);
+  SRpcMsg *pRpc = &pMsg->rpcMsg;
+  int32_t  code = -1;
+
+  if (pMsg->rpcMsg.msgType == TDMT_MON_SM_INFO) {
+    code = qmProcessGetMonQmInfoReq(pMgmt->pWrapper, pMsg);
+  }
+
+  if (pRpc->msgType & 1U) {
+    if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      if (code != 0) {
+        code = terrno;
+        dError("msg:%p, failed to process since %s", pMsg, terrstr());
+      }
+      SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
+      tmsgSendRsp(&rsp);
+    }
+  }
+
+  dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
+  rpcFreeCont(pRpc->pCont);
+  taosFreeQitem(pMsg);
+}
+
 static void qmProcessQueryQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SQnodeMgmt *pMgmt = pInfo->ahandle;
 
@@ -66,6 +93,15 @@ int32_t qmProcessFetchMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   return 0;
 }
 
+int32_t qmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
+  SQnodeMgmt    *pMgmt = pWrapper->pMgmt;
+  SSingleWorker *pWorker = &pMgmt->monitorWorker;
+
+  dTrace("msg:%p, put into worker:%s", pMsg, pWorker->name);
+  taosWriteQitem(pWorker->queue, pMsg);
+  return 0;
+}
+
 static int32_t qmPutRpcMsgToWorker(SQnodeMgmt *pMgmt, SSingleWorker *pWorker, SRpcMsg *pRpc) {
   SNodeMsg *pMsg = taosAllocateQitem(sizeof(SNodeMsg));
   if (pMsg == NULL) {
@@ -128,11 +164,21 @@ int32_t qmStartWorker(SQnodeMgmt *pMgmt) {
     return -1;
   }
 
+  if (tsMultiProcess) {
+    SSingleWorkerCfg sCfg = {
+        .min = 1, .max = 1, .name = "qnode-monitor", .fp = (FItem)qmProcessMonQueue, .param = pMgmt};
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+      dError("failed to start qnode-monitor worker since %s", terrstr());
+      return -1;
+    }
+  }
+
   dDebug("qnode workers are initialized");
   return 0;
 }
 
 void qmStopWorker(SQnodeMgmt *pMgmt) {
+  tSingleWorkerCleanup(&pMgmt->monitorWorker);
   tSingleWorkerCleanup(&pMgmt->queryWorker);
   tSingleWorkerCleanup(&pMgmt->fetchWorker);
   dDebug("qnode workers are closed");
diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index 214dc581b8..5500db4513 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -23,6 +23,29 @@ void smGetMonitorInfo(SMgmtWrapper *pWrapper, SMonSmInfo *smInfo) {
   }
 }
 
+int32_t smProcessGetMonSmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
+  SMonSmInfo smInfo = {0};
+  smGetMonitorInfo(pWrapper, &smInfo);
+  
+  int32_t rspLen = tSerializeSMonSmInfo(NULL, 0, &smInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonSmInfo(pRsp, rspLen, &smInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonSmInfo(&smInfo);
+  return 0;
+}
+
 int32_t smProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SDnode  *pDnode = pWrapper->pDnode;
   SRpcMsg *pReq = &pMsg->rpcMsg;
@@ -62,6 +85,8 @@ int32_t smProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
 }
 
 void smInitMsgHandle(SMgmtWrapper *pWrapper) {
+  dndSetMsgHandle(pWrapper, TDMT_MON_SM_INFO, smProcessMonitorMsg, DEFAULT_HANDLE);
+
   // Requests handled by SNODE
   dndSetMsgHandle(pWrapper, TDMT_SND_TASK_DEPLOY, smProcessMgmtMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_SND_TASK_EXEC, smProcessExecMsg, DEFAULT_HANDLE);
diff --git a/source/dnode/mgmt/sm/smWorker.c b/source/dnode/mgmt/sm/smWorker.c
index afa843953b..33ae289733 100644
--- a/source/dnode/mgmt/sm/smWorker.c
+++ b/source/dnode/mgmt/sm/smWorker.c
@@ -16,6 +16,33 @@
 #define _DEFAULT_SOURCE
 #include "smInt.h"
 
+static void smProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
+  SSnodeMgmt *pMgmt = pInfo->ahandle;
+
+  dTrace("msg:%p, get from snode monitor queue", pMsg);
+  SRpcMsg *pRpc = &pMsg->rpcMsg;
+  int32_t  code = -1;
+
+  if (pMsg->rpcMsg.msgType == TDMT_MON_SM_INFO) {
+    code = smProcessGetMonSmInfoReq(pMgmt->pWrapper, pMsg);
+  }
+
+  if (pRpc->msgType & 1U) {
+    if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      if (code != 0) {
+        code = terrno;
+        dError("msg:%p, failed to process since %s", pMsg, terrstr());
+      }
+      SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
+      tmsgSendRsp(&rsp);
+    }
+  }
+
+  dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
+  rpcFreeCont(pRpc->pCont);
+  taosFreeQitem(pMsg);
+}
+
 static void smProcessUniqueQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
   SSnodeMgmt *pMgmt = pInfo->ahandle;
 
@@ -80,11 +107,21 @@ int32_t smStartWorker(SSnodeMgmt *pMgmt) {
     return -1;
   }
 
+  if (tsMultiProcess) {
+    SSingleWorkerCfg sCfg = {
+        .min = 1, .max = 1, .name = "snode-monitor", .fp = (FItem)smProcessMonitorQueue, .param = pMgmt};
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+      dError("failed to start snode-monitor worker since %s", terrstr());
+      return -1;
+    }
+  }
+
   dDebug("snode workers are initialized");
   return 0;
 }
 
 void smStopWorker(SSnodeMgmt *pMgmt) {
+  tSingleWorkerCleanup(&pMgmt->monitorWorker);
   for (int32_t i = 0; i < taosArrayGetSize(pMgmt->uniqueWorkers); i++) {
     SMultiWorker *pWorker = taosArrayGetP(pMgmt->uniqueWorkers, i);
     tMultiWorkerCleanup(pWorker);
@@ -120,6 +157,15 @@ int32_t smProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   return 0;
 }
 
+int32_t smProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
+  SSnodeMgmt    *pMgmt = pWrapper->pMgmt;
+  SSingleWorker *pWorker = &pMgmt->monitorWorker;
+
+  dTrace("msg:%p, put into worker:%s", pMsg, pWorker->name);
+  taosWriteQitem(pWorker->queue, pMsg);
+  return 0;
+}
+
 int32_t smProcessUniqueMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SSnodeMgmt   *pMgmt = pWrapper->pMgmt;
   int32_t       index = smGetSWIdFromMsg(&pMsg->rpcMsg);
diff --git a/source/dnode/mgmt/vm/vmHandle.c b/source/dnode/mgmt/vm/vmHandle.c
index 0433846ca1..f003d8c58a 100644
--- a/source/dnode/mgmt/vm/vmHandle.c
+++ b/source/dnode/mgmt/vm/vmHandle.c
@@ -38,6 +38,52 @@ void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo) {
   }
 }
 
+int32_t vmProcessGetMonVmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
+  SMonVmInfo vmInfo = {0};
+  vmGetMonitorInfo(pWrapper, &vmInfo);
+
+  int32_t rspLen = tSerializeSMonVmInfo(NULL, 0, &vmInfo);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonVmInfo(pRsp, rspLen, &vmInfo);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonVmInfo(&vmInfo);
+  return 0;
+}
+
+int32_t vmProcessGetVnodeLoadsReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
+  SMonVloadInfo vloads = {0};
+  vmGetVnodeLoads(pWrapper, &vloads);
+
+  int32_t rspLen = tSerializeSMonVloadInfo(NULL, 0, &vloads);
+  if (rspLen < 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    return -1;
+  }
+
+  void *pRsp = rpcMallocCont(rspLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tSerializeSMonVloadInfo(pRsp, rspLen, &vloads);
+  pReq->pRsp = pRsp;
+  pReq->rspLen = rspLen;
+  tFreeSMonVloadInfo(&vloads);
+  return 0;
+}
+
 static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
   pCfg->vgId = pCreate->vgId;
   pCfg->wsize = pCreate->cacheBlockSize;
@@ -261,6 +307,9 @@ int32_t vmProcessCompactVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) {
 }
 
 void vmInitMsgHandle(SMgmtWrapper *pWrapper) {
+  dndSetMsgHandle(pWrapper, TDMT_MON_VM_INFO, vmProcessMonitorMsg, DEFAULT_HANDLE);
+  dndSetMsgHandle(pWrapper, TDMT_MON_VM_LOAD, vmProcessMonitorMsg, DEFAULT_HANDLE);
+
   // Requests handled by VNODE
   dndSetMsgHandle(pWrapper, TDMT_VND_SUBMIT, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE);
   dndSetMsgHandle(pWrapper, TDMT_VND_QUERY, (NodeMsgFp)vmProcessQueryMsg, DEFAULT_HANDLE);
diff --git a/source/dnode/mgmt/vm/vmWorker.c b/source/dnode/mgmt/vm/vmWorker.c
index ed1a4ca2f4..82c45f172d 100644
--- a/source/dnode/mgmt/vm/vmWorker.c
+++ b/source/dnode/mgmt/vm/vmWorker.c
@@ -29,6 +29,12 @@ static void vmProcessMgmtQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   dTrace("msg:%p, will be processed in vnode-mgmt queue", pMsg);
 
   switch (msgType) {
+    case TDMT_MON_VM_INFO:
+      code = vmProcessGetMonVmInfoReq(pMgmt->pWrapper, pMsg);
+      break;
+    case TDMT_MON_VM_LOAD:
+      code = vmProcessGetVnodeLoadsReq(pMgmt->pWrapper, pMsg);
+      break;
     case TDMT_DND_CREATE_VNODE:
       code = vmProcessCreateVnodeReq(pMgmt, pMsg);
       break;
@@ -255,6 +261,15 @@ int32_t vmProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   return 0;
 }
 
+int32_t vmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
+  SVnodesMgmt   *pMgmt = pWrapper->pMgmt;
+  SSingleWorker *pWorker = &pMgmt->monitorWorker;
+
+  dTrace("msg:%p, put into worker:%s", pMsg, pWorker->name);
+  taosWriteQitem(pWorker->queue, pMsg);
+  return 0;
+}
+
 static int32_t vmPutRpcMsgToQueue(SMgmtWrapper *pWrapper, SRpcMsg *pRpc, EQueueType qtype) {
   SVnodesMgmt *pMgmt = pWrapper->pMgmt;
   SMsgHead    *pHead = pRpc->pCont;
@@ -412,11 +427,21 @@ int32_t vmStartWorker(SVnodesMgmt *pMgmt) {
     return -1;
   }
 
+  if (tsMultiProcess) {
+    SSingleWorkerCfg sCfg = {
+        .min = 1, .max = 1, .name = "vnode-monitor", .fp = (FItem)vmProcessMgmtQueue, .param = pMgmt};
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+      dError("failed to start mnode vnode-monitor worker since %s", terrstr());
+      return -1;
+    }
+  }
+
   dDebug("vnode workers are initialized");
   return 0;
 }
 
 void vmStopWorker(SVnodesMgmt *pMgmt) {
+  tSingleWorkerCleanup(&pMgmt->monitorWorker);
   tSingleWorkerCleanup(&pMgmt->mgmtWorker);
   tQWorkerCleanup(&pMgmt->fetchPool);
   tQWorkerCleanup(&pMgmt->queryPool);
diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c
index c012911e8b..af7799cd7c 100644
--- a/source/libs/monitor/src/monMain.c
+++ b/source/libs/monitor/src/monMain.c
@@ -187,6 +187,7 @@ static void monGenBasicJson(SMonInfo *pMonitor) {
 
 static void monGenClusterJson(SMonInfo *pMonitor) {
   SMonClusterInfo *pInfo = &pMonitor->mmInfo.cluster;
+  if (pMonitor->mmInfo.cluster.first_ep_dnode_id == 0) return;
 
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
@@ -239,6 +240,7 @@ static void monGenClusterJson(SMonInfo *pMonitor) {
 
 static void monGenVgroupJson(SMonInfo *pMonitor) {
   SMonVgroupInfo *pInfo = &pMonitor->mmInfo.vgroup;
+  if (pMonitor->mmInfo.cluster.first_ep_dnode_id == 0) return;
 
   SJson *pJson = tjsonAddArrayToObject(pMonitor->pJson, "vgroup_infos");
   if (pJson == NULL) return;
@@ -277,6 +279,7 @@ static void monGenVgroupJson(SMonInfo *pMonitor) {
 
 static void monGenGrantJson(SMonInfo *pMonitor) {
   SMonGrantInfo *pInfo = &pMonitor->mmInfo.grant;
+  if (pMonitor->mmInfo.cluster.first_ep_dnode_id == 0) return;
 
   SJson *pJson = tjsonCreateObject();
   if (pJson == NULL) return;
diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c
index e7e870e998..74d7c15e78 100644
--- a/source/util/src/tconfig.c
+++ b/source/util/src/tconfig.c
@@ -348,7 +348,7 @@ SConfigItem *cfgGetItem(SConfig *pCfg, const char *name) {
     }
   }
 
-  uError("name:%s, cfg not found", name);
+  // uError("name:%s, cfg not found", name);
   terrno = TSDB_CODE_CFG_NOT_FOUND;
   return NULL;
 }

From cd71bf4816f2f93ba421b0d97e9debafea0670ea Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 8 Apr 2022 23:48:01 +0800
Subject: [PATCH 47/82] <fix>[query]: move the reset columnInfoData to the
 right place.

---
 source/dnode/vnode/src/tsdb/tsdbRead.c | 11 +++++------
 tests/script/tsim/insert/backquote.sim |  9 ++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 84bc6e66ad..78393b4582 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -2828,6 +2828,11 @@ static bool loadDataBlockFromTableSeq(STsdbReadHandle* pTsdbReadHandle) {
 bool tsdbNextDataBlock(tsdbReaderT pHandle) {
   STsdbReadHandle* pTsdbReadHandle = (STsdbReadHandle*) pHandle;
 
+  for(int32_t i = 0; i < taosArrayGetSize(pTsdbReadHandle->pColumns); ++i) {
+    SColumnInfoData* pColInfo = taosArrayGet(pTsdbReadHandle->pColumns, i);
+    colInfoDataCleanup(pColInfo, pTsdbReadHandle->outputCapacity);
+  }
+
   if (emptyQueryTimewindow(pTsdbReadHandle)) {
     tsdbDebug("%p query window not overlaps with the data set, no result returned, %s", pTsdbReadHandle, pTsdbReadHandle->idStr);
     return false;
@@ -3253,12 +3258,6 @@ SArray* tsdbRetrieveDataBlock(tsdbReaderT* pTsdbReadHandle, SArray* pIdList) {
    * 1. data is from cache, 2. data block is not completed qualified to query time range
    */
   STsdbReadHandle* pHandle = (STsdbReadHandle*)pTsdbReadHandle;
-
-  for(int32_t i = 0; i < taosArrayGetSize(pHandle->pColumns); ++i) {
-    SColumnInfoData* pColInfo = taosArrayGet(pHandle->pColumns, i);
-    colInfoDataCleanup(pColInfo, pHandle->outputCapacity);
-  }
-
   if (pHandle->cur.fid == INT32_MIN) {
     return pHandle->pColumns;
   } else {
diff --git a/tests/script/tsim/insert/backquote.sim b/tests/script/tsim/insert/backquote.sim
index 0c8b3df4af..71f35fabb2 100644
--- a/tests/script/tsim/insert/backquote.sim
+++ b/tests/script/tsim/insert/backquote.sim
@@ -83,7 +83,7 @@ while $dbCnt < 2
 
     print =============== query data
     sql select * from `table`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
     if $rows != 2 then 
@@ -99,7 +99,9 @@ while $dbCnt < 2
       print expect table, actual $data03
       return -1
     endi
-    
+
+
+    print =================> 1
     sql select * from `Table`
     print rows: $rows 
     print $data00 $data01 $data02 $data03
@@ -116,7 +118,8 @@ while $dbCnt < 2
     if $data03 != Table then 
       return -1
     endi
-    
+
+    print ================>2
     sql select * from `TAble`
     print rows: $rows 
     print $data00 $data01 $data02 $data03

From e9f7bf866aed2f464ab139af2b8d238264a49028 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sat, 9 Apr 2022 09:39:01 +0800
Subject: [PATCH 48/82] feature/qnode

---
 include/libs/catalog/catalog.h      |  3 ++
 source/dnode/mnode/impl/src/mndDb.c |  8 +++--
 source/libs/catalog/src/catalog.c   | 50 ++++++++++++++++++++++++++++-
 source/libs/qcom/src/querymsg.c     | 37 +++++++++++++++++++++
 4 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/include/libs/catalog/catalog.h b/include/libs/catalog/catalog.h
index a0b342fca2..5abda69aa8 100644
--- a/include/libs/catalog/catalog.h
+++ b/include/libs/catalog/catalog.h
@@ -78,6 +78,7 @@ typedef struct SDbVgVersion {
 } SDbVgVersion;
 
 typedef SDbCfgRsp SDbCfgInfo;
+typedef SUserIndexRsp SIndexInfo;
 
 int32_t catalogInit(SCatalogCfg *cfg);
 
@@ -221,6 +222,8 @@ int32_t catalogGetExpiredDBs(SCatalog* pCatalog, SDbVgVersion **dbs, uint32_t *n
 
 int32_t catalogGetDBCfg(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char* dbFName, SDbCfgInfo* pDbCfg);
 
+int32_t catalogGetIndexInfo(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char* indexName, SIndexInfo* pInfo);
+
 
 /**
  * Destroy catalog and relase all resources
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index bd12897827..fd739dc657 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -41,8 +41,8 @@ static int32_t  mndProcessCompactDbReq(SNodeMsg *pReq);
 static int32_t  mndGetDbMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextDb(SMnode *pMnode, void *pIter);
-static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq);
-static int32_t mndProcessGetIndexReq(SNodeMsg *pReq);
+static int32_t  mndProcessGetDbCfgReq(SNodeMsg *pReq);
+static int32_t  mndProcessGetIndexReq(SNodeMsg *pReq);
 
 int32_t mndInitDb(SMnode *pMnode) {
   SSdbTable table = {.sdbType = SDB_DB,
@@ -1684,6 +1684,8 @@ static int32_t mndProcessGetIndexReq(SNodeMsg *pReq) {
 
   if (!exist) {
     //TODO GET INDEX FROM FULLTEXT
+    code = -1;
+    terrno = TSDB_CODE_MND_DB_INDEX_NOT_EXIST;
   } else {
     int32_t contLen = tSerializeSUserIndexRsp(NULL, 0, &rsp);
     void   *pRsp = rpcMallocCont(contLen);
@@ -1702,7 +1704,7 @@ static int32_t mndProcessGetIndexReq(SNodeMsg *pReq) {
   }
 
 _OVER:
-  if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+  if (code != 0) {
     mError("failed to get index %s since %s", indexReq.indexFName, terrstr());
   }
 
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 6ed09ce7eb..195b7cda4b 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -606,6 +606,43 @@ int32_t ctgGetDBCfgFromMnode(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps,
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t ctgGetIndexInfoFromMnode(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char *indexName, SIndexInfo *out) {
+  char *msg = NULL;
+  int32_t msgLen = 0;
+
+  ctgDebug("try to get index from mnode, indexName:%s", indexName);
+
+  int32_t code = queryBuildMsg[TMSG_INDEX(TDMT_MND_GET_INDEX)]((void *)indexName, &msg, 0, &msgLen);
+  if (code) {
+    ctgError("Build get index msg failed, code:%x, db:%s", code, indexName);
+    CTG_ERR_RET(code);
+  }
+  
+  SRpcMsg rpcMsg = {
+      .msgType = TDMT_MND_GET_INDEX,
+      .pCont   = msg,
+      .contLen = msgLen,
+  };
+
+  SRpcMsg rpcRsp = {0};
+
+  rpcSendRecv(pRpc, (SEpSet*)pMgmtEps, &rpcMsg, &rpcRsp);
+  if (TSDB_CODE_SUCCESS != rpcRsp.code) {
+    ctgError("error rsp for get index, error:%s, indexName:%s", tstrerror(rpcRsp.code), indexName);
+    CTG_ERR_RET(rpcRsp.code);
+  }
+
+  code = queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_GET_INDEX)](out, rpcRsp.pCont, rpcRsp.contLen);
+  if (code) {
+    ctgError("Process get index rsp failed, code:%x, indexName:%s", code, indexName);
+    CTG_ERR_RET(code);
+  }
+
+  ctgDebug("Got index from mnode, indexName:%s", indexName);
+
+  return TSDB_CODE_SUCCESS;
+}
+
 
 int32_t ctgIsTableMetaExistInCache(SCatalog* pCtg, char *dbFName, char* tbName, int32_t *exist) {
   if (NULL == pCtg->dbCache) {
@@ -1776,7 +1813,7 @@ int32_t ctgGetTableMeta(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, cons
   if (NULL == pCtg || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName || NULL == pTableMeta) {
     CTG_ERR_RET(TSDB_CODE_CTG_INVALID_INPUT);
   }
-  
+
   bool inCache = false;
   int32_t code = 0;
   uint64_t dbId = 0;
@@ -2764,6 +2801,17 @@ int32_t catalogGetDBCfg(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, cons
   CTG_API_LEAVE(ctgGetDBCfgFromMnode(pCtg, pRpc, pMgmtEps, dbFName, pDbCfg));
 }
 
+int32_t catalogGetIndexInfo(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char* indexName, SIndexInfo* pInfo) {
+  CTG_API_ENTER();
+  
+  if (NULL == pCtg || NULL == pRpc || NULL == pMgmtEps || NULL == indexName || NULL == pInfo) {
+    CTG_API_LEAVE(TSDB_CODE_CTG_INVALID_INPUT);
+  }
+
+  CTG_API_LEAVE(ctgGetIndexInfoFromMnode(pCtg, pRpc, pMgmtEps, indexName, pInfo));
+}
+
+
 void catalogDestroy(void) {
   qInfo("start to destroy catalog");
   
diff --git a/source/libs/qcom/src/querymsg.c b/source/libs/qcom/src/querymsg.c
index d211e780b0..932107dfc1 100644
--- a/source/libs/qcom/src/querymsg.c
+++ b/source/libs/qcom/src/querymsg.c
@@ -139,6 +139,25 @@ int32_t queryBuildGetDBCfgMsg(void *input, char **msg, int32_t msgSize, int32_t
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t queryBuildGetIndexMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen) {
+  if (NULL == msg || NULL == msgLen) {
+    return TSDB_CODE_TSC_INVALID_INPUT;
+  }
+
+  SUserIndexReq indexReq = {0};
+  strcpy(indexReq.indexFName, input);
+
+  int32_t bufLen = tSerializeSUserIndexReq(NULL, 0, &indexReq);
+  void   *pBuf = rpcMallocCont(bufLen);
+  tSerializeSUserIndexReq(pBuf, bufLen, &indexReq);
+
+  *msg = pBuf;
+  *msgLen = bufLen;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+
 int32_t queryProcessUseDBRsp(void *output, char *msg, int32_t msgSize) {
   SUseDbOutput *pOut = output;
   SUseDbRsp     usedbRsp = {0};
@@ -343,6 +362,22 @@ int32_t queryProcessGetDbCfgRsp(void *output, char *msg, int32_t msgSize) {
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t queryProcessGetIndexRsp(void *output, char *msg, int32_t msgSize) {
+  SUserIndexRsp out = {0};
+
+  if (NULL == output || NULL == msg || msgSize <= 0) {
+    return TSDB_CODE_TSC_INVALID_INPUT;
+  }
+
+  if (tDeserializeSUserIndexRsp(msg, msgSize, &out) != 0) {
+    qError("tDeserializeSUserIndexRsp failed, msgSize:%d", msgSize);
+    return TSDB_CODE_INVALID_MSG;
+  }
+
+  memcpy(output, &out, sizeof(out));
+
+  return TSDB_CODE_SUCCESS;
+}
 
 void initQueryModuleMsgHandle() {
   queryBuildMsg[TMSG_INDEX(TDMT_VND_TABLE_META)] = queryBuildTableMetaReqMsg;
@@ -350,12 +385,14 @@ void initQueryModuleMsgHandle() {
   queryBuildMsg[TMSG_INDEX(TDMT_MND_USE_DB)]     = queryBuildUseDbMsg;
   queryBuildMsg[TMSG_INDEX(TDMT_MND_QNODE_LIST)] = queryBuildQnodeListMsg;
   queryBuildMsg[TMSG_INDEX(TDMT_MND_GET_DB_CFG)] = queryBuildGetDBCfgMsg;
+  queryBuildMsg[TMSG_INDEX(TDMT_MND_GET_INDEX)]  = queryBuildGetIndexMsg;
 
   queryProcessMsgRsp[TMSG_INDEX(TDMT_VND_TABLE_META)] = queryProcessTableMetaRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_TABLE_META)] = queryProcessTableMetaRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_USE_DB)]     = queryProcessUseDBRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_QNODE_LIST)] = queryProcessQnodeListRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_GET_DB_CFG)] = queryProcessGetDbCfgRsp;
+  queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_GET_INDEX)]  = queryProcessGetIndexRsp;
 }
 
 #pragma GCC diagnostic pop

From a722d3df4bec1b1025df595dc5935ecb19f949a1 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 09:51:56 +0800
Subject: [PATCH 49/82] feat[cluster]: send monitor information in
 multi-process mode

---
 source/libs/monitor/src/monMsg.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c
index 78a99b1066..94645f9da1 100644
--- a/source/libs/monitor/src/monMsg.c
+++ b/source/libs/monitor/src/monMsg.c
@@ -81,7 +81,7 @@ static int32_t tDecodeSMonLogs(SCoder *decoder, SMonLogs *pInfo) {
   if (tDecodeI32(decoder, &arraySize) < 0) return -1;
 
   pInfo->logs = taosArrayInit(arraySize, sizeof(SMonLogItem));
-  if (pInfo->logs != NULL) return -1;
+  if (pInfo->logs == NULL) return -1;
 
   for (int32_t i = 0; i < arraySize; ++i) {
     SMonLogItem desc = {0};
@@ -143,7 +143,7 @@ int32_t tDecodeSMonClusterInfo(SCoder *decoder, SMonClusterInfo *pInfo) {
 
   pInfo->dnodes = taosArrayInit(dnodesSize, sizeof(SMonDnodeDesc));
   pInfo->mnodes = taosArrayInit(mnodesSize, sizeof(SMonMnodeDesc));
-  if (pInfo->dnodes != NULL || pInfo->mnodes != NULL) return -1;
+  if (pInfo->dnodes == NULL || pInfo->mnodes == NULL) return -1;
 
   for (int32_t i = 0; i < dnodesSize; ++i) {
     SMonDnodeDesc desc = {0};
@@ -185,7 +185,7 @@ int32_t tDecodeSMonVgroupInfo(SCoder *decoder, SMonVgroupInfo *pInfo) {
   if (tDecodeI32(decoder, &arraySize) < 0) return -1;
 
   pInfo->vgroups = taosArrayInit(arraySize, sizeof(SMonVgroupDesc));
-  if (pInfo->vgroups != NULL) return -1;
+  if (pInfo->vgroups == NULL) return -1;
 
   for (int32_t i = 0; i < arraySize; ++i) {
     SMonVgroupDesc desc = {0};
@@ -292,7 +292,7 @@ static int32_t tDecodeSMonDiskInfo(SCoder *decoder, SMonDiskInfo *pInfo) {
   if (tDecodeI32(decoder, &arraySize) < 0) return -1;
 
   pInfo->datadirs = taosArrayInit(arraySize, sizeof(SMonDiskDesc));
-  if (pInfo->datadirs != NULL) return -1;
+  if (pInfo->datadirs == NULL) return -1;
 
   for (int32_t i = 0; i < arraySize; ++i) {
     SMonDiskDesc desc = {0};
@@ -501,7 +501,7 @@ int32_t tDeserializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInf
   if (tDecodeI32(&decoder, &arraySize) < 0) return -1;
 
   pInfo->pVloads = taosArrayInit(arraySize, sizeof(SVnodeLoad));
-  if (pInfo->pVloads != NULL) return -1;
+  if (pInfo->pVloads == NULL) return -1;
 
   for (int32_t i = 0; i < arraySize; ++i) {
     SVnodeLoad load = {0};

From a80610560dfb3f9b4f097d0522fb5efd8ec26139 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Sat, 9 Apr 2022 10:09:17 +0800
Subject: [PATCH 50/82] constant condition optimize

---
 include/libs/nodes/querynodes.h        |  1 +
 include/libs/parser/parser.h           | 10 ++++--
 source/client/src/clientImpl.c         | 37 ++++++++++++-------
 source/libs/parser/src/parCalcConst.c  | 49 +++++++++++++++++++++-----
 source/libs/parser/src/parInsert.c     |  2 +-
 source/libs/parser/src/parTranslater.c |  8 +++--
 6 files changed, 80 insertions(+), 27 deletions(-)

diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 6b6d11c2fe..f052c9daa7 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -238,6 +238,7 @@ typedef struct SSelectStmt {
   SNode* pSlimit;
   char stmtName[TSDB_TABLE_NAME_LEN];
   uint8_t precision;
+  bool isEmptyResult;
 } SSelectStmt;
 
 typedef enum ESetOperatorType {
diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index f10185c44f..fef624288a 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -44,8 +44,15 @@ typedef struct SCmdMsgInfo {
   void* pExtension;  // todo remove it soon
 } SCmdMsgInfo;
 
+typedef enum EQueryExecMode {
+  QUERY_EXEC_MODE_LOCAL = 1,
+  QUERY_EXEC_MODE_RPC,
+  QUERY_EXEC_MODE_SCHEDULE,
+  QUERY_EXEC_MODE_EMPTY_RESULT
+} EQueryExecMode;
+
 typedef struct SQuery {
-  bool directRpc;
+  EQueryExecMode execMode;
   bool haveResultSet;
   SNode* pRoot;
   int32_t numOfResCols;
@@ -55,7 +62,6 @@ typedef struct SQuery {
   SArray* pDbList;
   SArray* pTableList;
   bool showRewrite;
-  bool localCmd;
 } SQuery;
 
 int32_t qParseQuerySql(SParseContext* pCxt, SQuery** pQuery);
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index c3a17b6073..9938a2e1b9 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -281,22 +281,35 @@ int32_t scheduleQuery(SRequestObj* pRequest, SQueryPlan* pDag, SArray* pNodeList
 SRequestObj* execQueryImpl(STscObj* pTscObj, const char* sql, int sqlLen) {
   SRequestObj* pRequest = NULL;
   SQuery* pQuery = NULL;
-  int32_t code = 0;
   SArray* pNodeList = taosArrayInit(4, sizeof(struct SQueryNodeAddr));
 
-  CHECK_CODE_GOTO(buildRequest(pTscObj, sql, sqlLen, &pRequest), _return);
-  CHECK_CODE_GOTO(parseSql(pRequest, false, &pQuery), _return);
-
-  if (pQuery->localCmd) {
-    CHECK_CODE_GOTO(execLocalCmd(pRequest, pQuery), _return);
-  } else if (pQuery->directRpc) {
-    CHECK_CODE_GOTO(execDdlQuery(pRequest, pQuery), _return);
-  } else {
-    CHECK_CODE_GOTO(getPlan(pRequest, pQuery, &pRequest->body.pDag, pNodeList), _return);
-    CHECK_CODE_GOTO(scheduleQuery(pRequest, pRequest->body.pDag, pNodeList), _return);
+  int32_t code = buildRequest(pTscObj, sql, sqlLen, &pRequest);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = parseSql(pRequest, false, &pQuery);
+  }
+
+  if (TSDB_CODE_SUCCESS == code) {
+    switch (pQuery->execMode) {
+      case QUERY_EXEC_MODE_LOCAL:
+        code = execLocalCmd(pRequest, pQuery);
+        break;
+      case QUERY_EXEC_MODE_RPC:
+        code = execDdlQuery(pRequest, pQuery);
+        break;
+      case QUERY_EXEC_MODE_SCHEDULE:
+        code = getPlan(pRequest, pQuery, &pRequest->body.pDag, pNodeList);
+        if (TSDB_CODE_SUCCESS == code) {
+          code = scheduleQuery(pRequest, pRequest->body.pDag, pNodeList);
+        }
+        break;
+      case QUERY_EXEC_MODE_EMPTY_RESULT:
+        pRequest->type = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+        break;
+      default:
+        break;
+    }
   }
 
-_return:
   taosArrayDestroy(pNodeList);
   qDestroyQuery(pQuery);
   if (NULL != pRequest && TSDB_CODE_SUCCESS != code) {
diff --git a/source/libs/parser/src/parCalcConst.c b/source/libs/parser/src/parCalcConst.c
index 0b4f79d3ff..048830b80b 100644
--- a/source/libs/parser/src/parCalcConst.c
+++ b/source/libs/parser/src/parCalcConst.c
@@ -149,22 +149,37 @@ static int32_t rewriteConditionForFromTable(SCalcConstContext* pCxt, SNode* pTab
   return pCxt->code;
 }
 
+static void rewriteConstCondition(SSelectStmt* pSelect, SNode** pCond) {
+  if (QUERY_NODE_VALUE != nodeType(*pCond)) {
+    return;
+  }
+  if (((SValueNode*)*pCond)->datum.b) {
+    nodesDestroyNode(*pCond);
+    *pCond = NULL;
+  } else {
+    pSelect->isEmptyResult = true;
+  }
+}
+
 static int32_t calcConstFromTable(SCalcConstContext* pCxt, SSelectStmt* pSelect) {
-  nodesRewriteExprPostOrder(&pSelect->pFromTable, calcConst, pCxt);
+  pCxt->code = rewriteConditionForFromTable(pCxt, pSelect->pFromTable);
   if (TSDB_CODE_SUCCESS == pCxt->code) {
-    pCxt->code = rewriteConditionForFromTable(pCxt, pSelect->pFromTable);
+    nodesRewriteExprPostOrder(&pSelect->pFromTable, calcConst, pCxt);
   }
   return pCxt->code;
 }
 
-static int32_t calcConstCondition(SCalcConstContext* pCxt, SNode** pCond) {
+static int32_t calcConstCondition(SCalcConstContext* pCxt, SSelectStmt* pSelect, SNode** pCond) {
   if (NULL == *pCond) {
     return TSDB_CODE_SUCCESS;
   }
 
-  nodesRewriteExprPostOrder(pCond, calcConst, pCxt);
+  pCxt->code = rewriteCondition(pCxt, pCond);
   if (TSDB_CODE_SUCCESS == pCxt->code) {
-    pCxt->code = rewriteCondition(pCxt, pCond);
+    nodesRewriteExprPostOrder(pCond, calcConst, pCxt);
+  }
+  if (TSDB_CODE_SUCCESS == pCxt->code) {
+    rewriteConstCondition(pSelect, pCond);
   }
   return pCxt->code;
 }
@@ -176,7 +191,7 @@ static int32_t calcConstSelect(SSelectStmt* pSelect) {
     cxt.code = calcConstFromTable(&cxt, pSelect);
   }
   if (TSDB_CODE_SUCCESS == cxt.code) {
-    cxt.code = calcConstCondition(&cxt, &pSelect->pWhere);
+    cxt.code = calcConstCondition(&cxt, pSelect, &pSelect->pWhere);
   }
   if (TSDB_CODE_SUCCESS == cxt.code) {
     nodesRewriteExprsPostOrder(pSelect->pPartitionByList, calcConst, &cxt);
@@ -188,7 +203,7 @@ static int32_t calcConstSelect(SSelectStmt* pSelect) {
     nodesRewriteExprsPostOrder(pSelect->pGroupByList, calcConst, &cxt);
   }
   if (TSDB_CODE_SUCCESS == cxt.code) {
-    cxt.code = calcConstCondition(&cxt, &pSelect->pHaving);
+    cxt.code = calcConstCondition(&cxt, pSelect, &pSelect->pHaving);
   }
   if (TSDB_CODE_SUCCESS == cxt.code) {
     nodesRewriteExprsPostOrder(pSelect->pOrderByList, calcConst, &cxt);
@@ -208,6 +223,22 @@ static int32_t calcConstQuery(SNode* pStmt) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t calculateConstant(SParseContext* pParseCxt, SQuery* pQuery) {
-  return calcConstQuery(pQuery->pRoot);
+static bool isEmptyResultQuery(SNode* pStmt) {
+  switch (nodeType(pStmt)) {
+    case QUERY_NODE_SELECT_STMT:
+      return ((SSelectStmt*)pStmt)->isEmptyResult;    
+    case QUERY_NODE_EXPLAIN_STMT:
+      return isEmptyResultQuery(((SExplainStmt*)pStmt)->pQuery);
+    default:
+      break;
+  }
+  return false;
+}
+
+int32_t calculateConstant(SParseContext* pParseCxt, SQuery* pQuery) {
+  int32_t code = calcConstQuery(pQuery->pRoot);
+  if (TSDB_CODE_SUCCESS == code) {
+    pQuery->execMode = isEmptyResultQuery(pQuery->pRoot) ? QUERY_EXEC_MODE_EMPTY_RESULT : pQuery->execMode;
+  }
+  return code;
 }
diff --git a/source/libs/parser/src/parInsert.c b/source/libs/parser/src/parInsert.c
index d9cf0b39b5..9d945039b8 100644
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
@@ -1084,7 +1084,7 @@ int32_t parseInsertSql(SParseContext* pContext, SQuery** pQuery) {
   if (NULL == *pQuery) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
-  (*pQuery)->directRpc = false;
+  (*pQuery)->execMode = QUERY_EXEC_MODE_SCHEDULE;
   (*pQuery)->haveResultSet = false;
   (*pQuery)->msgType = TDMT_VND_SUBMIT;
   (*pQuery)->pRoot = (SNode*)context.pOutput;
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index ebe5b639c4..a286918ce5 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2923,21 +2923,23 @@ static int32_t setQuery(STranslateContext* pCxt, SQuery* pQuery) {
   switch (nodeType(pQuery->pRoot)) {
     case QUERY_NODE_SELECT_STMT:
     case QUERY_NODE_EXPLAIN_STMT:
+      pQuery->execMode = QUERY_EXEC_MODE_SCHEDULE;
       pQuery->haveResultSet = true;
       pQuery->msgType = TDMT_VND_QUERY;
       break;
     case QUERY_NODE_VNODE_MODIF_STMT:
+      pQuery->execMode = QUERY_EXEC_MODE_SCHEDULE;
       pQuery->msgType = TDMT_VND_CREATE_TABLE;
       break;
     case QUERY_NODE_DESCRIBE_STMT:
-      pQuery->localCmd = true;
+      pQuery->execMode = QUERY_EXEC_MODE_LOCAL;
       pQuery->haveResultSet = true;
       break;
     case QUERY_NODE_RESET_QUERY_CACHE_STMT:
-      pQuery->localCmd = true;
+      pQuery->execMode = QUERY_EXEC_MODE_LOCAL;
       break;
     default:
-      pQuery->directRpc = true;
+      pQuery->execMode = QUERY_EXEC_MODE_RPC;
       if (NULL != pCxt->pCmdMsg) {
         TSWAP(pQuery->pCmdMsg, pCxt->pCmdMsg, SCmdMsgInfo*);
         pQuery->msgType = pQuery->pCmdMsg->msgType;

From 94e19cc32a8921c1cc7a4f83b05d11a9864b5270 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 10:10:56 +0800
Subject: [PATCH 51/82] <fix>[query]: fix scalar function calculate bug in
 scalar module. td-14576

---
 include/common/tcommon.h                 |  8 ++++----
 source/dnode/vnode/src/tsdb/tsdbRead.c   |  5 ++++-
 source/libs/executor/src/executorimpl.c  |  2 +-
 source/libs/executor/src/groupoperator.c |  1 +
 source/libs/scalar/src/scalar.c          | 16 +++++++++++++---
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index ae873bbfa8..1040130f76 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -65,14 +65,14 @@ typedef struct SDataBlockInfo {
   STimeWindow window;
   int32_t     rows;
   int32_t     rowSize;
-  int16_t     numOfCols;
-  int16_t     hasVarCol;
-  int16_t     capacity;
   union {
-    int64_t uid;
+    int64_t uid;        // from which table of uid, comes from this data block
     int64_t blockId;
   };
   uint64_t    groupId;  // no need to serialize
+  int16_t     numOfCols;
+  int16_t     hasVarCol;
+  int16_t     capacity;
 } SDataBlockInfo;
 
 typedef struct SSDataBlock {
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 78393b4582..f618c35dcc 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -3184,7 +3184,10 @@ void tsdbRetrieveDataBlockInfo(tsdbReaderT* pTsdbReadHandle, SDataBlockInfo* pDa
     uid = pCheckInfo->tableId;
   }
 
-  pDataBlockInfo->uid    = uid;
+  tsdbDebug("data block generated, uid:%"PRIu64" numOfRows:%d, tsrange:%"PRId64" - %"PRId64" %s", uid, cur->rows, cur->win.skey,
+      cur->win.ekey, pHandle->idStr);
+
+//  pDataBlockInfo->uid    = uid; // block Id may be over write by assigning uid fro this data block. Do NOT assign the table uid
   pDataBlockInfo->rows   = cur->rows;
   pDataBlockInfo->window = cur->win;
   pDataBlockInfo->numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pHandle));
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 3f7999b076..b02efe4641 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1270,7 +1270,7 @@ static void projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSData
       SColumnInfoData* pColInfoData = taosArrayGet(pResult->pDataBlock, k);
       colDataAssign(pColInfoData, pCtx[k].input.pData[0], pCtx[k].input.numOfRows);
 
-      pResult->info.rows = pCtx[0].input.numOfRows;
+      pResult->info.rows = pSrcBlock->info.rows;
     } else if (pExpr[k].pExpr->nodeType == QUERY_NODE_VALUE) {
       SColumnInfoData* pColInfoData = taosArrayGet(pResult->pDataBlock, k);
       for (int32_t i = 0; i < pSrcBlock->info.rows; ++i) {
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 35191ccc8d..ba1f2dbd76 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -341,6 +341,7 @@ SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pEx
   pOperator->pExpr        = pExprInfo;
   pOperator->numOfOutput  = numOfCols;
   pOperator->info         = pInfo;
+  pOperator->pTaskInfo    = pTaskInfo;
   pOperator->_openFn      = operatorDummyOpenFn;
   pOperator->getNextFn    = hashGroupbyAggregate;
   pOperator->closeFn      = destroyGroupOperatorInfo;
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index 07358f905f..698c9312fc 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -192,13 +192,23 @@ int32_t sclInitParam(SNode* node, SScalarParam *param, SScalarCtx *ctx, int32_t
       }
       
       SColumnNode *ref = (SColumnNode *)node;
-      if (ref->dataBlockId >= taosArrayGetSize(ctx->pBlockList)) {
+
+      int32_t index = -1;
+      for(int32_t i = 0; i < taosArrayGetSize(ctx->pBlockList); ++i) {
+        SSDataBlock* pb = taosArrayGetP(ctx->pBlockList, i);
+        if (pb->info.blockId == ref->dataBlockId) {
+          index = i;
+          break;
+        }
+      }
+
+      if (index == -1) {
         sclError("column tupleId is too big, tupleId:%d, dataBlockNum:%d", ref->dataBlockId, (int32_t)taosArrayGetSize(ctx->pBlockList));
         SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
       }
 
-      SSDataBlock *block = *(SSDataBlock **)taosArrayGet(ctx->pBlockList, ref->dataBlockId);
-      if (NULL == block || ref->slotId >= taosArrayGetSize(block->pDataBlock)) {
+      SSDataBlock *block = *(SSDataBlock **)taosArrayGet(ctx->pBlockList, index);
+      if (NULL == block || ref->slotId >= block->info.numOfCols) {
         sclError("column slotId is too big, slodId:%d, dataBlockSize:%d", ref->slotId, (int32_t)taosArrayGetSize(block->pDataBlock));
         SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
       }

From 8641cfe22b6a30569e6f76b0e061d309ad0d7e30 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Sat, 9 Apr 2022 10:29:07 +0800
Subject: [PATCH 52/82] change test

---
 source/client/src/tmq.c        | 4 ++--
 source/dnode/vnode/src/tq/tq.c | 6 +++---
 tests/test/c/tmqSim.c          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index 5893a14bd5..955e25fd71 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -1044,7 +1044,7 @@ int32_t tmqAskEp(tmq_t* tmq, bool sync) {
   int8_t epStatus = atomic_val_compare_exchange_8(&tmq->epStatus, 0, 1);
   if (epStatus == 1) {
     int32_t epSkipCnt = atomic_add_fetch_32(&tmq->epSkipCnt, 1);
-    tscDebug("consumer %ld skip ask ep cnt %d", tmq->consumerId, epSkipCnt);
+    tscTrace("consumer %ld skip ask ep cnt %d", tmq->consumerId, epSkipCnt);
     if (epSkipCnt < 5000) return 0;
   }
   atomic_store_32(&tmq->epSkipCnt, 0);
@@ -1235,7 +1235,7 @@ int32_t tmqPollImpl(tmq_t* tmq, int64_t blockingTime) {
       int32_t      vgStatus = atomic_val_compare_exchange_32(&pVg->vgStatus, TMQ_VG_STATUS__IDLE, TMQ_VG_STATUS__WAIT);
       if (vgStatus != TMQ_VG_STATUS__IDLE) {
         int32_t vgSkipCnt = atomic_add_fetch_32(&pVg->vgSkipCnt, 1);
-        tscDebug("consumer %ld epoch %d skip vg %d skip cnt %d", tmq->consumerId, tmq->epoch, pVg->vgId, vgSkipCnt);
+        tscTrace("consumer %ld epoch %d skip vg %d skip cnt %d", tmq->consumerId, tmq->epoch, pVg->vgId, vgSkipCnt);
         continue;
         /*if (vgSkipCnt < 10000) continue;*/
 #if 0
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index f168695383..beefbc3d84 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -316,7 +316,7 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
     return 0;
   }
 
-  vDebug("poll topic %s from consumer %ld (epoch %d) %s", pTopic->topicName, consumerId, pReq->epoch, pTopic->topicName);
+  vDebug("poll topic %s from consumer %ld (epoch %d) vg %d", pTopic->topicName, consumerId, pReq->epoch, pTq->pVnode->vgId);
 
   rsp.reqOffset = pReq->currentOffset;
   rsp.skipLogNum = 0;
@@ -325,8 +325,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
     /*if (fetchOffset > walGetLastVer(pTq->pWal) || walReadWithHandle(pTopic->pReadhandle, fetchOffset) < 0) {*/
     // TODO
     consumerEpoch = atomic_load_32(&pConsumer->epoch);
-    if (consumerEpoch > pReq->epoch) {
-      // TODO: return
+    if (consumerEpoch > reqEpoch) {
+      vDebug("tmq poll: consumer %ld (epoch %d) vg %d offset %ld, found new consumer epoch %d discard req epoch %d", consumerId, pReq->epoch, pTq->pVnode->vgId, fetchOffset, consumerEpoch, reqEpoch);
       break;
     }
     SWalReadHead* pHead;
diff --git a/tests/test/c/tmqSim.c b/tests/test/c/tmqSim.c
index 7372745cb8..236d1e2eed 100644
--- a/tests/test/c/tmqSim.c
+++ b/tests/test/c/tmqSim.c
@@ -226,7 +226,7 @@ void loop_consume(tmq_t* tmq) {
   int32_t totalRows = 0;
   int32_t skipLogNum = 0;
   while (running) {
-    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 4000);
+    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 8000);
     if (tmqMsg) {
 	  totalMsgs++;
 

From 388ab2f50dcaceff343035f79f0b2be2f15ea6f1 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 9 Apr 2022 10:31:15 +0800
Subject: [PATCH 53/82] <fix>:fix compile error

---
 source/libs/executor/inc/executorimpl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index ba49db2c6f..6a1ded6441 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -681,7 +681,7 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo*
                                            SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 SOperatorInfo* createMultiTableAggOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 
-SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t num, SSDataBlock* pResBlock, SLimit* pLimit, SExecTaskInfo* pTaskInfo);
+SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t num, SSDataBlock* pResBlock, SLimit* pLimit, SLimit* pSlimit, SExecTaskInfo* pTaskInfo);
 SOperatorInfo *createSortOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock, SArray* pSortInfo, SArray* pIndexMap, SExecTaskInfo* pTaskInfo);
 
 SOperatorInfo* createSortedMergeOperatorInfo(SOperatorInfo** downstream, int32_t numOfDownstream, SExprInfo* pExprInfo, int32_t num, SArray* pSortInfo, SArray* pGroupInfo, SExecTaskInfo* pTaskInfo);

From ffaef98b7543b289491ba0d5d1ab9e958b9779a5 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 10:39:47 +0800
Subject: [PATCH 54/82] feat[cluster]: send monitor information in
 multi-process mode

---
 source/dnode/mgmt/bm/bmHandle.c        |  6 ++----
 source/dnode/mgmt/bm/bmWorker.c        | 25 ++++++++++++++-----------
 source/dnode/mgmt/dm/dmMonitor.c       | 26 ++++++++++++++------------
 source/dnode/mgmt/mm/mmHandle.c        |  6 ++----
 source/dnode/mgmt/mm/mmWorker.c        |  9 +++------
 source/dnode/mgmt/qm/qmHandle.c        |  6 ++----
 source/dnode/mgmt/qm/qmWorker.c        | 22 ++++++++++------------
 source/dnode/mgmt/sm/smHandle.c        | 11 ++++-------
 source/dnode/mgmt/sm/smWorker.c        | 23 +++++++++++++----------
 source/dnode/mgmt/vm/vmHandle.c        |  7 ++-----
 source/dnode/mgmt/vm/vmWorker.c        | 14 +++++++++-----
 source/dnode/mnode/impl/src/mndDnode.c |  2 +-
 source/dnode/mnode/impl/src/mnode.c    |  6 +++++-
 source/libs/monitor/src/monMain.c      |  4 +++-
 source/libs/transport/src/thttp.c      |  2 +-
 15 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index 3021c2798f..b73acd14c3 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -17,15 +17,13 @@
 #include "bmInt.h"
 
 void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo) {
-  if (pWrapper->procType == PROC_CHILD) {
-    dmGetMonitorSysInfo(&bmInfo->sys);
-    monGetLogs(&bmInfo->log);
-  }
 }
 
 int32_t bmProcessGetMonBmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonBmInfo bmInfo = {0};
   bmGetMonitorInfo(pWrapper, &bmInfo);
+  dmGetMonitorSysInfo(&bmInfo.sys);
+  monGetLogs(&bmInfo.log);
 
   int32_t rspLen = tSerializeSMonBmInfo(NULL, 0, &bmInfo);
   if (rspLen < 0) {
diff --git a/source/dnode/mgmt/bm/bmWorker.c b/source/dnode/mgmt/bm/bmWorker.c
index a08d390d43..cf2d7ac939 100644
--- a/source/dnode/mgmt/bm/bmWorker.c
+++ b/source/dnode/mgmt/bm/bmWorker.c
@@ -33,6 +33,15 @@ static void bmSendErrorRsps(SMgmtWrapper *pWrapper, STaosQall *qall, int32_t num
   }
 }
 
+static inline void bmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+  SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
+                 .ahandle = pMsg->rpcMsg.ahandle,
+                 .code = code,
+                 .pCont = pMsg->pRsp,
+                 .contLen = pMsg->rspLen};
+  tmsgSendRsp(&rsp);
+}
+
 static void bmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SBnodeMgmt *pMgmt = pInfo->ahandle;
 
@@ -45,14 +54,8 @@ static void bmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   }
 
   if (pRpc->msgType & 1U) {
-    if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
-      if (code != 0) {
-        code = terrno;
-        dError("msg:%p, failed to process since %s", pMsg, terrstr());
-      }
-      SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
-      tmsgSendRsp(&rsp);
-    }
+    if (code != 0 && terrno != 0) code = terrno;
+    bmSendRsp(pMgmt->pWrapper, pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -116,13 +119,13 @@ int32_t bmStartWorker(SBnodeMgmt *pMgmt) {
   }
 
   if (tsMultiProcess) {
-    SSingleWorkerCfg sCfg = {
+    SSingleWorkerCfg mCfg = {
         .min = 1, .max = 1, .name = "bnode-monitor", .fp = (FItem)bmProcessMonQueue, .param = pMgmt};
-    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start bnode-monitor worker since %s", terrstr());
       return -1;
     }
-  }
+   }
 
   dDebug("bnode workers are initialized");
   return 0;
diff --git a/source/dnode/mgmt/dm/dmMonitor.c b/source/dnode/mgmt/dm/dmMonitor.c
index ff5225e580..fb5855070c 100644
--- a/source/dnode/mgmt/dm/dmMonitor.c
+++ b/source/dnode/mgmt/dm/dmMonitor.c
@@ -62,8 +62,9 @@ void dmSendMonitorReport(SDnode *pDnode) {
   SMgmtWrapper *pWrapper = NULL;
   dmGetMonitorInfo(pDnode, &dmInfo);
 
+  bool getFromAPI = !tsMultiProcess;
   pWrapper = &pDnode->wrappers[MNODE];
-  if (!tsMultiProcess) {
+  if (getFromAPI) {
     if (dndMarkWrapper(pWrapper) != 0) {
       mmGetMonitorInfo(pWrapper, &mmInfo);
       dndReleaseWrapper(pWrapper);
@@ -72,7 +73,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
     if (pWrapper->required) {
       req.msgType = TDMT_MON_MM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      if (rsp.code == 0) {
+      if (rsp.code == 0 && rsp.contLen > 0) {
         tDeserializeSMonMmInfo(rsp.pCont, rsp.contLen, &mmInfo);
       }
       rpcFreeCont(rsp.pCont);
@@ -80,7 +81,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
   }
 
   pWrapper = &pDnode->wrappers[VNODES];
-  if (!tsMultiProcess) {
+  if (getFromAPI) {
     if (dndMarkWrapper(pWrapper) != 0) {
       vmGetMonitorInfo(pWrapper, &vmInfo);
       dndReleaseWrapper(pWrapper);
@@ -89,7 +90,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
     if (pWrapper->required) {
       req.msgType = TDMT_MON_VM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      if (rsp.code == 0) {
+      if (rsp.code == 0 && rsp.contLen > 0) {
         tDeserializeSMonVmInfo(rsp.pCont, rsp.contLen, &vmInfo);
       }
       rpcFreeCont(rsp.pCont);
@@ -97,7 +98,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
   }
 
   pWrapper = &pDnode->wrappers[QNODE];
-  if (!tsMultiProcess) {
+  if (getFromAPI) {
     if (dndMarkWrapper(pWrapper) != 0) {
       qmGetMonitorInfo(pWrapper, &qmInfo);
       dndReleaseWrapper(pWrapper);
@@ -106,7 +107,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
     if (pWrapper->required) {
       req.msgType = TDMT_MON_QM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      if (rsp.code == 0) {
+      if (rsp.code == 0 && rsp.contLen > 0) {
         tDeserializeSMonQmInfo(rsp.pCont, rsp.contLen, &qmInfo);
       }
       rpcFreeCont(rsp.pCont);
@@ -114,7 +115,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
   }
 
   pWrapper = &pDnode->wrappers[SNODE];
-  if (!tsMultiProcess) {
+  if (getFromAPI) {
     if (dndMarkWrapper(pWrapper) != 0) {
       smGetMonitorInfo(pWrapper, &smInfo);
       dndReleaseWrapper(pWrapper);
@@ -123,7 +124,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
     if (pWrapper->required) {
       req.msgType = TDMT_MON_SM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      if (rsp.code == 0) {
+      if (rsp.code == 0 && rsp.contLen > 0) {
         tDeserializeSMonSmInfo(rsp.pCont, rsp.contLen, &smInfo);
       }
       rpcFreeCont(rsp.pCont);
@@ -131,7 +132,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
   }
 
   pWrapper = &pDnode->wrappers[BNODE];
-  if (!tsMultiProcess) {
+  if (getFromAPI) {
     if (dndMarkWrapper(pWrapper) != 0) {
       bmGetMonitorInfo(pWrapper, &bmInfo);
       dndReleaseWrapper(pWrapper);
@@ -140,7 +141,7 @@ void dmSendMonitorReport(SDnode *pDnode) {
     if (pWrapper->required) {
       req.msgType = TDMT_MON_BM_INFO;
       dndSendRecv(pDnode, &epset, &req, &rsp);
-      if (rsp.code == 0) {
+      if (rsp.code == 0 && rsp.contLen > 0) {
         tDeserializeSMonBmInfo(rsp.pCont, rsp.contLen, &bmInfo);
       }
       rpcFreeCont(rsp.pCont);
@@ -162,7 +163,8 @@ void dmSendMonitorReport(SDnode *pDnode) {
 }
 
 void dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) {
-  if (!tsMultiProcess) {
+  bool getFromAPI = !tsMultiProcess;
+  if (getFromAPI) {
     vmGetVnodeLoads(pWrapper, pInfo);
   } else {
     SRpcMsg req = {.msgType = TDMT_MON_VM_LOAD};
@@ -172,7 +174,7 @@ void dmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) {
     epset.eps[0].port = tsServerPort;
 
     dndSendRecv(pWrapper->pDnode, &epset, &req, &rsp);
-    if (rsp.code == 0) {
+    if (rsp.code == 0 && rsp.contLen > 0) {
       tDeserializeSMonVloadInfo(rsp.pCont, rsp.contLen, pInfo);
     }
     rpcFreeCont(rsp.pCont);
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index b5aff12992..3c8dbc5d55 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -19,15 +19,13 @@
 void mmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonMmInfo *mmInfo) {
   SMnodeMgmt *pMgmt = pWrapper->pMgmt;
   mndGetMonitorInfo(pMgmt->pMnode, &mmInfo->cluster, &mmInfo->vgroup, &mmInfo->grant);
-  if (pWrapper->procType == PROC_CHILD) {
-    dmGetMonitorSysInfo(&mmInfo->sys);
-    monGetLogs(&mmInfo->log);
-  }
 }
 
 int32_t mmProcessGetMonMmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonMmInfo mmInfo = {0};
   mmGetMonitorInfo(pWrapper, &mmInfo);
+  dmGetMonitorSysInfo(&mmInfo.sys);
+  monGetLogs(&mmInfo.log);
 
   int32_t rspLen = tSerializeSMonMmInfo(NULL, 0, &mmInfo);
   if (rspLen < 0) {
diff --git a/source/dnode/mgmt/mm/mmWorker.c b/source/dnode/mgmt/mm/mmWorker.c
index 85aa265904..44bac61906 100644
--- a/source/dnode/mgmt/mm/mmWorker.c
+++ b/source/dnode/mgmt/mm/mmWorker.c
@@ -34,10 +34,7 @@ static void mmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 
   if (pRpc->msgType & 1U) {
     if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
-      if (code != 0) {
-        code = terrno;
-        dError("msg:%p, failed to process since %s", pMsg, terrstr());
-      }
+      if (code != 0 && terrno != 0) code = terrno;
       SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
       tmsgSendRsp(&rsp);
     }
@@ -173,8 +170,8 @@ int32_t mmStartWorker(SMnodeMgmt *pMgmt) {
   }
 
   if (tsMultiProcess) {
-    SSingleWorkerCfg sCfg = {.min = 1, .max = 1, .name = "mnode-monitor", .fp = (FItem)mmProcessQueue, .param = pMgmt};
-    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+    SSingleWorkerCfg mCfg = {.min = 1, .max = 1, .name = "mnode-monitor", .fp = (FItem)mmProcessQueue, .param = pMgmt};
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start mnode mnode-monitor worker since %s", terrstr());
       return -1;
     }
diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/qm/qmHandle.c
index c96b396691..11b4ff0622 100644
--- a/source/dnode/mgmt/qm/qmHandle.c
+++ b/source/dnode/mgmt/qm/qmHandle.c
@@ -17,15 +17,13 @@
 #include "qmInt.h"
 
 void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo) {
-  if (pWrapper->procType == PROC_CHILD) {
-    dmGetMonitorSysInfo(&qmInfo->sys);
-    monGetLogs(&qmInfo->log);
-  }
 }
 
 int32_t qmProcessGetMonQmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonQmInfo qmInfo = {0};
   qmGetMonitorInfo(pWrapper, &qmInfo);
+  dmGetMonitorSysInfo(&qmInfo.sys);
+  monGetLogs(&qmInfo.log);
 
   int32_t rspLen = tSerializeSMonQmInfo(NULL, 0, &qmInfo);
   if (rspLen < 0) {
diff --git a/source/dnode/mgmt/qm/qmWorker.c b/source/dnode/mgmt/qm/qmWorker.c
index e9d1173f20..6c8382aef9 100644
--- a/source/dnode/mgmt/qm/qmWorker.c
+++ b/source/dnode/mgmt/qm/qmWorker.c
@@ -16,8 +16,12 @@
 #define _DEFAULT_SOURCE
 #include "qmInt.h"
 
-static void qmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
-  SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle, .ahandle = pMsg->rpcMsg.ahandle, .code = code};
+static inline void qmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+  SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
+                 .ahandle = pMsg->rpcMsg.ahandle,
+                 .code = code,
+                 .pCont = pMsg->pRsp,
+                 .contLen = pMsg->rspLen};
   tmsgSendRsp(&rsp);
 }
 
@@ -33,14 +37,8 @@ static void qmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   }
 
   if (pRpc->msgType & 1U) {
-    if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
-      if (code != 0) {
-        code = terrno;
-        dError("msg:%p, failed to process since %s", pMsg, terrstr());
-      }
-      SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
-      tmsgSendRsp(&rsp);
-    }
+    if (code != 0 && terrno != 0) code = terrno;
+    qmSendRsp(pMgmt->pWrapper, pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -165,9 +163,9 @@ int32_t qmStartWorker(SQnodeMgmt *pMgmt) {
   }
 
   if (tsMultiProcess) {
-    SSingleWorkerCfg sCfg = {
+    SSingleWorkerCfg mCfg = {
         .min = 1, .max = 1, .name = "qnode-monitor", .fp = (FItem)qmProcessMonQueue, .param = pMgmt};
-    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start qnode-monitor worker since %s", terrstr());
       return -1;
     }
diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index 5500db4513..fed6b6528c 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -16,17 +16,14 @@
 #define _DEFAULT_SOURCE
 #include "smInt.h"
 
-void smGetMonitorInfo(SMgmtWrapper *pWrapper, SMonSmInfo *smInfo) {
-  if (pWrapper->procType == PROC_CHILD) {
-    dmGetMonitorSysInfo(&smInfo->sys);
-    monGetLogs(&smInfo->log);
-  }
-}
+void smGetMonitorInfo(SMgmtWrapper *pWrapper, SMonSmInfo *smInfo) {}
 
 int32_t smProcessGetMonSmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonSmInfo smInfo = {0};
   smGetMonitorInfo(pWrapper, &smInfo);
-  
+  dmGetMonitorSysInfo(&smInfo.sys);
+  monGetLogs(&smInfo.log);
+
   int32_t rspLen = tSerializeSMonSmInfo(NULL, 0, &smInfo);
   if (rspLen < 0) {
     terrno = TSDB_CODE_INVALID_MSG;
diff --git a/source/dnode/mgmt/sm/smWorker.c b/source/dnode/mgmt/sm/smWorker.c
index 33ae289733..a29d5d1abc 100644
--- a/source/dnode/mgmt/sm/smWorker.c
+++ b/source/dnode/mgmt/sm/smWorker.c
@@ -16,6 +16,15 @@
 #define _DEFAULT_SOURCE
 #include "smInt.h"
 
+static inline void smSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+  SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
+                 .ahandle = pMsg->rpcMsg.ahandle,
+                 .code = code,
+                 .pCont = pMsg->pRsp,
+                 .contLen = pMsg->rspLen};
+  tmsgSendRsp(&rsp);
+}
+
 static void smProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SSnodeMgmt *pMgmt = pInfo->ahandle;
 
@@ -28,14 +37,8 @@ static void smProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   }
 
   if (pRpc->msgType & 1U) {
-    if (pRpc->handle != NULL && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
-      if (code != 0) {
-        code = terrno;
-        dError("msg:%p, failed to process since %s", pMsg, terrstr());
-      }
-      SRpcMsg rsp = {.handle = pRpc->handle, .code = code, .contLen = pMsg->rspLen, .pCont = pMsg->pRsp};
-      tmsgSendRsp(&rsp);
-    }
+    if (code != 0 && terrno != 0) code = terrno;
+    smSendRsp(pMgmt->pWrapper, pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -108,9 +111,9 @@ int32_t smStartWorker(SSnodeMgmt *pMgmt) {
   }
 
   if (tsMultiProcess) {
-    SSingleWorkerCfg sCfg = {
+    SSingleWorkerCfg mCfg = {
         .min = 1, .max = 1, .name = "snode-monitor", .fp = (FItem)smProcessMonitorQueue, .param = pMgmt};
-    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start snode-monitor worker since %s", terrstr());
       return -1;
     }
diff --git a/source/dnode/mgmt/vm/vmHandle.c b/source/dnode/mgmt/vm/vmHandle.c
index f003d8c58a..ecad414fd6 100644
--- a/source/dnode/mgmt/vm/vmHandle.c
+++ b/source/dnode/mgmt/vm/vmHandle.c
@@ -31,16 +31,13 @@ void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo) {
       pMgmt->state.numOfBatchInsertSuccessReqs - pMgmt->lastState.numOfBatchInsertSuccessReqs;
   pMgmt->lastState = pMgmt->state;
   taosWUnLockLatch(&pMgmt->latch);
-
-  if (pWrapper->procType == PROC_CHILD) {
-    dmGetMonitorSysInfo(&vmInfo->sys);
-    monGetLogs(&vmInfo->log);
-  }
 }
 
 int32_t vmProcessGetMonVmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonVmInfo vmInfo = {0};
   vmGetMonitorInfo(pWrapper, &vmInfo);
+  dmGetMonitorSysInfo(&vmInfo.sys);
+  monGetLogs(&vmInfo.log);
 
   int32_t rspLen = tSerializeSMonVmInfo(NULL, 0, &vmInfo);
   if (rspLen < 0) {
diff --git a/source/dnode/mgmt/vm/vmWorker.c b/source/dnode/mgmt/vm/vmWorker.c
index 82c45f172d..ff92cf880b 100644
--- a/source/dnode/mgmt/vm/vmWorker.c
+++ b/source/dnode/mgmt/vm/vmWorker.c
@@ -16,8 +16,12 @@
 #define _DEFAULT_SOURCE
 #include "vmInt.h"
 
-static void vmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
-  SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle, .ahandle = pMsg->rpcMsg.ahandle, .code = code};
+static inline void vmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+  SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
+                 .ahandle = pMsg->rpcMsg.ahandle,
+                 .code = code,
+                 .pCont = pMsg->pRsp,
+                 .contLen = pMsg->rspLen};
   tmsgSendRsp(&rsp);
 }
 
@@ -26,7 +30,7 @@ static void vmProcessMgmtQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 
   int32_t code = -1;
   tmsg_t  msgType = pMsg->rpcMsg.msgType;
-  dTrace("msg:%p, will be processed in vnode-mgmt queue", pMsg);
+  dTrace("msg:%p, will be processed in vnode-m queue", pMsg);
 
   switch (msgType) {
     case TDMT_MON_VM_INFO:
@@ -428,9 +432,9 @@ int32_t vmStartWorker(SVnodesMgmt *pMgmt) {
   }
 
   if (tsMultiProcess) {
-    SSingleWorkerCfg sCfg = {
+    SSingleWorkerCfg mCfg = {
         .min = 1, .max = 1, .name = "vnode-monitor", .fp = (FItem)vmProcessMgmtQueue, .param = pMgmt};
-    if (tSingleWorkerInit(&pMgmt->monitorWorker, &sCfg) != 0) {
+    if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start mnode vnode-monitor worker since %s", terrstr());
       return -1;
     }
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 314e70db9b..6bc3ea9fc0 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -237,7 +237,7 @@ int32_t mndGetDnodeSize(SMnode *pMnode) {
 
 bool mndIsDnodeOnline(SMnode *pMnode, SDnodeObj *pDnode, int64_t curMs) {
   int64_t interval = TABS(pDnode->lastAccessTime - curMs);
-  if (interval > 3500 * tsStatusInterval) {
+  if (interval > 30000 * tsStatusInterval) {
     if (pDnode->rebootTime > 0) {
       pDnode->offlineReason = DND_REASON_STATUS_MSG_TIMEOUT;
     }
diff --git a/source/dnode/mnode/impl/src/mnode.c b/source/dnode/mnode/impl/src/mnode.c
index 5c3dd778e1..86bbc0257b 100644
--- a/source/dnode/mnode/impl/src/mnode.c
+++ b/source/dnode/mnode/impl/src/mnode.c
@@ -502,7 +502,11 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
 
     SMonVgroupDesc desc = {0};
     desc.vgroup_id = pVgroup->vgId;
-    strncpy(desc.database_name, pVgroup->dbName, sizeof(desc.database_name));
+
+    SName name = {0};
+    tNameFromString(&name, pVgroup->dbName, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
+    tNameGetDbName(&name, desc.database_name);
+
     desc.tables_num = pVgroup->numOfTables;
     pGrantInfo->timeseries_used += pVgroup->numOfTimeSeries;
     tstrncpy(desc.status, "unsynced", sizeof(desc.status));
diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c
index af7799cd7c..c90b1f58e8 100644
--- a/source/libs/monitor/src/monMain.c
+++ b/source/libs/monitor/src/monMain.c
@@ -529,7 +529,9 @@ void monSendReport() {
   char *pCont = tjsonToString(pMonitor->pJson);
   if (pCont != NULL) {
     EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT;
-    taosSendHttpReport(tsMonitor.cfg.server, tsMonitor.cfg.port, pCont, strlen(pCont), flag);
+    if (taosSendHttpReport(tsMonitor.cfg.server, tsMonitor.cfg.port, pCont, strlen(pCont), flag) != 0) {
+      uError("failed to send monitor msg since %s", terrstr());
+    }
     taosMemoryFree(pCont);
   }
 
diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 90f15dd7d0..cd1fbf8e0e 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -117,7 +117,7 @@ _OVER:
 static void clientConnCb(uv_connect_t* req, int32_t status) {
   if (status < 0) {
     terrno = TAOS_SYSTEM_ERROR(status);
-    uError("Connection error %s\n", uv_strerror(status));
+    uError("connection error %s", uv_strerror(status));
     uv_close((uv_handle_t*)req->handle, NULL);
     return;
   }

From 9df566b21096dda6dbd29c860a0a7a6db3a46cf4 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Sat, 9 Apr 2022 10:42:28 +0800
Subject: [PATCH 55/82] topic ci bugfix

---
 tests/test/c/tmqSim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test/c/tmqSim.c b/tests/test/c/tmqSim.c
index 7372745cb8..236d1e2eed 100644
--- a/tests/test/c/tmqSim.c
+++ b/tests/test/c/tmqSim.c
@@ -226,7 +226,7 @@ void loop_consume(tmq_t* tmq) {
   int32_t totalRows = 0;
   int32_t skipLogNum = 0;
   while (running) {
-    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 4000);
+    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 8000);
     if (tmqMsg) {
 	  totalMsgs++;
 

From 25234454529a3cfcbdd1774adbb8e48b8587b4be Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 11:55:59 +0800
Subject: [PATCH 56/82] <fix>[query]: refactor.

---
 include/common/tdatablock.h             |   2 +-
 source/common/src/tdatablock.c          |   2 +-
 source/libs/executor/src/executorimpl.c | 137 ------------------------
 3 files changed, 2 insertions(+), 139 deletions(-)

diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 49af7da44b..e16d5215ba 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -197,7 +197,7 @@ int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullF
 int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows);
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
 
-int32_t colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows);
+void    colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows);
 void    blockDataCleanup(SSDataBlock* pDataBlock);
 
 size_t  blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 647d69aabb..85eec0d97e 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1214,7 +1214,7 @@ int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows)
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows) {
+void colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows) {
   if (IS_VAR_DATA_TYPE(pColumn->info.type)) {
     pColumn->varmeta.length = 0;
   } else {
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index b02efe4641..eaed0354ab 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -406,85 +406,6 @@ static bool chkResultRowFromKey(STaskRuntimeEnv* pRuntimeEnv, SResultRowInfo* pR
   return p1 != NULL;
 }
 
-#if 0
-static SResultRow* doSetResultOutBufByKey(STaskRuntimeEnv* pRuntimeEnv, SResultRowInfo* pResultRowInfo, int64_t tid,
-                                          char* pData, int16_t bytes, bool masterscan, uint64_t tableGroupId) {
-  bool existed = false;
-  SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, pData, bytes, tableGroupId);
-
-  SResultRow** p1 =
-      (SResultRow**)taosHashGet(pRuntimeEnv->pResultRowHashTable, pRuntimeEnv->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
-
-  // in case of repeat scan/reverse scan, no new time window added.
-  if (QUERY_IS_INTERVAL_QUERY(pRuntimeEnv->pQueryAttr)) {
-    if (!masterscan) {  // the *p1 may be NULL in case of sliding+offset exists.
-      return (p1 != NULL) ? *p1 : NULL;
-    }
-
-    if (p1 != NULL) {
-      if (pResultRowInfo->size == 0) {
-        existed = false;
-//        assert(pResultRowInfo->curPos == -1);
-      } else if (pResultRowInfo->size == 1) {
-//        existed = (pResultRowInfo->pResult[0] == (*p1));
-//        pResultRowInfo->curPos = 0;
-      } else {  // check if current pResultRowInfo contains the existed pResultRow
-        SET_RES_EXT_WINDOW_KEY(pRuntimeEnv->keyBuf, pData, bytes, tid, pResultRowInfo);
-        int64_t* index =
-            taosHashGet(pRuntimeEnv->pResultRowListSet, pRuntimeEnv->keyBuf, GET_RES_EXT_WINDOW_KEY_LEN(bytes));
-        if (index != NULL) {
-//          pResultRowInfo->curPos = (int32_t)*index;
-          existed = true;
-        } else {
-          existed = false;
-        }
-      }
-    }
-  } else {
-    // In case of group by column query, the required SResultRow object must be existed in the pResultRowInfo object.
-    if (p1 != NULL) {
-      return *p1;
-    }
-  }
-
-  if (!existed) {
-    //    prepareResultListBuffer(pResultRowInfo, pRuntimeEnv);
-
-    SResultRow* pResult = NULL;
-    if (p1 == NULL) {
-      pResult = getNewResultRow(pRuntimeEnv->pool);
-      int32_t ret = initResultRow(pResult);
-      if (ret != TSDB_CODE_SUCCESS) {
-        longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
-      }
-
-      // add a new result set for a new group
-      taosHashPut(pRuntimeEnv->pResultRowHashTable, pRuntimeEnv->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), &pResult,
-                  POINTER_BYTES);
-      SResultRowCell cell = {.groupId = tableGroupId, .pRow = pResult};
-      taosArrayPush(pRuntimeEnv->pResultRowArrayList, &cell);
-    } else {
-      pResult = *p1;
-    }
-
-    pResultRowInfo->curPos = pResultRowInfo->size;
-    pResultRowInfo->pResult[pResultRowInfo->size++] = pResult;
-
-    int64_t index = pResultRowInfo->curPos;
-    SET_RES_EXT_WINDOW_KEY(pRuntimeEnv->keyBuf, pData, bytes, tid, pResultRowInfo);
-    taosHashPut(pRuntimeEnv->pResultRowListSet, pRuntimeEnv->keyBuf, GET_RES_EXT_WINDOW_KEY_LEN(bytes), &index,
-                POINTER_BYTES);
-  }
-
-  // too many time window in query
-  if (pResultRowInfo->size > MAX_INTERVAL_TIME_WINDOW) {
-    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW);
-  }
-
-  return pResultRowInfo->pResult[pResultRowInfo->curPos];
-}
-#endif
-
 SResultRow* getNewResultRow_rv(SDiskbasedBuf* pResultBuf, int64_t tableGroupId, int32_t interBufSize) {
   SFilePage* pData = NULL;
 
@@ -4009,64 +3930,6 @@ int32_t appendDownstream(SOperatorInfo* p, SOperatorInfo** pDownstream, int32_t
 
 static void doDestroyTableQueryInfo(STableGroupInfo* pTableqinfoGroupInfo);
 
-static int32_t setupQueryHandle(void* tsdb, STaskRuntimeEnv* pRuntimeEnv, int64_t qId, bool isSTableQuery) {
-  STaskAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
-#if 0
-  // TODO set the tags scan handle
-  if (onlyQueryTags(pQueryAttr)) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  STsdbQueryCond cond = createTsdbQueryCond(pQueryAttr, &pQueryAttr->window);
-  if (pQueryAttr->tsCompQuery || pQueryAttr->pointInterpQuery) {
-    cond.type = BLOCK_LOAD_TABLE_SEQ_ORDER;
-  }
-
-  if (!isSTableQuery
-    && (pRuntimeEnv->tableqinfoGroupInfo.numOfTables == 1)
-    && (cond.order == TSDB_ORDER_ASC)
-    && (!QUERY_IS_INTERVAL_QUERY(pQueryAttr))
-    && (!pQueryAttr->groupbyColumn)
-    && (!pQueryAttr->simpleAgg)
-  ) {
-    SArray* pa = GET_TABLEGROUP(pRuntimeEnv, 0);
-    STableQueryInfo* pCheckInfo = taosArrayGetP(pa, 0);
-    cond.twindow = pCheckInfo->win;
-  }
-
-  terrno = TSDB_CODE_SUCCESS;
-  if (isFirstLastRowQuery(pQueryAttr)) {
-    pRuntimeEnv->pTsdbReadHandle = tsdbQueryLastRow(tsdb, &cond, &pQueryAttr->tableGroupInfo, qId, &pQueryAttr->memRef);
-
-    // update the query time window
-    pQueryAttr->window = cond.twindow;
-    if (pQueryAttr->tableGroupInfo.numOfTables == 0) {
-      pRuntimeEnv->tableqinfoGroupInfo.numOfTables = 0;
-    } else {
-      size_t numOfGroups = GET_NUM_OF_TABLEGROUP(pRuntimeEnv);
-      for(int32_t i = 0; i < numOfGroups; ++i) {
-        SArray *group = GET_TABLEGROUP(pRuntimeEnv, i);
-
-        size_t t = taosArrayGetSize(group);
-        for (int32_t j = 0; j < t; ++j) {
-          STableQueryInfo *pCheckInfo = taosArrayGetP(group, j);
-
-          pCheckInfo->win = pQueryAttr->window;
-          pCheckInfo->lastKey = pCheckInfo->win.skey;
-        }
-      }
-    }
-  } else if (isCachedLastQuery(pQueryAttr)) {
-    pRuntimeEnv->pTsdbReadHandle = tsdbQueryCacheLast(tsdb, &cond, &pQueryAttr->tableGroupInfo, qId, &pQueryAttr->memRef);
-  } else if (pQueryAttr->pointInterpQuery) {
-    pRuntimeEnv->pTsdbReadHandle = tsdbQueryRowsInExternalWindow(tsdb, &cond, &pQueryAttr->tableGroupInfo, qId, &pQueryAttr->memRef);
-  } else {
-    pRuntimeEnv->pTsdbReadHandle = tsdbQueryTables(tsdb, &cond, &pQueryAttr->tableGroupInfo, qId, &pQueryAttr->memRef);
-  }
-#endif
-  return terrno;
-}
-
 static void doTableQueryInfoTimeWindowCheck(SExecTaskInfo* pTaskInfo, STableQueryInfo* pTableQueryInfo, int32_t order) {
 #if 0
     if (order == TSDB_ORDER_ASC) {

From 1d51e42b0efb6fcc2cacbdc14718df87e07bf8a7 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 13:10:55 +0800
Subject: [PATCH 57/82] <fix>[query]:fix some syntax errors.

---
 source/libs/executor/inc/executorimpl.h |  9 ---
 source/libs/executor/src/executorimpl.c | 76 -------------------------
 source/libs/monitor/src/monMsg.c        |  1 +
 source/libs/monitor/test/monTest.cpp    |  7 ++-
 4 files changed, 6 insertions(+), 87 deletions(-)

diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 6a1ded6441..b81fdafef0 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -712,15 +712,6 @@ SOperatorInfo* createAllMultiTableTimeIntervalOperatorInfo(STaskRuntimeEnv* pRun
                                                            SExprInfo* pExpr, int32_t numOfOutput);
 SOperatorInfo* createTagScanOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SExprInfo* pExpr, int32_t numOfOutput);
 
-SOperatorInfo* createMultiwaySortOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SExprInfo* pExpr, int32_t numOfOutput,
-                                              int32_t numOfRows, void* merger);
-SOperatorInfo* createGlobalAggregateOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorInfo* downstream,
-                                                 SExprInfo* pExpr, int32_t numOfOutput, void* param, SArray* pUdfInfo,
-                                                 bool groupResultMixedUp);
-
-SOperatorInfo* createSLimitOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorInfo* downstream, SExprInfo* pExpr,
-                                        int32_t numOfOutput, void* merger, bool multigroupResult);
-
 SOperatorInfo* createJoinOperatorInfo(SOperatorInfo** pdownstream, int32_t numOfDownstream, SSchema* pSchema,
                                       int32_t numOfOutput);
 #endif
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 8ae132818f..28a8c7bce8 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1964,30 +1964,6 @@ static void* destroySqlFunctionCtx(SqlFunctionCtx* pCtx, int32_t numOfOutput) {
   return NULL;
 }
 
-static void doFreeQueryHandle(STaskRuntimeEnv* pRuntimeEnv) {
-  STaskAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
-
-  //  tsdbCleanupReadHandle(pRuntimeEnv->pTsdbReadHandle);
-  pRuntimeEnv->pTsdbReadHandle = NULL;
-
-  //  SMemRef* pMemRef = &pQueryAttr->memRef;
-  //  assert(pMemRef->ref == 0 && pMemRef->snapshot.imem == NULL && pMemRef->snapshot.mem == NULL);
-}
-
-static void destroyTsComp(STaskRuntimeEnv* pRuntimeEnv, STaskAttr* pQueryAttr) {
-  if (pQueryAttr->tsCompQuery && pRuntimeEnv->outputBuf && pRuntimeEnv->outputBuf->pDataBlock &&
-      taosArrayGetSize(pRuntimeEnv->outputBuf->pDataBlock) > 0) {
-    SColumnInfoData* pColInfoData = taosArrayGet(pRuntimeEnv->outputBuf->pDataBlock, 0);
-    if (pColInfoData) {
-      TdFilePtr pFile = *(TdFilePtr*)pColInfoData->pData;  // TODO refactor
-      if (pFile != NULL) {
-        taosCloseFile(&pFile);
-        *(TdFilePtr*)pColInfoData->pData = NULL;
-      }
-    }
-  }
-}
-
 bool isTaskKilled(SExecTaskInfo* pTaskInfo) {
   // query has been executed more than tsShellActivityTimer, and the retrieve has not arrived
   // abort current query execution.
@@ -6347,7 +6323,6 @@ SOperatorInfo* createAllTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, S
   pOperator->pExpr = pExpr;
   pOperator->numOfOutput = numOfOutput;
   pOperator->info = pInfo;
-  pOperator->pRuntimeEnv = pRuntimeEnv;
   pOperator->getNextFn = doAllIntervalAgg;
   pOperator->closeFn = destroyBasicOperatorInfo;
 
@@ -6443,7 +6418,6 @@ SOperatorInfo* createMultiTableTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntim
   pOperator->pExpr = pExpr;
   pOperator->numOfOutput = numOfOutput;
   pOperator->info = pInfo;
-  pOperator->pRuntimeEnv = pRuntimeEnv;
 
   pOperator->getNextFn = doSTableIntervalAgg;
   pOperator->closeFn = destroyBasicOperatorInfo;
@@ -6468,7 +6442,6 @@ SOperatorInfo* createAllMultiTableTimeIntervalOperatorInfo(STaskRuntimeEnv* pRun
   pOperator->pExpr = pExpr;
   pOperator->numOfOutput = numOfOutput;
   pOperator->info = pInfo;
-  pOperator->pRuntimeEnv = pRuntimeEnv;
 
   pOperator->getNextFn = doAllSTableIntervalAgg;
   pOperator->closeFn = destroyBasicOperatorInfo;
@@ -6541,52 +6514,6 @@ _error:
   return NULL;
 }
 
-SOperatorInfo* createSLimitOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorInfo* downstream, SExprInfo* pExpr,
-                                        int32_t numOfOutput, void* pMerger, bool multigroupResult) {
-  SSLimitOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SSLimitOperatorInfo));
-  SOperatorInfo*       pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
-
-  //  pInfo->orderColumnList = getResultGroupCheckColumns(pQueryAttr);
-  //  pInfo->slimit          = pQueryAttr->slimit;
-  //  pInfo->limit           = pQueryAttr->limit;
-  //  pInfo->capacity        = pResultInfo->capacity;
-  //  pInfo->threshold       = (int64_t)(pInfo->capacity * 0.8);
-  //  pInfo->currentOffset   = pQueryAttr->limit.offset;
-  //  pInfo->currentGroupOffset = pQueryAttr->slimit.offset;
-  pInfo->multigroupResult = multigroupResult;
-
-  // TODO refactor
-  int32_t len = 0;
-  for (int32_t i = 0; i < numOfOutput; ++i) {
-    len += pExpr[i].base.resSchema.bytes;
-  }
-
-  int32_t numOfCols = (pInfo->orderColumnList != NULL) ? (int32_t)taosArrayGetSize(pInfo->orderColumnList) : 0;
-  pInfo->prevRow = taosMemoryCalloc(1, (POINTER_BYTES * numOfCols + len));
-
-  int32_t offset = POINTER_BYTES * numOfCols;
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    pInfo->prevRow[i] = (char*)pInfo->prevRow + offset;
-
-    SColIndex* index = taosArrayGet(pInfo->orderColumnList, i);
-    offset += pExpr[index->colIndex].base.resSchema.bytes;
-  }
-
-  //  pInfo->pRes = createOutputBuf(pExpr, numOfOutput, pOperator->resultInfo.capacity);
-
-  pOperator->name = "SLimitOperator";
-  // pOperator->operatorType = OP_SLimit;
-  pOperator->blockingOptr = false;
-  pOperator->status = OP_NOT_OPENED;
-  //  pOperator->exec         = doSLimit;
-  pOperator->info = pInfo;
-  pOperator->pRuntimeEnv = pRuntimeEnv;
-  pOperator->closeFn = destroySlimitOperatorInfo;
-
-  int32_t code = appendDownstream(pOperator, &downstream, 1);
-  return pOperator;
-}
-
 static SSDataBlock* doTagScan(SOperatorInfo* pOperator, bool* newgroup) {
 #if 0
   SOperatorInfo* pOperator = (SOperatorInfo*) param;
@@ -6594,7 +6521,6 @@ static SSDataBlock* doTagScan(SOperatorInfo* pOperator, bool* newgroup) {
     return NULL;
   }
 
-  STaskRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
   int32_t maxNumOfTables = (int32_t)pResultInfo->capacity;
 
   STagScanInfo *pInfo = pOperator->info;
@@ -6726,7 +6652,6 @@ SOperatorInfo* createTagScanOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SExprInfo
   size_t numOfGroup = GET_NUM_OF_TABLEGROUP(pRuntimeEnv);
   assert(numOfGroup == 0 || numOfGroup == 1);
 
-  pInfo->totalTables = pRuntimeEnv->tableqinfoGroupInfo.numOfTables;
   pInfo->curPos = 0;
 
   SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
@@ -6738,7 +6663,6 @@ SOperatorInfo* createTagScanOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SExprInfo
   pOperator->getNextFn = doTagScan;
   pOperator->pExpr = pExpr;
   pOperator->numOfOutput = numOfOutput;
-  pOperator->pRuntimeEnv = pRuntimeEnv;
   pOperator->closeFn = destroyTagScanOperatorInfo;
 
   return pOperator;
diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c
index 94645f9da1..b72ee4b924 100644
--- a/source/libs/monitor/src/monMsg.c
+++ b/source/libs/monitor/src/monMsg.c
@@ -267,6 +267,7 @@ int32_t tEncodeSMonDiskDesc(SCoder *encoder, const SMonDiskDesc *pDesc) {
   if (tEncodeI64(encoder, pDesc->size.total) < 0) return -1;
   if (tEncodeI64(encoder, pDesc->size.used) < 0) return -1;
   if (tEncodeI64(encoder, pDesc->size.avail) < 0) return -1;
+  return 0;
 }
 
 static int32_t tDecodeSMonDiskDesc(SCoder *decoder, SMonDiskDesc *pDesc) {
diff --git a/source/libs/monitor/test/monTest.cpp b/source/libs/monitor/test/monTest.cpp
index ceb9805e3d..726b2aafe4 100644
--- a/source/libs/monitor/test/monTest.cpp
+++ b/source/libs/monitor/test/monTest.cpp
@@ -208,12 +208,15 @@ void MonitorTest::GetDiskInfo(SMonDiskInfo *pInfo) {
 void MonitorTest::GetLogInfo(SMonLogs *logs) {
   logs->logs = taosArrayInit(4, sizeof(SMonLogItem));
 
-  SMonLogItem item1 = {.level = DEBUG_INFO};
+  SMonLogItem item1 = {0};
+  item1.level = DEBUG_INFO;
+
   item1.ts = taosGetTimestampMs();
   strcpy(item1.content, "log test1");
   taosArrayPush(logs->logs, &item1);
 
-  SMonLogItem item2 = {.level = DEBUG_ERROR};
+  SMonLogItem item2 = {0};
+  item2.level = DEBUG_ERROR;
   item2.ts = taosGetTimestampMs();
   strcpy(item2.content, "log test2");
   taosArrayPush(logs->logs, &item2);

From 119bdf8c7cea96f3b0f2c61635a9adb51f41203b Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 9 Apr 2022 13:16:32 +0800
Subject: [PATCH 58/82] compile failed

---
 source/libs/monitor/src/monMsg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c
index 94645f9da1..3aafcf071d 100644
--- a/source/libs/monitor/src/monMsg.c
+++ b/source/libs/monitor/src/monMsg.c
@@ -267,6 +267,7 @@ int32_t tEncodeSMonDiskDesc(SCoder *encoder, const SMonDiskDesc *pDesc) {
   if (tEncodeI64(encoder, pDesc->size.total) < 0) return -1;
   if (tEncodeI64(encoder, pDesc->size.used) < 0) return -1;
   if (tEncodeI64(encoder, pDesc->size.avail) < 0) return -1;
+  return 0;
 }
 
 static int32_t tDecodeSMonDiskDesc(SCoder *decoder, SMonDiskDesc *pDesc) {
@@ -528,4 +529,4 @@ int32_t tDeserializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInf
 void tFreeSMonVloadInfo(SMonVloadInfo *pInfo) {
   taosArrayDestroy(pInfo->pVloads);
   pInfo->pVloads = NULL;
-}
\ No newline at end of file
+}

From 257b7297573c258e14f97e281b02d8d8026f1099 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sat, 9 Apr 2022 13:36:36 +0800
Subject: [PATCH 59/82] feature/qnode

---
 source/libs/executor/src/executorimpl.c | 29 +++++++++++++++----------
 source/libs/executor/src/scanoperator.c | 22 +++++++++++++------
 source/libs/scalar/src/filter.c         | 11 ++++++++++
 tests/script/tsim/query/stddev.sim      |  2 +-
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index e85cfb76fd..5ba77d4a09 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3297,6 +3297,7 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock) {
 
   int8_t* rowRes = NULL;
   bool    keep = filterExecute(filter, pBlock, &rowRes, NULL, param1.numOfCols);
+  filterFreeInfo(filter);
 
   SSDataBlock* px = createOneDataBlock(pBlock);
   blockDataEnsureCapacity(px, pBlock->info.rows);
@@ -3306,19 +3307,25 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock) {
   for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
     SColumnInfoData* pDst = taosArrayGet(px->pDataBlock, i);
     SColumnInfoData* pSrc = taosArrayGet(pBlock->pDataBlock, i);
+    if (keep) {
+      colDataAssign(pDst, pSrc, pBlock->info.rows);
+      numOfRow = pBlock->info.rows;
+    } else if (NULL != rowRes) {
+      numOfRow = 0;
+      for (int32_t j = 0; j < pBlock->info.rows; ++j) {
+        if (rowRes[j] == 0) {
+          continue;
+        }
 
-    numOfRow = 0;
-    for (int32_t j = 0; j < pBlock->info.rows; ++j) {
-      if (rowRes[j] == 0) {
-        continue;
+        if (colDataIsNull_s(pSrc, j)) {
+          colDataAppendNULL(pDst, numOfRow);
+        } else {
+          colDataAppend(pDst, numOfRow, colDataGetData(pSrc, j), false);
+        }
+        numOfRow += 1;
       }
-
-      if (colDataIsNull_s(pSrc, j)) {
-        colDataAppendNULL(pDst, numOfRow);
-      } else {
-        colDataAppend(pDst, numOfRow, colDataGetData(pSrc, j), false);
-      }
-      numOfRow += 1;
+    } else {
+      numOfRow = 0;
     }
 
     *pSrc = *pDst;
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index c67f833699..7362f1da31 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -596,6 +596,7 @@ static SSDataBlock* doFilterResult(SSysTableScanInfo* pInfo) {
 
   int8_t* rowRes = NULL;
   bool    keep = filterExecute(filter, pInfo->pRes, &rowRes, NULL, param1.numOfCols);
+  filterFreeInfo(filter);
 
   SSDataBlock* px = createOneDataBlock(pInfo->pRes);
   blockDataEnsureCapacity(px, pInfo->pRes->info.rows);
@@ -606,14 +607,21 @@ static SSDataBlock* doFilterResult(SSysTableScanInfo* pInfo) {
     SColumnInfoData* pDest = taosArrayGet(px->pDataBlock, i);
     SColumnInfoData* pSrc = taosArrayGet(pInfo->pRes->pDataBlock, i);
 
-    numOfRow = 0;
-    for (int32_t j = 0; j < pInfo->pRes->info.rows; ++j) {
-      if (rowRes[j] == 0) {
-        continue;
+    if (keep) {
+      colDataAssign(pDest, pSrc, pInfo->pRes->info.rows);
+      numOfRow = pInfo->pRes->info.rows;
+    } else if (NULL != rowRes) {
+      numOfRow = 0;
+      for (int32_t j = 0; j < pInfo->pRes->info.rows; ++j) {
+        if (rowRes[j] == 0) {
+          continue;
+        }
+      
+        colDataAppend(pDest, numOfRow, colDataGetData(pSrc, j), false);
+        numOfRow += 1;
       }
-
-      colDataAppend(pDest, numOfRow, colDataGetData(pSrc, j), false);
-      numOfRow += 1;
+    } else {
+      numOfRow = 0;
     }
   }
 
diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 16236fc05b..c780ed5725 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -1797,6 +1797,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
       } else {
         SScalarParam out = {.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData))};
         out.columnData->info.type = type;
+        out.columnData->info.bytes = tDataTypes[type].bytes;
 
         // todo refactor the convert
         int32_t code = doConvertDataType(var, &out);
@@ -1804,6 +1805,8 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
           qError("convert value to type[%d] failed", type);
           return TSDB_CODE_TSC_INVALID_OPERATION;
         }
+
+        memcpy(fi->data, out.columnData->pData, out.columnData->info.bytes);
       }
     }
 
@@ -3638,6 +3641,10 @@ int32_t fltGetDataFromSlotId(void *param, int32_t id, void **data) {
 
 
 int32_t filterSetDataFromSlotId(SFilterInfo *info, void *param) {
+  if (NULL == info) {
+    return TSDB_CODE_QRY_INVALID_INPUT;
+  }
+  
   return fltSetColFieldDataImpl(info, param, fltGetDataFromSlotId, false);
 }
 
@@ -3691,6 +3698,10 @@ _return:
 }
 
 bool filterExecute(SFilterInfo *info, SSDataBlock *pSrc, int8_t** p, SColumnDataAgg *statis, int16_t numOfCols) {
+  if (NULL == info) {
+    return false;
+  }
+
   if (info->scalarMode) {
     SScalarParam output = {0};
 
diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim
index 01cde31966..adab1c354d 100644
--- a/tests/script/tsim/query/stddev.sim
+++ b/tests/script/tsim/query/stddev.sim
@@ -121,4 +121,4 @@ if $rows != 0 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

From a6b5dd8ef04eec7453fe9cbd036fccafd32d1617 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Sat, 9 Apr 2022 14:57:28 +0800
Subject: [PATCH 60/82] create/drop/show bnode/snode/mnode frontend implement

---
 include/common/ttokendef.h                |  321 +-
 include/libs/nodes/cmdnodes.h             |    8 +-
 include/libs/nodes/nodes.h                |    8 +
 include/util/tdef.h                       |    2 +
 source/libs/nodes/src/nodesCloneFuncs.c   |    1 -
 source/libs/nodes/src/nodesCodeFuncs.c    |   49 +-
 source/libs/nodes/src/nodesUtilFuncs.c    |   33 +-
 source/libs/parser/inc/parAst.h           |    4 +-
 source/libs/parser/inc/sql.y              |   18 +-
 source/libs/parser/src/parAstCreater.c    |    8 +-
 source/libs/parser/src/parTokenizer.c     |    5 +
 source/libs/parser/src/parTranslater.c    |   56 +-
 source/libs/parser/src/sql.c              | 4871 +++++++++++----------
 source/libs/parser/test/parserAstTest.cpp |   42 +
 source/libs/planner/test/plannerTest.cpp  |   10 +
 15 files changed, 2826 insertions(+), 2610 deletions(-)

diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
index 92f4f0a4fb..3eb43c35e1 100644
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@@ -59,164 +59,169 @@
 #define TK_LOCAL                           41
 #define TK_QNODE                           42
 #define TK_ON                              43
-#define TK_DATABASE                        44
-#define TK_USE                             45
-#define TK_IF                              46
-#define TK_NOT                             47
-#define TK_EXISTS                          48
-#define TK_BLOCKS                          49
-#define TK_CACHE                           50
-#define TK_CACHELAST                       51
-#define TK_COMP                            52
-#define TK_DAYS                            53
-#define TK_NK_VARIABLE                     54
-#define TK_FSYNC                           55
-#define TK_MAXROWS                         56
-#define TK_MINROWS                         57
-#define TK_KEEP                            58
-#define TK_PRECISION                       59
-#define TK_QUORUM                          60
-#define TK_REPLICA                         61
-#define TK_TTL                             62
-#define TK_WAL                             63
-#define TK_VGROUPS                         64
-#define TK_SINGLE_STABLE                   65
-#define TK_STREAM_MODE                     66
-#define TK_RETENTIONS                      67
-#define TK_NK_COMMA                        68
-#define TK_NK_COLON                        69
-#define TK_TABLE                           70
-#define TK_NK_LP                           71
-#define TK_NK_RP                           72
-#define TK_STABLE                          73
-#define TK_ADD                             74
-#define TK_COLUMN                          75
-#define TK_MODIFY                          76
-#define TK_RENAME                          77
-#define TK_TAG                             78
-#define TK_SET                             79
-#define TK_NK_EQ                           80
-#define TK_USING                           81
-#define TK_TAGS                            82
-#define TK_NK_DOT                          83
-#define TK_COMMENT                         84
-#define TK_BOOL                            85
-#define TK_TINYINT                         86
-#define TK_SMALLINT                        87
-#define TK_INT                             88
-#define TK_INTEGER                         89
-#define TK_BIGINT                          90
-#define TK_FLOAT                           91
-#define TK_DOUBLE                          92
-#define TK_BINARY                          93
-#define TK_TIMESTAMP                       94
-#define TK_NCHAR                           95
-#define TK_UNSIGNED                        96
-#define TK_JSON                            97
-#define TK_VARCHAR                         98
-#define TK_MEDIUMBLOB                      99
-#define TK_BLOB                           100
-#define TK_VARBINARY                      101
-#define TK_DECIMAL                        102
-#define TK_SMA                            103
-#define TK_ROLLUP                         104
-#define TK_FILE_FACTOR                    105
-#define TK_NK_FLOAT                       106
-#define TK_DELAY                          107
-#define TK_SHOW                           108
-#define TK_DATABASES                      109
-#define TK_TABLES                         110
-#define TK_STABLES                        111
-#define TK_MNODES                         112
-#define TK_MODULES                        113
-#define TK_QNODES                         114
-#define TK_FUNCTIONS                      115
-#define TK_INDEXES                        116
-#define TK_FROM                           117
-#define TK_ACCOUNTS                       118
-#define TK_APPS                           119
-#define TK_CONNECTIONS                    120
-#define TK_LICENCE                        121
-#define TK_QUERIES                        122
-#define TK_SCORES                         123
-#define TK_TOPICS                         124
-#define TK_VARIABLES                      125
-#define TK_LIKE                           126
-#define TK_INDEX                          127
-#define TK_FULLTEXT                       128
-#define TK_FUNCTION                       129
-#define TK_INTERVAL                       130
-#define TK_TOPIC                          131
-#define TK_AS                             132
-#define TK_DESC                           133
-#define TK_DESCRIBE                       134
-#define TK_RESET                          135
-#define TK_QUERY                          136
-#define TK_EXPLAIN                        137
-#define TK_ANALYZE                        138
-#define TK_VERBOSE                        139
-#define TK_NK_BOOL                        140
-#define TK_RATIO                          141
-#define TK_COMPACT                        142
-#define TK_VNODES                         143
-#define TK_IN                             144
-#define TK_OUTPUTTYPE                     145
-#define TK_AGGREGATE                      146
-#define TK_BUFSIZE                        147
-#define TK_STREAM                         148
-#define TK_INTO                           149
-#define TK_KILL                           150
-#define TK_CONNECTION                     151
-#define TK_MERGE                          152
-#define TK_VGROUP                         153
-#define TK_REDISTRIBUTE                   154
-#define TK_SPLIT                          155
-#define TK_SYNCDB                         156
-#define TK_NULL                           157
-#define TK_FIRST                          158
-#define TK_LAST                           159
-#define TK_NOW                            160
-#define TK_ROWTS                          161
-#define TK_TBNAME                         162
-#define TK_QSTARTTS                       163
-#define TK_QENDTS                         164
-#define TK_WSTARTTS                       165
-#define TK_WENDTS                         166
-#define TK_WDURATION                      167
-#define TK_BETWEEN                        168
-#define TK_IS                             169
-#define TK_NK_LT                          170
-#define TK_NK_GT                          171
-#define TK_NK_LE                          172
-#define TK_NK_GE                          173
-#define TK_NK_NE                          174
-#define TK_MATCH                          175
-#define TK_NMATCH                         176
-#define TK_JOIN                           177
-#define TK_INNER                          178
-#define TK_SELECT                         179
-#define TK_DISTINCT                       180
-#define TK_WHERE                          181
-#define TK_PARTITION                      182
-#define TK_BY                             183
-#define TK_SESSION                        184
-#define TK_STATE_WINDOW                   185
-#define TK_SLIDING                        186
-#define TK_FILL                           187
-#define TK_VALUE                          188
-#define TK_NONE                           189
-#define TK_PREV                           190
-#define TK_LINEAR                         191
-#define TK_NEXT                           192
-#define TK_GROUP                          193
-#define TK_HAVING                         194
-#define TK_ORDER                          195
-#define TK_SLIMIT                         196
-#define TK_SOFFSET                        197
-#define TK_LIMIT                          198
-#define TK_OFFSET                         199
-#define TK_ASC                            200
-#define TK_NULLS                          201
+#define TK_BNODE                           44
+#define TK_SNODE                           45
+#define TK_MNODE                           46
+#define TK_DATABASE                        47
+#define TK_USE                             48
+#define TK_IF                              49
+#define TK_NOT                             50
+#define TK_EXISTS                          51
+#define TK_BLOCKS                          52
+#define TK_CACHE                           53
+#define TK_CACHELAST                       54
+#define TK_COMP                            55
+#define TK_DAYS                            56
+#define TK_NK_VARIABLE                     57
+#define TK_FSYNC                           58
+#define TK_MAXROWS                         59
+#define TK_MINROWS                         60
+#define TK_KEEP                            61
+#define TK_PRECISION                       62
+#define TK_QUORUM                          63
+#define TK_REPLICA                         64
+#define TK_TTL                             65
+#define TK_WAL                             66
+#define TK_VGROUPS                         67
+#define TK_SINGLE_STABLE                   68
+#define TK_STREAM_MODE                     69
+#define TK_RETENTIONS                      70
+#define TK_NK_COMMA                        71
+#define TK_NK_COLON                        72
+#define TK_TABLE                           73
+#define TK_NK_LP                           74
+#define TK_NK_RP                           75
+#define TK_STABLE                          76
+#define TK_ADD                             77
+#define TK_COLUMN                          78
+#define TK_MODIFY                          79
+#define TK_RENAME                          80
+#define TK_TAG                             81
+#define TK_SET                             82
+#define TK_NK_EQ                           83
+#define TK_USING                           84
+#define TK_TAGS                            85
+#define TK_NK_DOT                          86
+#define TK_COMMENT                         87
+#define TK_BOOL                            88
+#define TK_TINYINT                         89
+#define TK_SMALLINT                        90
+#define TK_INT                             91
+#define TK_INTEGER                         92
+#define TK_BIGINT                          93
+#define TK_FLOAT                           94
+#define TK_DOUBLE                          95
+#define TK_BINARY                          96
+#define TK_TIMESTAMP                       97
+#define TK_NCHAR                           98
+#define TK_UNSIGNED                        99
+#define TK_JSON                           100
+#define TK_VARCHAR                        101
+#define TK_MEDIUMBLOB                     102
+#define TK_BLOB                           103
+#define TK_VARBINARY                      104
+#define TK_DECIMAL                        105
+#define TK_SMA                            106
+#define TK_ROLLUP                         107
+#define TK_FILE_FACTOR                    108
+#define TK_NK_FLOAT                       109
+#define TK_DELAY                          110
+#define TK_SHOW                           111
+#define TK_DATABASES                      112
+#define TK_TABLES                         113
+#define TK_STABLES                        114
+#define TK_MNODES                         115
+#define TK_MODULES                        116
+#define TK_QNODES                         117
+#define TK_FUNCTIONS                      118
+#define TK_INDEXES                        119
+#define TK_FROM                           120
+#define TK_ACCOUNTS                       121
+#define TK_APPS                           122
+#define TK_CONNECTIONS                    123
+#define TK_LICENCE                        124
+#define TK_QUERIES                        125
+#define TK_SCORES                         126
+#define TK_TOPICS                         127
+#define TK_VARIABLES                      128
+#define TK_BNODES                         129
+#define TK_SNODES                         130
+#define TK_LIKE                           131
+#define TK_INDEX                          132
+#define TK_FULLTEXT                       133
+#define TK_FUNCTION                       134
+#define TK_INTERVAL                       135
+#define TK_TOPIC                          136
+#define TK_AS                             137
+#define TK_DESC                           138
+#define TK_DESCRIBE                       139
+#define TK_RESET                          140
+#define TK_QUERY                          141
+#define TK_EXPLAIN                        142
+#define TK_ANALYZE                        143
+#define TK_VERBOSE                        144
+#define TK_NK_BOOL                        145
+#define TK_RATIO                          146
+#define TK_COMPACT                        147
+#define TK_VNODES                         148
+#define TK_IN                             149
+#define TK_OUTPUTTYPE                     150
+#define TK_AGGREGATE                      151
+#define TK_BUFSIZE                        152
+#define TK_STREAM                         153
+#define TK_INTO                           154
+#define TK_KILL                           155
+#define TK_CONNECTION                     156
+#define TK_MERGE                          157
+#define TK_VGROUP                         158
+#define TK_REDISTRIBUTE                   159
+#define TK_SPLIT                          160
+#define TK_SYNCDB                         161
+#define TK_NULL                           162
+#define TK_FIRST                          163
+#define TK_LAST                           164
+#define TK_NOW                            165
+#define TK_ROWTS                          166
+#define TK_TBNAME                         167
+#define TK_QSTARTTS                       168
+#define TK_QENDTS                         169
+#define TK_WSTARTTS                       170
+#define TK_WENDTS                         171
+#define TK_WDURATION                      172
+#define TK_BETWEEN                        173
+#define TK_IS                             174
+#define TK_NK_LT                          175
+#define TK_NK_GT                          176
+#define TK_NK_LE                          177
+#define TK_NK_GE                          178
+#define TK_NK_NE                          179
+#define TK_MATCH                          180
+#define TK_NMATCH                         181
+#define TK_JOIN                           182
+#define TK_INNER                          183
+#define TK_SELECT                         184
+#define TK_DISTINCT                       185
+#define TK_WHERE                          186
+#define TK_PARTITION                      187
+#define TK_BY                             188
+#define TK_SESSION                        189
+#define TK_STATE_WINDOW                   190
+#define TK_SLIDING                        191
+#define TK_FILL                           192
+#define TK_VALUE                          193
+#define TK_NONE                           194
+#define TK_PREV                           195
+#define TK_LINEAR                         196
+#define TK_NEXT                           197
+#define TK_GROUP                          198
+#define TK_HAVING                         199
+#define TK_ORDER                          200
+#define TK_SLIMIT                         201
+#define TK_SOFFSET                        202
+#define TK_LIMIT                          203
+#define TK_OFFSET                         204
+#define TK_ASC                            205
+#define TK_NULLS                          206
 
 #define TK_NK_SPACE                       300
 #define TK_NK_COMMENT                     301
diff --git a/include/libs/nodes/cmdnodes.h b/include/libs/nodes/cmdnodes.h
index 5acb11fc4f..7d0d0137ec 100644
--- a/include/libs/nodes/cmdnodes.h
+++ b/include/libs/nodes/cmdnodes.h
@@ -230,15 +230,15 @@ typedef struct SDropIndexStmt {
   char tableName[TSDB_TABLE_NAME_LEN];
 } SDropIndexStmt;
 
-typedef struct SCreateQnodeStmt {
+typedef struct SCreateComponentNodeStmt {
   ENodeType type;
   int32_t dnodeId;
-} SCreateQnodeStmt;
+} SCreateComponentNodeStmt;
 
-typedef struct SDropQnodeStmt {
+typedef struct SDropComponentNodeStmt {
   ENodeType type;
   int32_t dnodeId;
-} SDropQnodeStmt;
+} SDropComponentNodeStmt;
 
 typedef struct SCreateTopicStmt {
   ENodeType type;
diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h
index 39448ceef3..c91779ba8b 100644
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -105,6 +105,12 @@ typedef enum ENodeType {
   QUERY_NODE_DROP_INDEX_STMT,
   QUERY_NODE_CREATE_QNODE_STMT,
   QUERY_NODE_DROP_QNODE_STMT,
+  QUERY_NODE_CREATE_BNODE_STMT,
+  QUERY_NODE_DROP_BNODE_STMT,
+  QUERY_NODE_CREATE_SNODE_STMT,
+  QUERY_NODE_DROP_SNODE_STMT,
+  QUERY_NODE_CREATE_MNODE_STMT,
+  QUERY_NODE_DROP_MNODE_STMT,
   QUERY_NODE_CREATE_TOPIC_STMT,
   QUERY_NODE_DROP_TOPIC_STMT,
   QUERY_NODE_ALTER_LOCAL_STMT,
@@ -142,6 +148,8 @@ typedef enum ENodeType {
   QUERY_NODE_SHOW_SCORES_STMT,
   QUERY_NODE_SHOW_TOPICS_STMT,
   QUERY_NODE_SHOW_VARIABLE_STMT,
+  QUERY_NODE_SHOW_BNODES_STMT,
+  QUERY_NODE_SHOW_SNODES_STMT,
   QUERY_NODE_KILL_CONNECTION_STMT,
   QUERY_NODE_KILL_QUERY_STMT,
 
diff --git a/include/util/tdef.h b/include/util/tdef.h
index 2a634e2327..7db5fa8e6b 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -108,6 +108,8 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_INS_TABLE_USER_TABLE_DISTRIBUTED "user_table_distributed"
 #define TSDB_INS_TABLE_USER_USERS             "user_users"
 #define TSDB_INS_TABLE_VGROUPS                "vgroups"
+#define TSDB_INS_TABLE_BNODES                 "bnodes"
+#define TSDB_INS_TABLE_SNODES                 "snodes"
 
 #define TSDB_INS_USER_STABLES_DBNAME_COLID    2
 
diff --git a/source/libs/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c
index 12fe645473..fe3b7cb8a0 100644
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
@@ -106,7 +106,6 @@ static SNode* columnNodeCopy(const SColumnNode* pSrc, SColumnNode* pDst) {
   COPY_CHAR_ARRAY_FIELD(tableName);
   COPY_CHAR_ARRAY_FIELD(tableAlias);
   COPY_CHAR_ARRAY_FIELD(colName);
-  // CLONE_NODE_FIELD(pProjectRef);
   COPY_SCALAR_FIELD(dataBlockId);
   COPY_SCALAR_FIELD(slotId);
   return (SNode*)pDst;
diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c
index 8f90670d13..7f91aeb16f 100644
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
@@ -170,6 +170,10 @@ const char* nodesNodeName(ENodeType type) {
       return "LogicExchange";
     case QUERY_NODE_LOGIC_PLAN_WINDOW:
       return "LogicWindow";
+    case QUERY_NODE_LOGIC_PLAN_SORT:
+      return "LogicSort";
+    case QUERY_NODE_LOGIC_PLAN_PARTITION:
+      return "LogicPartition";
     case QUERY_NODE_LOGIC_SUBPLAN:
       return "LogicSubplan";
     case QUERY_NODE_LOGIC_PLAN:
@@ -530,6 +534,30 @@ static int32_t jsonToLogicProjectNode(const SJson* pJson, void* pObj) {
   return code;
 }
 
+static const char* jkSortLogicPlanSortKeys = "SortKeys";
+
+static int32_t logicSortNodeToJson(const void* pObj, SJson* pJson) {
+  const SSortLogicNode* pNode = (const SSortLogicNode*)pObj;
+
+  int32_t code = logicPlanNodeToJson(pObj, pJson);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = nodeListToJson(pJson, jkSortLogicPlanSortKeys, pNode->pSortKeys);
+  }
+
+  return code;
+}
+
+static int32_t jsonToLogicSortNode(const SJson* pJson, void* pObj) {
+  SSortLogicNode* pNode = (SSortLogicNode*)pObj;
+
+  int32_t code = jsonToLogicPlanNode(pJson, pObj);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeList(pJson, jkSortLogicPlanSortKeys, &pNode->pSortKeys);
+  }
+
+  return code;
+}
+
 static const char* jkJoinLogicPlanJoinType = "JoinType";
 static const char* jkJoinLogicPlanOnConditions = "OnConditions";
 
@@ -2468,6 +2496,9 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
     case QUERY_NODE_LOGIC_PLAN_PROJECT:
       return logicProjectNodeToJson(pObj, pJson);
     case QUERY_NODE_LOGIC_PLAN_VNODE_MODIF:
+      break;
+    case QUERY_NODE_LOGIC_PLAN_SORT:
+      return logicSortNodeToJson(pObj, pJson);
     case QUERY_NODE_LOGIC_SUBPLAN:
     case QUERY_NODE_LOGIC_PLAN:
       break;
@@ -2527,16 +2558,8 @@ static int32_t jsonToSpecificNode(const SJson* pJson, void* pObj) {
       return jsonToFunctionNode(pJson, pObj);
     case QUERY_NODE_REAL_TABLE:
       return jsonToRealTableNode(pJson, pObj);
-    // case QUERY_NODE_TEMP_TABLE:
-    // case QUERY_NODE_JOIN_TABLE:
-    //   break;
-    // case QUERY_NODE_GROUPING_SET:
-    //   return jsonToGroupingSetNode(pJson, pObj);
     case QUERY_NODE_ORDER_BY_EXPR:
       return jsonToOrderByExprNode(pJson, pObj);
-    // case QUERY_NODE_LIMIT:
-    // case QUERY_NODE_STATE_WINDOW:
-    // case QUERY_NODE_SESSION_WINDOW:
     case QUERY_NODE_INTERVAL_WINDOW:
       return jsonToIntervalWindowNode(pJson, pObj);
     case QUERY_NODE_NODE_LIST:
@@ -2545,28 +2568,22 @@ static int32_t jsonToSpecificNode(const SJson* pJson, void* pObj) {
       return jsonToFillNode(pJson, pObj);
     case QUERY_NODE_TARGET:
       return jsonToTargetNode(pJson, pObj);
-    // case QUERY_NODE_RAW_EXPR:
-    //   break;
     case QUERY_NODE_DATABLOCK_DESC:
       return jsonToDataBlockDescNode(pJson, pObj);
     case QUERY_NODE_SLOT_DESC:
       return jsonToSlotDescNode(pJson, pObj);
     case QUERY_NODE_DOWNSTREAM_SOURCE:
       return jsonToDownstreamSourceNode(pJson, pObj);
-    // case QUERY_NODE_SET_OPERATOR:
-    //   break;
     case QUERY_NODE_SELECT_STMT:
       return jsonToSelectStmt(pJson, pObj);
     case QUERY_NODE_CREATE_TOPIC_STMT:
       return jsonToCreateTopicStmt(pJson, pObj);
     case QUERY_NODE_LOGIC_PLAN_SCAN:
       return jsonToLogicScanNode(pJson, pObj);
-    // case QUERY_NODE_LOGIC_PLAN_JOIN:
-    //   return jsonToLogicJoinNode(pJson, pObj);
-    // case QUERY_NODE_LOGIC_PLAN_AGG:
-    //   return jsonToLogicAggNode(pJson, pObj);
     case QUERY_NODE_LOGIC_PLAN_PROJECT:
       return jsonToLogicProjectNode(pJson, pObj);
+    case QUERY_NODE_LOGIC_PLAN_SORT:
+      return jsonToLogicSortNode(pJson, pObj);
     case QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN:
       return jsonToPhysiTagScanNode(pJson, pObj);
     case QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN:
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index 074ec4dcae..fb96f84d8a 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -127,9 +127,15 @@ SNodeptr nodesMakeNode(ENodeType type) {
     case QUERY_NODE_DROP_INDEX_STMT:
       return makeNode(type, sizeof(SDropIndexStmt));
     case QUERY_NODE_CREATE_QNODE_STMT:
-      return makeNode(type, sizeof(SCreateQnodeStmt));
+    case QUERY_NODE_CREATE_BNODE_STMT:
+    case QUERY_NODE_CREATE_SNODE_STMT:
+    case QUERY_NODE_CREATE_MNODE_STMT:
+      return makeNode(type, sizeof(SCreateComponentNodeStmt));
     case QUERY_NODE_DROP_QNODE_STMT:
-      return makeNode(type, sizeof(SDropQnodeStmt));
+    case QUERY_NODE_DROP_BNODE_STMT:
+    case QUERY_NODE_DROP_SNODE_STMT:
+    case QUERY_NODE_DROP_MNODE_STMT:
+      return makeNode(type, sizeof(SDropComponentNodeStmt));
     case QUERY_NODE_CREATE_TOPIC_STMT:
       return makeNode(type, sizeof(SCreateTopicStmt));
     case QUERY_NODE_DROP_TOPIC_STMT:
@@ -991,12 +997,18 @@ typedef struct SCollectColumnsCxt {
   int32_t errCode;
   const char* pTableAlias;
   SNodeList* pCols;
-  SHashObj* pColIdHash;
+  SHashObj* pColHash;
 } SCollectColumnsCxt;
 
-static EDealRes doCollect(SCollectColumnsCxt* pCxt, int32_t id, SNode* pNode) {
-  if (NULL == taosHashGet(pCxt->pColIdHash, &id, sizeof(id))) {
-    pCxt->errCode = taosHashPut(pCxt->pColIdHash, &id, sizeof(id), NULL, 0);
+static EDealRes doCollect(SCollectColumnsCxt* pCxt, SColumnNode* pCol, SNode* pNode) {
+  char name[TSDB_TABLE_NAME_LEN + TSDB_COL_NAME_LEN];
+  int32_t len = 0;
+  if ('\0' == pCol->tableAlias[0]) {
+    len = sprintf(name, "%s", pCol->colName);
+  }
+  len = sprintf(name, "%s.%s", pCol->tableAlias, pCol->colName);
+  if (NULL == taosHashGet(pCxt->pColHash, name, len)) {
+    pCxt->errCode = taosHashPut(pCxt->pColHash, name, len, NULL, 0);
     if (TSDB_CODE_SUCCESS == pCxt->errCode) {
       pCxt->errCode = nodesListAppend(pCxt->pCols, pNode);
     }
@@ -1009,9 +1021,8 @@ static EDealRes collectColumns(SNode* pNode, void* pContext) {
   SCollectColumnsCxt* pCxt = (SCollectColumnsCxt*)pContext;
   if (QUERY_NODE_COLUMN == nodeType(pNode)) {
     SColumnNode* pCol = (SColumnNode*)pNode;
-    int32_t colId = pCol->colId;
     if (NULL == pCxt->pTableAlias || 0 == strcmp(pCxt->pTableAlias, pCol->tableAlias)) {
-      return doCollect(pCxt, colId, pNode);
+      return doCollect(pCxt, pCol, pNode);
     }
   }
   return DEAL_RES_CONTINUE;
@@ -1026,14 +1037,14 @@ int32_t nodesCollectColumns(SSelectStmt* pSelect, ESqlClause clause, const char*
     .errCode = TSDB_CODE_SUCCESS,
     .pTableAlias = pTableAlias,
     .pCols = nodesMakeList(),
-    .pColIdHash = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK)
+    .pColHash = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK)
   };
-  if (NULL == cxt.pCols || NULL == cxt.pColIdHash) {
+  if (NULL == cxt.pCols || NULL == cxt.pColHash) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   nodesWalkSelectStmt(pSelect, clause, collectColumns, &cxt);
-  taosHashCleanup(cxt.pColIdHash);
+  taosHashCleanup(cxt.pColHash);
   if (TSDB_CODE_SUCCESS != cxt.errCode) {
     nodesClearList(cxt.pCols);
     return cxt.errCode;
diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 2ac7dbe8e3..609eb1c84e 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -150,8 +150,8 @@ SNode* createAlterDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode, const
 SNode* createCreateIndexStmt(SAstCreateContext* pCxt, EIndexType type, bool ignoreExists, SToken* pIndexName, SToken* pTableName, SNodeList* pCols, SNode* pOptions);
 SNode* createIndexOption(SAstCreateContext* pCxt, SNodeList* pFuncs, SNode* pInterval, SNode* pOffset, SNode* pSliding);
 SNode* createDropIndexStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken* pIndexName, SToken* pTableName);
-SNode* createCreateQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId);
-SNode* createDropQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId);
+SNode* createCreateComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDnodeId);
+SNode* createDropComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDnodeId);
 SNode* createCreateTopicStmt(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, SNode* pQuery, const SToken* pSubscribeDbName);
 SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pTopicName);
 SNode* createAlterLocalStmt(SAstCreateContext* pCxt, const SToken* pConfig, const SToken* pValue);
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 6e6a769db7..bcedd97ec9 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -109,8 +109,20 @@ cmd ::= ALTER LOCAL NK_STRING(A).
 cmd ::= ALTER LOCAL NK_STRING(A) NK_STRING(B).                                    { pCxt->pRootNode = createAlterLocalStmt(pCxt, &A, &B); }
 
 /************************************************ create/drop qnode ***************************************************/
-cmd ::= CREATE QNODE ON DNODE NK_INTEGER(A).                                      { pCxt->pRootNode = createCreateQnodeStmt(pCxt, &A); }
-cmd ::= DROP QNODE ON DNODE NK_INTEGER(A).                                        { pCxt->pRootNode = createDropQnodeStmt(pCxt, &A); }
+cmd ::= CREATE QNODE ON DNODE NK_INTEGER(A).                                      { pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_QNODE_STMT, &A); }
+cmd ::= DROP QNODE ON DNODE NK_INTEGER(A).                                        { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_QNODE_STMT, &A); }
+
+/************************************************ create/drop bnode ***************************************************/
+cmd ::= CREATE BNODE ON DNODE NK_INTEGER(A).                                      { pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_BNODE_STMT, &A); }
+cmd ::= DROP BNODE ON DNODE NK_INTEGER(A).                                        { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_BNODE_STMT, &A); }
+
+/************************************************ create/drop snode ***************************************************/
+cmd ::= CREATE SNODE ON DNODE NK_INTEGER(A).                                      { pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_SNODE_STMT, &A); }
+cmd ::= DROP SNODE ON DNODE NK_INTEGER(A).                                        { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_SNODE_STMT, &A); }
+
+/************************************************ create/drop mnode ***************************************************/
+cmd ::= CREATE MNODE ON DNODE NK_INTEGER(A).                                      { pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_MNODE_STMT, &A); }
+cmd ::= DROP MNODE ON DNODE NK_INTEGER(A).                                        { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &A); }
 
 /************************************************ create/drop/show/use database ***************************************/
 cmd ::= CREATE DATABASE not_exists_opt(A) db_name(B) db_options(C).               { pCxt->pRootNode = createCreateDatabaseStmt(pCxt, A, &B, C); }
@@ -327,6 +339,8 @@ cmd ::= SHOW QUERIES.
 cmd ::= SHOW SCORES.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SCORES_STMT, NULL, NULL); }
 cmd ::= SHOW TOPICS.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TOPICS_STMT, NULL, NULL); }
 cmd ::= SHOW VARIABLES.                                                           { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VARIABLE_STMT, NULL, NULL); }
+cmd ::= SHOW BNODES.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_BNODES_STMT, NULL, NULL); }
+cmd ::= SHOW SNODES.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SNODES_STMT, NULL, NULL); }
 
 db_name_cond_opt(A) ::= .                                                         { A = createDefaultDatabaseCondValue(pCxt); }
 db_name_cond_opt(A) ::= db_name(B) NK_DOT.                                        { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 893d500641..731e23e20d 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -1034,15 +1034,15 @@ SNode* createDropIndexStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken
   return (SNode*)pStmt;
 }
 
-SNode* createCreateQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId) {
-  SCreateQnodeStmt* pStmt = nodesMakeNode(QUERY_NODE_CREATE_QNODE_STMT);
+SNode* createCreateComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDnodeId) {
+  SCreateComponentNodeStmt* pStmt = nodesMakeNode(type);
   CHECK_OUT_OF_MEM(pStmt);
   pStmt->dnodeId = strtol(pDnodeId->z, NULL, 10);;
   return (SNode*)pStmt;
 }
 
-SNode* createDropQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId) {
-  SDropQnodeStmt* pStmt = nodesMakeNode(QUERY_NODE_DROP_QNODE_STMT);
+SNode* createDropComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDnodeId) {
+  SDropComponentNodeStmt* pStmt = nodesMakeNode(type);
   CHECK_OUT_OF_MEM(pStmt);
   pStmt->dnodeId = strtol(pDnodeId->z, NULL, 10);;
   return (SNode*)pStmt;
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index 300c41f73f..daeb98b3e6 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -43,6 +43,8 @@ static SKeyword keywordTable[] = {
     {"BINARY",        TK_BINARY},
     {"BIGINT",        TK_BIGINT},
     {"BLOCKS",        TK_BLOCKS},
+    {"BNODE",         TK_BNODE},
+    {"BNODES",        TK_BNODES},
     {"BOOL",          TK_BOOL},
     {"BUFSIZE",       TK_BUFSIZE},
     {"BY",            TK_BY},
@@ -106,6 +108,7 @@ static SKeyword keywordTable[] = {
     {"MAXROWS",       TK_MAXROWS},
     {"MINROWS",       TK_MINROWS},
     {"MINUS",         TK_MINUS},
+    {"MNODE",         TK_MNODE},
     {"MNODES",        TK_MNODES},
     {"MODIFY",        TK_MODIFY},
     {"MODULES",       TK_MODULES},
@@ -152,6 +155,8 @@ static SKeyword keywordTable[] = {
     {"SLIMIT",        TK_SLIMIT},
     {"SMA",           TK_SMA},
     {"SMALLINT",      TK_SMALLINT},
+    {"SNODE",         TK_SNODE},
+    {"SNODES",        TK_SNODES},
     {"SOFFSET",       TK_SOFFSET},
     {"STABLE",        TK_STABLE},
     {"STABLES",       TK_STABLES},
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index a286918ce5..bdb00b7581 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2034,7 +2034,23 @@ static int32_t translateDropIndex(STranslateContext* pCxt, SDropIndexStmt* pStmt
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t translateCreateQnode(STranslateContext* pCxt, SCreateQnodeStmt* pStmt) {
+static int16_t getCreateComponentNodeMsgType(ENodeType type) {
+  switch (type) {
+    case QUERY_NODE_CREATE_QNODE_STMT:
+      return TDMT_DND_CREATE_QNODE;
+    case QUERY_NODE_CREATE_BNODE_STMT:
+      return TDMT_DND_CREATE_BNODE;
+    case QUERY_NODE_CREATE_SNODE_STMT:
+      return TDMT_DND_CREATE_SNODE;
+    case QUERY_NODE_CREATE_MNODE_STMT:
+      return TDMT_DND_CREATE_MNODE;
+    default:
+      break;
+  }
+  return -1;
+}
+
+static int32_t translateCreateComponentNode(STranslateContext* pCxt, SCreateComponentNodeStmt* pStmt) {
   SMCreateQnodeReq createReq = { .dnodeId = pStmt->dnodeId };
 
   pCxt->pCmdMsg = taosMemoryMalloc(sizeof(SCmdMsgInfo));
@@ -2042,7 +2058,7 @@ static int32_t translateCreateQnode(STranslateContext* pCxt, SCreateQnodeStmt* p
     return TSDB_CODE_OUT_OF_MEMORY;
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
-  pCxt->pCmdMsg->msgType = TDMT_DND_CREATE_QNODE;
+  pCxt->pCmdMsg->msgType = getCreateComponentNodeMsgType(nodeType(pStmt));
   pCxt->pCmdMsg->msgLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
@@ -2053,7 +2069,23 @@ static int32_t translateCreateQnode(STranslateContext* pCxt, SCreateQnodeStmt* p
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t translateDropQnode(STranslateContext* pCxt, SDropQnodeStmt* pStmt) {
+static int16_t getDropComponentNodeMsgType(ENodeType type) {
+  switch (type) {
+    case QUERY_NODE_DROP_QNODE_STMT:
+      return TDMT_DND_DROP_QNODE;
+    case QUERY_NODE_DROP_BNODE_STMT:
+      return TDMT_DND_DROP_BNODE;
+    case QUERY_NODE_DROP_SNODE_STMT:
+      return TDMT_DND_DROP_SNODE;
+    case QUERY_NODE_DROP_MNODE_STMT:
+      return TDMT_DND_DROP_MNODE;
+    default:
+      break;
+  }
+  return -1;
+}
+
+static int32_t translateDropComponentNode(STranslateContext* pCxt, SDropComponentNodeStmt* pStmt) {
   SDDropQnodeReq dropReq = { .dnodeId = pStmt->dnodeId };
 
   pCxt->pCmdMsg = taosMemoryMalloc(sizeof(SCmdMsgInfo));
@@ -2061,7 +2093,7 @@ static int32_t translateDropQnode(STranslateContext* pCxt, SDropQnodeStmt* pStmt
     return TSDB_CODE_OUT_OF_MEMORY;
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
-  pCxt->pCmdMsg->msgType = TDMT_DND_DROP_QNODE;
+  pCxt->pCmdMsg->msgType = getDropComponentNodeMsgType(nodeType(pStmt));
   pCxt->pCmdMsg->msgLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
@@ -2226,10 +2258,16 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
       code = translateDropIndex(pCxt, (SDropIndexStmt*)pNode);
       break;
     case QUERY_NODE_CREATE_QNODE_STMT:
-      code = translateCreateQnode(pCxt, (SCreateQnodeStmt*)pNode);
+    case QUERY_NODE_CREATE_BNODE_STMT:
+    case QUERY_NODE_CREATE_SNODE_STMT:
+    case QUERY_NODE_CREATE_MNODE_STMT:
+      code = translateCreateComponentNode(pCxt, (SCreateComponentNodeStmt*)pNode);
       break;
     case QUERY_NODE_DROP_QNODE_STMT:
-      code = translateDropQnode(pCxt, (SDropQnodeStmt*)pNode);
+    case QUERY_NODE_DROP_BNODE_STMT:
+    case QUERY_NODE_DROP_SNODE_STMT:
+    case QUERY_NODE_DROP_MNODE_STMT:
+      code = translateDropComponentNode(pCxt, (SDropComponentNodeStmt*)pNode);
       break;
     case QUERY_NODE_CREATE_TOPIC_STMT:
       code = translateCreateTopic(pCxt, (SCreateTopicStmt*)pNode);
@@ -2385,6 +2423,10 @@ static const char* getSysTableName(ENodeType type) {
       return TSDB_INS_TABLE_USER_INDEXES;
     case QUERY_NODE_SHOW_STREAMS_STMT:
       return TSDB_INS_TABLE_USER_STREAMS;
+    case QUERY_NODE_SHOW_BNODES_STMT:
+      return TSDB_INS_TABLE_BNODES;
+    case QUERY_NODE_SHOW_SNODES_STMT:
+      return TSDB_INS_TABLE_SNODES;
     default:
       break;
   }
@@ -2898,6 +2940,8 @@ static int32_t rewriteQuery(STranslateContext* pCxt, SQuery* pQuery) {
     case QUERY_NODE_SHOW_FUNCTIONS_STMT:
     case QUERY_NODE_SHOW_INDEXES_STMT:
     case QUERY_NODE_SHOW_STREAMS_STMT:
+    case QUERY_NODE_SHOW_BNODES_STMT:
+    case QUERY_NODE_SHOW_SNODES_STMT:
       code = rewriteShow(pCxt, pQuery);
       break;
     case QUERY_NODE_CREATE_TABLE_STMT:
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index b2ddd1d0bc..918b7aa41b 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -100,24 +100,24 @@
 #endif
 /************* Begin control #defines *****************************************/
 #define YYCODETYPE unsigned short int
-#define YYNOCODE 308
+#define YYNOCODE 313
 #define YYACTIONTYPE unsigned short int
 #define ParseTOKENTYPE  SToken 
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  ENullOrder yy81;
-  SNode* yy168;
-  SDataType yy224;
-  SAlterOption yy277;
-  SNodeList* yy376;
-  EFillMode yy382;
-  SToken yy393;
-  EOperatorType yy436;
-  int32_t yy508;
-  bool yy537;
-  EOrder yy554;
-  EJoinType yy596;
+  SToken yy21;
+  bool yy173;
+  EOrder yy256;
+  EFillMode yy268;
+  SDataType yy288;
+  SAlterOption yy289;
+  EJoinType yy440;
+  EOperatorType yy468;
+  SNodeList* yy476;
+  ENullOrder yy525;
+  SNode* yy564;
+  int32_t yy620;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -132,17 +132,17 @@ typedef union {
 #define ParseCTX_PARAM
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
-#define YYNSTATE             518
-#define YYNRULE              400
-#define YYNTOKEN             202
-#define YY_MAX_SHIFT         517
-#define YY_MIN_SHIFTREDUCE   776
-#define YY_MAX_SHIFTREDUCE   1175
-#define YY_ERROR_ACTION      1176
-#define YY_ACCEPT_ACTION     1177
-#define YY_NO_ACTION         1178
-#define YY_MIN_REDUCE        1179
-#define YY_MAX_REDUCE        1578
+#define YYNSTATE             544
+#define YYNRULE              408
+#define YYNTOKEN             207
+#define YY_MAX_SHIFT         543
+#define YY_MIN_SHIFTREDUCE   802
+#define YY_MAX_SHIFTREDUCE   1209
+#define YY_ERROR_ACTION      1210
+#define YY_ACCEPT_ACTION     1211
+#define YY_NO_ACTION         1212
+#define YY_MIN_REDUCE        1213
+#define YY_MAX_REDUCE        1620
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -209,466 +209,480 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (1488)
+#define YY_ACTTAB_COUNT (1523)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   255,  432,  272, 1447,  267,   52, 1218, 1380,  275,   25,
- /*    10 */   193,  304,   31,   29,  121, 1371, 1373, 1431,   96, 1431,
- /*    20 */   264,  444, 1012, 1431,  445, 1333, 1288, 1463,  367, 1427,
- /*    30 */  1433, 1427, 1433,   72,  429, 1427, 1434,  117, 1010, 1340,
- /*    40 */   352, 1251, 1557,  310,  431,  254, 1284,   11, 1418, 1293,
- /*    50 */  1338,  263, 1225,  413, 1017,  130,  813,  432,  812, 1555,
- /*    60 */    31,   29, 1118, 1381,  231, 1448, 1449, 1452,  264, 1270,
- /*    70 */  1012,    1,   12,  236,   31,   29,  814,  444,  100, 1340,
- /*    80 */   413,  444,  264,  445, 1012,  269, 1010,  343,   31,   29,
- /*    90 */  1338, 1418,   72, 1035,  514,   11,  264,  417, 1012,  358,
- /*   100 */  1010,  366, 1017,  360,  858,  100, 1011,  365, 1293,   11,
- /*   110 */    97,   98,  361,  359, 1010,  362, 1017, 1034, 1340,    1,
- /*   120 */   860,  186, 1503,  412,  276,  411,  445,  208, 1557, 1338,
- /*   130 */  1017,  476,   12,    1, 1222,  308, 1463,  116,   98, 1191,
- /*   140 */  1013,  130,  514,  429, 1032, 1555,  445,    7,  127, 1503,
- /*   150 */  1504, 1293, 1508,  478, 1011,  309,  514, 1016, 1036, 1037,
- /*   160 */  1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1011,  482,
- /*   170 */   514, 1293,  475,  474,  473,  406,  472,  163, 1117,  131,
- /*   180 */   131,  355, 1011,  502,  501,  500,  499,  279, 1013,  498,
- /*   190 */   497,  496,  102,  491,  490,  489,  488,  487,  486,  485,
- /*   200 */   484,  108, 1013,  357,    6, 1016, 1036, 1037, 1062, 1063,
- /*   210 */  1064, 1065, 1066, 1067, 1068, 1069, 1013,  510,  509, 1016,
- /*   220 */  1036, 1037, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069,
- /*   230 */  1038, 1036, 1037, 1016, 1036, 1037, 1062, 1063, 1064, 1065,
- /*   240 */  1066, 1067, 1068, 1069, 1142, 1271,   31,   29,  430,   32,
- /*   250 */    30,   28,   27,   26,  264,  131, 1012,  136,  407,   31,
- /*   260 */    29,  235,  303, 1032,  302,  445,   65,  264, 1180, 1012,
- /*   270 */   322,  403, 1010,  334,  315,  400, 1140, 1141, 1143, 1144,
- /*   280 */   101,  131,  335,   50, 1202, 1010,   49, 1285, 1017,   84,
- /*   290 */  1293,  343,   83,   82,   81,   80,   79,   78,   77,   76,
- /*   300 */    75, 1017,  131,  131,  329,    7,  480,  896,  468,  467,
- /*   310 */   466,  900,  465,  902,  903,  464,  905,  461,    7,  911,
- /*   320 */   458,  913,  914,  455,  452,  408,  404,   84,  514, 1418,
- /*   330 */    83,   82,   81,   80,   79,   78,   77,   76,   75, 1113,
- /*   340 */  1011,  514,  188,   32,   30,   28,   27,   26,  364,  363,
- /*   350 */   140,  139,  333, 1011, 1116,  328,  327,  326,  325,  324,
- /*   360 */   445,  321,  320,  319,  318,  314,  313,  312,  311,  316,
- /*   370 */  1172,    9,    8, 1033, 1013,   32,   30,   28,   27,   26,
- /*   380 */    32,   30,   28,   27,   26, 1293, 1201, 1013,  483, 1200,
- /*   390 */  1265, 1016, 1036, 1037, 1062, 1063, 1064, 1065, 1066, 1067,
- /*   400 */  1068, 1069,  421, 1132, 1016, 1036, 1037, 1062, 1063, 1064,
- /*   410 */  1065, 1066, 1067, 1068, 1069,  238, 1282,   31,   29,   32,
- /*   420 */    30,   28,   27,   26,  366,  264,  360, 1012, 1199, 1447,
- /*   430 */   365, 1418,  371,   97, 1418,  361,  359, 1171,  362,  471,
- /*   440 */  1050,  445, 1094, 1010, 1447, 1557,  445,  379, 1081,  268,
- /*   450 */   342, 1269,  380, 1463,  238, 1290, 1368,  114, 1556, 1017,
- /*   460 */   429,  165, 1555,  138,  374, 1295, 1293,   52, 1463,  368,
- /*   470 */   431, 1293,  164, 1418, 1418,  416,    1,  445, 1278,  417,
- /*   480 */    28,   27,   26, 1557, 1198,  431,  442, 1081, 1289, 1418,
- /*   490 */   227, 1448, 1449, 1452, 1082, 1280,  130,  480,   42,  514,
- /*   500 */  1555,   41, 1293, 1197, 1083,   69, 1448, 1449, 1452, 1496,
- /*   510 */  1557, 1011, 1086,  257, 1492,  125,  274,  495,  493, 1276,
- /*   520 */  1177, 1039, 1087,  130,  114,  215,  420, 1555, 1323, 1418,
- /*   530 */   115,  422, 1295, 1082, 1524,  221,   24,  262, 1076, 1077,
- /*   540 */  1078, 1079, 1080, 1084, 1085, 1013,   22,  219, 1418, 1196,
- /*   550 */  1195, 1086,   32,   30,   28,   27,   26,  141, 1515, 1113,
- /*   560 */   168, 1447, 1016, 1036, 1037, 1062, 1063, 1064, 1065, 1066,
- /*   570 */  1067, 1068, 1069,  280, 1447,   24,  262, 1076, 1077, 1078,
- /*   580 */  1079, 1080, 1084, 1085,  295, 1463,  388,  271,  270,   59,
- /*   590 */  1510,  445,  429,  114, 1418, 1418, 1510, 1025, 1463,  297,
- /*   600 */   443, 1296,  431,  413, 1557,  429, 1418, 1194, 1507,  445,
- /*   610 */  1286,  417, 1050, 1018, 1506,  431, 1293,  130,  207, 1418,
- /*   620 */    67, 1555,   68, 1448, 1449, 1452, 1496,  470,  100, 1017,
- /*   630 */   237, 1492,  277,  174, 1293,   70, 1448, 1449, 1452, 1496,
- /*   640 */   114,  812, 1557, 1495, 1492,   48,   47,  307, 1295,  135,
- /*   650 */  1193, 1252, 1418, 1192,  301,  130, 1407,  350, 1190, 1555,
- /*   660 */   248,   98,  244,  517,  293, 1447,  289,  285,  132,  446,
- /*   670 */   415,  126, 1503, 1504, 1189, 1508, 1188,  212, 1125, 1510,
- /*   680 */    95, 1021,  156,  163, 1034,  154,  506,  355,  211, 1463,
- /*   690 */   494,  131,  287, 1187,  298, 1418,  416, 1505,  445,  249,
- /*   700 */  1447,  247,  246, 1418,  354, 1186,  431,  278,  428,  357,
- /*   710 */  1418, 1185, 1184, 1183,   66, 1026,  106,  205,  419, 1418,
- /*   720 */   392, 1418, 1182, 1293, 1463, 1020,   69, 1448, 1449, 1452,
- /*   730 */  1496,  429, 1029, 1340,  257, 1492,  125, 1213, 1418,  401,
- /*   740 */  1340,  431, 1447,  158, 1372, 1418,  157,  441,  189,  160,
- /*   750 */  1418, 1339,  159, 1447,  396, 1523, 1418, 1418, 1418,  369,
- /*   760 */  1211,   69, 1448, 1449, 1452, 1496, 1463, 1418,  378,  257,
- /*   770 */  1492, 1569,  395,  429,  190,  170,  162, 1463, 1447,  161,
- /*   780 */  1530,  376,  372,  431,  429,   44,  424, 1418,  338, 1139,
- /*   790 */   996,  177,  167, 1023,  431,  179,    9,    8, 1418,  413,
- /*   800 */   389,  397, 1463,   69, 1448, 1449, 1452, 1496, 1334,  429,
- /*   810 */  1019,  257, 1492, 1569,  231, 1448, 1449, 1452, 1073,  431,
- /*   820 */    64, 1447, 1553, 1418,  100, 1174, 1175,   33,  387,   33,
- /*   830 */    61, 1088, 1447, 1047, 1438,  183,  349,  832, 1012,   69,
- /*   840 */  1448, 1449, 1452, 1496,  390, 1463, 1436,  257, 1492, 1569,
- /*   850 */  1526,   33,  429,  833, 1010,  979, 1463,   98, 1514, 1464,
- /*   860 */   196,   94,  431,  429,  198,  437, 1418,  128, 1503, 1504,
- /*   870 */  1017, 1508,  104,  431, 1447, 1557,  204, 1418, 1022,  414,
- /*   880 */   192,    2,   70, 1448, 1449, 1452, 1496, 1032,  130,  282,
- /*   890 */   427, 1492, 1555,  118, 1448, 1449, 1452,  286, 1463,  243,
- /*   900 */   106,  245, 1447,   44,  889,  429,  858,  884,  450,  104,
- /*   910 */   514,  988,  917,  921,  213,  431,  105,  425,  151, 1418,
- /*   920 */   927,  124, 1011,  317,  106, 1370, 1463,  348,  926,  150,
- /*   930 */  1447,  418, 1570,  429,  137,   70, 1448, 1449, 1452, 1496,
- /*   940 */   323,  104,  330,  431, 1493,  107,  331, 1418,  332,  336,
- /*   950 */  1043,  337, 1042,  339, 1463,   53, 1013,  143,  148, 1447,
- /*   960 */   340,  429, 1041,  230, 1448, 1449, 1452,   21,  341,  146,
- /*   970 */    51,  431, 1040, 1016,  351, 1418,  344,   32,   30,   28,
- /*   980 */    27,   26,  149, 1463, 1447,  383,  356,  353,  381,   74,
- /*   990 */   429,  118, 1448, 1449, 1452,  409,  253, 1283,  384,  153,
- /*  1000 */   431,  382,  391, 1279, 1418,  155,  109,  261, 1463,  110,
- /*  1010 */  1281, 1277,  147,  111,  120,  429,  144,  112, 1447,  169,
- /*  1020 */   231, 1448, 1449, 1452,   23,  431, 1179,  393,  172, 1418,
- /*  1030 */  1571, 1039,  265,  142,   32,   30,   28,   27,   26,  402,
- /*  1040 */  1527,  394, 1463, 1017,  435,  231, 1448, 1449, 1452,  429,
- /*  1050 */    93,   92,   91,   90,   89,   88,   87,   86,   85,  431,
- /*  1060 */  1537,  175, 1447, 1418,  399,    5,  178,  410, 1447,  256,
- /*  1070 */   398,  405, 1113,    4, 1038,   99,  123,   34, 1517,  224,
- /*  1080 */  1448, 1449, 1452, 1536,  185,  258, 1463,  184,  182, 1511,
- /*  1090 */    17,  426, 1463,  429,  423, 1478, 1447, 1572,  191,  429,
- /*  1100 */  1379,  433, 1554,  431, 1447,  434,  438, 1418,  439,  431,
- /*  1110 */  1378,  200,  266, 1418,  202,  214,  440,   58, 1294,   60,
- /*  1120 */  1463,  448, 1266,  229, 1448, 1449, 1452,  429, 1463,  232,
- /*  1130 */  1448, 1449, 1452,  477,  216,  429,  210,  431, 1447,  222,
- /*  1140 */    40, 1418,  513,  223,  220,  431, 1268, 1412,  218, 1418,
- /*  1150 */  1447, 1411,  281, 1408,  283,  284, 1006,  225, 1448, 1449,
- /*  1160 */  1452, 1007, 1463,  133, 1406,  233, 1448, 1449, 1452,  429,
- /*  1170 */   288,  290,  291,  292, 1463, 1405,  294, 1404,  296,  431,
- /*  1180 */  1395,  429,  134, 1418,  299,  300,  991,  990, 1389, 1388,
- /*  1190 */  1387,  431,  305,  306, 1386, 1418, 1447,  962, 1363,  226,
- /*  1200 */  1448, 1449, 1452, 1362,  208, 1361, 1360, 1359,  476, 1358,
- /*  1210 */  1357,  234, 1448, 1449, 1452, 1356, 1355, 1354, 1353, 1352,
- /*  1220 */  1463, 1447, 1351,  103, 1350, 1349, 1348,  429, 1347, 1346,
- /*  1230 */   478, 1345, 1447,  964, 1344, 1343, 1342,  431, 1341, 1224,
- /*  1240 */  1403, 1418, 1397, 1385, 1376, 1463, 1272,  145,  825,  475,
- /*  1250 */   474,  473,  429,  472, 1223, 1221, 1463, 1460, 1448, 1449,
- /*  1260 */  1452,  345,  431,  429,  347, 1210, 1418, 1209, 1447,  346,
- /*  1270 */  1206, 1274,   73,  431, 1447,  152,  494, 1418,  932,  934,
- /*  1280 */  1273,  492, 1459, 1448, 1449, 1452,  857,  856,  855,  854,
- /*  1290 */   851,  850, 1463, 1458, 1448, 1449, 1452, 1219, 1463,  429,
- /*  1300 */   250, 1214, 1447,  251, 1212,  429,  252,  370, 1205,  431,
- /*  1310 */  1447,  373,  375, 1418, 1204,  431,  377, 1402,   71, 1418,
- /*  1320 */   166,  998, 1396,   43,  113,  385, 1463,  386,  122,  241,
- /*  1330 */  1448, 1449, 1452,  429, 1463,  240, 1448, 1449, 1452, 1384,
- /*  1340 */  1383,  429, 1375,  431, 1447,   54,   37, 1418,  171,   14,
- /*  1350 */     3,  431, 1436,   33,  173, 1418,   38,   15,  176, 1138,
- /*  1360 */   119,  181,  180,  242, 1448, 1449, 1452,   19, 1463,   10,
- /*  1370 */    55,  239, 1448, 1449, 1452,  429,   56,   20, 1131, 1110,
- /*  1380 */    36,   16, 1109,  187, 1160,  431, 1159, 1165,  259, 1418,
- /*  1390 */  1164, 1163,  260,    8,  129, 1048,   13,   35,   18,  194,
- /*  1400 */   195, 1136, 1074,  197,  199,  228, 1448, 1449, 1452,  436,
- /*  1410 */  1374,  201,   45, 1435,   57,   61, 1027,  918,  206,  203,
- /*  1420 */    39,  449,  273,  915,  453,  456,  447,  451,  454,  895,
- /*  1430 */   912,  457,  910,  906,  459,  460,  462,  904,  463,  929,
- /*  1440 */    62,   46,   63,  909,  928,  923,  469,  925,  823,  479,
- /*  1450 */   481,  908,  846,  864,  845,  907,  209,  844,  843,  842,
- /*  1460 */   841,  839,  840,  859,  836,  861,  835,  834,  831,  830,
- /*  1470 */   829,  828, 1220,  503,  504, 1208, 1207,  505,  507,  508,
- /*  1480 */  1203,  511,  512, 1178, 1014,  217,  515,  516,
+ /*     0 */    25,  193, 1473, 1322,  255,  446, 1489,  459,  267,  310,
+ /*    10 */   275, 1422,   31,   29, 1469, 1476,  308, 1413, 1415, 1449,
+ /*    20 */   264, 1473, 1046,  272,  427,   32,   30,   28,   27,   26,
+ /*    30 */  1505,   21, 1333, 1469, 1475,  304,  458,  443, 1044,  236,
+ /*    40 */  1473,   32,   30,   28,   27,   26, 1068,  445,   23,  100,
+ /*    50 */    11, 1460, 1469, 1475, 1489,  287,  431, 1051,   32,   30,
+ /*    60 */    28,   27,   26,   31,   29, 1152, 1599,  227, 1490, 1491,
+ /*    70 */  1494,  264,  215, 1046,    1, 1363,   31,   29, 1505,  130,
+ /*    80 */  1552,  136,   98, 1597,  264,  443, 1046, 1599, 1166, 1044,
+ /*    90 */    52,  429,  126, 1545, 1546,  445, 1550,  540, 1549, 1460,
+ /*   100 */   130,   11, 1044,   96, 1597, 1069, 1211,   50, 1051, 1045,
+ /*   110 */    49, 1328,  378,  377,   11,   70, 1490, 1491, 1494, 1538,
+ /*   120 */   458, 1051,  345, 1537, 1534,    1, 1214,  928,  482,  481,
+ /*   130 */   480,  932,  479,  934,  935,  478,  937,  475,    1,  943,
+ /*   140 */   472,  945,  946,  469,  466, 1047,  485,   84,  540, 1324,
+ /*   150 */    83,   82,   81,   80,   79,   78,   77,   76,   75,  280,
+ /*   160 */  1045,  540, 1050, 1070, 1071, 1096, 1097, 1098, 1099, 1100,
+ /*   170 */  1101, 1102, 1103, 1045,   12, 1046,  459, 1066,  163,   31,
+ /*   180 */    29,  116,  369, 1225,  131,  309,  380,  264,  374, 1046,
+ /*   190 */  1599, 1044,  379,  403, 1460,   97, 1047,  375,  373,  156,
+ /*   200 */   376, 1333,  154,  130,  371, 1044,  303, 1597,  302, 1047,
+ /*   210 */  1051,  394,  458, 1050, 1070, 1071, 1096, 1097, 1098, 1099,
+ /*   220 */  1100, 1101, 1102, 1103, 1051,  417, 1050, 1070, 1071, 1096,
+ /*   230 */  1097, 1098, 1099, 1100, 1101, 1102, 1103,  404,  459, 1176,
+ /*   240 */   131,    7, 1599,   31,   29,  444,  131,   72, 1070, 1071,
+ /*   250 */   540,  264,  459, 1046,  366,  130,  890,   31,   29, 1597,
+ /*   260 */  1072,  317, 1045, 1333,  540,  264,   12, 1046, 1599, 1044,
+ /*   270 */   414, 1174, 1175, 1177, 1178,  892, 1045, 1333,   52,  422,
+ /*   280 */   418,  130, 1489, 1044,  131, 1597,   84, 1599, 1051,   83,
+ /*   290 */    82,   81,   80,   79,   78,   77,   76,   75, 1047, 1329,
+ /*   300 */  1598,  331, 1051,   65, 1597,    7, 1505,   32,   30,   28,
+ /*   310 */    27,   26, 1047,  443, 1505, 1050,  117,  101, 1236,    7,
+ /*   320 */  1291,  443,  421,  445, 1325, 1489, 1311, 1460,  540, 1050,
+ /*   330 */  1070, 1071, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103,
+ /*   340 */  1045,  131,  540,  118, 1490, 1491, 1494,  140,  139, 1505,
+ /*   350 */   235,  131, 1066,  420, 1045,  459,  443,  121,  494,  324,
+ /*   360 */   459, 1552,  336, 1460,  318, 1067,  445,  427, 1373,  344,
+ /*   370 */  1460,  337, 1380,  263, 1235,  345, 1047,  188,  254, 1548,
+ /*   380 */  1333,  432, 1612, 1378, 1309, 1333,  231, 1490, 1491, 1494,
+ /*   390 */  1047,  496,  100, 1050, 1070, 1071, 1096, 1097, 1098, 1099,
+ /*   400 */  1100, 1101, 1102, 1103,   28,   27,   26, 1050, 1070, 1071,
+ /*   410 */  1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103,  459, 1460,
+ /*   420 */    31,   29,  434, 1380,  268,   98, 1234, 1330,  264,  269,
+ /*   430 */  1046, 1262,  114,  494, 1378,  127, 1545, 1546, 1410, 1550,
+ /*   440 */  1335,  536,  535, 1333,  335,  138, 1044,  330,  329,  328,
+ /*   450 */   327,  326,   59,  323,  322,  321,  320,  316,  315,  314,
+ /*   460 */   313,  312,  311,  459, 1151, 1051,   32,   30,   28,   27,
+ /*   470 */    26, 1460,  456, 1326, 1318,   32,   30,   28,   27,   26,
+ /*   480 */   248, 1320,    1,  516,  515,  514,  513,  279, 1333,  512,
+ /*   490 */   511,  510,  102,  505,  504,  503,  502,  501,  500,  499,
+ /*   500 */   498,  108, 1489,  459,  238,  540,  163,  508,  114,  459,
+ /*   510 */   369,  298,   72,  238,  446,  274, 1336, 1045,  457,  372,
+ /*   520 */  1423, 1316,  249,  114,  247,  246, 1505,  368, 1333, 1084,
+ /*   530 */  1213, 1335,  371,  443, 1333, 1073,  277, 1115,   32,   30,
+ /*   540 */    28,   27,   26,  445,  114, 1292, 1115, 1460,  839, 1117,
+ /*   550 */   838, 1552, 1335, 1047,   93,   92,   91,   90,   89,   88,
+ /*   560 */    87,   86,   85,  224, 1490, 1491, 1494, 1121,  840, 1547,
+ /*   570 */  1050, 1070, 1071, 1096, 1097, 1098, 1099, 1100, 1101, 1102,
+ /*   580 */  1103,  385,    9,    8,  459, 1116, 1380,  509,  507,  459,
+ /*   590 */   115,   22,  276,  207, 1116,  221,  393, 1378,  278, 1480,
+ /*   600 */   497, 1084, 1305, 1120, 1233,  838, 1232,  219, 1265, 1333,
+ /*   610 */   165, 1478, 1120,  388, 1333, 1380, 1231,    6,  382,  433,
+ /*   620 */   141,  364, 1230, 1489,  164, 1229, 1414,   24,  262, 1110,
+ /*   630 */  1111, 1112, 1113, 1114, 1118, 1119,   24,  262, 1110, 1111,
+ /*   640 */  1112, 1113, 1114, 1118, 1119, 1150,  168, 1505, 1380, 1460,
+ /*   650 */    42, 1460,  174,   41,  443,  435, 1128, 1228, 1227, 1379,
+ /*   660 */   380, 1460,  374,  484,  445, 1054,  379, 1460, 1460,   97,
+ /*   670 */  1460,  375,  373,  431,  376, 1557, 1147, 1489, 1224, 1223,
+ /*   680 */  1222, 1221,  295,   67,   68, 1490, 1491, 1494, 1538, 1220,
+ /*   690 */   271,  270,  237, 1534,  392,    9,    8,  297, 1219, 1218,
+ /*   700 */  1059, 1505, 1460, 1460, 1599, 1217,  438,  390,  430, 1216,
+ /*   710 */    48,   47,  307,  402,  135, 1252, 1052,  130,  445,  301,
+ /*   720 */  1226, 1597, 1460, 1460, 1460, 1460, 1460,  244, 1489,  293,
+ /*   730 */  1053,  289,  285,  132, 1460, 1051, 1057,  381,   69, 1490,
+ /*   740 */  1491, 1494, 1538, 1460, 1460,  864,  257, 1534,  125, 1159,
+ /*   750 */  1460,  543, 1505,  190, 1460, 1068,  131, 1147,  158,  430,
+ /*   760 */   189,  157, 1208, 1209,  865,  212,  410, 1565,   95,  445,
+ /*   770 */   442, 1489, 1247, 1460,  532,  460,  528,  524,  520,  211,
+ /*   780 */   415,  160,  162, 1489,  159,  161,  436, 1055, 1245,   69,
+ /*   790 */  1490, 1491, 1494, 1538,  383, 1505, 1489,  257, 1534,  125,
+ /*   800 */   340, 1056,  443, 1374,  401,   66,  183, 1505,  205,  106,
+ /*   810 */   386,  363,  445,  406,  443,   44, 1460, 1568, 1566, 1173,
+ /*   820 */  1505,  177,   33, 1060,  445,  179, 1122,  443, 1460,  428,
+ /*   830 */  1506, 1489,  229, 1490, 1491, 1494,  192,  445,  455,  439,
+ /*   840 */  1063, 1460,    2, 1489,   69, 1490, 1491, 1494, 1538, 1066,
+ /*   850 */   282,  243,  257, 1534, 1611, 1505,  286,   70, 1490, 1491,
+ /*   860 */  1494, 1538,  443, 1572,  890,  409, 1535, 1505,  170,   33,
+ /*   870 */    64,   33,  445, 1081,  443, 1013, 1460,  196,  245, 1022,
+ /*   880 */    61,  198, 1107, 1030,  445,  167,   94,  104, 1460,  213,
+ /*   890 */   451,  204,   69, 1490, 1491, 1494, 1538,  319, 1412,  137,
+ /*   900 */   257, 1534, 1611, 1489,   69, 1490, 1491, 1494, 1538,  325,
+ /*   910 */   332, 1595,  257, 1534, 1611,  106,  333,  151,  427,  921,
+ /*   920 */   124,  334,  338, 1556,  339, 1077,  362, 1505,  358,  354,
+ /*   930 */   350,  150,   44,  464,  443, 1076,  916,  949,  104, 1489,
+ /*   940 */   143,  105,  953,  100,  445,  959,  341,  106, 1460,  342,
+ /*   950 */  1489,  958,   32,   30,   28,   27,   26,   53, 1075,  146,
+ /*   960 */   148,  343,  431, 1505,   70, 1490, 1491, 1494, 1538,  365,
+ /*   970 */   443,   51,  441, 1534, 1505,  104,   98,  346,  149,  107,
+ /*   980 */   445,  443, 1074,  427, 1460,   74,  186, 1545,  426,  367,
+ /*   990 */   425,  445, 1323, 1599,  370, 1460,  153, 1319,  411,  155,
+ /*  1000 */   230, 1490, 1491, 1494, 1489,  109,  130,  110,  100, 1489,
+ /*  1010 */  1597,  231, 1490, 1491, 1494, 1321,  147, 1317,  120,  253,
+ /*  1020 */   144,  111,  408,  112,  396,  395,  397,  405, 1505,  169,
+ /*  1030 */   398,  407,  423, 1505,  172,  443, 1073,  142, 1489,  416,
+ /*  1040 */   443,   98,  449, 1579, 1051,  445, 1569,  175,  413, 1460,
+ /*  1050 */   445,  128, 1545, 1546, 1460, 1550,  256,  261,  178,  419,
+ /*  1060 */   412,  424, 1505,    5, 1489,  118, 1490, 1491, 1494,  443,
+ /*  1070 */   231, 1490, 1491, 1494,    4, 1559, 1578,  182, 1206,  445,
+ /*  1080 */  1147,  123,   99, 1460, 1072,   34,  265, 1553, 1505,  184,
+ /*  1090 */   185,  258,  440,  437, 1614,  443,   17,  447,  191,  231,
+ /*  1100 */  1490, 1491, 1494, 1520, 1613,  445, 1489,  452, 1421, 1460,
+ /*  1110 */  1596, 1489,  448,  200, 1420,  266,  214, 1489,  453, 1334,
+ /*  1120 */   454,  202,   60,   58,  462,  232, 1490, 1491, 1494,  491,
+ /*  1130 */  1505,  539,  216,  210, 1306, 1505,  220,  443,  218,   40,
+ /*  1140 */   222, 1505,  443, 1454, 1453, 1205,  281,  445,  443, 1310,
+ /*  1150 */   223, 1460,  445, 1450,  283,  284, 1460, 1040,  445, 1489,
+ /*  1160 */  1041,  133, 1460,  288, 1448,  290,  291,  225, 1490, 1491,
+ /*  1170 */  1494, 1489,  233, 1490, 1491, 1494,  292, 1447,  226, 1490,
+ /*  1180 */  1491, 1494, 1446, 1505, 1489,  294,  296, 1437,  134,  299,
+ /*  1190 */   443,  300, 1025, 1431, 1024, 1505, 1430,  306,  305, 1429,
+ /*  1200 */   445, 1308,  443, 1428, 1460, 1405,  996, 1404, 1505, 1403,
+ /*  1210 */   208, 1402,  445, 1489,  490,  443, 1460, 1401, 1400, 1399,
+ /*  1220 */   234, 1490, 1491, 1494, 1398,  445, 1397, 1396, 1395, 1460,
+ /*  1230 */  1394, 1393, 1502, 1490, 1491, 1494,  492, 1505, 1392, 1489,
+ /*  1240 */  1391,  103, 1390, 1389,  443, 1501, 1490, 1491, 1494, 1388,
+ /*  1250 */  1387, 1386, 1385, 1384,  445,  489,  488,  487, 1460,  486,
+ /*  1260 */  1383,  998,  208, 1505, 1382, 1489,  490, 1381, 1264, 1445,
+ /*  1270 */   443, 1439, 1427, 1489, 1500, 1490, 1491, 1494, 1418,  145,
+ /*  1280 */   445, 1312, 1263,  857, 1460, 1261,  347,  349,  492, 1505,
+ /*  1290 */   348, 1259,  352,  351, 1257,  355,  443, 1505, 1255, 1489,
+ /*  1300 */   241, 1490, 1491, 1494,  443,  353,  445,  489,  488,  487,
+ /*  1310 */  1460,  486,  356,  357,  445,  359,  360,  361, 1460, 1244,
+ /*  1320 */  1243, 1240, 1314, 1505,   73,  966,  240, 1490, 1491, 1494,
+ /*  1330 */   443,  964,  508, 1313,  242, 1490, 1491, 1494,  889,  152,
+ /*  1340 */   445, 1489,  888,  887, 1460,  886,  506, 1253,  883,  882,
+ /*  1350 */   250, 1248,  251,  384, 1246,  387,  252, 1239,  389, 1238,
+ /*  1360 */   239, 1490, 1491, 1494,  391, 1505,   71, 1444,  166, 1032,
+ /*  1370 */    43, 1438,  443,  113,  399, 1426, 1425, 1417,  171,  122,
+ /*  1380 */    54, 1478,  445,  400,   37,   14, 1460,    3,  176,   33,
+ /*  1390 */  1172,  173,   15,   56,   38,   35,   10,    8,  119,  180,
+ /*  1400 */    19,   55,  228, 1490, 1491, 1494, 1194, 1165,  181,   20,
+ /*  1410 */  1193,  259, 1198, 1416, 1144, 1143,   36, 1197,  260, 1199,
+ /*  1420 */    16,  450,  203, 1061,   13, 1108,  201,  187, 1082,  129,
+ /*  1430 */    18,  463,  273,  195,  194, 1170,  197,  199,   45,   57,
+ /*  1440 */   467, 1477,  470,   39,  473,   61,  476,  927,  961,  957,
+ /*  1450 */   955,  871,  206,  950, 1260,  461,  465,  878,  877,  947,
+ /*  1460 */   468,  876,  944,  938,  471,  474,  855,  936,  493,  896,
+ /*  1470 */   477,  875,  874,  873,   62,  872,  891,  868,  893,   46,
+ /*  1480 */   942,   63,  867,  866,  941,  209,  483,  863,  495,  862,
+ /*  1490 */   861,  860,  518,  517, 1258,  522,  940,  939,  521, 1256,
+ /*  1500 */   519,  523,  525,  526,  527, 1254,  529,  530,  531, 1242,
+ /*  1510 */   533,  534,  960, 1241, 1237,  537,  538, 1212, 1048,  217,
+ /*  1520 */  1212,  541,  542,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */   233,  246,  233,  205,  249,  213,    0,  252,  238,  271,
- /*    10 */   272,  255,   12,   13,  228,  245,  246,  250,  226,  250,
- /*    20 */    20,   20,   22,  250,  211,  239,  234,  229,   22,  262,
- /*    30 */   263,  262,  263,  220,  236,  262,  263,  214,   38,  229,
- /*    40 */   227,  218,  286,  211,  246,  235,  205,   47,  250,  236,
- /*    50 */   240,  253,    0,  211,   54,  299,   20,  246,   22,  303,
- /*    60 */    12,   13,   14,  252,  266,  267,  268,  269,   20,    0,
- /*    70 */    22,   71,   71,  241,   12,   13,   40,   20,  236,  229,
- /*    80 */   211,   20,   20,  211,   22,  235,   38,   46,   12,   13,
- /*    90 */   240,  250,  220,   20,   94,   47,   20,  255,   22,  227,
- /*   100 */    38,   49,   54,   51,   38,  236,  106,   55,  236,   47,
- /*   110 */    58,  269,   60,   61,   38,   63,   54,   20,  229,   71,
- /*   120 */    54,  279,  280,  281,  235,  283,  211,   58,  286,  240,
- /*   130 */    54,   62,   71,   71,    0,  220,  229,  204,  269,  206,
- /*   140 */   140,  299,   94,  236,   20,  303,  211,   71,  279,  280,
- /*   150 */   281,  236,  283,   84,  106,  220,   94,  157,  158,  159,
- /*   160 */   160,  161,  162,  163,  164,  165,  166,  167,  106,   54,
- /*   170 */    94,  236,  103,  104,  105,  268,  107,   58,    4,  179,
- /*   180 */   179,   62,  106,   49,   50,   51,   52,   53,  140,   55,
- /*   190 */    56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
- /*   200 */    66,   67,  140,   84,   43,  157,  158,  159,  160,  161,
- /*   210 */   162,  163,  164,  165,  166,  167,  140,  208,  209,  157,
- /*   220 */   158,  159,  160,  161,  162,  163,  164,  165,  166,  167,
- /*   230 */    20,  158,  159,  157,  158,  159,  160,  161,  162,  163,
- /*   240 */   164,  165,  166,  167,  157,    0,   12,   13,   14,   12,
- /*   250 */    13,   14,   15,   16,   20,  179,   22,   44,   20,   12,
- /*   260 */    13,   18,  139,   20,  141,  211,  210,   20,    0,   22,
- /*   270 */    27,  130,   38,   30,  220,  188,  189,  190,  191,  192,
- /*   280 */   224,  179,   39,   70,  205,   38,   73,  231,   54,   21,
- /*   290 */   236,   46,   24,   25,   26,   27,   28,   29,   30,   31,
- /*   300 */    32,   54,  179,  179,   64,   71,   46,   85,   86,   87,
- /*   310 */    88,   89,   90,   91,   92,   93,   94,   95,   71,   97,
- /*   320 */    98,   99,  100,  101,  102,  184,  185,   21,   94,  250,
- /*   330 */    24,   25,   26,   27,   28,   29,   30,   31,   32,  178,
- /*   340 */   106,   94,  132,   12,   13,   14,   15,   16,  215,  216,
- /*   350 */   110,  111,  109,  106,  180,  112,  113,  114,  115,  116,
- /*   360 */   211,  118,  119,  120,  121,  122,  123,  124,  125,  220,
- /*   370 */   133,    1,    2,   20,  140,   12,   13,   14,   15,   16,
- /*   380 */    12,   13,   14,   15,   16,  236,  205,  140,  217,  205,
- /*   390 */   219,  157,  158,  159,  160,  161,  162,  163,  164,  165,
- /*   400 */   166,  167,   68,   72,  157,  158,  159,  160,  161,  162,
- /*   410 */   163,  164,  165,  166,  167,   47,  230,   12,   13,   12,
- /*   420 */    13,   14,   15,   16,   49,   20,   51,   22,  205,  205,
- /*   430 */    55,  250,    4,   58,  250,   60,   61,  200,   63,   82,
- /*   440 */    72,  211,   72,   38,  205,  286,  211,   19,   80,  221,
- /*   450 */   220,    0,  255,  229,   47,  220,  236,  229,  299,   54,
- /*   460 */   236,   33,  303,  243,   36,  237,  236,  213,  229,   41,
- /*   470 */   246,  236,   44,  250,  250,  236,   71,  211,  230,  255,
- /*   480 */    14,   15,   16,  286,  205,  246,  220,   80,  234,  250,
- /*   490 */   266,  267,  268,  269,  126,  230,  299,   46,   70,   94,
- /*   500 */   303,   73,  236,  205,  126,  266,  267,  268,  269,  270,
- /*   510 */   286,  106,  144,  274,  275,  276,  221,  215,  216,  230,
- /*   520 */   202,   20,  144,  299,  229,  222,    3,  303,  225,  250,
- /*   530 */    18,  197,  237,  126,  295,   23,  168,  169,  170,  171,
- /*   540 */   172,  173,  174,  175,  176,  140,  168,   35,  250,  205,
- /*   550 */   205,  144,   12,   13,   14,   15,   16,   45,  177,  178,
- /*   560 */   230,  205,  157,  158,  159,  160,  161,  162,  163,  164,
- /*   570 */   165,  166,  167,  255,  205,  168,  169,  170,  171,  172,
- /*   580 */   173,  174,  175,  176,  136,  229,  258,   12,   13,  210,
- /*   590 */   264,  211,  236,  229,  250,  250,  264,   22,  229,  151,
- /*   600 */   220,  237,  246,  211,  286,  236,  250,  205,  282,  211,
- /*   610 */   231,  255,   72,   38,  282,  246,  236,  299,  220,  250,
- /*   620 */   108,  303,  266,  267,  268,  269,  270,  230,  236,   54,
- /*   630 */   274,  275,  221,  132,  236,  266,  267,  268,  269,  270,
- /*   640 */   229,   22,  286,  274,  275,  133,  134,  135,  237,  137,
- /*   650 */   205,  218,  250,  206,  142,  299,    0,   38,  205,  303,
- /*   660 */    35,  269,  150,   19,  152,  205,  154,  155,  156,   94,
- /*   670 */   278,  279,  280,  281,  205,  283,  205,   33,   14,  264,
- /*   680 */    36,  106,   75,   58,   20,   78,   42,   62,   44,  229,
- /*   690 */    68,  179,   36,  205,   72,  250,  236,  282,  211,   74,
- /*   700 */   205,   76,   77,  250,   79,  205,  246,  220,   47,   84,
- /*   710 */   250,  205,  205,  205,   70,  140,   68,   73,  195,  250,
- /*   720 */    72,  250,  205,  236,  229,   38,  266,  267,  268,  269,
- /*   730 */   270,  236,  157,  229,  274,  275,  276,    0,  250,  297,
- /*   740 */   229,  246,  205,   75,  240,  250,   78,  103,  288,   75,
- /*   750 */   250,  240,   78,  205,  294,  295,  250,  250,  250,   22,
- /*   760 */     0,  266,  267,  268,  269,  270,  229,  250,   21,  274,
- /*   770 */   275,  276,  128,  236,  306,  131,   75,  229,  205,   78,
- /*   780 */   285,   34,   22,  246,  236,   68,   68,  250,  246,   72,
- /*   790 */   146,   68,  148,  106,  246,   72,    1,    2,  250,  211,
- /*   800 */   211,  253,  229,  266,  267,  268,  269,  270,  239,  236,
- /*   810 */    38,  274,  275,  276,  266,  267,  268,  269,  157,  246,
- /*   820 */    71,  205,  285,  250,  236,  158,  159,   68,  246,   68,
- /*   830 */    81,   72,  205,   72,   71,  291,  208,   38,   22,  266,
- /*   840 */   267,  268,  269,  270,  255,  229,   83,  274,  275,  276,
- /*   850 */   265,   68,  236,   54,   38,   72,  229,  269,  285,  229,
- /*   860 */    68,   68,  246,  236,   72,   72,  250,  279,  280,  281,
- /*   870 */    54,  283,   68,  246,  205,  286,   72,  250,  106,  284,
- /*   880 */   300,  287,  266,  267,  268,  269,  270,   20,  299,  211,
- /*   890 */   274,  275,  303,  266,  267,  268,  269,   36,  229,  261,
- /*   900 */    68,  215,  205,   68,   72,  236,   38,   72,   68,   68,
- /*   910 */    94,  138,   72,   72,  256,  246,   68,  199,   33,  250,
- /*   920 */    72,   36,  106,  211,   68,  211,  229,   42,   72,   44,
- /*   930 */   205,  304,  305,  236,  117,  266,  267,  268,  269,  270,
- /*   940 */   244,   68,  242,  246,  275,   72,  126,  250,  242,  211,
- /*   950 */    20,  260,   20,  254,  229,   70,  140,  213,   73,  205,
- /*   960 */   236,  236,   20,  266,  267,  268,  269,    2,  247,  213,
- /*   970 */   213,  246,   20,  157,  207,  250,  211,   12,   13,   14,
- /*   980 */    15,   16,  213,  229,  205,  147,  215,  229,  236,  211,
- /*   990 */   236,  266,  267,  268,  269,  298,  207,  229,  259,  229,
- /*  1000 */   246,  260,  254,  229,  250,  229,  229,  253,  229,  229,
- /*  1010 */   229,  229,  127,  229,  129,  236,  131,  229,  205,  210,
- /*  1020 */   266,  267,  268,  269,    2,  246,    0,  236,  210,  250,
- /*  1030 */   305,   20,  253,  148,   12,   13,   14,   15,   16,  187,
- /*  1040 */   265,  247,  229,   54,  186,  266,  267,  268,  269,  236,
- /*  1050 */    24,   25,   26,   27,   28,   29,   30,   31,   32,  246,
- /*  1060 */   296,  251,  205,  250,  250,  194,  251,  193,  205,  250,
- /*  1070 */   182,  250,  178,  181,   20,  236,  290,  117,  293,  266,
- /*  1080 */   267,  268,  269,  296,  277,  201,  229,  289,  292,  264,
- /*  1090 */    71,  198,  229,  236,  196,  273,  205,  307,  301,  236,
- /*  1100 */   251,  250,  302,  246,  205,  250,  129,  250,  248,  246,
- /*  1110 */   251,  236,  250,  250,  210,  225,  247,  210,  236,   71,
- /*  1120 */   229,  232,  219,  266,  267,  268,  269,  236,  229,  266,
- /*  1130 */   267,  268,  269,  215,  211,  236,  210,  246,  205,  223,
- /*  1140 */   257,  250,  207,  223,  203,  246,    0,    0,  212,  250,
- /*  1150 */   205,    0,   61,    0,   38,  153,   38,  266,  267,  268,
- /*  1160 */   269,   38,  229,   38,    0,  266,  267,  268,  269,  236,
- /*  1170 */   153,   38,   38,  153,  229,    0,   38,    0,   38,  246,
- /*  1180 */     0,  236,   71,  250,  144,  143,  106,  140,    0,    0,
- /*  1190 */     0,  246,   50,  136,    0,  250,  205,   83,    0,  266,
- /*  1200 */   267,  268,  269,    0,   58,    0,    0,    0,   62,    0,
- /*  1210 */     0,  266,  267,  268,  269,    0,    0,    0,    0,    0,
- /*  1220 */   229,  205,    0,  117,    0,    0,    0,  236,    0,    0,
- /*  1230 */    84,    0,  205,   22,    0,    0,    0,  246,    0,    0,
- /*  1240 */     0,  250,    0,    0,    0,  229,    0,   43,   48,  103,
- /*  1250 */   104,  105,  236,  107,    0,    0,  229,  266,  267,  268,
- /*  1260 */   269,   38,  246,  236,   43,    0,  250,    0,  205,   36,
- /*  1270 */     0,    0,   80,  246,  205,   78,   68,  250,   22,   38,
- /*  1280 */     0,   68,  266,  267,  268,  269,   38,   38,   38,   38,
- /*  1290 */    38,   38,  229,  266,  267,  268,  269,    0,  229,  236,
- /*  1300 */    22,    0,  205,   22,    0,  236,   22,   39,    0,  246,
- /*  1310 */   205,   38,   22,  250,    0,  246,   22,    0,   20,  250,
- /*  1320 */   149,   38,    0,  132,  145,   22,  229,  132,  129,  266,
- /*  1330 */   267,  268,  269,  236,  229,  266,  267,  268,  269,    0,
- /*  1340 */     0,  236,    0,  246,  205,   71,  132,  250,   43,  183,
- /*  1350 */    68,  246,   83,   68,  127,  250,   68,  183,   72,   72,
- /*  1360 */    71,   68,   71,  266,  267,  268,  269,   71,  229,  183,
- /*  1370 */    71,  266,  267,  268,  269,  236,    4,   68,   72,   72,
- /*  1380 */    68,   68,   72,   83,   38,  246,   38,   72,   38,  250,
- /*  1390 */    38,   38,   38,    2,   83,   72,   71,  177,   71,   83,
- /*  1400 */    72,   72,  157,   71,   71,  266,  267,  268,  269,  130,
- /*  1410 */     0,   43,   71,   83,   71,   81,   22,   72,   83,  127,
- /*  1420 */    71,   38,   38,   72,   38,   38,   82,   71,   71,   22,
- /*  1430 */    72,   71,   96,   72,   38,   71,   38,   72,   71,   38,
- /*  1440 */    71,   71,   71,   96,  106,   22,   84,   38,   48,   47,
- /*  1450 */    69,   96,   38,   54,   38,   96,   68,   38,   38,   38,
- /*  1460 */    38,   22,   38,   38,   38,   54,   38,   38,   38,   38,
- /*  1470 */    38,   38,    0,   38,   36,    0,    0,   43,   38,   37,
- /*  1480 */     0,   22,   21,  308,   22,   22,   21,   20,  308,  308,
- /*  1490 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1500 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1510 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1520 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1530 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1540 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1550 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1560 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1570 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1580 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1590 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1600 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1610 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1620 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1630 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1640 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1650 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1660 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1670 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
- /*  1680 */   308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+ /*     0 */   276,  277,  255,  235,  238,  251,  210,  216,  254,  216,
+ /*    10 */   243,  257,   12,   13,  267,  268,  225,  250,  251,    0,
+ /*    20 */    20,  255,   22,  238,  216,   12,   13,   14,   15,   16,
+ /*    30 */   234,    2,  241,  267,  268,  260,   20,  241,   38,  246,
+ /*    40 */   255,   12,   13,   14,   15,   16,   20,  251,    2,  241,
+ /*    50 */    50,  255,  267,  268,  210,   36,  260,   57,   12,   13,
+ /*    60 */    14,   15,   16,   12,   13,   14,  291,  271,  272,  273,
+ /*    70 */   274,   20,  227,   22,   74,  230,   12,   13,  234,  304,
+ /*    80 */   269,   47,  274,  308,   20,  241,   22,  291,   75,   38,
+ /*    90 */   218,  283,  284,  285,  286,  251,  288,   97,  287,  255,
+ /*   100 */   304,   50,   38,  231,  308,   20,  207,   73,   57,  109,
+ /*   110 */    76,  239,  220,  221,   50,  271,  272,  273,  274,  275,
+ /*   120 */    20,   57,   49,  279,  280,   74,    0,   88,   89,   90,
+ /*   130 */    91,   92,   93,   94,   95,   96,   97,   98,   74,  100,
+ /*   140 */   101,  102,  103,  104,  105,  145,   85,   21,   97,  210,
+ /*   150 */    24,   25,   26,   27,   28,   29,   30,   31,   32,  260,
+ /*   160 */   109,   97,  162,  163,  164,  165,  166,  167,  168,  169,
+ /*   170 */   170,  171,  172,  109,   74,   22,  216,   20,   61,   12,
+ /*   180 */    13,  209,   65,  211,  184,  225,   52,   20,   54,   22,
+ /*   190 */   291,   38,   58,  216,  255,   61,  145,   63,   64,   78,
+ /*   200 */    66,  241,   81,  304,   87,   38,  144,  308,  146,  145,
+ /*   210 */    57,  260,   20,  162,  163,  164,  165,  166,  167,  168,
+ /*   220 */   169,  170,  171,  172,   57,  135,  162,  163,  164,  165,
+ /*   230 */   166,  167,  168,  169,  170,  171,  172,  260,  216,  162,
+ /*   240 */   184,   74,  291,   12,   13,   14,  184,  225,  163,  164,
+ /*   250 */    97,   20,  216,   22,  232,  304,   38,   12,   13,  308,
+ /*   260 */    20,  225,  109,  241,   97,   20,   74,   22,  291,   38,
+ /*   270 */   193,  194,  195,  196,  197,   57,  109,  241,  218,  189,
+ /*   280 */   190,  304,  210,   38,  184,  308,   21,  291,   57,   24,
+ /*   290 */    25,   26,   27,   28,   29,   30,   31,   32,  145,  239,
+ /*   300 */   304,   67,   57,  215,  308,   74,  234,   12,   13,   14,
+ /*   310 */    15,   16,  145,  241,  234,  162,  219,  229,  210,   74,
+ /*   320 */   223,  241,   20,  251,  236,  210,    0,  255,   97,  162,
+ /*   330 */   163,  164,  165,  166,  167,  168,  169,  170,  171,  172,
+ /*   340 */   109,  184,   97,  271,  272,  273,  274,  113,  114,  234,
+ /*   350 */    18,  184,   20,  273,  109,  216,  241,  233,   49,   27,
+ /*   360 */   216,  269,   30,  255,  225,   20,  251,  216,  244,  225,
+ /*   370 */   255,   39,  234,  258,  210,   49,  145,  137,  240,  287,
+ /*   380 */   241,  309,  310,  245,    0,  241,  271,  272,  273,  274,
+ /*   390 */   145,   57,  241,  162,  163,  164,  165,  166,  167,  168,
+ /*   400 */   169,  170,  171,  172,   14,   15,   16,  162,  163,  164,
+ /*   410 */   165,  166,  167,  168,  169,  170,  171,  172,  216,  255,
+ /*   420 */    12,   13,    3,  234,  226,  274,  210,  225,   20,  240,
+ /*   430 */    22,    0,  234,   49,  245,  284,  285,  286,  241,  288,
+ /*   440 */   242,  213,  214,  241,  112,  248,   38,  115,  116,  117,
+ /*   450 */   118,  119,  215,  121,  122,  123,  124,  125,  126,  127,
+ /*   460 */   128,  129,  130,  216,    4,   57,   12,   13,   14,   15,
+ /*   470 */    16,  255,  225,  236,  235,   12,   13,   14,   15,   16,
+ /*   480 */    35,  235,   74,   52,   53,   54,   55,   56,  241,   58,
+ /*   490 */    59,   60,   61,   62,   63,   64,   65,   66,   67,   68,
+ /*   500 */    69,   70,  210,  216,   50,   97,   61,   71,  234,  216,
+ /*   510 */    65,   75,  225,   50,  251,  226,  242,  109,  225,  232,
+ /*   520 */   257,  235,   77,  234,   79,   80,  234,   82,  241,   75,
+ /*   530 */     0,  242,   87,  241,  241,   20,  226,   83,   12,   13,
+ /*   540 */    14,   15,   16,  251,  234,  223,   83,  255,   20,  131,
+ /*   550 */    22,  269,  242,  145,   24,   25,   26,   27,   28,   29,
+ /*   560 */    30,   31,   32,  271,  272,  273,  274,  149,   40,  287,
+ /*   570 */   162,  163,  164,  165,  166,  167,  168,  169,  170,  171,
+ /*   580 */   172,    4,    1,    2,  216,  131,  234,  220,  221,  216,
+ /*   590 */    18,  173,  240,  225,  131,   23,   19,  245,  225,   74,
+ /*   600 */   222,   75,  224,  149,  210,   22,  210,   35,    0,  241,
+ /*   610 */    33,   86,  149,   36,  241,  234,  210,   43,   41,  200,
+ /*   620 */    48,   38,  210,  210,   47,  210,  245,  173,  174,  175,
+ /*   630 */   176,  177,  178,  179,  180,  181,  173,  174,  175,  176,
+ /*   640 */   177,  178,  179,  180,  181,  185,  235,  234,  234,  255,
+ /*   650 */    73,  255,  137,   76,  241,   71,   75,  210,  210,  245,
+ /*   660 */    52,  255,   54,  235,  251,   38,   58,  255,  255,   61,
+ /*   670 */   255,   63,   64,  260,   66,  182,  183,  210,  210,  210,
+ /*   680 */   210,  210,  141,  111,  271,  272,  273,  274,  275,  210,
+ /*   690 */    12,   13,  279,  280,   21,    1,    2,  156,  210,  210,
+ /*   700 */    22,  234,  255,  255,  291,  210,   71,   34,  241,  210,
+ /*   710 */   138,  139,  140,  263,  142,    0,   38,  304,  251,  147,
+ /*   720 */   211,  308,  255,  255,  255,  255,  255,  155,  210,  157,
+ /*   730 */    38,  159,  160,  161,  255,   57,  109,   22,  271,  272,
+ /*   740 */   273,  274,  275,  255,  255,   38,  279,  280,  281,   14,
+ /*   750 */   255,   19,  234,  311,  255,   20,  184,  183,   78,  241,
+ /*   760 */   293,   81,  163,  164,   57,   33,  299,  300,   36,  251,
+ /*   770 */    50,  210,    0,  255,   42,   97,   44,   45,   46,   47,
+ /*   780 */   302,   78,   78,  210,   81,   81,  202,  109,    0,  271,
+ /*   790 */   272,  273,  274,  275,   22,  234,  210,  279,  280,  281,
+ /*   800 */   251,  109,  241,  244,  251,   73,  296,  234,   76,   71,
+ /*   810 */    22,  213,  251,   75,  241,   71,  255,  270,  300,   75,
+ /*   820 */   234,   71,   71,  145,  251,   75,   75,  241,  255,  289,
+ /*   830 */   234,  210,  271,  272,  273,  274,  305,  251,  106,  204,
+ /*   840 */   162,  255,  292,  210,  271,  272,  273,  274,  275,   20,
+ /*   850 */   216,  266,  279,  280,  281,  234,   36,  271,  272,  273,
+ /*   860 */   274,  275,  241,  290,   38,  133,  280,  234,  136,   71,
+ /*   870 */    74,   71,  251,   75,  241,   75,  255,   71,  220,  143,
+ /*   880 */    84,   75,  162,  151,  251,  153,   71,   71,  255,  261,
+ /*   890 */    75,   75,  271,  272,  273,  274,  275,  216,  216,  120,
+ /*   900 */   279,  280,  281,  210,  271,  272,  273,  274,  275,  249,
+ /*   910 */   247,  290,  279,  280,  281,   71,  131,   33,  216,   75,
+ /*   920 */    36,  247,  216,  290,  265,   20,   42,  234,   44,   45,
+ /*   930 */    46,   47,   71,   71,  241,   20,   75,   75,   71,  210,
+ /*   940 */   218,   71,   75,  241,  251,   75,  259,   71,  255,  241,
+ /*   950 */   210,   75,   12,   13,   14,   15,   16,   73,   20,  218,
+ /*   960 */    76,  252,  260,  234,  271,  272,  273,  274,  275,  212,
+ /*   970 */   241,  218,  279,  280,  234,   71,  274,  216,  218,   75,
+ /*   980 */   251,  241,   20,  216,  255,  216,  284,  285,  286,  234,
+ /*   990 */   288,  251,  234,  291,  220,  255,  234,  234,  258,  234,
+ /*  1000 */   271,  272,  273,  274,  210,  234,  304,  234,  241,  210,
+ /*  1010 */   308,  271,  272,  273,  274,  234,  132,  234,  134,  212,
+ /*  1020 */   136,  234,  252,  234,  265,  241,  152,  259,  234,  215,
+ /*  1030 */   264,  241,  303,  234,  215,  241,   20,  153,  210,  192,
+ /*  1040 */   241,  274,  191,  301,   57,  251,  270,  256,  255,  255,
+ /*  1050 */   251,  284,  285,  286,  255,  288,  255,  258,  256,  255,
+ /*  1060 */   187,  198,  234,  199,  210,  271,  272,  273,  274,  241,
+ /*  1070 */   271,  272,  273,  274,  186,  298,  301,  297,  138,  251,
+ /*  1080 */   183,  295,  241,  255,   20,  120,  258,  269,  234,  294,
+ /*  1090 */   282,  206,  203,  201,  312,  241,   74,  255,  306,  271,
+ /*  1100 */   272,  273,  274,  278,  310,  251,  210,  134,  256,  255,
+ /*  1110 */   307,  210,  255,  241,  256,  255,  230,  210,  253,  241,
+ /*  1120 */   252,  215,   74,  215,  237,  271,  272,  273,  274,  220,
+ /*  1130 */   234,  212,  216,  215,  224,  234,  208,  241,  217,  262,
+ /*  1140 */   228,  234,  241,    0,    0,  205,   64,  251,  241,    0,
+ /*  1150 */   228,  255,  251,    0,   38,  158,  255,   38,  251,  210,
+ /*  1160 */    38,   38,  255,  158,    0,   38,   38,  271,  272,  273,
+ /*  1170 */   274,  210,  271,  272,  273,  274,  158,    0,  271,  272,
+ /*  1180 */   273,  274,    0,  234,  210,   38,   38,    0,   74,  149,
+ /*  1190 */   241,  148,  109,    0,  145,  234,    0,  141,   53,    0,
+ /*  1200 */   251,    0,  241,    0,  255,    0,   86,    0,  234,    0,
+ /*  1210 */    61,    0,  251,  210,   65,  241,  255,    0,    0,    0,
+ /*  1220 */   271,  272,  273,  274,    0,  251,    0,    0,    0,  255,
+ /*  1230 */     0,    0,  271,  272,  273,  274,   87,  234,    0,  210,
+ /*  1240 */     0,  120,    0,    0,  241,  271,  272,  273,  274,    0,
+ /*  1250 */     0,    0,    0,    0,  251,  106,  107,  108,  255,  110,
+ /*  1260 */     0,   22,   61,  234,    0,  210,   65,    0,    0,    0,
+ /*  1270 */   241,    0,    0,  210,  271,  272,  273,  274,    0,   43,
+ /*  1280 */   251,    0,    0,   51,  255,    0,   38,   43,   87,  234,
+ /*  1290 */    36,    0,   36,   38,    0,   38,  241,  234,    0,  210,
+ /*  1300 */   271,  272,  273,  274,  241,   43,  251,  106,  107,  108,
+ /*  1310 */   255,  110,   36,   43,  251,   38,   36,   43,  255,    0,
+ /*  1320 */     0,    0,    0,  234,   83,   38,  271,  272,  273,  274,
+ /*  1330 */   241,   22,   71,    0,  271,  272,  273,  274,   38,   81,
+ /*  1340 */   251,  210,   38,   38,  255,   38,   71,    0,   38,   38,
+ /*  1350 */    22,    0,   22,   39,    0,   38,   22,    0,   22,    0,
+ /*  1360 */   271,  272,  273,  274,   22,  234,   20,    0,  154,   38,
+ /*  1370 */   137,    0,  241,  150,   22,    0,    0,    0,   43,  134,
+ /*  1380 */    74,   86,  251,  137,  137,  188,  255,   71,   75,   71,
+ /*  1390 */    75,  132,  188,    4,   71,  182,  188,    2,   74,   74,
+ /*  1400 */    74,   74,  271,  272,  273,  274,   38,   75,   71,   71,
+ /*  1410 */    38,   38,   38,    0,   75,   75,   71,   38,   38,   75,
+ /*  1420 */    71,  135,  132,   22,   74,  162,   43,   86,   75,   86,
+ /*  1430 */    74,   38,   38,   75,   86,   75,   74,   74,   74,   74,
+ /*  1440 */    38,   86,   38,   74,   38,   84,   38,   22,   38,   38,
+ /*  1450 */    22,   22,   86,   75,    0,   85,   74,   38,   38,   75,
+ /*  1460 */    74,   38,   75,   75,   74,   74,   51,   75,   50,   57,
+ /*  1470 */    74,   38,   38,   38,   74,   38,   38,   38,   57,   74,
+ /*  1480 */    99,   74,   38,   38,   99,   71,   87,   38,   72,   38,
+ /*  1490 */    38,   38,   36,   38,    0,   36,   99,   99,   38,    0,
+ /*  1500 */    43,   43,   38,   36,   43,    0,   38,   36,   43,    0,
+ /*  1510 */    38,   37,  109,    0,    0,   22,   21,  313,   22,   22,
+ /*  1520 */   313,   21,   20,  313,  313,  313,  313,  313,  313,  313,
+ /*  1530 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1540 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1550 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1560 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1570 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1580 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1590 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1600 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1610 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1620 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1630 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1640 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1650 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1660 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1670 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1680 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1690 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1700 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1710 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+ /*  1720 */   313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 };
-#define YY_SHIFT_COUNT    (517)
+#define YY_SHIFT_COUNT    (543)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (1480)
+#define YY_SHIFT_MAX      (1514)
 static const unsigned short int yy_shift_ofst[] = {
- /*     0 */   512,    0,   48,   62,   62,   62,   62,   76,   62,   62,
- /*    10 */   247,  405,    1,  234,  247,  247,  247,  247,  247,  247,
- /*    20 */   247,  247,  247,  247,  247,  247,  247,  247,  247,  247,
- /*    30 */   247,  247,  247,  247,   61,   61,   61,  124,  575,  575,
- /*    40 */   123,   57,   57,  102,  575,   73,   73,   57,   57,   57,
- /*    50 */    57,   57,   57,   41,   97,  238,  102,   97,   57,   57,
- /*    60 */    97,   57,   97,   97,   97,   57,  260,  243,  368,  407,
- /*    70 */   407,  306,  625,  816,  375,  816,  816,  816,  816,  816,
- /*    80 */   816,  816,  816,  816,  816,  816,  816,  816,  816,  816,
- /*    90 */   816,  816,  816,  816,   73,   36,  245,   66,  210,  210,
- /*   100 */   210,  451,   66,  353,   97,   97,   97,  357,  115,  222,
- /*   110 */   222,  222,  222,  222,  222,  644,  268,   52,  237,   87,
- /*   120 */    73,  119,   73,  141,  619,  501,  381,  161,  381,  664,
- /*   130 */   523,  174,  867,  861,  868,  773,  867,  867,  817,  820,
- /*   140 */   820,  867,  930,  932,   41,  353,  942,   41,   41,  867,
- /*   150 */    41,  952,   97,   97,   97,   97,   97,   97,   97,   97,
- /*   160 */    97,   97,   97,  868,  867,  952,  353,  930,  838,  932,
- /*   170 */   260,  353,  942,  260, 1011,  852,  858,  989,  852,  858,
- /*   180 */   989,  989,  871,  874,  888,  892,  894,  353, 1054,  960,
- /*   190 */   884,  893,  898, 1019,   97,  858,  989,  989,  858,  989,
- /*   200 */   977,  353,  942,  260,  357,  260,  353, 1048,  868,  115,
- /*   210 */   867,  260,  952, 1488, 1488, 1488, 1488, 1488,  134,  885,
- /*   220 */  1026,  428,   69, 1146,  331,  965, 1022,  540,  363,  363,
- /*   230 */   363,  363,  363,  363,  363,  213,  240,  370,  378,  466,
- /*   240 */   466,  466,  466,  656,  448,  622,  607,  668,  674,  701,
- /*   250 */     6,  737,  760,  747,  648,  717,  723,  795,  667,  334,
- /*   260 */   718,  759,  661,  761,  763,  783,  792,  793,  804,  832,
- /*   270 */   687,  772,  835,  840,  841,  848,  856,  873,  749,  799,
- /*   280 */  1147, 1151, 1091, 1153, 1116, 1002, 1118, 1123, 1125, 1017,
- /*   290 */  1164, 1133, 1134, 1020, 1175, 1138, 1177, 1140, 1180, 1111,
- /*   300 */  1040, 1042, 1080, 1047, 1188, 1189, 1142, 1057, 1190, 1194,
- /*   310 */  1114, 1198, 1203, 1205, 1206, 1207, 1209, 1210, 1215, 1216,
- /*   320 */  1217, 1218, 1219, 1222, 1106, 1224, 1225, 1226, 1228, 1229,
- /*   330 */  1231, 1211, 1234, 1235, 1236, 1238, 1239, 1240, 1242, 1243,
- /*   340 */  1244, 1204, 1246, 1200, 1254, 1255, 1223, 1233, 1221, 1265,
- /*   350 */  1267, 1270, 1271, 1192, 1197, 1241, 1208, 1256, 1280, 1248,
- /*   360 */  1249, 1250, 1251, 1213, 1208, 1252, 1253, 1297, 1278, 1301,
- /*   370 */  1281, 1268, 1304, 1284, 1273, 1308, 1290, 1314, 1294, 1298,
- /*   380 */  1317, 1191, 1171, 1283, 1322, 1179, 1303, 1195, 1199, 1339,
- /*   390 */  1340, 1214, 1342, 1274, 1305, 1227, 1282, 1285, 1166, 1286,
- /*   400 */  1288, 1287, 1289, 1291, 1296, 1306, 1293, 1269, 1299, 1309,
- /*   410 */  1174, 1307, 1310, 1300, 1220, 1312, 1311, 1315, 1313, 1186,
- /*   420 */  1372, 1346, 1348, 1350, 1352, 1353, 1354, 1391, 1245, 1316,
- /*   430 */  1323, 1325, 1327, 1328, 1329, 1332, 1333, 1279, 1341, 1410,
- /*   440 */  1368, 1292, 1343, 1334, 1330, 1335, 1394, 1349, 1344, 1345,
- /*   450 */  1383, 1384, 1356, 1351, 1386, 1357, 1358, 1387, 1360, 1361,
- /*   460 */  1396, 1364, 1365, 1398, 1367, 1336, 1347, 1355, 1359, 1407,
- /*   470 */  1362, 1369, 1401, 1338, 1370, 1371, 1409, 1208, 1423, 1400,
- /*   480 */  1402, 1399, 1381, 1388, 1414, 1416, 1419, 1420, 1421, 1422,
- /*   490 */  1424, 1439, 1411, 1213, 1425, 1208, 1426, 1428, 1429, 1430,
- /*   500 */  1431, 1432, 1433, 1472, 1435, 1438, 1434, 1475, 1440, 1442,
- /*   510 */  1476, 1480, 1459, 1461, 1462, 1463, 1465, 1467,
+ /*     0 */   572,    0,   51,   64,   64,   64,   64,  167,   64,   64,
+ /*    10 */   245,  408,  100,  231,  245,  245,  245,  245,  245,  245,
+ /*    20 */   245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
+ /*    30 */   245,  245,  245,  245,  192,  192,  192,  157,  678,  678,
+ /*    40 */    62,   16,   16,   56,  678,   85,   85,   16,   16,   16,
+ /*    50 */    16,   16,   16,   73,   26,  302,   56,   26,   16,   16,
+ /*    60 */    26,   16,   26,   26,   26,   16,  309,  332,  454,  463,
+ /*    70 */   463,  265,  445,  153,  134,  153,  153,  153,  153,  153,
+ /*    80 */   153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+ /*    90 */   153,  153,  153,  153,   85,  528,  326,  218,  240,  240,
+ /*   100 */   240,  384,  218,  345,   26,   26,   26,   61,  334,   39,
+ /*   110 */    39,   39,   39,   39,   39,  732,  126,  608,  940,   77,
+ /*   120 */    85,  117,   85,   90,  583,  515,  493,  574,  493,  735,
+ /*   130 */   419,  460,  829,  820,  826,  736,  829,  829,  779,  785,
+ /*   140 */   785,  829,  905,  915,   73,  345,  938,   73,   73,  829,
+ /*   150 */    73,  962,   26,   26,   26,   26,   26,   26,   26,   26,
+ /*   160 */    26,   26,   26,  826,  829,  962,  345,  905,  874,  915,
+ /*   170 */   309,  345,  938,  309, 1016,  847,  851,  987,  847,  851,
+ /*   180 */   987,  987,  864,  863,  873,  888,  897,  345, 1064,  965,
+ /*   190 */   885,  889,  892, 1022,   26,  851,  987,  987,  851,  987,
+ /*   200 */   973,  345,  938,  309,   61,  309,  345, 1048,  826,  334,
+ /*   210 */   829,  309,  962, 1523, 1523, 1523, 1523, 1523,  431,  884,
+ /*   220 */   530,  577, 1149, 1201,   13,   29,   46,  526,  295,  295,
+ /*   230 */   295,  295,  295,  295,  295,   34,  234,  581,  418,  390,
+ /*   240 */   390,  390,  390,   19,  541,  436,  121,  680,  703,  704,
+ /*   250 */   715,  772,  788,  673,  738,  744,  750,  694,  599,  584,
+ /*   260 */   635,  751,  720,  798,  525,  800,  806,  815,  816,  844,
+ /*   270 */   627,  692,  861,  862,  867,  870,  876,  904,  796,  707,
+ /*   280 */  1143, 1144, 1082, 1153, 1116,  997, 1119, 1122, 1123, 1005,
+ /*   290 */  1164, 1127, 1128, 1018, 1177, 1147, 1182, 1148, 1187, 1114,
+ /*   300 */  1040, 1043, 1083, 1049, 1193, 1196, 1145, 1056, 1199, 1203,
+ /*   310 */  1120, 1205, 1207, 1209, 1211, 1217, 1218, 1219, 1224, 1226,
+ /*   320 */  1227, 1228, 1230, 1231, 1238, 1240, 1121, 1242, 1243, 1249,
+ /*   330 */  1250, 1251, 1252, 1239, 1253, 1260, 1264, 1267, 1268, 1269,
+ /*   340 */  1271, 1272, 1278, 1236, 1281, 1232, 1282, 1285, 1248, 1254,
+ /*   350 */  1244, 1291, 1255, 1256, 1262, 1294, 1257, 1276, 1270, 1298,
+ /*   360 */  1277, 1280, 1274, 1319, 1320, 1321, 1322, 1241, 1258, 1287,
+ /*   370 */  1261, 1309, 1333, 1300, 1304, 1305, 1307, 1275, 1261, 1310,
+ /*   380 */  1311, 1347, 1328, 1351, 1330, 1314, 1354, 1334, 1317, 1357,
+ /*   390 */  1336, 1359, 1342, 1346, 1367, 1233, 1214, 1331, 1371, 1223,
+ /*   400 */  1352, 1246, 1245, 1375, 1376, 1247, 1377, 1306, 1335, 1259,
+ /*   410 */  1316, 1318, 1197, 1313, 1323, 1315, 1324, 1325, 1326, 1332,
+ /*   420 */  1337, 1295, 1327, 1338, 1204, 1339, 1340, 1341, 1213, 1345,
+ /*   430 */  1343, 1344, 1349, 1208, 1389, 1368, 1372, 1373, 1374, 1379,
+ /*   440 */  1380, 1395, 1263, 1348, 1353, 1350, 1356, 1358, 1360, 1362,
+ /*   450 */  1363, 1286, 1364, 1413, 1383, 1290, 1365, 1361, 1355, 1366,
+ /*   460 */  1401, 1369, 1370, 1378, 1393, 1394, 1382, 1384, 1402, 1386,
+ /*   470 */  1387, 1404, 1390, 1388, 1406, 1391, 1392, 1408, 1396, 1381,
+ /*   480 */  1385, 1397, 1398, 1425, 1399, 1400, 1410, 1403, 1405, 1407,
+ /*   490 */  1411, 1261, 1428, 1415, 1418, 1412, 1416, 1414, 1419, 1420,
+ /*   500 */  1423, 1433, 1434, 1435, 1437, 1429, 1421, 1275, 1438, 1261,
+ /*   510 */  1439, 1444, 1445, 1449, 1451, 1452, 1453, 1454, 1455, 1456,
+ /*   520 */  1457, 1494, 1460, 1459, 1458, 1499, 1464, 1467, 1461, 1505,
+ /*   530 */  1468, 1471, 1465, 1509, 1472, 1474, 1513, 1514, 1493, 1495,
+ /*   540 */  1496, 1497, 1500, 1502,
 };
 #define YY_REDUCE_COUNT (217)
-#define YY_REDUCE_MIN   (-262)
-#define YY_REDUCE_MAX   (1139)
+#define YY_REDUCE_MIN   (-276)
+#define YY_REDUCE_MAX   (1131)
 static const short yy_reduce_ofst[] = {
- /*     0 */   318,  356,  460,  239,  495,  537,  573,  224,  369,  616,
- /*    10 */   627,  669, -158, -202,  548,  697,  725,  754,  779,  813,
- /*    20 */   857,  863,  891,  899,  933,  945,  991, 1016, 1027, 1063,
- /*    30 */  1069, 1097, 1105, 1139,  392, -131,  588,  589, -233, -231,
- /*    40 */  -244, -187, -128,  197, -227, -245, -230,  -85,  -65,   54,
- /*    50 */   149,  230,  235, -208, -190,  -93,  159,  228,  266,  380,
- /*    60 */  -150,  398,  295, -111,  411,  487,   56, -168, -262, -262,
- /*    70 */  -262,  -67, -214, -159, -177,   79,  181,  184,  223,  279,
- /*    80 */   298,  344,  345,  402,  445,  453,  469,  471,  488,  500,
- /*    90 */   506,  507,  508,  517, -189,    9,  254,  133,  326,  332,
- /*   100 */   415,  379,  302,  220,  364,  504,  511,  303,  171,  186,
- /*   110 */   248,  265,  289,  330,  397,  328,  447,  433,  468,  442,
- /*   120 */   542,  569,  582,  544,  628,  585,  595,  595,  595,  630,
- /*   130 */   580,  594,  678,  638,  686,  658,  712,  714,  696,  700,
- /*   140 */   706,  738,  691,  699,  744,  724,  721,  756,  757,  765,
- /*   150 */   769,  767,  758,  768,  770,  774,  776,  777,  780,  781,
- /*   160 */   782,  784,  788,  771,  778,  789,  752,  741,  739,  748,
- /*   170 */   809,  791,  794,  818,  775,  764,  810,  814,  787,  815,
- /*   180 */   819,  821,  785,  796,  786,  798,  595,  839,  825,  807,
- /*   190 */   790,  800,  797,  822,  630,  849,  851,  855,  859,  862,
- /*   200 */   860,  875,  869,  904,  890,  907,  882,  889,  918,  903,
- /*   210 */   923,  926,  935,  883,  916,  920,  936,  941,
+ /*     0 */  -101,  413,  467,  518,  573,  621,  633, -204, -156,  693,
+ /*    10 */    72,  586,  702,  115,  740,  729,  794,  799,  828,  292,
+ /*    20 */   561,  854,  896,  901,  907,  949,  961,  974, 1003, 1029,
+ /*    30 */  1055, 1063, 1089, 1131, -192,  151,  767,  -23, -234, -215,
+ /*    40 */  -225,   22,  287,  -49, -253, -246, -233, -209,  -40,   36,
+ /*    50 */   139,  144,  202, -128,  138,   80,   -4,  198,  247,  293,
+ /*    60 */   189,  368,  289,  352,  310,  373,   88, -207, -276, -276,
+ /*    70 */  -276,  -28,  124,  -61,   97,  108,  164,  216,  394,  396,
+ /*    80 */   406,  412,  415,  447,  448,  468,  469,  470,  471,  479,
+ /*    90 */   488,  489,  495,  499,  263,  228,   60, -108, -189,   92,
+ /*   100 */   282,  237,  367,  197,  274,  381,  414, -155,  378, -232,
+ /*   110 */   239,  246,  286,  411,  428,  450,  509,  322,  442,  478,
+ /*   120 */   549,  559,  553,  510,  598,  547,  540,  540,  540,  596,
+ /*   130 */   531,  550,  634,  585,  658,  628,  681,  682,  660,  663,
+ /*   140 */   674,  706,  659,  687,  722,  708,  709,  741,  753,  761,
+ /*   150 */   760,  757,  755,  758,  762,  763,  765,  771,  773,  781,
+ /*   160 */   783,  787,  789,  774,  769,  807,  784,  759,  766,  768,
+ /*   170 */   814,  790,  770,  819,  776,  742,  791,  793,  775,  802,
+ /*   180 */   801,  804,  777,  780,  786,  795,  540,  841,  818,  808,
+ /*   190 */   782,  803,  792,  825,  596,  852,  842,  857,  858,  860,
+ /*   200 */   865,  872,  868,  906,  886,  908,  878,  887,  909,  910,
+ /*   210 */   916,  918,  919,  877,  912,  922,  921,  928,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    10 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    20 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    30 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    40 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    50 */  1176, 1176, 1176, 1229, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    60 */  1176, 1176, 1176, 1176, 1176, 1176, 1227, 1364, 1176, 1498,
- /*    70 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    80 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*    90 */  1176, 1176, 1176, 1176, 1176, 1176, 1229, 1176, 1509, 1509,
- /*   100 */  1509, 1227, 1176, 1176, 1176, 1176, 1176, 1322, 1176, 1176,
- /*   110 */  1176, 1176, 1176, 1176, 1176, 1398, 1176, 1176, 1573, 1176,
- /*   120 */  1176, 1275, 1176, 1533, 1176, 1525, 1501, 1515, 1502, 1176,
- /*   130 */  1558, 1518, 1176, 1176, 1176, 1390, 1176, 1176, 1369, 1366,
- /*   140 */  1366, 1176, 1176, 1176, 1229, 1176, 1176, 1229, 1229, 1176,
- /*   150 */  1229, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   160 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1400, 1176,
- /*   170 */  1227, 1176, 1176, 1227, 1176, 1540, 1538, 1176, 1540, 1538,
- /*   180 */  1176, 1176, 1552, 1548, 1531, 1529, 1515, 1176, 1176, 1176,
- /*   190 */  1576, 1564, 1560, 1176, 1176, 1538, 1176, 1176, 1538, 1176,
- /*   200 */  1377, 1176, 1176, 1227, 1176, 1227, 1176, 1291, 1176, 1176,
- /*   210 */  1176, 1227, 1176, 1392, 1325, 1325, 1230, 1181, 1176, 1176,
- /*   220 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1462, 1551,
- /*   230 */  1550, 1461, 1475, 1474, 1473, 1176, 1176, 1176, 1176, 1456,
- /*   240 */  1457, 1455, 1454, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   250 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1499, 1176, 1561,
- /*   260 */  1565, 1176, 1176, 1176, 1437, 1176, 1176, 1176, 1176, 1176,
- /*   270 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   280 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   290 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   300 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   310 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   320 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   330 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   340 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   350 */  1176, 1176, 1176, 1176, 1176, 1176, 1336, 1176, 1176, 1176,
- /*   360 */  1176, 1176, 1176, 1256, 1255, 1176, 1176, 1176, 1176, 1176,
- /*   370 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   380 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   390 */  1176, 1176, 1176, 1176, 1176, 1176, 1522, 1532, 1176, 1176,
- /*   400 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1437, 1176, 1549,
- /*   410 */  1176, 1508, 1504, 1176, 1176, 1500, 1176, 1176, 1559, 1176,
- /*   420 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1494, 1176, 1176,
- /*   430 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   440 */  1176, 1176, 1176, 1176, 1436, 1176, 1176, 1176, 1176, 1176,
- /*   450 */  1176, 1176, 1319, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   460 */  1176, 1176, 1176, 1176, 1176, 1304, 1302, 1301, 1300, 1176,
- /*   470 */  1297, 1176, 1176, 1176, 1176, 1176, 1176, 1327, 1176, 1176,
- /*   480 */  1176, 1176, 1176, 1250, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   490 */  1176, 1176, 1176, 1241, 1176, 1240, 1176, 1176, 1176, 1176,
- /*   500 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
- /*   510 */  1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
+ /*     0 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    10 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    20 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    30 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    40 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    50 */  1210, 1210, 1210, 1269, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    60 */  1210, 1210, 1210, 1210, 1210, 1210, 1267, 1406, 1210, 1540,
+ /*    70 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    80 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*    90 */  1210, 1210, 1210, 1210, 1210, 1210, 1269, 1210, 1551, 1551,
+ /*   100 */  1551, 1267, 1210, 1210, 1210, 1210, 1210, 1362, 1210, 1210,
+ /*   110 */  1210, 1210, 1210, 1210, 1210, 1440, 1210, 1210, 1615, 1210,
+ /*   120 */  1210, 1315, 1210, 1575, 1210, 1567, 1543, 1557, 1544, 1210,
+ /*   130 */  1600, 1560, 1210, 1210, 1210, 1432, 1210, 1210, 1411, 1408,
+ /*   140 */  1408, 1210, 1210, 1210, 1269, 1210, 1210, 1269, 1269, 1210,
+ /*   150 */  1269, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   160 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1442, 1210,
+ /*   170 */  1267, 1210, 1210, 1267, 1210, 1582, 1580, 1210, 1582, 1580,
+ /*   180 */  1210, 1210, 1594, 1590, 1573, 1571, 1557, 1210, 1210, 1210,
+ /*   190 */  1618, 1606, 1602, 1210, 1210, 1580, 1210, 1210, 1580, 1210,
+ /*   200 */  1419, 1210, 1210, 1267, 1210, 1267, 1210, 1331, 1210, 1210,
+ /*   210 */  1210, 1267, 1210, 1434, 1365, 1365, 1270, 1215, 1210, 1210,
+ /*   220 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1504, 1593,
+ /*   230 */  1592, 1503, 1517, 1516, 1515, 1210, 1210, 1210, 1210, 1498,
+ /*   240 */  1499, 1497, 1496, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   250 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1541, 1210, 1603,
+ /*   260 */  1607, 1210, 1210, 1210, 1479, 1210, 1210, 1210, 1210, 1210,
+ /*   270 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   280 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   290 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   300 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   310 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   320 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   330 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   340 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   350 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   360 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   370 */  1376, 1210, 1210, 1210, 1210, 1210, 1210, 1296, 1295, 1210,
+ /*   380 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   390 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   400 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   410 */  1564, 1574, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   420 */  1210, 1479, 1210, 1591, 1210, 1550, 1546, 1210, 1210, 1542,
+ /*   430 */  1210, 1210, 1601, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   440 */  1210, 1536, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   450 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1478, 1210,
+ /*   460 */  1210, 1210, 1210, 1210, 1210, 1210, 1359, 1210, 1210, 1210,
+ /*   470 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1344,
+ /*   480 */  1342, 1341, 1340, 1210, 1337, 1210, 1210, 1210, 1210, 1210,
+ /*   490 */  1210, 1367, 1210, 1210, 1210, 1210, 1210, 1290, 1210, 1210,
+ /*   500 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1281, 1210, 1280,
+ /*   510 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   520 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   530 */  1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210,
+ /*   540 */  1210, 1210, 1210, 1210,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -819,270 +833,275 @@ static const char *const yyTokenName[] = {
   /*   41 */ "LOCAL",
   /*   42 */ "QNODE",
   /*   43 */ "ON",
-  /*   44 */ "DATABASE",
-  /*   45 */ "USE",
-  /*   46 */ "IF",
-  /*   47 */ "NOT",
-  /*   48 */ "EXISTS",
-  /*   49 */ "BLOCKS",
-  /*   50 */ "CACHE",
-  /*   51 */ "CACHELAST",
-  /*   52 */ "COMP",
-  /*   53 */ "DAYS",
-  /*   54 */ "NK_VARIABLE",
-  /*   55 */ "FSYNC",
-  /*   56 */ "MAXROWS",
-  /*   57 */ "MINROWS",
-  /*   58 */ "KEEP",
-  /*   59 */ "PRECISION",
-  /*   60 */ "QUORUM",
-  /*   61 */ "REPLICA",
-  /*   62 */ "TTL",
-  /*   63 */ "WAL",
-  /*   64 */ "VGROUPS",
-  /*   65 */ "SINGLE_STABLE",
-  /*   66 */ "STREAM_MODE",
-  /*   67 */ "RETENTIONS",
-  /*   68 */ "NK_COMMA",
-  /*   69 */ "NK_COLON",
-  /*   70 */ "TABLE",
-  /*   71 */ "NK_LP",
-  /*   72 */ "NK_RP",
-  /*   73 */ "STABLE",
-  /*   74 */ "ADD",
-  /*   75 */ "COLUMN",
-  /*   76 */ "MODIFY",
-  /*   77 */ "RENAME",
-  /*   78 */ "TAG",
-  /*   79 */ "SET",
-  /*   80 */ "NK_EQ",
-  /*   81 */ "USING",
-  /*   82 */ "TAGS",
-  /*   83 */ "NK_DOT",
-  /*   84 */ "COMMENT",
-  /*   85 */ "BOOL",
-  /*   86 */ "TINYINT",
-  /*   87 */ "SMALLINT",
-  /*   88 */ "INT",
-  /*   89 */ "INTEGER",
-  /*   90 */ "BIGINT",
-  /*   91 */ "FLOAT",
-  /*   92 */ "DOUBLE",
-  /*   93 */ "BINARY",
-  /*   94 */ "TIMESTAMP",
-  /*   95 */ "NCHAR",
-  /*   96 */ "UNSIGNED",
-  /*   97 */ "JSON",
-  /*   98 */ "VARCHAR",
-  /*   99 */ "MEDIUMBLOB",
-  /*  100 */ "BLOB",
-  /*  101 */ "VARBINARY",
-  /*  102 */ "DECIMAL",
-  /*  103 */ "SMA",
-  /*  104 */ "ROLLUP",
-  /*  105 */ "FILE_FACTOR",
-  /*  106 */ "NK_FLOAT",
-  /*  107 */ "DELAY",
-  /*  108 */ "SHOW",
-  /*  109 */ "DATABASES",
-  /*  110 */ "TABLES",
-  /*  111 */ "STABLES",
-  /*  112 */ "MNODES",
-  /*  113 */ "MODULES",
-  /*  114 */ "QNODES",
-  /*  115 */ "FUNCTIONS",
-  /*  116 */ "INDEXES",
-  /*  117 */ "FROM",
-  /*  118 */ "ACCOUNTS",
-  /*  119 */ "APPS",
-  /*  120 */ "CONNECTIONS",
-  /*  121 */ "LICENCE",
-  /*  122 */ "QUERIES",
-  /*  123 */ "SCORES",
-  /*  124 */ "TOPICS",
-  /*  125 */ "VARIABLES",
-  /*  126 */ "LIKE",
-  /*  127 */ "INDEX",
-  /*  128 */ "FULLTEXT",
-  /*  129 */ "FUNCTION",
-  /*  130 */ "INTERVAL",
-  /*  131 */ "TOPIC",
-  /*  132 */ "AS",
-  /*  133 */ "DESC",
-  /*  134 */ "DESCRIBE",
-  /*  135 */ "RESET",
-  /*  136 */ "QUERY",
-  /*  137 */ "EXPLAIN",
-  /*  138 */ "ANALYZE",
-  /*  139 */ "VERBOSE",
-  /*  140 */ "NK_BOOL",
-  /*  141 */ "RATIO",
-  /*  142 */ "COMPACT",
-  /*  143 */ "VNODES",
-  /*  144 */ "IN",
-  /*  145 */ "OUTPUTTYPE",
-  /*  146 */ "AGGREGATE",
-  /*  147 */ "BUFSIZE",
-  /*  148 */ "STREAM",
-  /*  149 */ "INTO",
-  /*  150 */ "KILL",
-  /*  151 */ "CONNECTION",
-  /*  152 */ "MERGE",
-  /*  153 */ "VGROUP",
-  /*  154 */ "REDISTRIBUTE",
-  /*  155 */ "SPLIT",
-  /*  156 */ "SYNCDB",
-  /*  157 */ "NULL",
-  /*  158 */ "FIRST",
-  /*  159 */ "LAST",
-  /*  160 */ "NOW",
-  /*  161 */ "ROWTS",
-  /*  162 */ "TBNAME",
-  /*  163 */ "QSTARTTS",
-  /*  164 */ "QENDTS",
-  /*  165 */ "WSTARTTS",
-  /*  166 */ "WENDTS",
-  /*  167 */ "WDURATION",
-  /*  168 */ "BETWEEN",
-  /*  169 */ "IS",
-  /*  170 */ "NK_LT",
-  /*  171 */ "NK_GT",
-  /*  172 */ "NK_LE",
-  /*  173 */ "NK_GE",
-  /*  174 */ "NK_NE",
-  /*  175 */ "MATCH",
-  /*  176 */ "NMATCH",
-  /*  177 */ "JOIN",
-  /*  178 */ "INNER",
-  /*  179 */ "SELECT",
-  /*  180 */ "DISTINCT",
-  /*  181 */ "WHERE",
-  /*  182 */ "PARTITION",
-  /*  183 */ "BY",
-  /*  184 */ "SESSION",
-  /*  185 */ "STATE_WINDOW",
-  /*  186 */ "SLIDING",
-  /*  187 */ "FILL",
-  /*  188 */ "VALUE",
-  /*  189 */ "NONE",
-  /*  190 */ "PREV",
-  /*  191 */ "LINEAR",
-  /*  192 */ "NEXT",
-  /*  193 */ "GROUP",
-  /*  194 */ "HAVING",
-  /*  195 */ "ORDER",
-  /*  196 */ "SLIMIT",
-  /*  197 */ "SOFFSET",
-  /*  198 */ "LIMIT",
-  /*  199 */ "OFFSET",
-  /*  200 */ "ASC",
-  /*  201 */ "NULLS",
-  /*  202 */ "cmd",
-  /*  203 */ "account_options",
-  /*  204 */ "alter_account_options",
-  /*  205 */ "literal",
-  /*  206 */ "alter_account_option",
-  /*  207 */ "user_name",
-  /*  208 */ "dnode_endpoint",
-  /*  209 */ "dnode_host_name",
-  /*  210 */ "not_exists_opt",
-  /*  211 */ "db_name",
-  /*  212 */ "db_options",
-  /*  213 */ "exists_opt",
-  /*  214 */ "alter_db_options",
-  /*  215 */ "integer_list",
-  /*  216 */ "variable_list",
-  /*  217 */ "retention_list",
-  /*  218 */ "alter_db_option",
-  /*  219 */ "retention",
-  /*  220 */ "full_table_name",
-  /*  221 */ "column_def_list",
-  /*  222 */ "tags_def_opt",
-  /*  223 */ "table_options",
-  /*  224 */ "multi_create_clause",
-  /*  225 */ "tags_def",
-  /*  226 */ "multi_drop_clause",
-  /*  227 */ "alter_table_clause",
-  /*  228 */ "alter_table_options",
-  /*  229 */ "column_name",
-  /*  230 */ "type_name",
-  /*  231 */ "create_subtable_clause",
-  /*  232 */ "specific_tags_opt",
-  /*  233 */ "literal_list",
-  /*  234 */ "drop_table_clause",
-  /*  235 */ "col_name_list",
-  /*  236 */ "table_name",
-  /*  237 */ "column_def",
-  /*  238 */ "func_name_list",
-  /*  239 */ "alter_table_option",
-  /*  240 */ "col_name",
-  /*  241 */ "db_name_cond_opt",
-  /*  242 */ "like_pattern_opt",
-  /*  243 */ "table_name_cond",
-  /*  244 */ "from_db_opt",
-  /*  245 */ "func_name",
-  /*  246 */ "function_name",
-  /*  247 */ "index_name",
-  /*  248 */ "index_options",
-  /*  249 */ "func_list",
-  /*  250 */ "duration_literal",
-  /*  251 */ "sliding_opt",
-  /*  252 */ "func",
-  /*  253 */ "expression_list",
-  /*  254 */ "topic_name",
-  /*  255 */ "query_expression",
-  /*  256 */ "analyze_opt",
-  /*  257 */ "explain_options",
-  /*  258 */ "agg_func_opt",
-  /*  259 */ "bufsize_opt",
-  /*  260 */ "stream_name",
-  /*  261 */ "dnode_list",
-  /*  262 */ "signed",
-  /*  263 */ "signed_literal",
-  /*  264 */ "table_alias",
-  /*  265 */ "column_alias",
-  /*  266 */ "expression",
-  /*  267 */ "pseudo_column",
-  /*  268 */ "column_reference",
-  /*  269 */ "subquery",
-  /*  270 */ "predicate",
-  /*  271 */ "compare_op",
-  /*  272 */ "in_op",
-  /*  273 */ "in_predicate_value",
-  /*  274 */ "boolean_value_expression",
-  /*  275 */ "boolean_primary",
-  /*  276 */ "common_expression",
-  /*  277 */ "from_clause",
-  /*  278 */ "table_reference_list",
-  /*  279 */ "table_reference",
-  /*  280 */ "table_primary",
-  /*  281 */ "joined_table",
-  /*  282 */ "alias_opt",
-  /*  283 */ "parenthesized_joined_table",
-  /*  284 */ "join_type",
-  /*  285 */ "search_condition",
-  /*  286 */ "query_specification",
-  /*  287 */ "set_quantifier_opt",
-  /*  288 */ "select_list",
-  /*  289 */ "where_clause_opt",
-  /*  290 */ "partition_by_clause_opt",
-  /*  291 */ "twindow_clause_opt",
-  /*  292 */ "group_by_clause_opt",
-  /*  293 */ "having_clause_opt",
-  /*  294 */ "select_sublist",
-  /*  295 */ "select_item",
-  /*  296 */ "fill_opt",
-  /*  297 */ "fill_mode",
-  /*  298 */ "group_by_list",
-  /*  299 */ "query_expression_body",
-  /*  300 */ "order_by_clause_opt",
-  /*  301 */ "slimit_clause_opt",
-  /*  302 */ "limit_clause_opt",
-  /*  303 */ "query_primary",
-  /*  304 */ "sort_specification_list",
-  /*  305 */ "sort_specification",
-  /*  306 */ "ordering_specification_opt",
-  /*  307 */ "null_ordering_opt",
+  /*   44 */ "BNODE",
+  /*   45 */ "SNODE",
+  /*   46 */ "MNODE",
+  /*   47 */ "DATABASE",
+  /*   48 */ "USE",
+  /*   49 */ "IF",
+  /*   50 */ "NOT",
+  /*   51 */ "EXISTS",
+  /*   52 */ "BLOCKS",
+  /*   53 */ "CACHE",
+  /*   54 */ "CACHELAST",
+  /*   55 */ "COMP",
+  /*   56 */ "DAYS",
+  /*   57 */ "NK_VARIABLE",
+  /*   58 */ "FSYNC",
+  /*   59 */ "MAXROWS",
+  /*   60 */ "MINROWS",
+  /*   61 */ "KEEP",
+  /*   62 */ "PRECISION",
+  /*   63 */ "QUORUM",
+  /*   64 */ "REPLICA",
+  /*   65 */ "TTL",
+  /*   66 */ "WAL",
+  /*   67 */ "VGROUPS",
+  /*   68 */ "SINGLE_STABLE",
+  /*   69 */ "STREAM_MODE",
+  /*   70 */ "RETENTIONS",
+  /*   71 */ "NK_COMMA",
+  /*   72 */ "NK_COLON",
+  /*   73 */ "TABLE",
+  /*   74 */ "NK_LP",
+  /*   75 */ "NK_RP",
+  /*   76 */ "STABLE",
+  /*   77 */ "ADD",
+  /*   78 */ "COLUMN",
+  /*   79 */ "MODIFY",
+  /*   80 */ "RENAME",
+  /*   81 */ "TAG",
+  /*   82 */ "SET",
+  /*   83 */ "NK_EQ",
+  /*   84 */ "USING",
+  /*   85 */ "TAGS",
+  /*   86 */ "NK_DOT",
+  /*   87 */ "COMMENT",
+  /*   88 */ "BOOL",
+  /*   89 */ "TINYINT",
+  /*   90 */ "SMALLINT",
+  /*   91 */ "INT",
+  /*   92 */ "INTEGER",
+  /*   93 */ "BIGINT",
+  /*   94 */ "FLOAT",
+  /*   95 */ "DOUBLE",
+  /*   96 */ "BINARY",
+  /*   97 */ "TIMESTAMP",
+  /*   98 */ "NCHAR",
+  /*   99 */ "UNSIGNED",
+  /*  100 */ "JSON",
+  /*  101 */ "VARCHAR",
+  /*  102 */ "MEDIUMBLOB",
+  /*  103 */ "BLOB",
+  /*  104 */ "VARBINARY",
+  /*  105 */ "DECIMAL",
+  /*  106 */ "SMA",
+  /*  107 */ "ROLLUP",
+  /*  108 */ "FILE_FACTOR",
+  /*  109 */ "NK_FLOAT",
+  /*  110 */ "DELAY",
+  /*  111 */ "SHOW",
+  /*  112 */ "DATABASES",
+  /*  113 */ "TABLES",
+  /*  114 */ "STABLES",
+  /*  115 */ "MNODES",
+  /*  116 */ "MODULES",
+  /*  117 */ "QNODES",
+  /*  118 */ "FUNCTIONS",
+  /*  119 */ "INDEXES",
+  /*  120 */ "FROM",
+  /*  121 */ "ACCOUNTS",
+  /*  122 */ "APPS",
+  /*  123 */ "CONNECTIONS",
+  /*  124 */ "LICENCE",
+  /*  125 */ "QUERIES",
+  /*  126 */ "SCORES",
+  /*  127 */ "TOPICS",
+  /*  128 */ "VARIABLES",
+  /*  129 */ "BNODES",
+  /*  130 */ "SNODES",
+  /*  131 */ "LIKE",
+  /*  132 */ "INDEX",
+  /*  133 */ "FULLTEXT",
+  /*  134 */ "FUNCTION",
+  /*  135 */ "INTERVAL",
+  /*  136 */ "TOPIC",
+  /*  137 */ "AS",
+  /*  138 */ "DESC",
+  /*  139 */ "DESCRIBE",
+  /*  140 */ "RESET",
+  /*  141 */ "QUERY",
+  /*  142 */ "EXPLAIN",
+  /*  143 */ "ANALYZE",
+  /*  144 */ "VERBOSE",
+  /*  145 */ "NK_BOOL",
+  /*  146 */ "RATIO",
+  /*  147 */ "COMPACT",
+  /*  148 */ "VNODES",
+  /*  149 */ "IN",
+  /*  150 */ "OUTPUTTYPE",
+  /*  151 */ "AGGREGATE",
+  /*  152 */ "BUFSIZE",
+  /*  153 */ "STREAM",
+  /*  154 */ "INTO",
+  /*  155 */ "KILL",
+  /*  156 */ "CONNECTION",
+  /*  157 */ "MERGE",
+  /*  158 */ "VGROUP",
+  /*  159 */ "REDISTRIBUTE",
+  /*  160 */ "SPLIT",
+  /*  161 */ "SYNCDB",
+  /*  162 */ "NULL",
+  /*  163 */ "FIRST",
+  /*  164 */ "LAST",
+  /*  165 */ "NOW",
+  /*  166 */ "ROWTS",
+  /*  167 */ "TBNAME",
+  /*  168 */ "QSTARTTS",
+  /*  169 */ "QENDTS",
+  /*  170 */ "WSTARTTS",
+  /*  171 */ "WENDTS",
+  /*  172 */ "WDURATION",
+  /*  173 */ "BETWEEN",
+  /*  174 */ "IS",
+  /*  175 */ "NK_LT",
+  /*  176 */ "NK_GT",
+  /*  177 */ "NK_LE",
+  /*  178 */ "NK_GE",
+  /*  179 */ "NK_NE",
+  /*  180 */ "MATCH",
+  /*  181 */ "NMATCH",
+  /*  182 */ "JOIN",
+  /*  183 */ "INNER",
+  /*  184 */ "SELECT",
+  /*  185 */ "DISTINCT",
+  /*  186 */ "WHERE",
+  /*  187 */ "PARTITION",
+  /*  188 */ "BY",
+  /*  189 */ "SESSION",
+  /*  190 */ "STATE_WINDOW",
+  /*  191 */ "SLIDING",
+  /*  192 */ "FILL",
+  /*  193 */ "VALUE",
+  /*  194 */ "NONE",
+  /*  195 */ "PREV",
+  /*  196 */ "LINEAR",
+  /*  197 */ "NEXT",
+  /*  198 */ "GROUP",
+  /*  199 */ "HAVING",
+  /*  200 */ "ORDER",
+  /*  201 */ "SLIMIT",
+  /*  202 */ "SOFFSET",
+  /*  203 */ "LIMIT",
+  /*  204 */ "OFFSET",
+  /*  205 */ "ASC",
+  /*  206 */ "NULLS",
+  /*  207 */ "cmd",
+  /*  208 */ "account_options",
+  /*  209 */ "alter_account_options",
+  /*  210 */ "literal",
+  /*  211 */ "alter_account_option",
+  /*  212 */ "user_name",
+  /*  213 */ "dnode_endpoint",
+  /*  214 */ "dnode_host_name",
+  /*  215 */ "not_exists_opt",
+  /*  216 */ "db_name",
+  /*  217 */ "db_options",
+  /*  218 */ "exists_opt",
+  /*  219 */ "alter_db_options",
+  /*  220 */ "integer_list",
+  /*  221 */ "variable_list",
+  /*  222 */ "retention_list",
+  /*  223 */ "alter_db_option",
+  /*  224 */ "retention",
+  /*  225 */ "full_table_name",
+  /*  226 */ "column_def_list",
+  /*  227 */ "tags_def_opt",
+  /*  228 */ "table_options",
+  /*  229 */ "multi_create_clause",
+  /*  230 */ "tags_def",
+  /*  231 */ "multi_drop_clause",
+  /*  232 */ "alter_table_clause",
+  /*  233 */ "alter_table_options",
+  /*  234 */ "column_name",
+  /*  235 */ "type_name",
+  /*  236 */ "create_subtable_clause",
+  /*  237 */ "specific_tags_opt",
+  /*  238 */ "literal_list",
+  /*  239 */ "drop_table_clause",
+  /*  240 */ "col_name_list",
+  /*  241 */ "table_name",
+  /*  242 */ "column_def",
+  /*  243 */ "func_name_list",
+  /*  244 */ "alter_table_option",
+  /*  245 */ "col_name",
+  /*  246 */ "db_name_cond_opt",
+  /*  247 */ "like_pattern_opt",
+  /*  248 */ "table_name_cond",
+  /*  249 */ "from_db_opt",
+  /*  250 */ "func_name",
+  /*  251 */ "function_name",
+  /*  252 */ "index_name",
+  /*  253 */ "index_options",
+  /*  254 */ "func_list",
+  /*  255 */ "duration_literal",
+  /*  256 */ "sliding_opt",
+  /*  257 */ "func",
+  /*  258 */ "expression_list",
+  /*  259 */ "topic_name",
+  /*  260 */ "query_expression",
+  /*  261 */ "analyze_opt",
+  /*  262 */ "explain_options",
+  /*  263 */ "agg_func_opt",
+  /*  264 */ "bufsize_opt",
+  /*  265 */ "stream_name",
+  /*  266 */ "dnode_list",
+  /*  267 */ "signed",
+  /*  268 */ "signed_literal",
+  /*  269 */ "table_alias",
+  /*  270 */ "column_alias",
+  /*  271 */ "expression",
+  /*  272 */ "pseudo_column",
+  /*  273 */ "column_reference",
+  /*  274 */ "subquery",
+  /*  275 */ "predicate",
+  /*  276 */ "compare_op",
+  /*  277 */ "in_op",
+  /*  278 */ "in_predicate_value",
+  /*  279 */ "boolean_value_expression",
+  /*  280 */ "boolean_primary",
+  /*  281 */ "common_expression",
+  /*  282 */ "from_clause",
+  /*  283 */ "table_reference_list",
+  /*  284 */ "table_reference",
+  /*  285 */ "table_primary",
+  /*  286 */ "joined_table",
+  /*  287 */ "alias_opt",
+  /*  288 */ "parenthesized_joined_table",
+  /*  289 */ "join_type",
+  /*  290 */ "search_condition",
+  /*  291 */ "query_specification",
+  /*  292 */ "set_quantifier_opt",
+  /*  293 */ "select_list",
+  /*  294 */ "where_clause_opt",
+  /*  295 */ "partition_by_clause_opt",
+  /*  296 */ "twindow_clause_opt",
+  /*  297 */ "group_by_clause_opt",
+  /*  298 */ "having_clause_opt",
+  /*  299 */ "select_sublist",
+  /*  300 */ "select_item",
+  /*  301 */ "fill_opt",
+  /*  302 */ "fill_mode",
+  /*  303 */ "group_by_list",
+  /*  304 */ "query_expression_body",
+  /*  305 */ "order_by_clause_opt",
+  /*  306 */ "slimit_clause_opt",
+  /*  307 */ "limit_clause_opt",
+  /*  308 */ "query_primary",
+  /*  309 */ "sort_specification_list",
+  /*  310 */ "sort_specification",
+  /*  311 */ "ordering_specification_opt",
+  /*  312 */ "null_ordering_opt",
 };
 #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
 
@@ -1133,363 +1152,371 @@ static const char *const yyRuleName[] = {
  /*  40 */ "cmd ::= ALTER LOCAL NK_STRING NK_STRING",
  /*  41 */ "cmd ::= CREATE QNODE ON DNODE NK_INTEGER",
  /*  42 */ "cmd ::= DROP QNODE ON DNODE NK_INTEGER",
- /*  43 */ "cmd ::= CREATE DATABASE not_exists_opt db_name db_options",
- /*  44 */ "cmd ::= DROP DATABASE exists_opt db_name",
- /*  45 */ "cmd ::= USE db_name",
- /*  46 */ "cmd ::= ALTER DATABASE db_name alter_db_options",
- /*  47 */ "not_exists_opt ::= IF NOT EXISTS",
- /*  48 */ "not_exists_opt ::=",
- /*  49 */ "exists_opt ::= IF EXISTS",
- /*  50 */ "exists_opt ::=",
- /*  51 */ "db_options ::=",
- /*  52 */ "db_options ::= db_options BLOCKS NK_INTEGER",
- /*  53 */ "db_options ::= db_options CACHE NK_INTEGER",
- /*  54 */ "db_options ::= db_options CACHELAST NK_INTEGER",
- /*  55 */ "db_options ::= db_options COMP NK_INTEGER",
- /*  56 */ "db_options ::= db_options DAYS NK_INTEGER",
- /*  57 */ "db_options ::= db_options DAYS NK_VARIABLE",
- /*  58 */ "db_options ::= db_options FSYNC NK_INTEGER",
- /*  59 */ "db_options ::= db_options MAXROWS NK_INTEGER",
- /*  60 */ "db_options ::= db_options MINROWS NK_INTEGER",
- /*  61 */ "db_options ::= db_options KEEP integer_list",
- /*  62 */ "db_options ::= db_options KEEP variable_list",
- /*  63 */ "db_options ::= db_options PRECISION NK_STRING",
- /*  64 */ "db_options ::= db_options QUORUM NK_INTEGER",
- /*  65 */ "db_options ::= db_options REPLICA NK_INTEGER",
- /*  66 */ "db_options ::= db_options TTL NK_INTEGER",
- /*  67 */ "db_options ::= db_options WAL NK_INTEGER",
- /*  68 */ "db_options ::= db_options VGROUPS NK_INTEGER",
- /*  69 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER",
- /*  70 */ "db_options ::= db_options STREAM_MODE NK_INTEGER",
- /*  71 */ "db_options ::= db_options RETENTIONS retention_list",
- /*  72 */ "alter_db_options ::= alter_db_option",
- /*  73 */ "alter_db_options ::= alter_db_options alter_db_option",
- /*  74 */ "alter_db_option ::= BLOCKS NK_INTEGER",
- /*  75 */ "alter_db_option ::= FSYNC NK_INTEGER",
- /*  76 */ "alter_db_option ::= KEEP integer_list",
- /*  77 */ "alter_db_option ::= KEEP variable_list",
- /*  78 */ "alter_db_option ::= WAL NK_INTEGER",
- /*  79 */ "alter_db_option ::= QUORUM NK_INTEGER",
- /*  80 */ "alter_db_option ::= CACHELAST NK_INTEGER",
- /*  81 */ "alter_db_option ::= REPLICA NK_INTEGER",
- /*  82 */ "integer_list ::= NK_INTEGER",
- /*  83 */ "integer_list ::= integer_list NK_COMMA NK_INTEGER",
- /*  84 */ "variable_list ::= NK_VARIABLE",
- /*  85 */ "variable_list ::= variable_list NK_COMMA NK_VARIABLE",
- /*  86 */ "retention_list ::= retention",
- /*  87 */ "retention_list ::= retention_list NK_COMMA retention",
- /*  88 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE",
- /*  89 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options",
- /*  90 */ "cmd ::= CREATE TABLE multi_create_clause",
- /*  91 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options",
- /*  92 */ "cmd ::= DROP TABLE multi_drop_clause",
- /*  93 */ "cmd ::= DROP STABLE exists_opt full_table_name",
- /*  94 */ "cmd ::= ALTER TABLE alter_table_clause",
- /*  95 */ "cmd ::= ALTER STABLE alter_table_clause",
- /*  96 */ "alter_table_clause ::= full_table_name alter_table_options",
- /*  97 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name",
- /*  98 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name",
- /*  99 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name",
- /* 100 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name",
- /* 101 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name",
- /* 102 */ "alter_table_clause ::= full_table_name DROP TAG column_name",
- /* 103 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name",
- /* 104 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name",
- /* 105 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal",
- /* 106 */ "multi_create_clause ::= create_subtable_clause",
- /* 107 */ "multi_create_clause ::= multi_create_clause create_subtable_clause",
- /* 108 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP",
- /* 109 */ "multi_drop_clause ::= drop_table_clause",
- /* 110 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause",
- /* 111 */ "drop_table_clause ::= exists_opt full_table_name",
- /* 112 */ "specific_tags_opt ::=",
- /* 113 */ "specific_tags_opt ::= NK_LP col_name_list NK_RP",
- /* 114 */ "full_table_name ::= table_name",
- /* 115 */ "full_table_name ::= db_name NK_DOT table_name",
- /* 116 */ "column_def_list ::= column_def",
- /* 117 */ "column_def_list ::= column_def_list NK_COMMA column_def",
- /* 118 */ "column_def ::= column_name type_name",
- /* 119 */ "column_def ::= column_name type_name COMMENT NK_STRING",
- /* 120 */ "type_name ::= BOOL",
- /* 121 */ "type_name ::= TINYINT",
- /* 122 */ "type_name ::= SMALLINT",
- /* 123 */ "type_name ::= INT",
- /* 124 */ "type_name ::= INTEGER",
- /* 125 */ "type_name ::= BIGINT",
- /* 126 */ "type_name ::= FLOAT",
- /* 127 */ "type_name ::= DOUBLE",
- /* 128 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP",
- /* 129 */ "type_name ::= TIMESTAMP",
- /* 130 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP",
- /* 131 */ "type_name ::= TINYINT UNSIGNED",
- /* 132 */ "type_name ::= SMALLINT UNSIGNED",
- /* 133 */ "type_name ::= INT UNSIGNED",
- /* 134 */ "type_name ::= BIGINT UNSIGNED",
- /* 135 */ "type_name ::= JSON",
- /* 136 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP",
- /* 137 */ "type_name ::= MEDIUMBLOB",
- /* 138 */ "type_name ::= BLOB",
- /* 139 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP",
- /* 140 */ "type_name ::= DECIMAL",
- /* 141 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP",
- /* 142 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP",
- /* 143 */ "tags_def_opt ::=",
- /* 144 */ "tags_def_opt ::= tags_def",
- /* 145 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP",
- /* 146 */ "table_options ::=",
- /* 147 */ "table_options ::= table_options COMMENT NK_STRING",
- /* 148 */ "table_options ::= table_options KEEP integer_list",
- /* 149 */ "table_options ::= table_options TTL NK_INTEGER",
- /* 150 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP",
- /* 151 */ "table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP",
- /* 152 */ "table_options ::= table_options FILE_FACTOR NK_FLOAT",
- /* 153 */ "table_options ::= table_options DELAY NK_INTEGER",
- /* 154 */ "alter_table_options ::= alter_table_option",
- /* 155 */ "alter_table_options ::= alter_table_options alter_table_option",
- /* 156 */ "alter_table_option ::= COMMENT NK_STRING",
- /* 157 */ "alter_table_option ::= KEEP integer_list",
- /* 158 */ "alter_table_option ::= TTL NK_INTEGER",
- /* 159 */ "col_name_list ::= col_name",
- /* 160 */ "col_name_list ::= col_name_list NK_COMMA col_name",
- /* 161 */ "col_name ::= column_name",
- /* 162 */ "cmd ::= SHOW DNODES",
- /* 163 */ "cmd ::= SHOW USERS",
- /* 164 */ "cmd ::= SHOW DATABASES",
- /* 165 */ "cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt",
- /* 166 */ "cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt",
- /* 167 */ "cmd ::= SHOW db_name_cond_opt VGROUPS",
- /* 168 */ "cmd ::= SHOW MNODES",
- /* 169 */ "cmd ::= SHOW MODULES",
- /* 170 */ "cmd ::= SHOW QNODES",
- /* 171 */ "cmd ::= SHOW FUNCTIONS",
- /* 172 */ "cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt",
- /* 173 */ "cmd ::= SHOW STREAMS",
- /* 174 */ "cmd ::= SHOW ACCOUNTS",
- /* 175 */ "cmd ::= SHOW APPS",
- /* 176 */ "cmd ::= SHOW CONNECTIONS",
- /* 177 */ "cmd ::= SHOW LICENCE",
- /* 178 */ "cmd ::= SHOW CREATE DATABASE db_name",
- /* 179 */ "cmd ::= SHOW CREATE TABLE full_table_name",
- /* 180 */ "cmd ::= SHOW CREATE STABLE full_table_name",
- /* 181 */ "cmd ::= SHOW QUERIES",
- /* 182 */ "cmd ::= SHOW SCORES",
- /* 183 */ "cmd ::= SHOW TOPICS",
- /* 184 */ "cmd ::= SHOW VARIABLES",
- /* 185 */ "db_name_cond_opt ::=",
- /* 186 */ "db_name_cond_opt ::= db_name NK_DOT",
- /* 187 */ "like_pattern_opt ::=",
- /* 188 */ "like_pattern_opt ::= LIKE NK_STRING",
- /* 189 */ "table_name_cond ::= table_name",
- /* 190 */ "from_db_opt ::=",
- /* 191 */ "from_db_opt ::= FROM db_name",
- /* 192 */ "func_name_list ::= func_name",
- /* 193 */ "func_name_list ::= func_name_list NK_COMMA col_name",
- /* 194 */ "func_name ::= function_name",
- /* 195 */ "cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options",
- /* 196 */ "cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP",
- /* 197 */ "cmd ::= DROP INDEX exists_opt index_name ON table_name",
- /* 198 */ "index_options ::=",
- /* 199 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt",
- /* 200 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt",
- /* 201 */ "func_list ::= func",
- /* 202 */ "func_list ::= func_list NK_COMMA func",
- /* 203 */ "func ::= function_name NK_LP expression_list NK_RP",
- /* 204 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression",
- /* 205 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name",
- /* 206 */ "cmd ::= DROP TOPIC exists_opt topic_name",
- /* 207 */ "cmd ::= DESC full_table_name",
- /* 208 */ "cmd ::= DESCRIBE full_table_name",
- /* 209 */ "cmd ::= RESET QUERY CACHE",
- /* 210 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression",
- /* 211 */ "analyze_opt ::=",
- /* 212 */ "analyze_opt ::= ANALYZE",
- /* 213 */ "explain_options ::=",
- /* 214 */ "explain_options ::= explain_options VERBOSE NK_BOOL",
- /* 215 */ "explain_options ::= explain_options RATIO NK_FLOAT",
- /* 216 */ "cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP",
- /* 217 */ "cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt",
- /* 218 */ "cmd ::= DROP FUNCTION function_name",
- /* 219 */ "agg_func_opt ::=",
- /* 220 */ "agg_func_opt ::= AGGREGATE",
- /* 221 */ "bufsize_opt ::=",
- /* 222 */ "bufsize_opt ::= BUFSIZE NK_INTEGER",
- /* 223 */ "cmd ::= CREATE STREAM stream_name INTO table_name AS query_expression",
- /* 224 */ "cmd ::= DROP STREAM stream_name",
- /* 225 */ "cmd ::= KILL CONNECTION NK_INTEGER",
- /* 226 */ "cmd ::= KILL QUERY NK_INTEGER",
- /* 227 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER",
- /* 228 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list",
- /* 229 */ "cmd ::= SPLIT VGROUP NK_INTEGER",
- /* 230 */ "dnode_list ::= DNODE NK_INTEGER",
- /* 231 */ "dnode_list ::= dnode_list DNODE NK_INTEGER",
- /* 232 */ "cmd ::= SYNCDB db_name REPLICA",
- /* 233 */ "cmd ::= query_expression",
- /* 234 */ "literal ::= NK_INTEGER",
- /* 235 */ "literal ::= NK_FLOAT",
- /* 236 */ "literal ::= NK_STRING",
- /* 237 */ "literal ::= NK_BOOL",
- /* 238 */ "literal ::= TIMESTAMP NK_STRING",
- /* 239 */ "literal ::= duration_literal",
- /* 240 */ "literal ::= NULL",
- /* 241 */ "duration_literal ::= NK_VARIABLE",
- /* 242 */ "signed ::= NK_INTEGER",
- /* 243 */ "signed ::= NK_PLUS NK_INTEGER",
- /* 244 */ "signed ::= NK_MINUS NK_INTEGER",
- /* 245 */ "signed ::= NK_FLOAT",
- /* 246 */ "signed ::= NK_PLUS NK_FLOAT",
- /* 247 */ "signed ::= NK_MINUS NK_FLOAT",
- /* 248 */ "signed_literal ::= signed",
- /* 249 */ "signed_literal ::= NK_STRING",
- /* 250 */ "signed_literal ::= NK_BOOL",
- /* 251 */ "signed_literal ::= TIMESTAMP NK_STRING",
- /* 252 */ "signed_literal ::= duration_literal",
- /* 253 */ "signed_literal ::= NULL",
- /* 254 */ "literal_list ::= signed_literal",
- /* 255 */ "literal_list ::= literal_list NK_COMMA signed_literal",
- /* 256 */ "db_name ::= NK_ID",
- /* 257 */ "table_name ::= NK_ID",
- /* 258 */ "column_name ::= NK_ID",
- /* 259 */ "function_name ::= NK_ID",
- /* 260 */ "function_name ::= FIRST",
- /* 261 */ "function_name ::= LAST",
- /* 262 */ "table_alias ::= NK_ID",
- /* 263 */ "column_alias ::= NK_ID",
- /* 264 */ "user_name ::= NK_ID",
- /* 265 */ "index_name ::= NK_ID",
- /* 266 */ "topic_name ::= NK_ID",
- /* 267 */ "stream_name ::= NK_ID",
- /* 268 */ "expression ::= literal",
- /* 269 */ "expression ::= pseudo_column",
- /* 270 */ "expression ::= column_reference",
- /* 271 */ "expression ::= function_name NK_LP expression_list NK_RP",
- /* 272 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
- /* 273 */ "expression ::= subquery",
- /* 274 */ "expression ::= NK_LP expression NK_RP",
- /* 275 */ "expression ::= NK_PLUS expression",
- /* 276 */ "expression ::= NK_MINUS expression",
- /* 277 */ "expression ::= expression NK_PLUS expression",
- /* 278 */ "expression ::= expression NK_MINUS expression",
- /* 279 */ "expression ::= expression NK_STAR expression",
- /* 280 */ "expression ::= expression NK_SLASH expression",
- /* 281 */ "expression ::= expression NK_REM expression",
- /* 282 */ "expression_list ::= expression",
- /* 283 */ "expression_list ::= expression_list NK_COMMA expression",
- /* 284 */ "column_reference ::= column_name",
- /* 285 */ "column_reference ::= table_name NK_DOT column_name",
- /* 286 */ "pseudo_column ::= NOW",
- /* 287 */ "pseudo_column ::= ROWTS",
- /* 288 */ "pseudo_column ::= TBNAME",
- /* 289 */ "pseudo_column ::= QSTARTTS",
- /* 290 */ "pseudo_column ::= QENDTS",
- /* 291 */ "pseudo_column ::= WSTARTTS",
- /* 292 */ "pseudo_column ::= WENDTS",
- /* 293 */ "pseudo_column ::= WDURATION",
- /* 294 */ "predicate ::= expression compare_op expression",
- /* 295 */ "predicate ::= expression BETWEEN expression AND expression",
- /* 296 */ "predicate ::= expression NOT BETWEEN expression AND expression",
- /* 297 */ "predicate ::= expression IS NULL",
- /* 298 */ "predicate ::= expression IS NOT NULL",
- /* 299 */ "predicate ::= expression in_op in_predicate_value",
- /* 300 */ "compare_op ::= NK_LT",
- /* 301 */ "compare_op ::= NK_GT",
- /* 302 */ "compare_op ::= NK_LE",
- /* 303 */ "compare_op ::= NK_GE",
- /* 304 */ "compare_op ::= NK_NE",
- /* 305 */ "compare_op ::= NK_EQ",
- /* 306 */ "compare_op ::= LIKE",
- /* 307 */ "compare_op ::= NOT LIKE",
- /* 308 */ "compare_op ::= MATCH",
- /* 309 */ "compare_op ::= NMATCH",
- /* 310 */ "in_op ::= IN",
- /* 311 */ "in_op ::= NOT IN",
- /* 312 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
- /* 313 */ "boolean_value_expression ::= boolean_primary",
- /* 314 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 315 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 316 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 317 */ "boolean_primary ::= predicate",
- /* 318 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 319 */ "common_expression ::= expression",
- /* 320 */ "common_expression ::= boolean_value_expression",
- /* 321 */ "from_clause ::= FROM table_reference_list",
- /* 322 */ "table_reference_list ::= table_reference",
- /* 323 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 324 */ "table_reference ::= table_primary",
- /* 325 */ "table_reference ::= joined_table",
- /* 326 */ "table_primary ::= table_name alias_opt",
- /* 327 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 328 */ "table_primary ::= subquery alias_opt",
- /* 329 */ "table_primary ::= parenthesized_joined_table",
- /* 330 */ "alias_opt ::=",
- /* 331 */ "alias_opt ::= table_alias",
- /* 332 */ "alias_opt ::= AS table_alias",
- /* 333 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 334 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 335 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 336 */ "join_type ::=",
- /* 337 */ "join_type ::= INNER",
- /* 338 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
- /* 339 */ "set_quantifier_opt ::=",
- /* 340 */ "set_quantifier_opt ::= DISTINCT",
- /* 341 */ "set_quantifier_opt ::= ALL",
- /* 342 */ "select_list ::= NK_STAR",
- /* 343 */ "select_list ::= select_sublist",
- /* 344 */ "select_sublist ::= select_item",
- /* 345 */ "select_sublist ::= select_sublist NK_COMMA select_item",
- /* 346 */ "select_item ::= common_expression",
- /* 347 */ "select_item ::= common_expression column_alias",
- /* 348 */ "select_item ::= common_expression AS column_alias",
- /* 349 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 350 */ "where_clause_opt ::=",
- /* 351 */ "where_clause_opt ::= WHERE search_condition",
- /* 352 */ "partition_by_clause_opt ::=",
- /* 353 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
- /* 354 */ "twindow_clause_opt ::=",
- /* 355 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
- /* 356 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP",
- /* 357 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
- /* 358 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
- /* 359 */ "sliding_opt ::=",
- /* 360 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
- /* 361 */ "fill_opt ::=",
- /* 362 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 363 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
- /* 364 */ "fill_mode ::= NONE",
- /* 365 */ "fill_mode ::= PREV",
- /* 366 */ "fill_mode ::= NULL",
- /* 367 */ "fill_mode ::= LINEAR",
- /* 368 */ "fill_mode ::= NEXT",
- /* 369 */ "group_by_clause_opt ::=",
- /* 370 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 371 */ "group_by_list ::= expression",
- /* 372 */ "group_by_list ::= group_by_list NK_COMMA expression",
- /* 373 */ "having_clause_opt ::=",
- /* 374 */ "having_clause_opt ::= HAVING search_condition",
- /* 375 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 376 */ "query_expression_body ::= query_primary",
- /* 377 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
- /* 378 */ "query_primary ::= query_specification",
- /* 379 */ "order_by_clause_opt ::=",
- /* 380 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 381 */ "slimit_clause_opt ::=",
- /* 382 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 383 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 384 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 385 */ "limit_clause_opt ::=",
- /* 386 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 387 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 388 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 389 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 390 */ "search_condition ::= common_expression",
- /* 391 */ "sort_specification_list ::= sort_specification",
- /* 392 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 393 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
- /* 394 */ "ordering_specification_opt ::=",
- /* 395 */ "ordering_specification_opt ::= ASC",
- /* 396 */ "ordering_specification_opt ::= DESC",
- /* 397 */ "null_ordering_opt ::=",
- /* 398 */ "null_ordering_opt ::= NULLS FIRST",
- /* 399 */ "null_ordering_opt ::= NULLS LAST",
+ /*  43 */ "cmd ::= CREATE BNODE ON DNODE NK_INTEGER",
+ /*  44 */ "cmd ::= DROP BNODE ON DNODE NK_INTEGER",
+ /*  45 */ "cmd ::= CREATE SNODE ON DNODE NK_INTEGER",
+ /*  46 */ "cmd ::= DROP SNODE ON DNODE NK_INTEGER",
+ /*  47 */ "cmd ::= CREATE MNODE ON DNODE NK_INTEGER",
+ /*  48 */ "cmd ::= DROP MNODE ON DNODE NK_INTEGER",
+ /*  49 */ "cmd ::= CREATE DATABASE not_exists_opt db_name db_options",
+ /*  50 */ "cmd ::= DROP DATABASE exists_opt db_name",
+ /*  51 */ "cmd ::= USE db_name",
+ /*  52 */ "cmd ::= ALTER DATABASE db_name alter_db_options",
+ /*  53 */ "not_exists_opt ::= IF NOT EXISTS",
+ /*  54 */ "not_exists_opt ::=",
+ /*  55 */ "exists_opt ::= IF EXISTS",
+ /*  56 */ "exists_opt ::=",
+ /*  57 */ "db_options ::=",
+ /*  58 */ "db_options ::= db_options BLOCKS NK_INTEGER",
+ /*  59 */ "db_options ::= db_options CACHE NK_INTEGER",
+ /*  60 */ "db_options ::= db_options CACHELAST NK_INTEGER",
+ /*  61 */ "db_options ::= db_options COMP NK_INTEGER",
+ /*  62 */ "db_options ::= db_options DAYS NK_INTEGER",
+ /*  63 */ "db_options ::= db_options DAYS NK_VARIABLE",
+ /*  64 */ "db_options ::= db_options FSYNC NK_INTEGER",
+ /*  65 */ "db_options ::= db_options MAXROWS NK_INTEGER",
+ /*  66 */ "db_options ::= db_options MINROWS NK_INTEGER",
+ /*  67 */ "db_options ::= db_options KEEP integer_list",
+ /*  68 */ "db_options ::= db_options KEEP variable_list",
+ /*  69 */ "db_options ::= db_options PRECISION NK_STRING",
+ /*  70 */ "db_options ::= db_options QUORUM NK_INTEGER",
+ /*  71 */ "db_options ::= db_options REPLICA NK_INTEGER",
+ /*  72 */ "db_options ::= db_options TTL NK_INTEGER",
+ /*  73 */ "db_options ::= db_options WAL NK_INTEGER",
+ /*  74 */ "db_options ::= db_options VGROUPS NK_INTEGER",
+ /*  75 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER",
+ /*  76 */ "db_options ::= db_options STREAM_MODE NK_INTEGER",
+ /*  77 */ "db_options ::= db_options RETENTIONS retention_list",
+ /*  78 */ "alter_db_options ::= alter_db_option",
+ /*  79 */ "alter_db_options ::= alter_db_options alter_db_option",
+ /*  80 */ "alter_db_option ::= BLOCKS NK_INTEGER",
+ /*  81 */ "alter_db_option ::= FSYNC NK_INTEGER",
+ /*  82 */ "alter_db_option ::= KEEP integer_list",
+ /*  83 */ "alter_db_option ::= KEEP variable_list",
+ /*  84 */ "alter_db_option ::= WAL NK_INTEGER",
+ /*  85 */ "alter_db_option ::= QUORUM NK_INTEGER",
+ /*  86 */ "alter_db_option ::= CACHELAST NK_INTEGER",
+ /*  87 */ "alter_db_option ::= REPLICA NK_INTEGER",
+ /*  88 */ "integer_list ::= NK_INTEGER",
+ /*  89 */ "integer_list ::= integer_list NK_COMMA NK_INTEGER",
+ /*  90 */ "variable_list ::= NK_VARIABLE",
+ /*  91 */ "variable_list ::= variable_list NK_COMMA NK_VARIABLE",
+ /*  92 */ "retention_list ::= retention",
+ /*  93 */ "retention_list ::= retention_list NK_COMMA retention",
+ /*  94 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE",
+ /*  95 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options",
+ /*  96 */ "cmd ::= CREATE TABLE multi_create_clause",
+ /*  97 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options",
+ /*  98 */ "cmd ::= DROP TABLE multi_drop_clause",
+ /*  99 */ "cmd ::= DROP STABLE exists_opt full_table_name",
+ /* 100 */ "cmd ::= ALTER TABLE alter_table_clause",
+ /* 101 */ "cmd ::= ALTER STABLE alter_table_clause",
+ /* 102 */ "alter_table_clause ::= full_table_name alter_table_options",
+ /* 103 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name",
+ /* 104 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name",
+ /* 105 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name",
+ /* 106 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name",
+ /* 107 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name",
+ /* 108 */ "alter_table_clause ::= full_table_name DROP TAG column_name",
+ /* 109 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name",
+ /* 110 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name",
+ /* 111 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal",
+ /* 112 */ "multi_create_clause ::= create_subtable_clause",
+ /* 113 */ "multi_create_clause ::= multi_create_clause create_subtable_clause",
+ /* 114 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP",
+ /* 115 */ "multi_drop_clause ::= drop_table_clause",
+ /* 116 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause",
+ /* 117 */ "drop_table_clause ::= exists_opt full_table_name",
+ /* 118 */ "specific_tags_opt ::=",
+ /* 119 */ "specific_tags_opt ::= NK_LP col_name_list NK_RP",
+ /* 120 */ "full_table_name ::= table_name",
+ /* 121 */ "full_table_name ::= db_name NK_DOT table_name",
+ /* 122 */ "column_def_list ::= column_def",
+ /* 123 */ "column_def_list ::= column_def_list NK_COMMA column_def",
+ /* 124 */ "column_def ::= column_name type_name",
+ /* 125 */ "column_def ::= column_name type_name COMMENT NK_STRING",
+ /* 126 */ "type_name ::= BOOL",
+ /* 127 */ "type_name ::= TINYINT",
+ /* 128 */ "type_name ::= SMALLINT",
+ /* 129 */ "type_name ::= INT",
+ /* 130 */ "type_name ::= INTEGER",
+ /* 131 */ "type_name ::= BIGINT",
+ /* 132 */ "type_name ::= FLOAT",
+ /* 133 */ "type_name ::= DOUBLE",
+ /* 134 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP",
+ /* 135 */ "type_name ::= TIMESTAMP",
+ /* 136 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP",
+ /* 137 */ "type_name ::= TINYINT UNSIGNED",
+ /* 138 */ "type_name ::= SMALLINT UNSIGNED",
+ /* 139 */ "type_name ::= INT UNSIGNED",
+ /* 140 */ "type_name ::= BIGINT UNSIGNED",
+ /* 141 */ "type_name ::= JSON",
+ /* 142 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP",
+ /* 143 */ "type_name ::= MEDIUMBLOB",
+ /* 144 */ "type_name ::= BLOB",
+ /* 145 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP",
+ /* 146 */ "type_name ::= DECIMAL",
+ /* 147 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP",
+ /* 148 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP",
+ /* 149 */ "tags_def_opt ::=",
+ /* 150 */ "tags_def_opt ::= tags_def",
+ /* 151 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP",
+ /* 152 */ "table_options ::=",
+ /* 153 */ "table_options ::= table_options COMMENT NK_STRING",
+ /* 154 */ "table_options ::= table_options KEEP integer_list",
+ /* 155 */ "table_options ::= table_options TTL NK_INTEGER",
+ /* 156 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP",
+ /* 157 */ "table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP",
+ /* 158 */ "table_options ::= table_options FILE_FACTOR NK_FLOAT",
+ /* 159 */ "table_options ::= table_options DELAY NK_INTEGER",
+ /* 160 */ "alter_table_options ::= alter_table_option",
+ /* 161 */ "alter_table_options ::= alter_table_options alter_table_option",
+ /* 162 */ "alter_table_option ::= COMMENT NK_STRING",
+ /* 163 */ "alter_table_option ::= KEEP integer_list",
+ /* 164 */ "alter_table_option ::= TTL NK_INTEGER",
+ /* 165 */ "col_name_list ::= col_name",
+ /* 166 */ "col_name_list ::= col_name_list NK_COMMA col_name",
+ /* 167 */ "col_name ::= column_name",
+ /* 168 */ "cmd ::= SHOW DNODES",
+ /* 169 */ "cmd ::= SHOW USERS",
+ /* 170 */ "cmd ::= SHOW DATABASES",
+ /* 171 */ "cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt",
+ /* 172 */ "cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt",
+ /* 173 */ "cmd ::= SHOW db_name_cond_opt VGROUPS",
+ /* 174 */ "cmd ::= SHOW MNODES",
+ /* 175 */ "cmd ::= SHOW MODULES",
+ /* 176 */ "cmd ::= SHOW QNODES",
+ /* 177 */ "cmd ::= SHOW FUNCTIONS",
+ /* 178 */ "cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt",
+ /* 179 */ "cmd ::= SHOW STREAMS",
+ /* 180 */ "cmd ::= SHOW ACCOUNTS",
+ /* 181 */ "cmd ::= SHOW APPS",
+ /* 182 */ "cmd ::= SHOW CONNECTIONS",
+ /* 183 */ "cmd ::= SHOW LICENCE",
+ /* 184 */ "cmd ::= SHOW CREATE DATABASE db_name",
+ /* 185 */ "cmd ::= SHOW CREATE TABLE full_table_name",
+ /* 186 */ "cmd ::= SHOW CREATE STABLE full_table_name",
+ /* 187 */ "cmd ::= SHOW QUERIES",
+ /* 188 */ "cmd ::= SHOW SCORES",
+ /* 189 */ "cmd ::= SHOW TOPICS",
+ /* 190 */ "cmd ::= SHOW VARIABLES",
+ /* 191 */ "cmd ::= SHOW BNODES",
+ /* 192 */ "cmd ::= SHOW SNODES",
+ /* 193 */ "db_name_cond_opt ::=",
+ /* 194 */ "db_name_cond_opt ::= db_name NK_DOT",
+ /* 195 */ "like_pattern_opt ::=",
+ /* 196 */ "like_pattern_opt ::= LIKE NK_STRING",
+ /* 197 */ "table_name_cond ::= table_name",
+ /* 198 */ "from_db_opt ::=",
+ /* 199 */ "from_db_opt ::= FROM db_name",
+ /* 200 */ "func_name_list ::= func_name",
+ /* 201 */ "func_name_list ::= func_name_list NK_COMMA col_name",
+ /* 202 */ "func_name ::= function_name",
+ /* 203 */ "cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options",
+ /* 204 */ "cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP",
+ /* 205 */ "cmd ::= DROP INDEX exists_opt index_name ON table_name",
+ /* 206 */ "index_options ::=",
+ /* 207 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt",
+ /* 208 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt",
+ /* 209 */ "func_list ::= func",
+ /* 210 */ "func_list ::= func_list NK_COMMA func",
+ /* 211 */ "func ::= function_name NK_LP expression_list NK_RP",
+ /* 212 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression",
+ /* 213 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name",
+ /* 214 */ "cmd ::= DROP TOPIC exists_opt topic_name",
+ /* 215 */ "cmd ::= DESC full_table_name",
+ /* 216 */ "cmd ::= DESCRIBE full_table_name",
+ /* 217 */ "cmd ::= RESET QUERY CACHE",
+ /* 218 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression",
+ /* 219 */ "analyze_opt ::=",
+ /* 220 */ "analyze_opt ::= ANALYZE",
+ /* 221 */ "explain_options ::=",
+ /* 222 */ "explain_options ::= explain_options VERBOSE NK_BOOL",
+ /* 223 */ "explain_options ::= explain_options RATIO NK_FLOAT",
+ /* 224 */ "cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP",
+ /* 225 */ "cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt",
+ /* 226 */ "cmd ::= DROP FUNCTION function_name",
+ /* 227 */ "agg_func_opt ::=",
+ /* 228 */ "agg_func_opt ::= AGGREGATE",
+ /* 229 */ "bufsize_opt ::=",
+ /* 230 */ "bufsize_opt ::= BUFSIZE NK_INTEGER",
+ /* 231 */ "cmd ::= CREATE STREAM stream_name INTO table_name AS query_expression",
+ /* 232 */ "cmd ::= DROP STREAM stream_name",
+ /* 233 */ "cmd ::= KILL CONNECTION NK_INTEGER",
+ /* 234 */ "cmd ::= KILL QUERY NK_INTEGER",
+ /* 235 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER",
+ /* 236 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list",
+ /* 237 */ "cmd ::= SPLIT VGROUP NK_INTEGER",
+ /* 238 */ "dnode_list ::= DNODE NK_INTEGER",
+ /* 239 */ "dnode_list ::= dnode_list DNODE NK_INTEGER",
+ /* 240 */ "cmd ::= SYNCDB db_name REPLICA",
+ /* 241 */ "cmd ::= query_expression",
+ /* 242 */ "literal ::= NK_INTEGER",
+ /* 243 */ "literal ::= NK_FLOAT",
+ /* 244 */ "literal ::= NK_STRING",
+ /* 245 */ "literal ::= NK_BOOL",
+ /* 246 */ "literal ::= TIMESTAMP NK_STRING",
+ /* 247 */ "literal ::= duration_literal",
+ /* 248 */ "literal ::= NULL",
+ /* 249 */ "duration_literal ::= NK_VARIABLE",
+ /* 250 */ "signed ::= NK_INTEGER",
+ /* 251 */ "signed ::= NK_PLUS NK_INTEGER",
+ /* 252 */ "signed ::= NK_MINUS NK_INTEGER",
+ /* 253 */ "signed ::= NK_FLOAT",
+ /* 254 */ "signed ::= NK_PLUS NK_FLOAT",
+ /* 255 */ "signed ::= NK_MINUS NK_FLOAT",
+ /* 256 */ "signed_literal ::= signed",
+ /* 257 */ "signed_literal ::= NK_STRING",
+ /* 258 */ "signed_literal ::= NK_BOOL",
+ /* 259 */ "signed_literal ::= TIMESTAMP NK_STRING",
+ /* 260 */ "signed_literal ::= duration_literal",
+ /* 261 */ "signed_literal ::= NULL",
+ /* 262 */ "literal_list ::= signed_literal",
+ /* 263 */ "literal_list ::= literal_list NK_COMMA signed_literal",
+ /* 264 */ "db_name ::= NK_ID",
+ /* 265 */ "table_name ::= NK_ID",
+ /* 266 */ "column_name ::= NK_ID",
+ /* 267 */ "function_name ::= NK_ID",
+ /* 268 */ "function_name ::= FIRST",
+ /* 269 */ "function_name ::= LAST",
+ /* 270 */ "table_alias ::= NK_ID",
+ /* 271 */ "column_alias ::= NK_ID",
+ /* 272 */ "user_name ::= NK_ID",
+ /* 273 */ "index_name ::= NK_ID",
+ /* 274 */ "topic_name ::= NK_ID",
+ /* 275 */ "stream_name ::= NK_ID",
+ /* 276 */ "expression ::= literal",
+ /* 277 */ "expression ::= pseudo_column",
+ /* 278 */ "expression ::= column_reference",
+ /* 279 */ "expression ::= function_name NK_LP expression_list NK_RP",
+ /* 280 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
+ /* 281 */ "expression ::= subquery",
+ /* 282 */ "expression ::= NK_LP expression NK_RP",
+ /* 283 */ "expression ::= NK_PLUS expression",
+ /* 284 */ "expression ::= NK_MINUS expression",
+ /* 285 */ "expression ::= expression NK_PLUS expression",
+ /* 286 */ "expression ::= expression NK_MINUS expression",
+ /* 287 */ "expression ::= expression NK_STAR expression",
+ /* 288 */ "expression ::= expression NK_SLASH expression",
+ /* 289 */ "expression ::= expression NK_REM expression",
+ /* 290 */ "expression_list ::= expression",
+ /* 291 */ "expression_list ::= expression_list NK_COMMA expression",
+ /* 292 */ "column_reference ::= column_name",
+ /* 293 */ "column_reference ::= table_name NK_DOT column_name",
+ /* 294 */ "pseudo_column ::= NOW",
+ /* 295 */ "pseudo_column ::= ROWTS",
+ /* 296 */ "pseudo_column ::= TBNAME",
+ /* 297 */ "pseudo_column ::= QSTARTTS",
+ /* 298 */ "pseudo_column ::= QENDTS",
+ /* 299 */ "pseudo_column ::= WSTARTTS",
+ /* 300 */ "pseudo_column ::= WENDTS",
+ /* 301 */ "pseudo_column ::= WDURATION",
+ /* 302 */ "predicate ::= expression compare_op expression",
+ /* 303 */ "predicate ::= expression BETWEEN expression AND expression",
+ /* 304 */ "predicate ::= expression NOT BETWEEN expression AND expression",
+ /* 305 */ "predicate ::= expression IS NULL",
+ /* 306 */ "predicate ::= expression IS NOT NULL",
+ /* 307 */ "predicate ::= expression in_op in_predicate_value",
+ /* 308 */ "compare_op ::= NK_LT",
+ /* 309 */ "compare_op ::= NK_GT",
+ /* 310 */ "compare_op ::= NK_LE",
+ /* 311 */ "compare_op ::= NK_GE",
+ /* 312 */ "compare_op ::= NK_NE",
+ /* 313 */ "compare_op ::= NK_EQ",
+ /* 314 */ "compare_op ::= LIKE",
+ /* 315 */ "compare_op ::= NOT LIKE",
+ /* 316 */ "compare_op ::= MATCH",
+ /* 317 */ "compare_op ::= NMATCH",
+ /* 318 */ "in_op ::= IN",
+ /* 319 */ "in_op ::= NOT IN",
+ /* 320 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
+ /* 321 */ "boolean_value_expression ::= boolean_primary",
+ /* 322 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 323 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 324 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 325 */ "boolean_primary ::= predicate",
+ /* 326 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 327 */ "common_expression ::= expression",
+ /* 328 */ "common_expression ::= boolean_value_expression",
+ /* 329 */ "from_clause ::= FROM table_reference_list",
+ /* 330 */ "table_reference_list ::= table_reference",
+ /* 331 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 332 */ "table_reference ::= table_primary",
+ /* 333 */ "table_reference ::= joined_table",
+ /* 334 */ "table_primary ::= table_name alias_opt",
+ /* 335 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 336 */ "table_primary ::= subquery alias_opt",
+ /* 337 */ "table_primary ::= parenthesized_joined_table",
+ /* 338 */ "alias_opt ::=",
+ /* 339 */ "alias_opt ::= table_alias",
+ /* 340 */ "alias_opt ::= AS table_alias",
+ /* 341 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 342 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 343 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 344 */ "join_type ::=",
+ /* 345 */ "join_type ::= INNER",
+ /* 346 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
+ /* 347 */ "set_quantifier_opt ::=",
+ /* 348 */ "set_quantifier_opt ::= DISTINCT",
+ /* 349 */ "set_quantifier_opt ::= ALL",
+ /* 350 */ "select_list ::= NK_STAR",
+ /* 351 */ "select_list ::= select_sublist",
+ /* 352 */ "select_sublist ::= select_item",
+ /* 353 */ "select_sublist ::= select_sublist NK_COMMA select_item",
+ /* 354 */ "select_item ::= common_expression",
+ /* 355 */ "select_item ::= common_expression column_alias",
+ /* 356 */ "select_item ::= common_expression AS column_alias",
+ /* 357 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 358 */ "where_clause_opt ::=",
+ /* 359 */ "where_clause_opt ::= WHERE search_condition",
+ /* 360 */ "partition_by_clause_opt ::=",
+ /* 361 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
+ /* 362 */ "twindow_clause_opt ::=",
+ /* 363 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
+ /* 364 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP",
+ /* 365 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
+ /* 366 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
+ /* 367 */ "sliding_opt ::=",
+ /* 368 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
+ /* 369 */ "fill_opt ::=",
+ /* 370 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 371 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
+ /* 372 */ "fill_mode ::= NONE",
+ /* 373 */ "fill_mode ::= PREV",
+ /* 374 */ "fill_mode ::= NULL",
+ /* 375 */ "fill_mode ::= LINEAR",
+ /* 376 */ "fill_mode ::= NEXT",
+ /* 377 */ "group_by_clause_opt ::=",
+ /* 378 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 379 */ "group_by_list ::= expression",
+ /* 380 */ "group_by_list ::= group_by_list NK_COMMA expression",
+ /* 381 */ "having_clause_opt ::=",
+ /* 382 */ "having_clause_opt ::= HAVING search_condition",
+ /* 383 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 384 */ "query_expression_body ::= query_primary",
+ /* 385 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
+ /* 386 */ "query_primary ::= query_specification",
+ /* 387 */ "order_by_clause_opt ::=",
+ /* 388 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 389 */ "slimit_clause_opt ::=",
+ /* 390 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 391 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 392 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 393 */ "limit_clause_opt ::=",
+ /* 394 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 395 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 396 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 397 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 398 */ "search_condition ::= common_expression",
+ /* 399 */ "sort_specification_list ::= sort_specification",
+ /* 400 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 401 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
+ /* 402 */ "ordering_specification_opt ::=",
+ /* 403 */ "ordering_specification_opt ::= ASC",
+ /* 404 */ "ordering_specification_opt ::= DESC",
+ /* 405 */ "null_ordering_opt ::=",
+ /* 406 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 407 */ "null_ordering_opt ::= NULLS LAST",
 };
 #endif /* NDEBUG */
 
@@ -1616,156 +1643,156 @@ static void yy_destructor(
     */
 /********* Begin destructor definitions ***************************************/
       /* Default NON-TERMINAL Destructor */
-    case 202: /* cmd */
-    case 205: /* literal */
-    case 212: /* db_options */
-    case 214: /* alter_db_options */
-    case 219: /* retention */
-    case 220: /* full_table_name */
-    case 223: /* table_options */
-    case 227: /* alter_table_clause */
-    case 228: /* alter_table_options */
-    case 231: /* create_subtable_clause */
-    case 234: /* drop_table_clause */
-    case 237: /* column_def */
-    case 240: /* col_name */
-    case 241: /* db_name_cond_opt */
-    case 242: /* like_pattern_opt */
-    case 243: /* table_name_cond */
-    case 244: /* from_db_opt */
-    case 245: /* func_name */
-    case 248: /* index_options */
-    case 250: /* duration_literal */
-    case 251: /* sliding_opt */
-    case 252: /* func */
-    case 255: /* query_expression */
-    case 257: /* explain_options */
-    case 262: /* signed */
-    case 263: /* signed_literal */
-    case 266: /* expression */
-    case 267: /* pseudo_column */
-    case 268: /* column_reference */
-    case 269: /* subquery */
-    case 270: /* predicate */
-    case 273: /* in_predicate_value */
-    case 274: /* boolean_value_expression */
-    case 275: /* boolean_primary */
-    case 276: /* common_expression */
-    case 277: /* from_clause */
-    case 278: /* table_reference_list */
-    case 279: /* table_reference */
-    case 280: /* table_primary */
-    case 281: /* joined_table */
-    case 283: /* parenthesized_joined_table */
-    case 285: /* search_condition */
-    case 286: /* query_specification */
-    case 289: /* where_clause_opt */
-    case 291: /* twindow_clause_opt */
-    case 293: /* having_clause_opt */
-    case 295: /* select_item */
-    case 296: /* fill_opt */
-    case 299: /* query_expression_body */
-    case 301: /* slimit_clause_opt */
-    case 302: /* limit_clause_opt */
-    case 303: /* query_primary */
-    case 305: /* sort_specification */
+    case 207: /* cmd */
+    case 210: /* literal */
+    case 217: /* db_options */
+    case 219: /* alter_db_options */
+    case 224: /* retention */
+    case 225: /* full_table_name */
+    case 228: /* table_options */
+    case 232: /* alter_table_clause */
+    case 233: /* alter_table_options */
+    case 236: /* create_subtable_clause */
+    case 239: /* drop_table_clause */
+    case 242: /* column_def */
+    case 245: /* col_name */
+    case 246: /* db_name_cond_opt */
+    case 247: /* like_pattern_opt */
+    case 248: /* table_name_cond */
+    case 249: /* from_db_opt */
+    case 250: /* func_name */
+    case 253: /* index_options */
+    case 255: /* duration_literal */
+    case 256: /* sliding_opt */
+    case 257: /* func */
+    case 260: /* query_expression */
+    case 262: /* explain_options */
+    case 267: /* signed */
+    case 268: /* signed_literal */
+    case 271: /* expression */
+    case 272: /* pseudo_column */
+    case 273: /* column_reference */
+    case 274: /* subquery */
+    case 275: /* predicate */
+    case 278: /* in_predicate_value */
+    case 279: /* boolean_value_expression */
+    case 280: /* boolean_primary */
+    case 281: /* common_expression */
+    case 282: /* from_clause */
+    case 283: /* table_reference_list */
+    case 284: /* table_reference */
+    case 285: /* table_primary */
+    case 286: /* joined_table */
+    case 288: /* parenthesized_joined_table */
+    case 290: /* search_condition */
+    case 291: /* query_specification */
+    case 294: /* where_clause_opt */
+    case 296: /* twindow_clause_opt */
+    case 298: /* having_clause_opt */
+    case 300: /* select_item */
+    case 301: /* fill_opt */
+    case 304: /* query_expression_body */
+    case 306: /* slimit_clause_opt */
+    case 307: /* limit_clause_opt */
+    case 308: /* query_primary */
+    case 310: /* sort_specification */
 {
- nodesDestroyNode((yypminor->yy168)); 
+ nodesDestroyNode((yypminor->yy564)); 
 }
       break;
-    case 203: /* account_options */
-    case 204: /* alter_account_options */
-    case 206: /* alter_account_option */
-    case 259: /* bufsize_opt */
+    case 208: /* account_options */
+    case 209: /* alter_account_options */
+    case 211: /* alter_account_option */
+    case 264: /* bufsize_opt */
 {
  
 }
       break;
-    case 207: /* user_name */
-    case 208: /* dnode_endpoint */
-    case 209: /* dnode_host_name */
-    case 211: /* db_name */
-    case 229: /* column_name */
-    case 236: /* table_name */
-    case 246: /* function_name */
-    case 247: /* index_name */
-    case 254: /* topic_name */
-    case 260: /* stream_name */
-    case 264: /* table_alias */
-    case 265: /* column_alias */
-    case 282: /* alias_opt */
+    case 212: /* user_name */
+    case 213: /* dnode_endpoint */
+    case 214: /* dnode_host_name */
+    case 216: /* db_name */
+    case 234: /* column_name */
+    case 241: /* table_name */
+    case 251: /* function_name */
+    case 252: /* index_name */
+    case 259: /* topic_name */
+    case 265: /* stream_name */
+    case 269: /* table_alias */
+    case 270: /* column_alias */
+    case 287: /* alias_opt */
 {
  
 }
       break;
-    case 210: /* not_exists_opt */
-    case 213: /* exists_opt */
-    case 256: /* analyze_opt */
-    case 258: /* agg_func_opt */
-    case 287: /* set_quantifier_opt */
+    case 215: /* not_exists_opt */
+    case 218: /* exists_opt */
+    case 261: /* analyze_opt */
+    case 263: /* agg_func_opt */
+    case 292: /* set_quantifier_opt */
 {
  
 }
       break;
-    case 215: /* integer_list */
-    case 216: /* variable_list */
-    case 217: /* retention_list */
-    case 221: /* column_def_list */
-    case 222: /* tags_def_opt */
-    case 224: /* multi_create_clause */
-    case 225: /* tags_def */
-    case 226: /* multi_drop_clause */
-    case 232: /* specific_tags_opt */
-    case 233: /* literal_list */
-    case 235: /* col_name_list */
-    case 238: /* func_name_list */
-    case 249: /* func_list */
-    case 253: /* expression_list */
-    case 261: /* dnode_list */
-    case 288: /* select_list */
-    case 290: /* partition_by_clause_opt */
-    case 292: /* group_by_clause_opt */
-    case 294: /* select_sublist */
-    case 298: /* group_by_list */
-    case 300: /* order_by_clause_opt */
-    case 304: /* sort_specification_list */
+    case 220: /* integer_list */
+    case 221: /* variable_list */
+    case 222: /* retention_list */
+    case 226: /* column_def_list */
+    case 227: /* tags_def_opt */
+    case 229: /* multi_create_clause */
+    case 230: /* tags_def */
+    case 231: /* multi_drop_clause */
+    case 237: /* specific_tags_opt */
+    case 238: /* literal_list */
+    case 240: /* col_name_list */
+    case 243: /* func_name_list */
+    case 254: /* func_list */
+    case 258: /* expression_list */
+    case 266: /* dnode_list */
+    case 293: /* select_list */
+    case 295: /* partition_by_clause_opt */
+    case 297: /* group_by_clause_opt */
+    case 299: /* select_sublist */
+    case 303: /* group_by_list */
+    case 305: /* order_by_clause_opt */
+    case 309: /* sort_specification_list */
 {
- nodesDestroyList((yypminor->yy376)); 
+ nodesDestroyList((yypminor->yy476)); 
 }
       break;
-    case 218: /* alter_db_option */
-    case 239: /* alter_table_option */
+    case 223: /* alter_db_option */
+    case 244: /* alter_table_option */
 {
  
 }
       break;
-    case 230: /* type_name */
+    case 235: /* type_name */
 {
  
 }
       break;
-    case 271: /* compare_op */
-    case 272: /* in_op */
+    case 276: /* compare_op */
+    case 277: /* in_op */
 {
  
 }
       break;
-    case 284: /* join_type */
+    case 289: /* join_type */
 {
  
 }
       break;
-    case 297: /* fill_mode */
+    case 302: /* fill_mode */
 {
  
 }
       break;
-    case 306: /* ordering_specification_opt */
+    case 311: /* ordering_specification_opt */
 {
  
 }
       break;
-    case 307: /* null_ordering_opt */
+    case 312: /* null_ordering_opt */
 {
  
 }
@@ -2064,406 +2091,414 @@ static const struct {
   YYCODETYPE lhs;       /* Symbol on the left-hand side of the rule */
   signed char nrhs;     /* Negative of the number of RHS symbols in the rule */
 } yyRuleInfo[] = {
-  {  202,   -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
-  {  202,   -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
-  {  203,    0 }, /* (2) account_options ::= */
-  {  203,   -3 }, /* (3) account_options ::= account_options PPS literal */
-  {  203,   -3 }, /* (4) account_options ::= account_options TSERIES literal */
-  {  203,   -3 }, /* (5) account_options ::= account_options STORAGE literal */
-  {  203,   -3 }, /* (6) account_options ::= account_options STREAMS literal */
-  {  203,   -3 }, /* (7) account_options ::= account_options QTIME literal */
-  {  203,   -3 }, /* (8) account_options ::= account_options DBS literal */
-  {  203,   -3 }, /* (9) account_options ::= account_options USERS literal */
-  {  203,   -3 }, /* (10) account_options ::= account_options CONNS literal */
-  {  203,   -3 }, /* (11) account_options ::= account_options STATE literal */
-  {  204,   -1 }, /* (12) alter_account_options ::= alter_account_option */
-  {  204,   -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
-  {  206,   -2 }, /* (14) alter_account_option ::= PASS literal */
-  {  206,   -2 }, /* (15) alter_account_option ::= PPS literal */
-  {  206,   -2 }, /* (16) alter_account_option ::= TSERIES literal */
-  {  206,   -2 }, /* (17) alter_account_option ::= STORAGE literal */
-  {  206,   -2 }, /* (18) alter_account_option ::= STREAMS literal */
-  {  206,   -2 }, /* (19) alter_account_option ::= QTIME literal */
-  {  206,   -2 }, /* (20) alter_account_option ::= DBS literal */
-  {  206,   -2 }, /* (21) alter_account_option ::= USERS literal */
-  {  206,   -2 }, /* (22) alter_account_option ::= CONNS literal */
-  {  206,   -2 }, /* (23) alter_account_option ::= STATE literal */
-  {  202,   -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */
-  {  202,   -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
-  {  202,   -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
-  {  202,   -3 }, /* (27) cmd ::= DROP USER user_name */
-  {  202,   -3 }, /* (28) cmd ::= CREATE DNODE dnode_endpoint */
-  {  202,   -5 }, /* (29) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-  {  202,   -3 }, /* (30) cmd ::= DROP DNODE NK_INTEGER */
-  {  202,   -3 }, /* (31) cmd ::= DROP DNODE dnode_endpoint */
-  {  202,   -4 }, /* (32) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
-  {  202,   -5 }, /* (33) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
-  {  202,   -4 }, /* (34) cmd ::= ALTER ALL DNODES NK_STRING */
-  {  202,   -5 }, /* (35) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
-  {  208,   -1 }, /* (36) dnode_endpoint ::= NK_STRING */
-  {  209,   -1 }, /* (37) dnode_host_name ::= NK_ID */
-  {  209,   -1 }, /* (38) dnode_host_name ::= NK_IPTOKEN */
-  {  202,   -3 }, /* (39) cmd ::= ALTER LOCAL NK_STRING */
-  {  202,   -4 }, /* (40) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
-  {  202,   -5 }, /* (41) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
-  {  202,   -5 }, /* (42) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
-  {  202,   -5 }, /* (43) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-  {  202,   -4 }, /* (44) cmd ::= DROP DATABASE exists_opt db_name */
-  {  202,   -2 }, /* (45) cmd ::= USE db_name */
-  {  202,   -4 }, /* (46) cmd ::= ALTER DATABASE db_name alter_db_options */
-  {  210,   -3 }, /* (47) not_exists_opt ::= IF NOT EXISTS */
-  {  210,    0 }, /* (48) not_exists_opt ::= */
-  {  213,   -2 }, /* (49) exists_opt ::= IF EXISTS */
-  {  213,    0 }, /* (50) exists_opt ::= */
-  {  212,    0 }, /* (51) db_options ::= */
-  {  212,   -3 }, /* (52) db_options ::= db_options BLOCKS NK_INTEGER */
-  {  212,   -3 }, /* (53) db_options ::= db_options CACHE NK_INTEGER */
-  {  212,   -3 }, /* (54) db_options ::= db_options CACHELAST NK_INTEGER */
-  {  212,   -3 }, /* (55) db_options ::= db_options COMP NK_INTEGER */
-  {  212,   -3 }, /* (56) db_options ::= db_options DAYS NK_INTEGER */
-  {  212,   -3 }, /* (57) db_options ::= db_options DAYS NK_VARIABLE */
-  {  212,   -3 }, /* (58) db_options ::= db_options FSYNC NK_INTEGER */
-  {  212,   -3 }, /* (59) db_options ::= db_options MAXROWS NK_INTEGER */
-  {  212,   -3 }, /* (60) db_options ::= db_options MINROWS NK_INTEGER */
-  {  212,   -3 }, /* (61) db_options ::= db_options KEEP integer_list */
-  {  212,   -3 }, /* (62) db_options ::= db_options KEEP variable_list */
-  {  212,   -3 }, /* (63) db_options ::= db_options PRECISION NK_STRING */
-  {  212,   -3 }, /* (64) db_options ::= db_options QUORUM NK_INTEGER */
-  {  212,   -3 }, /* (65) db_options ::= db_options REPLICA NK_INTEGER */
-  {  212,   -3 }, /* (66) db_options ::= db_options TTL NK_INTEGER */
-  {  212,   -3 }, /* (67) db_options ::= db_options WAL NK_INTEGER */
-  {  212,   -3 }, /* (68) db_options ::= db_options VGROUPS NK_INTEGER */
-  {  212,   -3 }, /* (69) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-  {  212,   -3 }, /* (70) db_options ::= db_options STREAM_MODE NK_INTEGER */
-  {  212,   -3 }, /* (71) db_options ::= db_options RETENTIONS retention_list */
-  {  214,   -1 }, /* (72) alter_db_options ::= alter_db_option */
-  {  214,   -2 }, /* (73) alter_db_options ::= alter_db_options alter_db_option */
-  {  218,   -2 }, /* (74) alter_db_option ::= BLOCKS NK_INTEGER */
-  {  218,   -2 }, /* (75) alter_db_option ::= FSYNC NK_INTEGER */
-  {  218,   -2 }, /* (76) alter_db_option ::= KEEP integer_list */
-  {  218,   -2 }, /* (77) alter_db_option ::= KEEP variable_list */
-  {  218,   -2 }, /* (78) alter_db_option ::= WAL NK_INTEGER */
-  {  218,   -2 }, /* (79) alter_db_option ::= QUORUM NK_INTEGER */
-  {  218,   -2 }, /* (80) alter_db_option ::= CACHELAST NK_INTEGER */
-  {  218,   -2 }, /* (81) alter_db_option ::= REPLICA NK_INTEGER */
-  {  215,   -1 }, /* (82) integer_list ::= NK_INTEGER */
-  {  215,   -3 }, /* (83) integer_list ::= integer_list NK_COMMA NK_INTEGER */
-  {  216,   -1 }, /* (84) variable_list ::= NK_VARIABLE */
-  {  216,   -3 }, /* (85) variable_list ::= variable_list NK_COMMA NK_VARIABLE */
-  {  217,   -1 }, /* (86) retention_list ::= retention */
-  {  217,   -3 }, /* (87) retention_list ::= retention_list NK_COMMA retention */
-  {  219,   -3 }, /* (88) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
-  {  202,   -9 }, /* (89) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
-  {  202,   -3 }, /* (90) cmd ::= CREATE TABLE multi_create_clause */
-  {  202,   -9 }, /* (91) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
-  {  202,   -3 }, /* (92) cmd ::= DROP TABLE multi_drop_clause */
-  {  202,   -4 }, /* (93) cmd ::= DROP STABLE exists_opt full_table_name */
-  {  202,   -3 }, /* (94) cmd ::= ALTER TABLE alter_table_clause */
-  {  202,   -3 }, /* (95) cmd ::= ALTER STABLE alter_table_clause */
-  {  227,   -2 }, /* (96) alter_table_clause ::= full_table_name alter_table_options */
-  {  227,   -5 }, /* (97) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-  {  227,   -4 }, /* (98) alter_table_clause ::= full_table_name DROP COLUMN column_name */
-  {  227,   -5 }, /* (99) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-  {  227,   -5 }, /* (100) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-  {  227,   -5 }, /* (101) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-  {  227,   -4 }, /* (102) alter_table_clause ::= full_table_name DROP TAG column_name */
-  {  227,   -5 }, /* (103) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-  {  227,   -5 }, /* (104) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-  {  227,   -6 }, /* (105) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
-  {  224,   -1 }, /* (106) multi_create_clause ::= create_subtable_clause */
-  {  224,   -2 }, /* (107) multi_create_clause ::= multi_create_clause create_subtable_clause */
-  {  231,   -9 }, /* (108) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-  {  226,   -1 }, /* (109) multi_drop_clause ::= drop_table_clause */
-  {  226,   -2 }, /* (110) multi_drop_clause ::= multi_drop_clause drop_table_clause */
-  {  234,   -2 }, /* (111) drop_table_clause ::= exists_opt full_table_name */
-  {  232,    0 }, /* (112) specific_tags_opt ::= */
-  {  232,   -3 }, /* (113) specific_tags_opt ::= NK_LP col_name_list NK_RP */
-  {  220,   -1 }, /* (114) full_table_name ::= table_name */
-  {  220,   -3 }, /* (115) full_table_name ::= db_name NK_DOT table_name */
-  {  221,   -1 }, /* (116) column_def_list ::= column_def */
-  {  221,   -3 }, /* (117) column_def_list ::= column_def_list NK_COMMA column_def */
-  {  237,   -2 }, /* (118) column_def ::= column_name type_name */
-  {  237,   -4 }, /* (119) column_def ::= column_name type_name COMMENT NK_STRING */
-  {  230,   -1 }, /* (120) type_name ::= BOOL */
-  {  230,   -1 }, /* (121) type_name ::= TINYINT */
-  {  230,   -1 }, /* (122) type_name ::= SMALLINT */
-  {  230,   -1 }, /* (123) type_name ::= INT */
-  {  230,   -1 }, /* (124) type_name ::= INTEGER */
-  {  230,   -1 }, /* (125) type_name ::= BIGINT */
-  {  230,   -1 }, /* (126) type_name ::= FLOAT */
-  {  230,   -1 }, /* (127) type_name ::= DOUBLE */
-  {  230,   -4 }, /* (128) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-  {  230,   -1 }, /* (129) type_name ::= TIMESTAMP */
-  {  230,   -4 }, /* (130) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-  {  230,   -2 }, /* (131) type_name ::= TINYINT UNSIGNED */
-  {  230,   -2 }, /* (132) type_name ::= SMALLINT UNSIGNED */
-  {  230,   -2 }, /* (133) type_name ::= INT UNSIGNED */
-  {  230,   -2 }, /* (134) type_name ::= BIGINT UNSIGNED */
-  {  230,   -1 }, /* (135) type_name ::= JSON */
-  {  230,   -4 }, /* (136) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-  {  230,   -1 }, /* (137) type_name ::= MEDIUMBLOB */
-  {  230,   -1 }, /* (138) type_name ::= BLOB */
-  {  230,   -4 }, /* (139) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-  {  230,   -1 }, /* (140) type_name ::= DECIMAL */
-  {  230,   -4 }, /* (141) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-  {  230,   -6 }, /* (142) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-  {  222,    0 }, /* (143) tags_def_opt ::= */
-  {  222,   -1 }, /* (144) tags_def_opt ::= tags_def */
-  {  225,   -4 }, /* (145) tags_def ::= TAGS NK_LP column_def_list NK_RP */
-  {  223,    0 }, /* (146) table_options ::= */
-  {  223,   -3 }, /* (147) table_options ::= table_options COMMENT NK_STRING */
-  {  223,   -3 }, /* (148) table_options ::= table_options KEEP integer_list */
-  {  223,   -3 }, /* (149) table_options ::= table_options TTL NK_INTEGER */
-  {  223,   -5 }, /* (150) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-  {  223,   -5 }, /* (151) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
-  {  223,   -3 }, /* (152) table_options ::= table_options FILE_FACTOR NK_FLOAT */
-  {  223,   -3 }, /* (153) table_options ::= table_options DELAY NK_INTEGER */
-  {  228,   -1 }, /* (154) alter_table_options ::= alter_table_option */
-  {  228,   -2 }, /* (155) alter_table_options ::= alter_table_options alter_table_option */
-  {  239,   -2 }, /* (156) alter_table_option ::= COMMENT NK_STRING */
-  {  239,   -2 }, /* (157) alter_table_option ::= KEEP integer_list */
-  {  239,   -2 }, /* (158) alter_table_option ::= TTL NK_INTEGER */
-  {  235,   -1 }, /* (159) col_name_list ::= col_name */
-  {  235,   -3 }, /* (160) col_name_list ::= col_name_list NK_COMMA col_name */
-  {  240,   -1 }, /* (161) col_name ::= column_name */
-  {  202,   -2 }, /* (162) cmd ::= SHOW DNODES */
-  {  202,   -2 }, /* (163) cmd ::= SHOW USERS */
-  {  202,   -2 }, /* (164) cmd ::= SHOW DATABASES */
-  {  202,   -4 }, /* (165) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-  {  202,   -4 }, /* (166) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-  {  202,   -3 }, /* (167) cmd ::= SHOW db_name_cond_opt VGROUPS */
-  {  202,   -2 }, /* (168) cmd ::= SHOW MNODES */
-  {  202,   -2 }, /* (169) cmd ::= SHOW MODULES */
-  {  202,   -2 }, /* (170) cmd ::= SHOW QNODES */
-  {  202,   -2 }, /* (171) cmd ::= SHOW FUNCTIONS */
-  {  202,   -5 }, /* (172) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-  {  202,   -2 }, /* (173) cmd ::= SHOW STREAMS */
-  {  202,   -2 }, /* (174) cmd ::= SHOW ACCOUNTS */
-  {  202,   -2 }, /* (175) cmd ::= SHOW APPS */
-  {  202,   -2 }, /* (176) cmd ::= SHOW CONNECTIONS */
-  {  202,   -2 }, /* (177) cmd ::= SHOW LICENCE */
-  {  202,   -4 }, /* (178) cmd ::= SHOW CREATE DATABASE db_name */
-  {  202,   -4 }, /* (179) cmd ::= SHOW CREATE TABLE full_table_name */
-  {  202,   -4 }, /* (180) cmd ::= SHOW CREATE STABLE full_table_name */
-  {  202,   -2 }, /* (181) cmd ::= SHOW QUERIES */
-  {  202,   -2 }, /* (182) cmd ::= SHOW SCORES */
-  {  202,   -2 }, /* (183) cmd ::= SHOW TOPICS */
-  {  202,   -2 }, /* (184) cmd ::= SHOW VARIABLES */
-  {  241,    0 }, /* (185) db_name_cond_opt ::= */
-  {  241,   -2 }, /* (186) db_name_cond_opt ::= db_name NK_DOT */
-  {  242,    0 }, /* (187) like_pattern_opt ::= */
-  {  242,   -2 }, /* (188) like_pattern_opt ::= LIKE NK_STRING */
-  {  243,   -1 }, /* (189) table_name_cond ::= table_name */
-  {  244,    0 }, /* (190) from_db_opt ::= */
-  {  244,   -2 }, /* (191) from_db_opt ::= FROM db_name */
-  {  238,   -1 }, /* (192) func_name_list ::= func_name */
-  {  238,   -3 }, /* (193) func_name_list ::= func_name_list NK_COMMA col_name */
-  {  245,   -1 }, /* (194) func_name ::= function_name */
-  {  202,   -8 }, /* (195) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
-  {  202,  -10 }, /* (196) cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
-  {  202,   -6 }, /* (197) cmd ::= DROP INDEX exists_opt index_name ON table_name */
-  {  248,    0 }, /* (198) index_options ::= */
-  {  248,   -9 }, /* (199) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-  {  248,  -11 }, /* (200) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
-  {  249,   -1 }, /* (201) func_list ::= func */
-  {  249,   -3 }, /* (202) func_list ::= func_list NK_COMMA func */
-  {  252,   -4 }, /* (203) func ::= function_name NK_LP expression_list NK_RP */
-  {  202,   -6 }, /* (204) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-  {  202,   -6 }, /* (205) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-  {  202,   -4 }, /* (206) cmd ::= DROP TOPIC exists_opt topic_name */
-  {  202,   -2 }, /* (207) cmd ::= DESC full_table_name */
-  {  202,   -2 }, /* (208) cmd ::= DESCRIBE full_table_name */
-  {  202,   -3 }, /* (209) cmd ::= RESET QUERY CACHE */
-  {  202,   -4 }, /* (210) cmd ::= EXPLAIN analyze_opt explain_options query_expression */
-  {  256,    0 }, /* (211) analyze_opt ::= */
-  {  256,   -1 }, /* (212) analyze_opt ::= ANALYZE */
-  {  257,    0 }, /* (213) explain_options ::= */
-  {  257,   -3 }, /* (214) explain_options ::= explain_options VERBOSE NK_BOOL */
-  {  257,   -3 }, /* (215) explain_options ::= explain_options RATIO NK_FLOAT */
-  {  202,   -6 }, /* (216) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
-  {  202,   -9 }, /* (217) cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
-  {  202,   -3 }, /* (218) cmd ::= DROP FUNCTION function_name */
-  {  258,    0 }, /* (219) agg_func_opt ::= */
-  {  258,   -1 }, /* (220) agg_func_opt ::= AGGREGATE */
-  {  259,    0 }, /* (221) bufsize_opt ::= */
-  {  259,   -2 }, /* (222) bufsize_opt ::= BUFSIZE NK_INTEGER */
-  {  202,   -7 }, /* (223) cmd ::= CREATE STREAM stream_name INTO table_name AS query_expression */
-  {  202,   -3 }, /* (224) cmd ::= DROP STREAM stream_name */
-  {  202,   -3 }, /* (225) cmd ::= KILL CONNECTION NK_INTEGER */
-  {  202,   -3 }, /* (226) cmd ::= KILL QUERY NK_INTEGER */
-  {  202,   -4 }, /* (227) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
-  {  202,   -4 }, /* (228) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
-  {  202,   -3 }, /* (229) cmd ::= SPLIT VGROUP NK_INTEGER */
-  {  261,   -2 }, /* (230) dnode_list ::= DNODE NK_INTEGER */
-  {  261,   -3 }, /* (231) dnode_list ::= dnode_list DNODE NK_INTEGER */
-  {  202,   -3 }, /* (232) cmd ::= SYNCDB db_name REPLICA */
-  {  202,   -1 }, /* (233) cmd ::= query_expression */
-  {  205,   -1 }, /* (234) literal ::= NK_INTEGER */
-  {  205,   -1 }, /* (235) literal ::= NK_FLOAT */
-  {  205,   -1 }, /* (236) literal ::= NK_STRING */
-  {  205,   -1 }, /* (237) literal ::= NK_BOOL */
-  {  205,   -2 }, /* (238) literal ::= TIMESTAMP NK_STRING */
-  {  205,   -1 }, /* (239) literal ::= duration_literal */
-  {  205,   -1 }, /* (240) literal ::= NULL */
-  {  250,   -1 }, /* (241) duration_literal ::= NK_VARIABLE */
-  {  262,   -1 }, /* (242) signed ::= NK_INTEGER */
-  {  262,   -2 }, /* (243) signed ::= NK_PLUS NK_INTEGER */
-  {  262,   -2 }, /* (244) signed ::= NK_MINUS NK_INTEGER */
-  {  262,   -1 }, /* (245) signed ::= NK_FLOAT */
-  {  262,   -2 }, /* (246) signed ::= NK_PLUS NK_FLOAT */
-  {  262,   -2 }, /* (247) signed ::= NK_MINUS NK_FLOAT */
-  {  263,   -1 }, /* (248) signed_literal ::= signed */
-  {  263,   -1 }, /* (249) signed_literal ::= NK_STRING */
-  {  263,   -1 }, /* (250) signed_literal ::= NK_BOOL */
-  {  263,   -2 }, /* (251) signed_literal ::= TIMESTAMP NK_STRING */
-  {  263,   -1 }, /* (252) signed_literal ::= duration_literal */
-  {  263,   -1 }, /* (253) signed_literal ::= NULL */
-  {  233,   -1 }, /* (254) literal_list ::= signed_literal */
-  {  233,   -3 }, /* (255) literal_list ::= literal_list NK_COMMA signed_literal */
-  {  211,   -1 }, /* (256) db_name ::= NK_ID */
-  {  236,   -1 }, /* (257) table_name ::= NK_ID */
-  {  229,   -1 }, /* (258) column_name ::= NK_ID */
-  {  246,   -1 }, /* (259) function_name ::= NK_ID */
-  {  246,   -1 }, /* (260) function_name ::= FIRST */
-  {  246,   -1 }, /* (261) function_name ::= LAST */
-  {  264,   -1 }, /* (262) table_alias ::= NK_ID */
-  {  265,   -1 }, /* (263) column_alias ::= NK_ID */
-  {  207,   -1 }, /* (264) user_name ::= NK_ID */
-  {  247,   -1 }, /* (265) index_name ::= NK_ID */
-  {  254,   -1 }, /* (266) topic_name ::= NK_ID */
-  {  260,   -1 }, /* (267) stream_name ::= NK_ID */
-  {  266,   -1 }, /* (268) expression ::= literal */
-  {  266,   -1 }, /* (269) expression ::= pseudo_column */
-  {  266,   -1 }, /* (270) expression ::= column_reference */
-  {  266,   -4 }, /* (271) expression ::= function_name NK_LP expression_list NK_RP */
-  {  266,   -4 }, /* (272) expression ::= function_name NK_LP NK_STAR NK_RP */
-  {  266,   -1 }, /* (273) expression ::= subquery */
-  {  266,   -3 }, /* (274) expression ::= NK_LP expression NK_RP */
-  {  266,   -2 }, /* (275) expression ::= NK_PLUS expression */
-  {  266,   -2 }, /* (276) expression ::= NK_MINUS expression */
-  {  266,   -3 }, /* (277) expression ::= expression NK_PLUS expression */
-  {  266,   -3 }, /* (278) expression ::= expression NK_MINUS expression */
-  {  266,   -3 }, /* (279) expression ::= expression NK_STAR expression */
-  {  266,   -3 }, /* (280) expression ::= expression NK_SLASH expression */
-  {  266,   -3 }, /* (281) expression ::= expression NK_REM expression */
-  {  253,   -1 }, /* (282) expression_list ::= expression */
-  {  253,   -3 }, /* (283) expression_list ::= expression_list NK_COMMA expression */
-  {  268,   -1 }, /* (284) column_reference ::= column_name */
-  {  268,   -3 }, /* (285) column_reference ::= table_name NK_DOT column_name */
-  {  267,   -1 }, /* (286) pseudo_column ::= NOW */
-  {  267,   -1 }, /* (287) pseudo_column ::= ROWTS */
-  {  267,   -1 }, /* (288) pseudo_column ::= TBNAME */
-  {  267,   -1 }, /* (289) pseudo_column ::= QSTARTTS */
-  {  267,   -1 }, /* (290) pseudo_column ::= QENDTS */
-  {  267,   -1 }, /* (291) pseudo_column ::= WSTARTTS */
-  {  267,   -1 }, /* (292) pseudo_column ::= WENDTS */
-  {  267,   -1 }, /* (293) pseudo_column ::= WDURATION */
-  {  270,   -3 }, /* (294) predicate ::= expression compare_op expression */
-  {  270,   -5 }, /* (295) predicate ::= expression BETWEEN expression AND expression */
-  {  270,   -6 }, /* (296) predicate ::= expression NOT BETWEEN expression AND expression */
-  {  270,   -3 }, /* (297) predicate ::= expression IS NULL */
-  {  270,   -4 }, /* (298) predicate ::= expression IS NOT NULL */
-  {  270,   -3 }, /* (299) predicate ::= expression in_op in_predicate_value */
-  {  271,   -1 }, /* (300) compare_op ::= NK_LT */
-  {  271,   -1 }, /* (301) compare_op ::= NK_GT */
-  {  271,   -1 }, /* (302) compare_op ::= NK_LE */
-  {  271,   -1 }, /* (303) compare_op ::= NK_GE */
-  {  271,   -1 }, /* (304) compare_op ::= NK_NE */
-  {  271,   -1 }, /* (305) compare_op ::= NK_EQ */
-  {  271,   -1 }, /* (306) compare_op ::= LIKE */
-  {  271,   -2 }, /* (307) compare_op ::= NOT LIKE */
-  {  271,   -1 }, /* (308) compare_op ::= MATCH */
-  {  271,   -1 }, /* (309) compare_op ::= NMATCH */
-  {  272,   -1 }, /* (310) in_op ::= IN */
-  {  272,   -2 }, /* (311) in_op ::= NOT IN */
-  {  273,   -3 }, /* (312) in_predicate_value ::= NK_LP expression_list NK_RP */
-  {  274,   -1 }, /* (313) boolean_value_expression ::= boolean_primary */
-  {  274,   -2 }, /* (314) boolean_value_expression ::= NOT boolean_primary */
-  {  274,   -3 }, /* (315) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-  {  274,   -3 }, /* (316) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-  {  275,   -1 }, /* (317) boolean_primary ::= predicate */
-  {  275,   -3 }, /* (318) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
-  {  276,   -1 }, /* (319) common_expression ::= expression */
-  {  276,   -1 }, /* (320) common_expression ::= boolean_value_expression */
-  {  277,   -2 }, /* (321) from_clause ::= FROM table_reference_list */
-  {  278,   -1 }, /* (322) table_reference_list ::= table_reference */
-  {  278,   -3 }, /* (323) table_reference_list ::= table_reference_list NK_COMMA table_reference */
-  {  279,   -1 }, /* (324) table_reference ::= table_primary */
-  {  279,   -1 }, /* (325) table_reference ::= joined_table */
-  {  280,   -2 }, /* (326) table_primary ::= table_name alias_opt */
-  {  280,   -4 }, /* (327) table_primary ::= db_name NK_DOT table_name alias_opt */
-  {  280,   -2 }, /* (328) table_primary ::= subquery alias_opt */
-  {  280,   -1 }, /* (329) table_primary ::= parenthesized_joined_table */
-  {  282,    0 }, /* (330) alias_opt ::= */
-  {  282,   -1 }, /* (331) alias_opt ::= table_alias */
-  {  282,   -2 }, /* (332) alias_opt ::= AS table_alias */
-  {  283,   -3 }, /* (333) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-  {  283,   -3 }, /* (334) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
-  {  281,   -6 }, /* (335) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-  {  284,    0 }, /* (336) join_type ::= */
-  {  284,   -1 }, /* (337) join_type ::= INNER */
-  {  286,   -9 }, /* (338) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
-  {  287,    0 }, /* (339) set_quantifier_opt ::= */
-  {  287,   -1 }, /* (340) set_quantifier_opt ::= DISTINCT */
-  {  287,   -1 }, /* (341) set_quantifier_opt ::= ALL */
-  {  288,   -1 }, /* (342) select_list ::= NK_STAR */
-  {  288,   -1 }, /* (343) select_list ::= select_sublist */
-  {  294,   -1 }, /* (344) select_sublist ::= select_item */
-  {  294,   -3 }, /* (345) select_sublist ::= select_sublist NK_COMMA select_item */
-  {  295,   -1 }, /* (346) select_item ::= common_expression */
-  {  295,   -2 }, /* (347) select_item ::= common_expression column_alias */
-  {  295,   -3 }, /* (348) select_item ::= common_expression AS column_alias */
-  {  295,   -3 }, /* (349) select_item ::= table_name NK_DOT NK_STAR */
-  {  289,    0 }, /* (350) where_clause_opt ::= */
-  {  289,   -2 }, /* (351) where_clause_opt ::= WHERE search_condition */
-  {  290,    0 }, /* (352) partition_by_clause_opt ::= */
-  {  290,   -3 }, /* (353) partition_by_clause_opt ::= PARTITION BY expression_list */
-  {  291,    0 }, /* (354) twindow_clause_opt ::= */
-  {  291,   -6 }, /* (355) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-  {  291,   -4 }, /* (356) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
-  {  291,   -6 }, /* (357) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-  {  291,   -8 }, /* (358) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-  {  251,    0 }, /* (359) sliding_opt ::= */
-  {  251,   -4 }, /* (360) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-  {  296,    0 }, /* (361) fill_opt ::= */
-  {  296,   -4 }, /* (362) fill_opt ::= FILL NK_LP fill_mode NK_RP */
-  {  296,   -6 }, /* (363) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-  {  297,   -1 }, /* (364) fill_mode ::= NONE */
-  {  297,   -1 }, /* (365) fill_mode ::= PREV */
-  {  297,   -1 }, /* (366) fill_mode ::= NULL */
-  {  297,   -1 }, /* (367) fill_mode ::= LINEAR */
-  {  297,   -1 }, /* (368) fill_mode ::= NEXT */
-  {  292,    0 }, /* (369) group_by_clause_opt ::= */
-  {  292,   -3 }, /* (370) group_by_clause_opt ::= GROUP BY group_by_list */
-  {  298,   -1 }, /* (371) group_by_list ::= expression */
-  {  298,   -3 }, /* (372) group_by_list ::= group_by_list NK_COMMA expression */
-  {  293,    0 }, /* (373) having_clause_opt ::= */
-  {  293,   -2 }, /* (374) having_clause_opt ::= HAVING search_condition */
-  {  255,   -4 }, /* (375) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
-  {  299,   -1 }, /* (376) query_expression_body ::= query_primary */
-  {  299,   -4 }, /* (377) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-  {  303,   -1 }, /* (378) query_primary ::= query_specification */
-  {  300,    0 }, /* (379) order_by_clause_opt ::= */
-  {  300,   -3 }, /* (380) order_by_clause_opt ::= ORDER BY sort_specification_list */
-  {  301,    0 }, /* (381) slimit_clause_opt ::= */
-  {  301,   -2 }, /* (382) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-  {  301,   -4 }, /* (383) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-  {  301,   -4 }, /* (384) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  302,    0 }, /* (385) limit_clause_opt ::= */
-  {  302,   -2 }, /* (386) limit_clause_opt ::= LIMIT NK_INTEGER */
-  {  302,   -4 }, /* (387) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-  {  302,   -4 }, /* (388) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  269,   -3 }, /* (389) subquery ::= NK_LP query_expression NK_RP */
-  {  285,   -1 }, /* (390) search_condition ::= common_expression */
-  {  304,   -1 }, /* (391) sort_specification_list ::= sort_specification */
-  {  304,   -3 }, /* (392) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-  {  305,   -3 }, /* (393) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-  {  306,    0 }, /* (394) ordering_specification_opt ::= */
-  {  306,   -1 }, /* (395) ordering_specification_opt ::= ASC */
-  {  306,   -1 }, /* (396) ordering_specification_opt ::= DESC */
-  {  307,    0 }, /* (397) null_ordering_opt ::= */
-  {  307,   -2 }, /* (398) null_ordering_opt ::= NULLS FIRST */
-  {  307,   -2 }, /* (399) null_ordering_opt ::= NULLS LAST */
+  {  207,   -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
+  {  207,   -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
+  {  208,    0 }, /* (2) account_options ::= */
+  {  208,   -3 }, /* (3) account_options ::= account_options PPS literal */
+  {  208,   -3 }, /* (4) account_options ::= account_options TSERIES literal */
+  {  208,   -3 }, /* (5) account_options ::= account_options STORAGE literal */
+  {  208,   -3 }, /* (6) account_options ::= account_options STREAMS literal */
+  {  208,   -3 }, /* (7) account_options ::= account_options QTIME literal */
+  {  208,   -3 }, /* (8) account_options ::= account_options DBS literal */
+  {  208,   -3 }, /* (9) account_options ::= account_options USERS literal */
+  {  208,   -3 }, /* (10) account_options ::= account_options CONNS literal */
+  {  208,   -3 }, /* (11) account_options ::= account_options STATE literal */
+  {  209,   -1 }, /* (12) alter_account_options ::= alter_account_option */
+  {  209,   -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
+  {  211,   -2 }, /* (14) alter_account_option ::= PASS literal */
+  {  211,   -2 }, /* (15) alter_account_option ::= PPS literal */
+  {  211,   -2 }, /* (16) alter_account_option ::= TSERIES literal */
+  {  211,   -2 }, /* (17) alter_account_option ::= STORAGE literal */
+  {  211,   -2 }, /* (18) alter_account_option ::= STREAMS literal */
+  {  211,   -2 }, /* (19) alter_account_option ::= QTIME literal */
+  {  211,   -2 }, /* (20) alter_account_option ::= DBS literal */
+  {  211,   -2 }, /* (21) alter_account_option ::= USERS literal */
+  {  211,   -2 }, /* (22) alter_account_option ::= CONNS literal */
+  {  211,   -2 }, /* (23) alter_account_option ::= STATE literal */
+  {  207,   -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */
+  {  207,   -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
+  {  207,   -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
+  {  207,   -3 }, /* (27) cmd ::= DROP USER user_name */
+  {  207,   -3 }, /* (28) cmd ::= CREATE DNODE dnode_endpoint */
+  {  207,   -5 }, /* (29) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
+  {  207,   -3 }, /* (30) cmd ::= DROP DNODE NK_INTEGER */
+  {  207,   -3 }, /* (31) cmd ::= DROP DNODE dnode_endpoint */
+  {  207,   -4 }, /* (32) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
+  {  207,   -5 }, /* (33) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
+  {  207,   -4 }, /* (34) cmd ::= ALTER ALL DNODES NK_STRING */
+  {  207,   -5 }, /* (35) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
+  {  213,   -1 }, /* (36) dnode_endpoint ::= NK_STRING */
+  {  214,   -1 }, /* (37) dnode_host_name ::= NK_ID */
+  {  214,   -1 }, /* (38) dnode_host_name ::= NK_IPTOKEN */
+  {  207,   -3 }, /* (39) cmd ::= ALTER LOCAL NK_STRING */
+  {  207,   -4 }, /* (40) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
+  {  207,   -5 }, /* (41) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (42) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (43) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (44) cmd ::= DROP BNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (45) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (46) cmd ::= DROP SNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (47) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (48) cmd ::= DROP MNODE ON DNODE NK_INTEGER */
+  {  207,   -5 }, /* (49) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
+  {  207,   -4 }, /* (50) cmd ::= DROP DATABASE exists_opt db_name */
+  {  207,   -2 }, /* (51) cmd ::= USE db_name */
+  {  207,   -4 }, /* (52) cmd ::= ALTER DATABASE db_name alter_db_options */
+  {  215,   -3 }, /* (53) not_exists_opt ::= IF NOT EXISTS */
+  {  215,    0 }, /* (54) not_exists_opt ::= */
+  {  218,   -2 }, /* (55) exists_opt ::= IF EXISTS */
+  {  218,    0 }, /* (56) exists_opt ::= */
+  {  217,    0 }, /* (57) db_options ::= */
+  {  217,   -3 }, /* (58) db_options ::= db_options BLOCKS NK_INTEGER */
+  {  217,   -3 }, /* (59) db_options ::= db_options CACHE NK_INTEGER */
+  {  217,   -3 }, /* (60) db_options ::= db_options CACHELAST NK_INTEGER */
+  {  217,   -3 }, /* (61) db_options ::= db_options COMP NK_INTEGER */
+  {  217,   -3 }, /* (62) db_options ::= db_options DAYS NK_INTEGER */
+  {  217,   -3 }, /* (63) db_options ::= db_options DAYS NK_VARIABLE */
+  {  217,   -3 }, /* (64) db_options ::= db_options FSYNC NK_INTEGER */
+  {  217,   -3 }, /* (65) db_options ::= db_options MAXROWS NK_INTEGER */
+  {  217,   -3 }, /* (66) db_options ::= db_options MINROWS NK_INTEGER */
+  {  217,   -3 }, /* (67) db_options ::= db_options KEEP integer_list */
+  {  217,   -3 }, /* (68) db_options ::= db_options KEEP variable_list */
+  {  217,   -3 }, /* (69) db_options ::= db_options PRECISION NK_STRING */
+  {  217,   -3 }, /* (70) db_options ::= db_options QUORUM NK_INTEGER */
+  {  217,   -3 }, /* (71) db_options ::= db_options REPLICA NK_INTEGER */
+  {  217,   -3 }, /* (72) db_options ::= db_options TTL NK_INTEGER */
+  {  217,   -3 }, /* (73) db_options ::= db_options WAL NK_INTEGER */
+  {  217,   -3 }, /* (74) db_options ::= db_options VGROUPS NK_INTEGER */
+  {  217,   -3 }, /* (75) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
+  {  217,   -3 }, /* (76) db_options ::= db_options STREAM_MODE NK_INTEGER */
+  {  217,   -3 }, /* (77) db_options ::= db_options RETENTIONS retention_list */
+  {  219,   -1 }, /* (78) alter_db_options ::= alter_db_option */
+  {  219,   -2 }, /* (79) alter_db_options ::= alter_db_options alter_db_option */
+  {  223,   -2 }, /* (80) alter_db_option ::= BLOCKS NK_INTEGER */
+  {  223,   -2 }, /* (81) alter_db_option ::= FSYNC NK_INTEGER */
+  {  223,   -2 }, /* (82) alter_db_option ::= KEEP integer_list */
+  {  223,   -2 }, /* (83) alter_db_option ::= KEEP variable_list */
+  {  223,   -2 }, /* (84) alter_db_option ::= WAL NK_INTEGER */
+  {  223,   -2 }, /* (85) alter_db_option ::= QUORUM NK_INTEGER */
+  {  223,   -2 }, /* (86) alter_db_option ::= CACHELAST NK_INTEGER */
+  {  223,   -2 }, /* (87) alter_db_option ::= REPLICA NK_INTEGER */
+  {  220,   -1 }, /* (88) integer_list ::= NK_INTEGER */
+  {  220,   -3 }, /* (89) integer_list ::= integer_list NK_COMMA NK_INTEGER */
+  {  221,   -1 }, /* (90) variable_list ::= NK_VARIABLE */
+  {  221,   -3 }, /* (91) variable_list ::= variable_list NK_COMMA NK_VARIABLE */
+  {  222,   -1 }, /* (92) retention_list ::= retention */
+  {  222,   -3 }, /* (93) retention_list ::= retention_list NK_COMMA retention */
+  {  224,   -3 }, /* (94) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
+  {  207,   -9 }, /* (95) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
+  {  207,   -3 }, /* (96) cmd ::= CREATE TABLE multi_create_clause */
+  {  207,   -9 }, /* (97) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
+  {  207,   -3 }, /* (98) cmd ::= DROP TABLE multi_drop_clause */
+  {  207,   -4 }, /* (99) cmd ::= DROP STABLE exists_opt full_table_name */
+  {  207,   -3 }, /* (100) cmd ::= ALTER TABLE alter_table_clause */
+  {  207,   -3 }, /* (101) cmd ::= ALTER STABLE alter_table_clause */
+  {  232,   -2 }, /* (102) alter_table_clause ::= full_table_name alter_table_options */
+  {  232,   -5 }, /* (103) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
+  {  232,   -4 }, /* (104) alter_table_clause ::= full_table_name DROP COLUMN column_name */
+  {  232,   -5 }, /* (105) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
+  {  232,   -5 }, /* (106) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
+  {  232,   -5 }, /* (107) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
+  {  232,   -4 }, /* (108) alter_table_clause ::= full_table_name DROP TAG column_name */
+  {  232,   -5 }, /* (109) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
+  {  232,   -5 }, /* (110) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
+  {  232,   -6 }, /* (111) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
+  {  229,   -1 }, /* (112) multi_create_clause ::= create_subtable_clause */
+  {  229,   -2 }, /* (113) multi_create_clause ::= multi_create_clause create_subtable_clause */
+  {  236,   -9 }, /* (114) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
+  {  231,   -1 }, /* (115) multi_drop_clause ::= drop_table_clause */
+  {  231,   -2 }, /* (116) multi_drop_clause ::= multi_drop_clause drop_table_clause */
+  {  239,   -2 }, /* (117) drop_table_clause ::= exists_opt full_table_name */
+  {  237,    0 }, /* (118) specific_tags_opt ::= */
+  {  237,   -3 }, /* (119) specific_tags_opt ::= NK_LP col_name_list NK_RP */
+  {  225,   -1 }, /* (120) full_table_name ::= table_name */
+  {  225,   -3 }, /* (121) full_table_name ::= db_name NK_DOT table_name */
+  {  226,   -1 }, /* (122) column_def_list ::= column_def */
+  {  226,   -3 }, /* (123) column_def_list ::= column_def_list NK_COMMA column_def */
+  {  242,   -2 }, /* (124) column_def ::= column_name type_name */
+  {  242,   -4 }, /* (125) column_def ::= column_name type_name COMMENT NK_STRING */
+  {  235,   -1 }, /* (126) type_name ::= BOOL */
+  {  235,   -1 }, /* (127) type_name ::= TINYINT */
+  {  235,   -1 }, /* (128) type_name ::= SMALLINT */
+  {  235,   -1 }, /* (129) type_name ::= INT */
+  {  235,   -1 }, /* (130) type_name ::= INTEGER */
+  {  235,   -1 }, /* (131) type_name ::= BIGINT */
+  {  235,   -1 }, /* (132) type_name ::= FLOAT */
+  {  235,   -1 }, /* (133) type_name ::= DOUBLE */
+  {  235,   -4 }, /* (134) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
+  {  235,   -1 }, /* (135) type_name ::= TIMESTAMP */
+  {  235,   -4 }, /* (136) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
+  {  235,   -2 }, /* (137) type_name ::= TINYINT UNSIGNED */
+  {  235,   -2 }, /* (138) type_name ::= SMALLINT UNSIGNED */
+  {  235,   -2 }, /* (139) type_name ::= INT UNSIGNED */
+  {  235,   -2 }, /* (140) type_name ::= BIGINT UNSIGNED */
+  {  235,   -1 }, /* (141) type_name ::= JSON */
+  {  235,   -4 }, /* (142) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
+  {  235,   -1 }, /* (143) type_name ::= MEDIUMBLOB */
+  {  235,   -1 }, /* (144) type_name ::= BLOB */
+  {  235,   -4 }, /* (145) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
+  {  235,   -1 }, /* (146) type_name ::= DECIMAL */
+  {  235,   -4 }, /* (147) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
+  {  235,   -6 }, /* (148) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+  {  227,    0 }, /* (149) tags_def_opt ::= */
+  {  227,   -1 }, /* (150) tags_def_opt ::= tags_def */
+  {  230,   -4 }, /* (151) tags_def ::= TAGS NK_LP column_def_list NK_RP */
+  {  228,    0 }, /* (152) table_options ::= */
+  {  228,   -3 }, /* (153) table_options ::= table_options COMMENT NK_STRING */
+  {  228,   -3 }, /* (154) table_options ::= table_options KEEP integer_list */
+  {  228,   -3 }, /* (155) table_options ::= table_options TTL NK_INTEGER */
+  {  228,   -5 }, /* (156) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
+  {  228,   -5 }, /* (157) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
+  {  228,   -3 }, /* (158) table_options ::= table_options FILE_FACTOR NK_FLOAT */
+  {  228,   -3 }, /* (159) table_options ::= table_options DELAY NK_INTEGER */
+  {  233,   -1 }, /* (160) alter_table_options ::= alter_table_option */
+  {  233,   -2 }, /* (161) alter_table_options ::= alter_table_options alter_table_option */
+  {  244,   -2 }, /* (162) alter_table_option ::= COMMENT NK_STRING */
+  {  244,   -2 }, /* (163) alter_table_option ::= KEEP integer_list */
+  {  244,   -2 }, /* (164) alter_table_option ::= TTL NK_INTEGER */
+  {  240,   -1 }, /* (165) col_name_list ::= col_name */
+  {  240,   -3 }, /* (166) col_name_list ::= col_name_list NK_COMMA col_name */
+  {  245,   -1 }, /* (167) col_name ::= column_name */
+  {  207,   -2 }, /* (168) cmd ::= SHOW DNODES */
+  {  207,   -2 }, /* (169) cmd ::= SHOW USERS */
+  {  207,   -2 }, /* (170) cmd ::= SHOW DATABASES */
+  {  207,   -4 }, /* (171) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
+  {  207,   -4 }, /* (172) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
+  {  207,   -3 }, /* (173) cmd ::= SHOW db_name_cond_opt VGROUPS */
+  {  207,   -2 }, /* (174) cmd ::= SHOW MNODES */
+  {  207,   -2 }, /* (175) cmd ::= SHOW MODULES */
+  {  207,   -2 }, /* (176) cmd ::= SHOW QNODES */
+  {  207,   -2 }, /* (177) cmd ::= SHOW FUNCTIONS */
+  {  207,   -5 }, /* (178) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
+  {  207,   -2 }, /* (179) cmd ::= SHOW STREAMS */
+  {  207,   -2 }, /* (180) cmd ::= SHOW ACCOUNTS */
+  {  207,   -2 }, /* (181) cmd ::= SHOW APPS */
+  {  207,   -2 }, /* (182) cmd ::= SHOW CONNECTIONS */
+  {  207,   -2 }, /* (183) cmd ::= SHOW LICENCE */
+  {  207,   -4 }, /* (184) cmd ::= SHOW CREATE DATABASE db_name */
+  {  207,   -4 }, /* (185) cmd ::= SHOW CREATE TABLE full_table_name */
+  {  207,   -4 }, /* (186) cmd ::= SHOW CREATE STABLE full_table_name */
+  {  207,   -2 }, /* (187) cmd ::= SHOW QUERIES */
+  {  207,   -2 }, /* (188) cmd ::= SHOW SCORES */
+  {  207,   -2 }, /* (189) cmd ::= SHOW TOPICS */
+  {  207,   -2 }, /* (190) cmd ::= SHOW VARIABLES */
+  {  207,   -2 }, /* (191) cmd ::= SHOW BNODES */
+  {  207,   -2 }, /* (192) cmd ::= SHOW SNODES */
+  {  246,    0 }, /* (193) db_name_cond_opt ::= */
+  {  246,   -2 }, /* (194) db_name_cond_opt ::= db_name NK_DOT */
+  {  247,    0 }, /* (195) like_pattern_opt ::= */
+  {  247,   -2 }, /* (196) like_pattern_opt ::= LIKE NK_STRING */
+  {  248,   -1 }, /* (197) table_name_cond ::= table_name */
+  {  249,    0 }, /* (198) from_db_opt ::= */
+  {  249,   -2 }, /* (199) from_db_opt ::= FROM db_name */
+  {  243,   -1 }, /* (200) func_name_list ::= func_name */
+  {  243,   -3 }, /* (201) func_name_list ::= func_name_list NK_COMMA col_name */
+  {  250,   -1 }, /* (202) func_name ::= function_name */
+  {  207,   -8 }, /* (203) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
+  {  207,  -10 }, /* (204) cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
+  {  207,   -6 }, /* (205) cmd ::= DROP INDEX exists_opt index_name ON table_name */
+  {  253,    0 }, /* (206) index_options ::= */
+  {  253,   -9 }, /* (207) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
+  {  253,  -11 }, /* (208) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
+  {  254,   -1 }, /* (209) func_list ::= func */
+  {  254,   -3 }, /* (210) func_list ::= func_list NK_COMMA func */
+  {  257,   -4 }, /* (211) func ::= function_name NK_LP expression_list NK_RP */
+  {  207,   -6 }, /* (212) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
+  {  207,   -6 }, /* (213) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
+  {  207,   -4 }, /* (214) cmd ::= DROP TOPIC exists_opt topic_name */
+  {  207,   -2 }, /* (215) cmd ::= DESC full_table_name */
+  {  207,   -2 }, /* (216) cmd ::= DESCRIBE full_table_name */
+  {  207,   -3 }, /* (217) cmd ::= RESET QUERY CACHE */
+  {  207,   -4 }, /* (218) cmd ::= EXPLAIN analyze_opt explain_options query_expression */
+  {  261,    0 }, /* (219) analyze_opt ::= */
+  {  261,   -1 }, /* (220) analyze_opt ::= ANALYZE */
+  {  262,    0 }, /* (221) explain_options ::= */
+  {  262,   -3 }, /* (222) explain_options ::= explain_options VERBOSE NK_BOOL */
+  {  262,   -3 }, /* (223) explain_options ::= explain_options RATIO NK_FLOAT */
+  {  207,   -6 }, /* (224) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
+  {  207,   -9 }, /* (225) cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
+  {  207,   -3 }, /* (226) cmd ::= DROP FUNCTION function_name */
+  {  263,    0 }, /* (227) agg_func_opt ::= */
+  {  263,   -1 }, /* (228) agg_func_opt ::= AGGREGATE */
+  {  264,    0 }, /* (229) bufsize_opt ::= */
+  {  264,   -2 }, /* (230) bufsize_opt ::= BUFSIZE NK_INTEGER */
+  {  207,   -7 }, /* (231) cmd ::= CREATE STREAM stream_name INTO table_name AS query_expression */
+  {  207,   -3 }, /* (232) cmd ::= DROP STREAM stream_name */
+  {  207,   -3 }, /* (233) cmd ::= KILL CONNECTION NK_INTEGER */
+  {  207,   -3 }, /* (234) cmd ::= KILL QUERY NK_INTEGER */
+  {  207,   -4 }, /* (235) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
+  {  207,   -4 }, /* (236) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
+  {  207,   -3 }, /* (237) cmd ::= SPLIT VGROUP NK_INTEGER */
+  {  266,   -2 }, /* (238) dnode_list ::= DNODE NK_INTEGER */
+  {  266,   -3 }, /* (239) dnode_list ::= dnode_list DNODE NK_INTEGER */
+  {  207,   -3 }, /* (240) cmd ::= SYNCDB db_name REPLICA */
+  {  207,   -1 }, /* (241) cmd ::= query_expression */
+  {  210,   -1 }, /* (242) literal ::= NK_INTEGER */
+  {  210,   -1 }, /* (243) literal ::= NK_FLOAT */
+  {  210,   -1 }, /* (244) literal ::= NK_STRING */
+  {  210,   -1 }, /* (245) literal ::= NK_BOOL */
+  {  210,   -2 }, /* (246) literal ::= TIMESTAMP NK_STRING */
+  {  210,   -1 }, /* (247) literal ::= duration_literal */
+  {  210,   -1 }, /* (248) literal ::= NULL */
+  {  255,   -1 }, /* (249) duration_literal ::= NK_VARIABLE */
+  {  267,   -1 }, /* (250) signed ::= NK_INTEGER */
+  {  267,   -2 }, /* (251) signed ::= NK_PLUS NK_INTEGER */
+  {  267,   -2 }, /* (252) signed ::= NK_MINUS NK_INTEGER */
+  {  267,   -1 }, /* (253) signed ::= NK_FLOAT */
+  {  267,   -2 }, /* (254) signed ::= NK_PLUS NK_FLOAT */
+  {  267,   -2 }, /* (255) signed ::= NK_MINUS NK_FLOAT */
+  {  268,   -1 }, /* (256) signed_literal ::= signed */
+  {  268,   -1 }, /* (257) signed_literal ::= NK_STRING */
+  {  268,   -1 }, /* (258) signed_literal ::= NK_BOOL */
+  {  268,   -2 }, /* (259) signed_literal ::= TIMESTAMP NK_STRING */
+  {  268,   -1 }, /* (260) signed_literal ::= duration_literal */
+  {  268,   -1 }, /* (261) signed_literal ::= NULL */
+  {  238,   -1 }, /* (262) literal_list ::= signed_literal */
+  {  238,   -3 }, /* (263) literal_list ::= literal_list NK_COMMA signed_literal */
+  {  216,   -1 }, /* (264) db_name ::= NK_ID */
+  {  241,   -1 }, /* (265) table_name ::= NK_ID */
+  {  234,   -1 }, /* (266) column_name ::= NK_ID */
+  {  251,   -1 }, /* (267) function_name ::= NK_ID */
+  {  251,   -1 }, /* (268) function_name ::= FIRST */
+  {  251,   -1 }, /* (269) function_name ::= LAST */
+  {  269,   -1 }, /* (270) table_alias ::= NK_ID */
+  {  270,   -1 }, /* (271) column_alias ::= NK_ID */
+  {  212,   -1 }, /* (272) user_name ::= NK_ID */
+  {  252,   -1 }, /* (273) index_name ::= NK_ID */
+  {  259,   -1 }, /* (274) topic_name ::= NK_ID */
+  {  265,   -1 }, /* (275) stream_name ::= NK_ID */
+  {  271,   -1 }, /* (276) expression ::= literal */
+  {  271,   -1 }, /* (277) expression ::= pseudo_column */
+  {  271,   -1 }, /* (278) expression ::= column_reference */
+  {  271,   -4 }, /* (279) expression ::= function_name NK_LP expression_list NK_RP */
+  {  271,   -4 }, /* (280) expression ::= function_name NK_LP NK_STAR NK_RP */
+  {  271,   -1 }, /* (281) expression ::= subquery */
+  {  271,   -3 }, /* (282) expression ::= NK_LP expression NK_RP */
+  {  271,   -2 }, /* (283) expression ::= NK_PLUS expression */
+  {  271,   -2 }, /* (284) expression ::= NK_MINUS expression */
+  {  271,   -3 }, /* (285) expression ::= expression NK_PLUS expression */
+  {  271,   -3 }, /* (286) expression ::= expression NK_MINUS expression */
+  {  271,   -3 }, /* (287) expression ::= expression NK_STAR expression */
+  {  271,   -3 }, /* (288) expression ::= expression NK_SLASH expression */
+  {  271,   -3 }, /* (289) expression ::= expression NK_REM expression */
+  {  258,   -1 }, /* (290) expression_list ::= expression */
+  {  258,   -3 }, /* (291) expression_list ::= expression_list NK_COMMA expression */
+  {  273,   -1 }, /* (292) column_reference ::= column_name */
+  {  273,   -3 }, /* (293) column_reference ::= table_name NK_DOT column_name */
+  {  272,   -1 }, /* (294) pseudo_column ::= NOW */
+  {  272,   -1 }, /* (295) pseudo_column ::= ROWTS */
+  {  272,   -1 }, /* (296) pseudo_column ::= TBNAME */
+  {  272,   -1 }, /* (297) pseudo_column ::= QSTARTTS */
+  {  272,   -1 }, /* (298) pseudo_column ::= QENDTS */
+  {  272,   -1 }, /* (299) pseudo_column ::= WSTARTTS */
+  {  272,   -1 }, /* (300) pseudo_column ::= WENDTS */
+  {  272,   -1 }, /* (301) pseudo_column ::= WDURATION */
+  {  275,   -3 }, /* (302) predicate ::= expression compare_op expression */
+  {  275,   -5 }, /* (303) predicate ::= expression BETWEEN expression AND expression */
+  {  275,   -6 }, /* (304) predicate ::= expression NOT BETWEEN expression AND expression */
+  {  275,   -3 }, /* (305) predicate ::= expression IS NULL */
+  {  275,   -4 }, /* (306) predicate ::= expression IS NOT NULL */
+  {  275,   -3 }, /* (307) predicate ::= expression in_op in_predicate_value */
+  {  276,   -1 }, /* (308) compare_op ::= NK_LT */
+  {  276,   -1 }, /* (309) compare_op ::= NK_GT */
+  {  276,   -1 }, /* (310) compare_op ::= NK_LE */
+  {  276,   -1 }, /* (311) compare_op ::= NK_GE */
+  {  276,   -1 }, /* (312) compare_op ::= NK_NE */
+  {  276,   -1 }, /* (313) compare_op ::= NK_EQ */
+  {  276,   -1 }, /* (314) compare_op ::= LIKE */
+  {  276,   -2 }, /* (315) compare_op ::= NOT LIKE */
+  {  276,   -1 }, /* (316) compare_op ::= MATCH */
+  {  276,   -1 }, /* (317) compare_op ::= NMATCH */
+  {  277,   -1 }, /* (318) in_op ::= IN */
+  {  277,   -2 }, /* (319) in_op ::= NOT IN */
+  {  278,   -3 }, /* (320) in_predicate_value ::= NK_LP expression_list NK_RP */
+  {  279,   -1 }, /* (321) boolean_value_expression ::= boolean_primary */
+  {  279,   -2 }, /* (322) boolean_value_expression ::= NOT boolean_primary */
+  {  279,   -3 }, /* (323) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+  {  279,   -3 }, /* (324) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+  {  280,   -1 }, /* (325) boolean_primary ::= predicate */
+  {  280,   -3 }, /* (326) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+  {  281,   -1 }, /* (327) common_expression ::= expression */
+  {  281,   -1 }, /* (328) common_expression ::= boolean_value_expression */
+  {  282,   -2 }, /* (329) from_clause ::= FROM table_reference_list */
+  {  283,   -1 }, /* (330) table_reference_list ::= table_reference */
+  {  283,   -3 }, /* (331) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+  {  284,   -1 }, /* (332) table_reference ::= table_primary */
+  {  284,   -1 }, /* (333) table_reference ::= joined_table */
+  {  285,   -2 }, /* (334) table_primary ::= table_name alias_opt */
+  {  285,   -4 }, /* (335) table_primary ::= db_name NK_DOT table_name alias_opt */
+  {  285,   -2 }, /* (336) table_primary ::= subquery alias_opt */
+  {  285,   -1 }, /* (337) table_primary ::= parenthesized_joined_table */
+  {  287,    0 }, /* (338) alias_opt ::= */
+  {  287,   -1 }, /* (339) alias_opt ::= table_alias */
+  {  287,   -2 }, /* (340) alias_opt ::= AS table_alias */
+  {  288,   -3 }, /* (341) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+  {  288,   -3 }, /* (342) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+  {  286,   -6 }, /* (343) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+  {  289,    0 }, /* (344) join_type ::= */
+  {  289,   -1 }, /* (345) join_type ::= INNER */
+  {  291,   -9 }, /* (346) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+  {  292,    0 }, /* (347) set_quantifier_opt ::= */
+  {  292,   -1 }, /* (348) set_quantifier_opt ::= DISTINCT */
+  {  292,   -1 }, /* (349) set_quantifier_opt ::= ALL */
+  {  293,   -1 }, /* (350) select_list ::= NK_STAR */
+  {  293,   -1 }, /* (351) select_list ::= select_sublist */
+  {  299,   -1 }, /* (352) select_sublist ::= select_item */
+  {  299,   -3 }, /* (353) select_sublist ::= select_sublist NK_COMMA select_item */
+  {  300,   -1 }, /* (354) select_item ::= common_expression */
+  {  300,   -2 }, /* (355) select_item ::= common_expression column_alias */
+  {  300,   -3 }, /* (356) select_item ::= common_expression AS column_alias */
+  {  300,   -3 }, /* (357) select_item ::= table_name NK_DOT NK_STAR */
+  {  294,    0 }, /* (358) where_clause_opt ::= */
+  {  294,   -2 }, /* (359) where_clause_opt ::= WHERE search_condition */
+  {  295,    0 }, /* (360) partition_by_clause_opt ::= */
+  {  295,   -3 }, /* (361) partition_by_clause_opt ::= PARTITION BY expression_list */
+  {  296,    0 }, /* (362) twindow_clause_opt ::= */
+  {  296,   -6 }, /* (363) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+  {  296,   -4 }, /* (364) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
+  {  296,   -6 }, /* (365) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+  {  296,   -8 }, /* (366) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+  {  256,    0 }, /* (367) sliding_opt ::= */
+  {  256,   -4 }, /* (368) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+  {  301,    0 }, /* (369) fill_opt ::= */
+  {  301,   -4 }, /* (370) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+  {  301,   -6 }, /* (371) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+  {  302,   -1 }, /* (372) fill_mode ::= NONE */
+  {  302,   -1 }, /* (373) fill_mode ::= PREV */
+  {  302,   -1 }, /* (374) fill_mode ::= NULL */
+  {  302,   -1 }, /* (375) fill_mode ::= LINEAR */
+  {  302,   -1 }, /* (376) fill_mode ::= NEXT */
+  {  297,    0 }, /* (377) group_by_clause_opt ::= */
+  {  297,   -3 }, /* (378) group_by_clause_opt ::= GROUP BY group_by_list */
+  {  303,   -1 }, /* (379) group_by_list ::= expression */
+  {  303,   -3 }, /* (380) group_by_list ::= group_by_list NK_COMMA expression */
+  {  298,    0 }, /* (381) having_clause_opt ::= */
+  {  298,   -2 }, /* (382) having_clause_opt ::= HAVING search_condition */
+  {  260,   -4 }, /* (383) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+  {  304,   -1 }, /* (384) query_expression_body ::= query_primary */
+  {  304,   -4 }, /* (385) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+  {  308,   -1 }, /* (386) query_primary ::= query_specification */
+  {  305,    0 }, /* (387) order_by_clause_opt ::= */
+  {  305,   -3 }, /* (388) order_by_clause_opt ::= ORDER BY sort_specification_list */
+  {  306,    0 }, /* (389) slimit_clause_opt ::= */
+  {  306,   -2 }, /* (390) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+  {  306,   -4 }, /* (391) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+  {  306,   -4 }, /* (392) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  307,    0 }, /* (393) limit_clause_opt ::= */
+  {  307,   -2 }, /* (394) limit_clause_opt ::= LIMIT NK_INTEGER */
+  {  307,   -4 }, /* (395) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+  {  307,   -4 }, /* (396) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  274,   -3 }, /* (397) subquery ::= NK_LP query_expression NK_RP */
+  {  290,   -1 }, /* (398) search_condition ::= common_expression */
+  {  309,   -1 }, /* (399) sort_specification_list ::= sort_specification */
+  {  309,   -3 }, /* (400) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+  {  310,   -3 }, /* (401) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+  {  311,    0 }, /* (402) ordering_specification_opt ::= */
+  {  311,   -1 }, /* (403) ordering_specification_opt ::= ASC */
+  {  311,   -1 }, /* (404) ordering_specification_opt ::= DESC */
+  {  312,    0 }, /* (405) null_ordering_opt ::= */
+  {  312,   -2 }, /* (406) null_ordering_opt ::= NULLS FIRST */
+  {  312,   -2 }, /* (407) null_ordering_opt ::= NULLS LAST */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -2552,11 +2587,11 @@ static YYACTIONTYPE yy_reduce(
         YYMINORTYPE yylhsminor;
       case 0: /* cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
 { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
-  yy_destructor(yypParser,203,&yymsp[0].minor);
+  yy_destructor(yypParser,208,&yymsp[0].minor);
         break;
       case 1: /* cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
 { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
-  yy_destructor(yypParser,204,&yymsp[0].minor);
+  yy_destructor(yypParser,209,&yymsp[0].minor);
         break;
       case 2: /* account_options ::= */
 { }
@@ -2570,20 +2605,20 @@ static YYACTIONTYPE yy_reduce(
       case 9: /* account_options ::= account_options USERS literal */ yytestcase(yyruleno==9);
       case 10: /* account_options ::= account_options CONNS literal */ yytestcase(yyruleno==10);
       case 11: /* account_options ::= account_options STATE literal */ yytestcase(yyruleno==11);
-{  yy_destructor(yypParser,203,&yymsp[-2].minor);
+{  yy_destructor(yypParser,208,&yymsp[-2].minor);
 { }
-  yy_destructor(yypParser,205,&yymsp[0].minor);
+  yy_destructor(yypParser,210,&yymsp[0].minor);
 }
         break;
       case 12: /* alter_account_options ::= alter_account_option */
-{  yy_destructor(yypParser,206,&yymsp[0].minor);
+{  yy_destructor(yypParser,211,&yymsp[0].minor);
 { }
 }
         break;
       case 13: /* alter_account_options ::= alter_account_options alter_account_option */
-{  yy_destructor(yypParser,204,&yymsp[-1].minor);
+{  yy_destructor(yypParser,209,&yymsp[-1].minor);
 { }
-  yy_destructor(yypParser,206,&yymsp[0].minor);
+  yy_destructor(yypParser,211,&yymsp[0].minor);
 }
         break;
       case 14: /* alter_account_option ::= PASS literal */
@@ -2597,31 +2632,31 @@ static YYACTIONTYPE yy_reduce(
       case 22: /* alter_account_option ::= CONNS literal */ yytestcase(yyruleno==22);
       case 23: /* alter_account_option ::= STATE literal */ yytestcase(yyruleno==23);
 { }
-  yy_destructor(yypParser,205,&yymsp[0].minor);
+  yy_destructor(yypParser,210,&yymsp[0].minor);
         break;
       case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy0); }
         break;
       case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy393, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy21, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
         break;
       case 26: /* cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy393, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy21, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
         break;
       case 27: /* cmd ::= DROP USER user_name */
-{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy393); }
+{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy21); }
         break;
       case 28: /* cmd ::= CREATE DNODE dnode_endpoint */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy393, NULL); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy21, NULL); }
         break;
       case 29: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy0); }
         break;
       case 30: /* cmd ::= DROP DNODE NK_INTEGER */
 { pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 31: /* cmd ::= DROP DNODE dnode_endpoint */
-{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy393); }
+{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy21); }
         break;
       case 32: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
 { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); }
@@ -2638,20 +2673,20 @@ static YYACTIONTYPE yy_reduce(
       case 36: /* dnode_endpoint ::= NK_STRING */
       case 37: /* dnode_host_name ::= NK_ID */ yytestcase(yyruleno==37);
       case 38: /* dnode_host_name ::= NK_IPTOKEN */ yytestcase(yyruleno==38);
-      case 256: /* db_name ::= NK_ID */ yytestcase(yyruleno==256);
-      case 257: /* table_name ::= NK_ID */ yytestcase(yyruleno==257);
-      case 258: /* column_name ::= NK_ID */ yytestcase(yyruleno==258);
-      case 259: /* function_name ::= NK_ID */ yytestcase(yyruleno==259);
-      case 260: /* function_name ::= FIRST */ yytestcase(yyruleno==260);
-      case 261: /* function_name ::= LAST */ yytestcase(yyruleno==261);
-      case 262: /* table_alias ::= NK_ID */ yytestcase(yyruleno==262);
-      case 263: /* column_alias ::= NK_ID */ yytestcase(yyruleno==263);
-      case 264: /* user_name ::= NK_ID */ yytestcase(yyruleno==264);
-      case 265: /* index_name ::= NK_ID */ yytestcase(yyruleno==265);
-      case 266: /* topic_name ::= NK_ID */ yytestcase(yyruleno==266);
-      case 267: /* stream_name ::= NK_ID */ yytestcase(yyruleno==267);
-{ yylhsminor.yy393 = yymsp[0].minor.yy0; }
-  yymsp[0].minor.yy393 = yylhsminor.yy393;
+      case 264: /* db_name ::= NK_ID */ yytestcase(yyruleno==264);
+      case 265: /* table_name ::= NK_ID */ yytestcase(yyruleno==265);
+      case 266: /* column_name ::= NK_ID */ yytestcase(yyruleno==266);
+      case 267: /* function_name ::= NK_ID */ yytestcase(yyruleno==267);
+      case 268: /* function_name ::= FIRST */ yytestcase(yyruleno==268);
+      case 269: /* function_name ::= LAST */ yytestcase(yyruleno==269);
+      case 270: /* table_alias ::= NK_ID */ yytestcase(yyruleno==270);
+      case 271: /* column_alias ::= NK_ID */ yytestcase(yyruleno==271);
+      case 272: /* user_name ::= NK_ID */ yytestcase(yyruleno==272);
+      case 273: /* index_name ::= NK_ID */ yytestcase(yyruleno==273);
+      case 274: /* topic_name ::= NK_ID */ yytestcase(yyruleno==274);
+      case 275: /* stream_name ::= NK_ID */ yytestcase(yyruleno==275);
+{ yylhsminor.yy21 = yymsp[0].minor.yy0; }
+  yymsp[0].minor.yy21 = yylhsminor.yy21;
         break;
       case 39: /* cmd ::= ALTER LOCAL NK_STRING */
 { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); }
@@ -2660,1083 +2695,1107 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
         break;
       case 41: /* cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
-{ pCxt->pRootNode = createCreateQnodeStmt(pCxt, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_QNODE_STMT, &yymsp[0].minor.yy0); }
         break;
       case 42: /* cmd ::= DROP QNODE ON DNODE NK_INTEGER */
-{ pCxt->pRootNode = createDropQnodeStmt(pCxt, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_QNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 43: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy537, &yymsp[-1].minor.yy393, yymsp[0].minor.yy168); }
+      case 43: /* cmd ::= CREATE BNODE ON DNODE NK_INTEGER */
+{ pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_BNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 44: /* cmd ::= DROP DATABASE exists_opt db_name */
-{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy537, &yymsp[0].minor.yy393); }
+      case 44: /* cmd ::= DROP BNODE ON DNODE NK_INTEGER */
+{ pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_BNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 45: /* cmd ::= USE db_name */
-{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy393); }
+      case 45: /* cmd ::= CREATE SNODE ON DNODE NK_INTEGER */
+{ pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_SNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 46: /* cmd ::= ALTER DATABASE db_name alter_db_options */
-{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy393, yymsp[0].minor.yy168); }
+      case 46: /* cmd ::= DROP SNODE ON DNODE NK_INTEGER */
+{ pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_SNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 47: /* not_exists_opt ::= IF NOT EXISTS */
-{ yymsp[-2].minor.yy537 = true; }
+      case 47: /* cmd ::= CREATE MNODE ON DNODE NK_INTEGER */
+{ pCxt->pRootNode = createCreateComponentNodeStmt(pCxt, QUERY_NODE_CREATE_MNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 48: /* not_exists_opt ::= */
-      case 50: /* exists_opt ::= */ yytestcase(yyruleno==50);
-      case 211: /* analyze_opt ::= */ yytestcase(yyruleno==211);
-      case 219: /* agg_func_opt ::= */ yytestcase(yyruleno==219);
-      case 339: /* set_quantifier_opt ::= */ yytestcase(yyruleno==339);
-{ yymsp[1].minor.yy537 = false; }
+      case 48: /* cmd ::= DROP MNODE ON DNODE NK_INTEGER */
+{ pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 49: /* exists_opt ::= IF EXISTS */
-{ yymsp[-1].minor.yy537 = true; }
+      case 49: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
+{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy173, &yymsp[-1].minor.yy21, yymsp[0].minor.yy564); }
         break;
-      case 51: /* db_options ::= */
-{ yymsp[1].minor.yy168 = createDatabaseOptions(pCxt); }
+      case 50: /* cmd ::= DROP DATABASE exists_opt db_name */
+{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy21); }
         break;
-      case 52: /* db_options ::= db_options BLOCKS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pNumOfBlocks = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 51: /* cmd ::= USE db_name */
+{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy21); }
         break;
-      case 53: /* db_options ::= db_options CACHE NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pCacheBlockSize = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 52: /* cmd ::= ALTER DATABASE db_name alter_db_options */
+{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy21, yymsp[0].minor.yy564); }
         break;
-      case 54: /* db_options ::= db_options CACHELAST NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pCachelast = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 53: /* not_exists_opt ::= IF NOT EXISTS */
+{ yymsp[-2].minor.yy173 = true; }
         break;
-      case 55: /* db_options ::= db_options COMP NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pCompressionLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 54: /* not_exists_opt ::= */
+      case 56: /* exists_opt ::= */ yytestcase(yyruleno==56);
+      case 219: /* analyze_opt ::= */ yytestcase(yyruleno==219);
+      case 227: /* agg_func_opt ::= */ yytestcase(yyruleno==227);
+      case 347: /* set_quantifier_opt ::= */ yytestcase(yyruleno==347);
+{ yymsp[1].minor.yy173 = false; }
         break;
-      case 56: /* db_options ::= db_options DAYS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pDaysPerFile = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 55: /* exists_opt ::= IF EXISTS */
+{ yymsp[-1].minor.yy173 = true; }
         break;
-      case 57: /* db_options ::= db_options DAYS NK_VARIABLE */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pDaysPerFile = (SValueNode*)createDurationValueNode(pCxt, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 57: /* db_options ::= */
+{ yymsp[1].minor.yy564 = createDatabaseOptions(pCxt); }
         break;
-      case 58: /* db_options ::= db_options FSYNC NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pFsyncPeriod = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 58: /* db_options ::= db_options BLOCKS NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pNumOfBlocks = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 59: /* db_options ::= db_options MAXROWS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pMaxRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 59: /* db_options ::= db_options CACHE NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pCacheBlockSize = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 60: /* db_options ::= db_options MINROWS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pMinRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 60: /* db_options ::= db_options CACHELAST NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pCachelast = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 61: /* db_options ::= db_options KEEP integer_list */
-      case 62: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==62);
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pKeep = yymsp[0].minor.yy376; yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 61: /* db_options ::= db_options COMP NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pCompressionLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 63: /* db_options ::= db_options PRECISION NK_STRING */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pPrecision = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 64: /* db_options ::= db_options QUORUM NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pQuorum = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 65: /* db_options ::= db_options REPLICA NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pReplica = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 66: /* db_options ::= db_options TTL NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 67: /* db_options ::= db_options WAL NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pWalLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 68: /* db_options ::= db_options VGROUPS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pNumOfVgroups = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 62: /* db_options ::= db_options DAYS NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pDaysPerFile = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 69: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 70: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 71: /* db_options ::= db_options RETENTIONS retention_list */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy168)->pRetentions = yymsp[0].minor.yy376; yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 72: /* alter_db_options ::= alter_db_option */
-{ yylhsminor.yy168 = createDatabaseOptions(pCxt); yylhsminor.yy168 = setDatabaseAlterOption(pCxt, yylhsminor.yy168, &yymsp[0].minor.yy277); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 73: /* alter_db_options ::= alter_db_options alter_db_option */
-{ yylhsminor.yy168 = setDatabaseAlterOption(pCxt, yymsp[-1].minor.yy168, &yymsp[0].minor.yy277); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 74: /* alter_db_option ::= BLOCKS NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-        break;
-      case 75: /* alter_db_option ::= FSYNC NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-        break;
-      case 76: /* alter_db_option ::= KEEP integer_list */
-      case 77: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==77);
-{ yymsp[-1].minor.yy277.type = DB_OPTION_KEEP; yymsp[-1].minor.yy277.pList = yymsp[0].minor.yy376; }
-        break;
-      case 78: /* alter_db_option ::= WAL NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_WAL; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-        break;
-      case 79: /* alter_db_option ::= QUORUM NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-        break;
-      case 80: /* alter_db_option ::= CACHELAST NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-        break;
-      case 81: /* alter_db_option ::= REPLICA NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-        break;
-      case 82: /* integer_list ::= NK_INTEGER */
-{ yylhsminor.yy376 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy376 = yylhsminor.yy376;
-        break;
-      case 83: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */
-      case 231: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==231);
-{ yylhsminor.yy376 = addNodeToList(pCxt, yymsp[-2].minor.yy376, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[-2].minor.yy376 = yylhsminor.yy376;
-        break;
-      case 84: /* variable_list ::= NK_VARIABLE */
-{ yylhsminor.yy376 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy376 = yylhsminor.yy376;
-        break;
-      case 85: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */
-{ yylhsminor.yy376 = addNodeToList(pCxt, yymsp[-2].minor.yy376, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[-2].minor.yy376 = yylhsminor.yy376;
-        break;
-      case 86: /* retention_list ::= retention */
-      case 106: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==106);
-      case 109: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==109);
-      case 116: /* column_def_list ::= column_def */ yytestcase(yyruleno==116);
-      case 159: /* col_name_list ::= col_name */ yytestcase(yyruleno==159);
-      case 192: /* func_name_list ::= func_name */ yytestcase(yyruleno==192);
-      case 201: /* func_list ::= func */ yytestcase(yyruleno==201);
-      case 254: /* literal_list ::= signed_literal */ yytestcase(yyruleno==254);
-      case 344: /* select_sublist ::= select_item */ yytestcase(yyruleno==344);
-      case 391: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==391);
-{ yylhsminor.yy376 = createNodeList(pCxt, yymsp[0].minor.yy168); }
-  yymsp[0].minor.yy376 = yylhsminor.yy376;
-        break;
-      case 87: /* retention_list ::= retention_list NK_COMMA retention */
-      case 117: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==117);
-      case 160: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==160);
-      case 193: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==193);
-      case 202: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==202);
-      case 255: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==255);
-      case 345: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==345);
-      case 392: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==392);
-{ yylhsminor.yy376 = addNodeToList(pCxt, yymsp[-2].minor.yy376, yymsp[0].minor.yy168); }
-  yymsp[-2].minor.yy376 = yylhsminor.yy376;
-        break;
-      case 88: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
-{ yylhsminor.yy168 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 89: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
-      case 91: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==91);
-{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy537, yymsp[-5].minor.yy168, yymsp[-3].minor.yy376, yymsp[-1].minor.yy376, yymsp[0].minor.yy168); }
-        break;
-      case 90: /* cmd ::= CREATE TABLE multi_create_clause */
-{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy376); }
-        break;
-      case 92: /* cmd ::= DROP TABLE multi_drop_clause */
-{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy376); }
-        break;
-      case 93: /* cmd ::= DROP STABLE exists_opt full_table_name */
-{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy537, yymsp[0].minor.yy168); }
-        break;
-      case 94: /* cmd ::= ALTER TABLE alter_table_clause */
-      case 95: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==95);
-      case 233: /* cmd ::= query_expression */ yytestcase(yyruleno==233);
-{ pCxt->pRootNode = yymsp[0].minor.yy168; }
-        break;
-      case 96: /* alter_table_clause ::= full_table_name alter_table_options */
-{ yylhsminor.yy168 = createAlterTableOption(pCxt, yymsp[-1].minor.yy168, yymsp[0].minor.yy168); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 97: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-{ yylhsminor.yy168 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy168, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy393, yymsp[0].minor.yy224); }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 98: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
-{ yylhsminor.yy168 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy168, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy393); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
-        break;
-      case 99: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-{ yylhsminor.yy168 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy168, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy393, yymsp[0].minor.yy224); }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 63: /* db_options ::= db_options DAYS NK_VARIABLE */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pDaysPerFile = (SValueNode*)createDurationValueNode(pCxt, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 100: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-{ yylhsminor.yy168 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy168, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy393, &yymsp[0].minor.yy393); }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 64: /* db_options ::= db_options FSYNC NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pFsyncPeriod = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 101: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-{ yylhsminor.yy168 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy168, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy393, yymsp[0].minor.yy224); }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 65: /* db_options ::= db_options MAXROWS NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pMaxRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 102: /* alter_table_clause ::= full_table_name DROP TAG column_name */
-{ yylhsminor.yy168 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy168, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy393); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 66: /* db_options ::= db_options MINROWS NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pMinRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 103: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-{ yylhsminor.yy168 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy168, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy393, yymsp[0].minor.yy224); }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 67: /* db_options ::= db_options KEEP integer_list */
+      case 68: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==68);
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pKeep = yymsp[0].minor.yy476; yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 104: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-{ yylhsminor.yy168 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy168, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy393, &yymsp[0].minor.yy393); }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 69: /* db_options ::= db_options PRECISION NK_STRING */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pPrecision = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 105: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
-{ yylhsminor.yy168 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy168, &yymsp[-2].minor.yy393, yymsp[0].minor.yy168); }
-  yymsp[-5].minor.yy168 = yylhsminor.yy168;
+      case 70: /* db_options ::= db_options QUORUM NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pQuorum = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 107: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
-      case 110: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==110);
-{ yylhsminor.yy376 = addNodeToList(pCxt, yymsp[-1].minor.yy376, yymsp[0].minor.yy168); }
-  yymsp[-1].minor.yy376 = yylhsminor.yy376;
+      case 71: /* db_options ::= db_options REPLICA NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pReplica = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 108: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-{ yylhsminor.yy168 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy537, yymsp[-7].minor.yy168, yymsp[-5].minor.yy168, yymsp[-4].minor.yy376, yymsp[-1].minor.yy376); }
-  yymsp[-8].minor.yy168 = yylhsminor.yy168;
+      case 72: /* db_options ::= db_options TTL NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 111: /* drop_table_clause ::= exists_opt full_table_name */
-{ yylhsminor.yy168 = createDropTableClause(pCxt, yymsp[-1].minor.yy537, yymsp[0].minor.yy168); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 73: /* db_options ::= db_options WAL NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pWalLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 74: /* db_options ::= db_options VGROUPS NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pNumOfVgroups = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 112: /* specific_tags_opt ::= */
-      case 143: /* tags_def_opt ::= */ yytestcase(yyruleno==143);
-      case 352: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==352);
-      case 369: /* group_by_clause_opt ::= */ yytestcase(yyruleno==369);
-      case 379: /* order_by_clause_opt ::= */ yytestcase(yyruleno==379);
-{ yymsp[1].minor.yy376 = NULL; }
+      case 75: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 76: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 77: /* db_options ::= db_options RETENTIONS retention_list */
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy564)->pRetentions = yymsp[0].minor.yy476; yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 78: /* alter_db_options ::= alter_db_option */
+{ yylhsminor.yy564 = createDatabaseOptions(pCxt); yylhsminor.yy564 = setDatabaseAlterOption(pCxt, yylhsminor.yy564, &yymsp[0].minor.yy289); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 79: /* alter_db_options ::= alter_db_options alter_db_option */
+{ yylhsminor.yy564 = setDatabaseAlterOption(pCxt, yymsp[-1].minor.yy564, &yymsp[0].minor.yy289); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 80: /* alter_db_option ::= BLOCKS NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 81: /* alter_db_option ::= FSYNC NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 82: /* alter_db_option ::= KEEP integer_list */
+      case 83: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==83);
+{ yymsp[-1].minor.yy289.type = DB_OPTION_KEEP; yymsp[-1].minor.yy289.pList = yymsp[0].minor.yy476; }
+        break;
+      case 84: /* alter_db_option ::= WAL NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = DB_OPTION_WAL; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 85: /* alter_db_option ::= QUORUM NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 86: /* alter_db_option ::= CACHELAST NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 87: /* alter_db_option ::= REPLICA NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 88: /* integer_list ::= NK_INTEGER */
+{ yylhsminor.yy476 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy476 = yylhsminor.yy476;
+        break;
+      case 89: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */
+      case 239: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==239);
+{ yylhsminor.yy476 = addNodeToList(pCxt, yymsp[-2].minor.yy476, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[-2].minor.yy476 = yylhsminor.yy476;
+        break;
+      case 90: /* variable_list ::= NK_VARIABLE */
+{ yylhsminor.yy476 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy476 = yylhsminor.yy476;
+        break;
+      case 91: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */
+{ yylhsminor.yy476 = addNodeToList(pCxt, yymsp[-2].minor.yy476, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[-2].minor.yy476 = yylhsminor.yy476;
+        break;
+      case 92: /* retention_list ::= retention */
+      case 112: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==112);
+      case 115: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==115);
+      case 122: /* column_def_list ::= column_def */ yytestcase(yyruleno==122);
+      case 165: /* col_name_list ::= col_name */ yytestcase(yyruleno==165);
+      case 200: /* func_name_list ::= func_name */ yytestcase(yyruleno==200);
+      case 209: /* func_list ::= func */ yytestcase(yyruleno==209);
+      case 262: /* literal_list ::= signed_literal */ yytestcase(yyruleno==262);
+      case 352: /* select_sublist ::= select_item */ yytestcase(yyruleno==352);
+      case 399: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==399);
+{ yylhsminor.yy476 = createNodeList(pCxt, yymsp[0].minor.yy564); }
+  yymsp[0].minor.yy476 = yylhsminor.yy476;
+        break;
+      case 93: /* retention_list ::= retention_list NK_COMMA retention */
+      case 123: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==123);
+      case 166: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==166);
+      case 201: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==201);
+      case 210: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==210);
+      case 263: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==263);
+      case 353: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==353);
+      case 400: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==400);
+{ yylhsminor.yy476 = addNodeToList(pCxt, yymsp[-2].minor.yy476, yymsp[0].minor.yy564); }
+  yymsp[-2].minor.yy476 = yylhsminor.yy476;
+        break;
+      case 94: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
+{ yylhsminor.yy564 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 95: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
+      case 97: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==97);
+{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy173, yymsp[-5].minor.yy564, yymsp[-3].minor.yy476, yymsp[-1].minor.yy476, yymsp[0].minor.yy564); }
+        break;
+      case 96: /* cmd ::= CREATE TABLE multi_create_clause */
+{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy476); }
+        break;
+      case 98: /* cmd ::= DROP TABLE multi_drop_clause */
+{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy476); }
+        break;
+      case 99: /* cmd ::= DROP STABLE exists_opt full_table_name */
+{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy173, yymsp[0].minor.yy564); }
+        break;
+      case 100: /* cmd ::= ALTER TABLE alter_table_clause */
+      case 101: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==101);
+      case 241: /* cmd ::= query_expression */ yytestcase(yyruleno==241);
+{ pCxt->pRootNode = yymsp[0].minor.yy564; }
+        break;
+      case 102: /* alter_table_clause ::= full_table_name alter_table_options */
+{ yylhsminor.yy564 = createAlterTableOption(pCxt, yymsp[-1].minor.yy564, yymsp[0].minor.yy564); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 103: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
+{ yylhsminor.yy564 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy564, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy21, yymsp[0].minor.yy288); }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 104: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
+{ yylhsminor.yy564 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy564, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy21); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 105: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
+{ yylhsminor.yy564 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy564, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy21, yymsp[0].minor.yy288); }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
         break;
-      case 113: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
-{ yymsp[-2].minor.yy376 = yymsp[-1].minor.yy376; }
+      case 106: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
+{ yylhsminor.yy564 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy564, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy21, &yymsp[0].minor.yy21); }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
         break;
-      case 114: /* full_table_name ::= table_name */
-{ yylhsminor.yy168 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy393, NULL); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 107: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
+{ yylhsminor.yy564 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy564, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy21, yymsp[0].minor.yy288); }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
         break;
-      case 115: /* full_table_name ::= db_name NK_DOT table_name */
-{ yylhsminor.yy168 = createRealTableNode(pCxt, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy393, NULL); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 108: /* alter_table_clause ::= full_table_name DROP TAG column_name */
+{ yylhsminor.yy564 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy564, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy21); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 118: /* column_def ::= column_name type_name */
-{ yylhsminor.yy168 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy393, yymsp[0].minor.yy224, NULL); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 109: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
+{ yylhsminor.yy564 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy564, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy21, yymsp[0].minor.yy288); }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
         break;
-      case 119: /* column_def ::= column_name type_name COMMENT NK_STRING */
-{ yylhsminor.yy168 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy393, yymsp[-2].minor.yy224, &yymsp[0].minor.yy0); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 110: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
+{ yylhsminor.yy564 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy564, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy21, &yymsp[0].minor.yy21); }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
         break;
-      case 120: /* type_name ::= BOOL */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_BOOL); }
+      case 111: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
+{ yylhsminor.yy564 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy564, &yymsp[-2].minor.yy21, yymsp[0].minor.yy564); }
+  yymsp[-5].minor.yy564 = yylhsminor.yy564;
         break;
-      case 121: /* type_name ::= TINYINT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_TINYINT); }
+      case 113: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
+      case 116: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==116);
+{ yylhsminor.yy476 = addNodeToList(pCxt, yymsp[-1].minor.yy476, yymsp[0].minor.yy564); }
+  yymsp[-1].minor.yy476 = yylhsminor.yy476;
         break;
-      case 122: /* type_name ::= SMALLINT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
+      case 114: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
+{ yylhsminor.yy564 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy173, yymsp[-7].minor.yy564, yymsp[-5].minor.yy564, yymsp[-4].minor.yy476, yymsp[-1].minor.yy476); }
+  yymsp[-8].minor.yy564 = yylhsminor.yy564;
         break;
-      case 123: /* type_name ::= INT */
-      case 124: /* type_name ::= INTEGER */ yytestcase(yyruleno==124);
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_INT); }
+      case 117: /* drop_table_clause ::= exists_opt full_table_name */
+{ yylhsminor.yy564 = createDropTableClause(pCxt, yymsp[-1].minor.yy173, yymsp[0].minor.yy564); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 125: /* type_name ::= BIGINT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_BIGINT); }
+      case 118: /* specific_tags_opt ::= */
+      case 149: /* tags_def_opt ::= */ yytestcase(yyruleno==149);
+      case 360: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==360);
+      case 377: /* group_by_clause_opt ::= */ yytestcase(yyruleno==377);
+      case 387: /* order_by_clause_opt ::= */ yytestcase(yyruleno==387);
+{ yymsp[1].minor.yy476 = NULL; }
         break;
-      case 126: /* type_name ::= FLOAT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_FLOAT); }
+      case 119: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
+{ yymsp[-2].minor.yy476 = yymsp[-1].minor.yy476; }
         break;
-      case 127: /* type_name ::= DOUBLE */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
+      case 120: /* full_table_name ::= table_name */
+{ yylhsminor.yy564 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy21, NULL); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 128: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
+      case 121: /* full_table_name ::= db_name NK_DOT table_name */
+{ yylhsminor.yy564 = createRealTableNode(pCxt, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy21, NULL); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 129: /* type_name ::= TIMESTAMP */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
+      case 124: /* column_def ::= column_name type_name */
+{ yylhsminor.yy564 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy21, yymsp[0].minor.yy288, NULL); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 130: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
+      case 125: /* column_def ::= column_name type_name COMMENT NK_STRING */
+{ yylhsminor.yy564 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy21, yymsp[-2].minor.yy288, &yymsp[0].minor.yy0); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 131: /* type_name ::= TINYINT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
+      case 126: /* type_name ::= BOOL */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_BOOL); }
         break;
-      case 132: /* type_name ::= SMALLINT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
+      case 127: /* type_name ::= TINYINT */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_TINYINT); }
         break;
-      case 133: /* type_name ::= INT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_UINT); }
+      case 128: /* type_name ::= SMALLINT */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
         break;
-      case 134: /* type_name ::= BIGINT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
+      case 129: /* type_name ::= INT */
+      case 130: /* type_name ::= INTEGER */ yytestcase(yyruleno==130);
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_INT); }
         break;
-      case 135: /* type_name ::= JSON */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_JSON); }
+      case 131: /* type_name ::= BIGINT */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_BIGINT); }
         break;
-      case 136: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
+      case 132: /* type_name ::= FLOAT */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_FLOAT); }
         break;
-      case 137: /* type_name ::= MEDIUMBLOB */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
+      case 133: /* type_name ::= DOUBLE */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
         break;
-      case 138: /* type_name ::= BLOB */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_BLOB); }
+      case 134: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy288 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
         break;
-      case 139: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
+      case 135: /* type_name ::= TIMESTAMP */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
         break;
-      case 140: /* type_name ::= DECIMAL */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+      case 136: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy288 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
         break;
-      case 141: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+      case 137: /* type_name ::= TINYINT UNSIGNED */
+{ yymsp[-1].minor.yy288 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
         break;
-      case 142: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy224 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+      case 138: /* type_name ::= SMALLINT UNSIGNED */
+{ yymsp[-1].minor.yy288 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
         break;
-      case 144: /* tags_def_opt ::= tags_def */
-      case 343: /* select_list ::= select_sublist */ yytestcase(yyruleno==343);
-{ yylhsminor.yy376 = yymsp[0].minor.yy376; }
-  yymsp[0].minor.yy376 = yylhsminor.yy376;
+      case 139: /* type_name ::= INT UNSIGNED */
+{ yymsp[-1].minor.yy288 = createDataType(TSDB_DATA_TYPE_UINT); }
         break;
-      case 145: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
-{ yymsp[-3].minor.yy376 = yymsp[-1].minor.yy376; }
+      case 140: /* type_name ::= BIGINT UNSIGNED */
+{ yymsp[-1].minor.yy288 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
         break;
-      case 146: /* table_options ::= */
-{ yymsp[1].minor.yy168 = createTableOptions(pCxt); }
+      case 141: /* type_name ::= JSON */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_JSON); }
         break;
-      case 147: /* table_options ::= table_options COMMENT NK_STRING */
-{ ((STableOptions*)yymsp[-2].minor.yy168)->pComments = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 142: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy288 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
         break;
-      case 148: /* table_options ::= table_options KEEP integer_list */
-{ ((STableOptions*)yymsp[-2].minor.yy168)->pKeep = yymsp[0].minor.yy376; yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 143: /* type_name ::= MEDIUMBLOB */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
         break;
-      case 149: /* table_options ::= table_options TTL NK_INTEGER */
-{ ((STableOptions*)yymsp[-2].minor.yy168)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 144: /* type_name ::= BLOB */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_BLOB); }
         break;
-      case 150: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-{ ((STableOptions*)yymsp[-4].minor.yy168)->pSma = yymsp[-1].minor.yy376; yylhsminor.yy168 = yymsp[-4].minor.yy168; }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 145: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy288 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
         break;
-      case 151: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
-{ ((STableOptions*)yymsp[-4].minor.yy168)->pFuncs = yymsp[-1].minor.yy376; yylhsminor.yy168 = yymsp[-4].minor.yy168; }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+      case 146: /* type_name ::= DECIMAL */
+{ yymsp[0].minor.yy288 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
-      case 152: /* table_options ::= table_options FILE_FACTOR NK_FLOAT */
-{ ((STableOptions*)yymsp[-2].minor.yy168)->pFilesFactor = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 147: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy288 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
-      case 153: /* table_options ::= table_options DELAY NK_INTEGER */
-{ ((STableOptions*)yymsp[-2].minor.yy168)->pDelay = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy168 = yymsp[-2].minor.yy168; }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 148: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+{ yymsp[-5].minor.yy288 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
-      case 154: /* alter_table_options ::= alter_table_option */
-{ yylhsminor.yy168 = createTableOptions(pCxt); yylhsminor.yy168 = setTableAlterOption(pCxt, yylhsminor.yy168, &yymsp[0].minor.yy277); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 150: /* tags_def_opt ::= tags_def */
+      case 351: /* select_list ::= select_sublist */ yytestcase(yyruleno==351);
+{ yylhsminor.yy476 = yymsp[0].minor.yy476; }
+  yymsp[0].minor.yy476 = yylhsminor.yy476;
         break;
-      case 155: /* alter_table_options ::= alter_table_options alter_table_option */
-{ yylhsminor.yy168 = setTableAlterOption(pCxt, yymsp[-1].minor.yy168, &yymsp[0].minor.yy277); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 151: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
+{ yymsp[-3].minor.yy476 = yymsp[-1].minor.yy476; }
         break;
-      case 156: /* alter_table_option ::= COMMENT NK_STRING */
-{ yymsp[-1].minor.yy277.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+      case 152: /* table_options ::= */
+{ yymsp[1].minor.yy564 = createTableOptions(pCxt); }
         break;
-      case 157: /* alter_table_option ::= KEEP integer_list */
-{ yymsp[-1].minor.yy277.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy277.pList = yymsp[0].minor.yy376; }
+      case 153: /* table_options ::= table_options COMMENT NK_STRING */
+{ ((STableOptions*)yymsp[-2].minor.yy564)->pComments = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 158: /* alter_table_option ::= TTL NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+      case 154: /* table_options ::= table_options KEEP integer_list */
+{ ((STableOptions*)yymsp[-2].minor.yy564)->pKeep = yymsp[0].minor.yy476; yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 161: /* col_name ::= column_name */
-{ yylhsminor.yy168 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy393); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 155: /* table_options ::= table_options TTL NK_INTEGER */
+{ ((STableOptions*)yymsp[-2].minor.yy564)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 162: /* cmd ::= SHOW DNODES */
+      case 156: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
+{ ((STableOptions*)yymsp[-4].minor.yy564)->pSma = yymsp[-1].minor.yy476; yylhsminor.yy564 = yymsp[-4].minor.yy564; }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 157: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
+{ ((STableOptions*)yymsp[-4].minor.yy564)->pFuncs = yymsp[-1].minor.yy476; yylhsminor.yy564 = yymsp[-4].minor.yy564; }
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 158: /* table_options ::= table_options FILE_FACTOR NK_FLOAT */
+{ ((STableOptions*)yymsp[-2].minor.yy564)->pFilesFactor = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 159: /* table_options ::= table_options DELAY NK_INTEGER */
+{ ((STableOptions*)yymsp[-2].minor.yy564)->pDelay = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy564 = yymsp[-2].minor.yy564; }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 160: /* alter_table_options ::= alter_table_option */
+{ yylhsminor.yy564 = createTableOptions(pCxt); yylhsminor.yy564 = setTableAlterOption(pCxt, yylhsminor.yy564, &yymsp[0].minor.yy289); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 161: /* alter_table_options ::= alter_table_options alter_table_option */
+{ yylhsminor.yy564 = setTableAlterOption(pCxt, yymsp[-1].minor.yy564, &yymsp[0].minor.yy289); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 162: /* alter_table_option ::= COMMENT NK_STRING */
+{ yymsp[-1].minor.yy289.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+        break;
+      case 163: /* alter_table_option ::= KEEP integer_list */
+{ yymsp[-1].minor.yy289.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy289.pList = yymsp[0].minor.yy476; }
+        break;
+      case 164: /* alter_table_option ::= TTL NK_INTEGER */
+{ yymsp[-1].minor.yy289.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy289.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 167: /* col_name ::= column_name */
+{ yylhsminor.yy564 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy21); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
+        break;
+      case 168: /* cmd ::= SHOW DNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL, NULL); }
         break;
-      case 163: /* cmd ::= SHOW USERS */
+      case 169: /* cmd ::= SHOW USERS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_USERS_STMT, NULL, NULL); }
         break;
-      case 164: /* cmd ::= SHOW DATABASES */
+      case 170: /* cmd ::= SHOW DATABASES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL, NULL); }
         break;
-      case 165: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy168, yymsp[0].minor.yy168); }
+      case 171: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy564, yymsp[0].minor.yy564); }
         break;
-      case 166: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy168, yymsp[0].minor.yy168); }
+      case 172: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy564, yymsp[0].minor.yy564); }
         break;
-      case 167: /* cmd ::= SHOW db_name_cond_opt VGROUPS */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy168, NULL); }
+      case 173: /* cmd ::= SHOW db_name_cond_opt VGROUPS */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy564, NULL); }
         break;
-      case 168: /* cmd ::= SHOW MNODES */
+      case 174: /* cmd ::= SHOW MNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT, NULL, NULL); }
         break;
-      case 169: /* cmd ::= SHOW MODULES */
+      case 175: /* cmd ::= SHOW MODULES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MODULES_STMT, NULL, NULL); }
         break;
-      case 170: /* cmd ::= SHOW QNODES */
+      case 176: /* cmd ::= SHOW QNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT, NULL, NULL); }
         break;
-      case 171: /* cmd ::= SHOW FUNCTIONS */
+      case 177: /* cmd ::= SHOW FUNCTIONS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT, NULL, NULL); }
         break;
-      case 172: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy168, yymsp[0].minor.yy168); }
+      case 178: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy564, yymsp[0].minor.yy564); }
         break;
-      case 173: /* cmd ::= SHOW STREAMS */
+      case 179: /* cmd ::= SHOW STREAMS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT, NULL, NULL); }
         break;
-      case 174: /* cmd ::= SHOW ACCOUNTS */
+      case 180: /* cmd ::= SHOW ACCOUNTS */
 { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
         break;
-      case 175: /* cmd ::= SHOW APPS */
+      case 181: /* cmd ::= SHOW APPS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT, NULL, NULL); }
         break;
-      case 176: /* cmd ::= SHOW CONNECTIONS */
+      case 182: /* cmd ::= SHOW CONNECTIONS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT, NULL, NULL); }
         break;
-      case 177: /* cmd ::= SHOW LICENCE */
+      case 183: /* cmd ::= SHOW LICENCE */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT, NULL, NULL); }
         break;
-      case 178: /* cmd ::= SHOW CREATE DATABASE db_name */
-{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy393); }
+      case 184: /* cmd ::= SHOW CREATE DATABASE db_name */
+{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy21); }
         break;
-      case 179: /* cmd ::= SHOW CREATE TABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy168); }
+      case 185: /* cmd ::= SHOW CREATE TABLE full_table_name */
+{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy564); }
         break;
-      case 180: /* cmd ::= SHOW CREATE STABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy168); }
+      case 186: /* cmd ::= SHOW CREATE STABLE full_table_name */
+{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy564); }
         break;
-      case 181: /* cmd ::= SHOW QUERIES */
+      case 187: /* cmd ::= SHOW QUERIES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT, NULL, NULL); }
         break;
-      case 182: /* cmd ::= SHOW SCORES */
+      case 188: /* cmd ::= SHOW SCORES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SCORES_STMT, NULL, NULL); }
         break;
-      case 183: /* cmd ::= SHOW TOPICS */
+      case 189: /* cmd ::= SHOW TOPICS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TOPICS_STMT, NULL, NULL); }
         break;
-      case 184: /* cmd ::= SHOW VARIABLES */
+      case 190: /* cmd ::= SHOW VARIABLES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VARIABLE_STMT, NULL, NULL); }
         break;
-      case 185: /* db_name_cond_opt ::= */
-      case 190: /* from_db_opt ::= */ yytestcase(yyruleno==190);
-{ yymsp[1].minor.yy168 = createDefaultDatabaseCondValue(pCxt); }
+      case 191: /* cmd ::= SHOW BNODES */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_BNODES_STMT, NULL, NULL); }
         break;
-      case 186: /* db_name_cond_opt ::= db_name NK_DOT */
-{ yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy393); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 192: /* cmd ::= SHOW SNODES */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SNODES_STMT, NULL, NULL); }
         break;
-      case 187: /* like_pattern_opt ::= */
-      case 198: /* index_options ::= */ yytestcase(yyruleno==198);
-      case 350: /* where_clause_opt ::= */ yytestcase(yyruleno==350);
-      case 354: /* twindow_clause_opt ::= */ yytestcase(yyruleno==354);
-      case 359: /* sliding_opt ::= */ yytestcase(yyruleno==359);
-      case 361: /* fill_opt ::= */ yytestcase(yyruleno==361);
-      case 373: /* having_clause_opt ::= */ yytestcase(yyruleno==373);
-      case 381: /* slimit_clause_opt ::= */ yytestcase(yyruleno==381);
-      case 385: /* limit_clause_opt ::= */ yytestcase(yyruleno==385);
-{ yymsp[1].minor.yy168 = NULL; }
+      case 193: /* db_name_cond_opt ::= */
+      case 198: /* from_db_opt ::= */ yytestcase(yyruleno==198);
+{ yymsp[1].minor.yy564 = createDefaultDatabaseCondValue(pCxt); }
         break;
-      case 188: /* like_pattern_opt ::= LIKE NK_STRING */
-{ yymsp[-1].minor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+      case 194: /* db_name_cond_opt ::= db_name NK_DOT */
+{ yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy21); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 189: /* table_name_cond ::= table_name */
-{ yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy393); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 195: /* like_pattern_opt ::= */
+      case 206: /* index_options ::= */ yytestcase(yyruleno==206);
+      case 358: /* where_clause_opt ::= */ yytestcase(yyruleno==358);
+      case 362: /* twindow_clause_opt ::= */ yytestcase(yyruleno==362);
+      case 367: /* sliding_opt ::= */ yytestcase(yyruleno==367);
+      case 369: /* fill_opt ::= */ yytestcase(yyruleno==369);
+      case 381: /* having_clause_opt ::= */ yytestcase(yyruleno==381);
+      case 389: /* slimit_clause_opt ::= */ yytestcase(yyruleno==389);
+      case 393: /* limit_clause_opt ::= */ yytestcase(yyruleno==393);
+{ yymsp[1].minor.yy564 = NULL; }
         break;
-      case 191: /* from_db_opt ::= FROM db_name */
-{ yymsp[-1].minor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy393); }
+      case 196: /* like_pattern_opt ::= LIKE NK_STRING */
+{ yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
         break;
-      case 194: /* func_name ::= function_name */
-{ yylhsminor.yy168 = createFunctionNode(pCxt, &yymsp[0].minor.yy393, NULL); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 197: /* table_name_cond ::= table_name */
+{ yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy21); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 195: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy537, &yymsp[-3].minor.yy393, &yymsp[-1].minor.yy393, NULL, yymsp[0].minor.yy168); }
+      case 199: /* from_db_opt ::= FROM db_name */
+{ yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy21); }
         break;
-      case 196: /* cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy537, &yymsp[-5].minor.yy393, &yymsp[-3].minor.yy393, yymsp[-1].minor.yy376, NULL); }
+      case 202: /* func_name ::= function_name */
+{ yylhsminor.yy564 = createFunctionNode(pCxt, &yymsp[0].minor.yy21, NULL); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 197: /* cmd ::= DROP INDEX exists_opt index_name ON table_name */
-{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy537, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy393); }
+      case 203: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy21, &yymsp[-1].minor.yy21, NULL, yymsp[0].minor.yy564); }
         break;
-      case 199: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-{ yymsp[-8].minor.yy168 = createIndexOption(pCxt, yymsp[-6].minor.yy376, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), NULL, yymsp[0].minor.yy168); }
+      case 204: /* cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy173, &yymsp[-5].minor.yy21, &yymsp[-3].minor.yy21, yymsp[-1].minor.yy476, NULL); }
         break;
-      case 200: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
-{ yymsp[-10].minor.yy168 = createIndexOption(pCxt, yymsp[-8].minor.yy376, releaseRawExprNode(pCxt, yymsp[-4].minor.yy168), releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), yymsp[0].minor.yy168); }
+      case 205: /* cmd ::= DROP INDEX exists_opt index_name ON table_name */
+{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy21); }
         break;
-      case 203: /* func ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy168 = createFunctionNode(pCxt, &yymsp[-3].minor.yy393, yymsp[-1].minor.yy376); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 207: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
+{ yymsp[-8].minor.yy564 = createIndexOption(pCxt, yymsp[-6].minor.yy476, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), NULL, yymsp[0].minor.yy564); }
         break;
-      case 204: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy537, &yymsp[-2].minor.yy393, yymsp[0].minor.yy168, NULL); }
+      case 208: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
+{ yymsp[-10].minor.yy564 = createIndexOption(pCxt, yymsp[-8].minor.yy476, releaseRawExprNode(pCxt, yymsp[-4].minor.yy564), releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), yymsp[0].minor.yy564); }
         break;
-      case 205: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy537, &yymsp[-2].minor.yy393, NULL, &yymsp[0].minor.yy393); }
+      case 211: /* func ::= function_name NK_LP expression_list NK_RP */
+{ yylhsminor.yy564 = createFunctionNode(pCxt, &yymsp[-3].minor.yy21, yymsp[-1].minor.yy476); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 206: /* cmd ::= DROP TOPIC exists_opt topic_name */
-{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy537, &yymsp[0].minor.yy393); }
+      case 212: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy21, yymsp[0].minor.yy564, NULL); }
         break;
-      case 207: /* cmd ::= DESC full_table_name */
-      case 208: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==208);
-{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy168); }
+      case 213: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy21, NULL, &yymsp[0].minor.yy21); }
         break;
-      case 209: /* cmd ::= RESET QUERY CACHE */
+      case 214: /* cmd ::= DROP TOPIC exists_opt topic_name */
+{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy21); }
+        break;
+      case 215: /* cmd ::= DESC full_table_name */
+      case 216: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==216);
+{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy564); }
+        break;
+      case 217: /* cmd ::= RESET QUERY CACHE */
 { pCxt->pRootNode = createResetQueryCacheStmt(pCxt); }
         break;
-      case 210: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */
-{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy537, yymsp[-1].minor.yy168, yymsp[0].minor.yy168); }
+      case 218: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */
+{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy173, yymsp[-1].minor.yy564, yymsp[0].minor.yy564); }
         break;
-      case 212: /* analyze_opt ::= ANALYZE */
-      case 220: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==220);
-      case 340: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==340);
-{ yymsp[0].minor.yy537 = true; }
+      case 220: /* analyze_opt ::= ANALYZE */
+      case 228: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==228);
+      case 348: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==348);
+{ yymsp[0].minor.yy173 = true; }
         break;
-      case 213: /* explain_options ::= */
-{ yymsp[1].minor.yy168 = createDefaultExplainOptions(pCxt); }
+      case 221: /* explain_options ::= */
+{ yymsp[1].minor.yy564 = createDefaultExplainOptions(pCxt); }
         break;
-      case 214: /* explain_options ::= explain_options VERBOSE NK_BOOL */
-{ yylhsminor.yy168 = setExplainVerbose(pCxt, yymsp[-2].minor.yy168, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 222: /* explain_options ::= explain_options VERBOSE NK_BOOL */
+{ yylhsminor.yy564 = setExplainVerbose(pCxt, yymsp[-2].minor.yy564, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 215: /* explain_options ::= explain_options RATIO NK_FLOAT */
-{ yylhsminor.yy168 = setExplainRatio(pCxt, yymsp[-2].minor.yy168, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 223: /* explain_options ::= explain_options RATIO NK_FLOAT */
+{ yylhsminor.yy564 = setExplainRatio(pCxt, yymsp[-2].minor.yy564, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 216: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
-{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy376); }
+      case 224: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
+{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy476); }
         break;
-      case 217: /* cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
-{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-7].minor.yy537, &yymsp[-5].minor.yy393, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy224, yymsp[0].minor.yy508); }
+      case 225: /* cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
+{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-7].minor.yy173, &yymsp[-5].minor.yy21, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy288, yymsp[0].minor.yy620); }
         break;
-      case 218: /* cmd ::= DROP FUNCTION function_name */
-{ pCxt->pRootNode = createDropFunctionStmt(pCxt, &yymsp[0].minor.yy393); }
+      case 226: /* cmd ::= DROP FUNCTION function_name */
+{ pCxt->pRootNode = createDropFunctionStmt(pCxt, &yymsp[0].minor.yy21); }
         break;
-      case 221: /* bufsize_opt ::= */
-{ yymsp[1].minor.yy508 = 0; }
+      case 229: /* bufsize_opt ::= */
+{ yymsp[1].minor.yy620 = 0; }
         break;
-      case 222: /* bufsize_opt ::= BUFSIZE NK_INTEGER */
-{ yymsp[-1].minor.yy508 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+      case 230: /* bufsize_opt ::= BUFSIZE NK_INTEGER */
+{ yymsp[-1].minor.yy620 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
         break;
-      case 223: /* cmd ::= CREATE STREAM stream_name INTO table_name AS query_expression */
-{ pCxt->pRootNode = createCreateStreamStmt(pCxt, &yymsp[-4].minor.yy393, &yymsp[-2].minor.yy393, yymsp[0].minor.yy168); }
+      case 231: /* cmd ::= CREATE STREAM stream_name INTO table_name AS query_expression */
+{ pCxt->pRootNode = createCreateStreamStmt(pCxt, &yymsp[-4].minor.yy21, &yymsp[-2].minor.yy21, yymsp[0].minor.yy564); }
         break;
-      case 224: /* cmd ::= DROP STREAM stream_name */
-{ pCxt->pRootNode = createDropStreamStmt(pCxt, &yymsp[0].minor.yy393); }
+      case 232: /* cmd ::= DROP STREAM stream_name */
+{ pCxt->pRootNode = createDropStreamStmt(pCxt, &yymsp[0].minor.yy21); }
         break;
-      case 225: /* cmd ::= KILL CONNECTION NK_INTEGER */
+      case 233: /* cmd ::= KILL CONNECTION NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 226: /* cmd ::= KILL QUERY NK_INTEGER */
+      case 234: /* cmd ::= KILL QUERY NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_QUERY_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 227: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
+      case 235: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
 { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 228: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
-{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy376); }
+      case 236: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
+{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy476); }
         break;
-      case 229: /* cmd ::= SPLIT VGROUP NK_INTEGER */
+      case 237: /* cmd ::= SPLIT VGROUP NK_INTEGER */
 { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
-      case 230: /* dnode_list ::= DNODE NK_INTEGER */
-{ yymsp[-1].minor.yy376 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+      case 238: /* dnode_list ::= DNODE NK_INTEGER */
+{ yymsp[-1].minor.yy476 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
         break;
-      case 232: /* cmd ::= SYNCDB db_name REPLICA */
-{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy393); }
+      case 240: /* cmd ::= SYNCDB db_name REPLICA */
+{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy21); }
         break;
-      case 234: /* literal ::= NK_INTEGER */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 242: /* literal ::= NK_INTEGER */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 235: /* literal ::= NK_FLOAT */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 243: /* literal ::= NK_FLOAT */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 236: /* literal ::= NK_STRING */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 244: /* literal ::= NK_STRING */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 237: /* literal ::= NK_BOOL */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 245: /* literal ::= NK_BOOL */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 238: /* literal ::= TIMESTAMP NK_STRING */
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 246: /* literal ::= TIMESTAMP NK_STRING */
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 239: /* literal ::= duration_literal */
-      case 248: /* signed_literal ::= signed */ yytestcase(yyruleno==248);
-      case 268: /* expression ::= literal */ yytestcase(yyruleno==268);
-      case 269: /* expression ::= pseudo_column */ yytestcase(yyruleno==269);
-      case 270: /* expression ::= column_reference */ yytestcase(yyruleno==270);
-      case 273: /* expression ::= subquery */ yytestcase(yyruleno==273);
-      case 313: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==313);
-      case 317: /* boolean_primary ::= predicate */ yytestcase(yyruleno==317);
-      case 319: /* common_expression ::= expression */ yytestcase(yyruleno==319);
-      case 320: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==320);
-      case 322: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==322);
-      case 324: /* table_reference ::= table_primary */ yytestcase(yyruleno==324);
-      case 325: /* table_reference ::= joined_table */ yytestcase(yyruleno==325);
-      case 329: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==329);
-      case 376: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==376);
-      case 378: /* query_primary ::= query_specification */ yytestcase(yyruleno==378);
-{ yylhsminor.yy168 = yymsp[0].minor.yy168; }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 247: /* literal ::= duration_literal */
+      case 256: /* signed_literal ::= signed */ yytestcase(yyruleno==256);
+      case 276: /* expression ::= literal */ yytestcase(yyruleno==276);
+      case 277: /* expression ::= pseudo_column */ yytestcase(yyruleno==277);
+      case 278: /* expression ::= column_reference */ yytestcase(yyruleno==278);
+      case 281: /* expression ::= subquery */ yytestcase(yyruleno==281);
+      case 321: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==321);
+      case 325: /* boolean_primary ::= predicate */ yytestcase(yyruleno==325);
+      case 327: /* common_expression ::= expression */ yytestcase(yyruleno==327);
+      case 328: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==328);
+      case 330: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==330);
+      case 332: /* table_reference ::= table_primary */ yytestcase(yyruleno==332);
+      case 333: /* table_reference ::= joined_table */ yytestcase(yyruleno==333);
+      case 337: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==337);
+      case 384: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==384);
+      case 386: /* query_primary ::= query_specification */ yytestcase(yyruleno==386);
+{ yylhsminor.yy564 = yymsp[0].minor.yy564; }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 240: /* literal ::= NULL */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 248: /* literal ::= NULL */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 241: /* duration_literal ::= NK_VARIABLE */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 249: /* duration_literal ::= NK_VARIABLE */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 242: /* signed ::= NK_INTEGER */
-{ yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 250: /* signed ::= NK_INTEGER */
+{ yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 243: /* signed ::= NK_PLUS NK_INTEGER */
-{ yymsp[-1].minor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+      case 251: /* signed ::= NK_PLUS NK_INTEGER */
+{ yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
-      case 244: /* signed ::= NK_MINUS NK_INTEGER */
+      case 252: /* signed ::= NK_MINUS NK_INTEGER */
 { 
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
-                                                                                    yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
+                                                                                    yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
                                                                                   }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 245: /* signed ::= NK_FLOAT */
-{ yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 253: /* signed ::= NK_FLOAT */
+{ yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 246: /* signed ::= NK_PLUS NK_FLOAT */
-{ yymsp[-1].minor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+      case 254: /* signed ::= NK_PLUS NK_FLOAT */
+{ yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
         break;
-      case 247: /* signed ::= NK_MINUS NK_FLOAT */
+      case 255: /* signed ::= NK_MINUS NK_FLOAT */
 { 
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
-                                                                                    yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
+                                                                                    yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
                                                                                   }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 249: /* signed_literal ::= NK_STRING */
-{ yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 257: /* signed_literal ::= NK_STRING */
+{ yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 250: /* signed_literal ::= NK_BOOL */
-{ yylhsminor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 258: /* signed_literal ::= NK_BOOL */
+{ yylhsminor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 251: /* signed_literal ::= TIMESTAMP NK_STRING */
-{ yymsp[-1].minor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
+      case 259: /* signed_literal ::= TIMESTAMP NK_STRING */
+{ yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
         break;
-      case 252: /* signed_literal ::= duration_literal */
-      case 390: /* search_condition ::= common_expression */ yytestcase(yyruleno==390);
-{ yylhsminor.yy168 = releaseRawExprNode(pCxt, yymsp[0].minor.yy168); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 260: /* signed_literal ::= duration_literal */
+      case 398: /* search_condition ::= common_expression */ yytestcase(yyruleno==398);
+{ yylhsminor.yy564 = releaseRawExprNode(pCxt, yymsp[0].minor.yy564); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 253: /* signed_literal ::= NULL */
-{ yymsp[0].minor.yy168 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); }
+      case 261: /* signed_literal ::= NULL */
+{ yymsp[0].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); }
         break;
-      case 271: /* expression ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy393, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy393, yymsp[-1].minor.yy376)); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 279: /* expression ::= function_name NK_LP expression_list NK_RP */
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy21, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy21, yymsp[-1].minor.yy476)); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 272: /* expression ::= function_name NK_LP NK_STAR NK_RP */
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy393, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy393, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 280: /* expression ::= function_name NK_LP NK_STAR NK_RP */
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy21, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy21, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 274: /* expression ::= NK_LP expression NK_RP */
-      case 318: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==318);
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy168)); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 282: /* expression ::= NK_LP expression NK_RP */
+      case 326: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==326);
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy564)); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 275: /* expression ::= NK_PLUS expression */
+      case 283: /* expression ::= NK_PLUS expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy168));
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy564));
                                                                                   }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 276: /* expression ::= NK_MINUS expression */
+      case 284: /* expression ::= NK_MINUS expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy168), NULL));
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy564), NULL));
                                                                                   }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 277: /* expression ::= expression NK_PLUS expression */
+      case 285: /* expression ::= expression NK_PLUS expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); 
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 278: /* expression ::= expression NK_MINUS expression */
+      case 286: /* expression ::= expression NK_MINUS expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); 
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 279: /* expression ::= expression NK_STAR expression */
+      case 287: /* expression ::= expression NK_STAR expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); 
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 280: /* expression ::= expression NK_SLASH expression */
+      case 288: /* expression ::= expression NK_SLASH expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); 
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 281: /* expression ::= expression NK_REM expression */
+      case 289: /* expression ::= expression NK_REM expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); 
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 282: /* expression_list ::= expression */
-{ yylhsminor.yy376 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy168)); }
-  yymsp[0].minor.yy376 = yylhsminor.yy376;
+      case 290: /* expression_list ::= expression */
+{ yylhsminor.yy476 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy564)); }
+  yymsp[0].minor.yy476 = yylhsminor.yy476;
         break;
-      case 283: /* expression_list ::= expression_list NK_COMMA expression */
-{ yylhsminor.yy376 = addNodeToList(pCxt, yymsp[-2].minor.yy376, releaseRawExprNode(pCxt, yymsp[0].minor.yy168)); }
-  yymsp[-2].minor.yy376 = yylhsminor.yy376;
+      case 291: /* expression_list ::= expression_list NK_COMMA expression */
+{ yylhsminor.yy476 = addNodeToList(pCxt, yymsp[-2].minor.yy476, releaseRawExprNode(pCxt, yymsp[0].minor.yy564)); }
+  yymsp[-2].minor.yy476 = yylhsminor.yy476;
         break;
-      case 284: /* column_reference ::= column_name */
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy393, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy393)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 292: /* column_reference ::= column_name */
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy21, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy21)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 285: /* column_reference ::= table_name NK_DOT column_name */
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy393, createColumnNode(pCxt, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy393)); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 293: /* column_reference ::= table_name NK_DOT column_name */
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy21, createColumnNode(pCxt, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy21)); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 286: /* pseudo_column ::= NOW */
-      case 287: /* pseudo_column ::= ROWTS */ yytestcase(yyruleno==287);
-      case 288: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==288);
-      case 289: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==289);
-      case 290: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==290);
-      case 291: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==291);
-      case 292: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==292);
-      case 293: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==293);
-{ yylhsminor.yy168 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+      case 294: /* pseudo_column ::= NOW */
+      case 295: /* pseudo_column ::= ROWTS */ yytestcase(yyruleno==295);
+      case 296: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==296);
+      case 297: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==297);
+      case 298: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==298);
+      case 299: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==299);
+      case 300: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==300);
+      case 301: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==301);
+{ yylhsminor.yy564 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 294: /* predicate ::= expression compare_op expression */
-      case 299: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==299);
+      case 302: /* predicate ::= expression compare_op expression */
+      case 307: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==307);
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy436, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy468, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564)));
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 295: /* predicate ::= expression BETWEEN expression AND expression */
+      case 303: /* predicate ::= expression BETWEEN expression AND expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy168), releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy564), releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564)));
                                                                                   }
-  yymsp[-4].minor.yy168 = yylhsminor.yy168;
+  yymsp[-4].minor.yy564 = yylhsminor.yy564;
         break;
-      case 296: /* predicate ::= expression NOT BETWEEN expression AND expression */
+      case 304: /* predicate ::= expression NOT BETWEEN expression AND expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[-5].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[-5].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564)));
                                                                                   }
-  yymsp[-5].minor.yy168 = yylhsminor.yy168;
+  yymsp[-5].minor.yy564 = yylhsminor.yy564;
         break;
-      case 297: /* predicate ::= expression IS NULL */
+      case 305: /* predicate ::= expression IS NULL */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), NULL));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), NULL));
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 298: /* predicate ::= expression IS NOT NULL */
+      case 306: /* predicate ::= expression IS NOT NULL */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy168), NULL));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy564), NULL));
                                                                                   }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 300: /* compare_op ::= NK_LT */
-{ yymsp[0].minor.yy436 = OP_TYPE_LOWER_THAN; }
+      case 308: /* compare_op ::= NK_LT */
+{ yymsp[0].minor.yy468 = OP_TYPE_LOWER_THAN; }
         break;
-      case 301: /* compare_op ::= NK_GT */
-{ yymsp[0].minor.yy436 = OP_TYPE_GREATER_THAN; }
+      case 309: /* compare_op ::= NK_GT */
+{ yymsp[0].minor.yy468 = OP_TYPE_GREATER_THAN; }
         break;
-      case 302: /* compare_op ::= NK_LE */
-{ yymsp[0].minor.yy436 = OP_TYPE_LOWER_EQUAL; }
+      case 310: /* compare_op ::= NK_LE */
+{ yymsp[0].minor.yy468 = OP_TYPE_LOWER_EQUAL; }
         break;
-      case 303: /* compare_op ::= NK_GE */
-{ yymsp[0].minor.yy436 = OP_TYPE_GREATER_EQUAL; }
+      case 311: /* compare_op ::= NK_GE */
+{ yymsp[0].minor.yy468 = OP_TYPE_GREATER_EQUAL; }
         break;
-      case 304: /* compare_op ::= NK_NE */
-{ yymsp[0].minor.yy436 = OP_TYPE_NOT_EQUAL; }
+      case 312: /* compare_op ::= NK_NE */
+{ yymsp[0].minor.yy468 = OP_TYPE_NOT_EQUAL; }
         break;
-      case 305: /* compare_op ::= NK_EQ */
-{ yymsp[0].minor.yy436 = OP_TYPE_EQUAL; }
+      case 313: /* compare_op ::= NK_EQ */
+{ yymsp[0].minor.yy468 = OP_TYPE_EQUAL; }
         break;
-      case 306: /* compare_op ::= LIKE */
-{ yymsp[0].minor.yy436 = OP_TYPE_LIKE; }
+      case 314: /* compare_op ::= LIKE */
+{ yymsp[0].minor.yy468 = OP_TYPE_LIKE; }
         break;
-      case 307: /* compare_op ::= NOT LIKE */
-{ yymsp[-1].minor.yy436 = OP_TYPE_NOT_LIKE; }
+      case 315: /* compare_op ::= NOT LIKE */
+{ yymsp[-1].minor.yy468 = OP_TYPE_NOT_LIKE; }
         break;
-      case 308: /* compare_op ::= MATCH */
-{ yymsp[0].minor.yy436 = OP_TYPE_MATCH; }
+      case 316: /* compare_op ::= MATCH */
+{ yymsp[0].minor.yy468 = OP_TYPE_MATCH; }
         break;
-      case 309: /* compare_op ::= NMATCH */
-{ yymsp[0].minor.yy436 = OP_TYPE_NMATCH; }
+      case 317: /* compare_op ::= NMATCH */
+{ yymsp[0].minor.yy468 = OP_TYPE_NMATCH; }
         break;
-      case 310: /* in_op ::= IN */
-{ yymsp[0].minor.yy436 = OP_TYPE_IN; }
+      case 318: /* in_op ::= IN */
+{ yymsp[0].minor.yy468 = OP_TYPE_IN; }
         break;
-      case 311: /* in_op ::= NOT IN */
-{ yymsp[-1].minor.yy436 = OP_TYPE_NOT_IN; }
+      case 319: /* in_op ::= NOT IN */
+{ yymsp[-1].minor.yy468 = OP_TYPE_NOT_IN; }
         break;
-      case 312: /* in_predicate_value ::= NK_LP expression_list NK_RP */
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy376)); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 320: /* in_predicate_value ::= NK_LP expression_list NK_RP */
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy476)); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 314: /* boolean_value_expression ::= NOT boolean_primary */
+      case 322: /* boolean_value_expression ::= NOT boolean_primary */
 {
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy168), NULL));
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy564), NULL));
                                                                                   }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 315: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+      case 323: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564)));
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 316: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+      case 324: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy168);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), releaseRawExprNode(pCxt, yymsp[0].minor.yy168)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy564);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), releaseRawExprNode(pCxt, yymsp[0].minor.yy564)));
                                                                                   }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 321: /* from_clause ::= FROM table_reference_list */
-      case 351: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==351);
-      case 374: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==374);
-{ yymsp[-1].minor.yy168 = yymsp[0].minor.yy168; }
+      case 329: /* from_clause ::= FROM table_reference_list */
+      case 359: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==359);
+      case 382: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==382);
+{ yymsp[-1].minor.yy564 = yymsp[0].minor.yy564; }
         break;
-      case 323: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
-{ yylhsminor.yy168 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy168, yymsp[0].minor.yy168, NULL); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 331: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+{ yylhsminor.yy564 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy564, yymsp[0].minor.yy564, NULL); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 326: /* table_primary ::= table_name alias_opt */
-{ yylhsminor.yy168 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy393, &yymsp[0].minor.yy393); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 334: /* table_primary ::= table_name alias_opt */
+{ yylhsminor.yy564 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy21, &yymsp[0].minor.yy21); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 327: /* table_primary ::= db_name NK_DOT table_name alias_opt */
-{ yylhsminor.yy168 = createRealTableNode(pCxt, &yymsp[-3].minor.yy393, &yymsp[-1].minor.yy393, &yymsp[0].minor.yy393); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 335: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+{ yylhsminor.yy564 = createRealTableNode(pCxt, &yymsp[-3].minor.yy21, &yymsp[-1].minor.yy21, &yymsp[0].minor.yy21); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 328: /* table_primary ::= subquery alias_opt */
-{ yylhsminor.yy168 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy168), &yymsp[0].minor.yy393); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 336: /* table_primary ::= subquery alias_opt */
+{ yylhsminor.yy564 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy564), &yymsp[0].minor.yy21); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 330: /* alias_opt ::= */
-{ yymsp[1].minor.yy393 = nil_token;  }
+      case 338: /* alias_opt ::= */
+{ yymsp[1].minor.yy21 = nil_token;  }
         break;
-      case 331: /* alias_opt ::= table_alias */
-{ yylhsminor.yy393 = yymsp[0].minor.yy393; }
-  yymsp[0].minor.yy393 = yylhsminor.yy393;
+      case 339: /* alias_opt ::= table_alias */
+{ yylhsminor.yy21 = yymsp[0].minor.yy21; }
+  yymsp[0].minor.yy21 = yylhsminor.yy21;
         break;
-      case 332: /* alias_opt ::= AS table_alias */
-{ yymsp[-1].minor.yy393 = yymsp[0].minor.yy393; }
+      case 340: /* alias_opt ::= AS table_alias */
+{ yymsp[-1].minor.yy21 = yymsp[0].minor.yy21; }
         break;
-      case 333: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-      case 334: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==334);
-{ yymsp[-2].minor.yy168 = yymsp[-1].minor.yy168; }
+      case 341: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+      case 342: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==342);
+{ yymsp[-2].minor.yy564 = yymsp[-1].minor.yy564; }
         break;
-      case 335: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-{ yylhsminor.yy168 = createJoinTableNode(pCxt, yymsp[-4].minor.yy596, yymsp[-5].minor.yy168, yymsp[-2].minor.yy168, yymsp[0].minor.yy168); }
-  yymsp[-5].minor.yy168 = yylhsminor.yy168;
+      case 343: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+{ yylhsminor.yy564 = createJoinTableNode(pCxt, yymsp[-4].minor.yy440, yymsp[-5].minor.yy564, yymsp[-2].minor.yy564, yymsp[0].minor.yy564); }
+  yymsp[-5].minor.yy564 = yylhsminor.yy564;
         break;
-      case 336: /* join_type ::= */
-{ yymsp[1].minor.yy596 = JOIN_TYPE_INNER; }
+      case 344: /* join_type ::= */
+{ yymsp[1].minor.yy440 = JOIN_TYPE_INNER; }
         break;
-      case 337: /* join_type ::= INNER */
-{ yymsp[0].minor.yy596 = JOIN_TYPE_INNER; }
+      case 345: /* join_type ::= INNER */
+{ yymsp[0].minor.yy440 = JOIN_TYPE_INNER; }
         break;
-      case 338: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+      case 346: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
 { 
-                                                                                    yymsp[-8].minor.yy168 = createSelectStmt(pCxt, yymsp[-7].minor.yy537, yymsp[-6].minor.yy376, yymsp[-5].minor.yy168);
-                                                                                    yymsp[-8].minor.yy168 = addWhereClause(pCxt, yymsp[-8].minor.yy168, yymsp[-4].minor.yy168);
-                                                                                    yymsp[-8].minor.yy168 = addPartitionByClause(pCxt, yymsp[-8].minor.yy168, yymsp[-3].minor.yy376);
-                                                                                    yymsp[-8].minor.yy168 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy168, yymsp[-2].minor.yy168);
-                                                                                    yymsp[-8].minor.yy168 = addGroupByClause(pCxt, yymsp[-8].minor.yy168, yymsp[-1].minor.yy376);
-                                                                                    yymsp[-8].minor.yy168 = addHavingClause(pCxt, yymsp[-8].minor.yy168, yymsp[0].minor.yy168);
+                                                                                    yymsp[-8].minor.yy564 = createSelectStmt(pCxt, yymsp[-7].minor.yy173, yymsp[-6].minor.yy476, yymsp[-5].minor.yy564);
+                                                                                    yymsp[-8].minor.yy564 = addWhereClause(pCxt, yymsp[-8].minor.yy564, yymsp[-4].minor.yy564);
+                                                                                    yymsp[-8].minor.yy564 = addPartitionByClause(pCxt, yymsp[-8].minor.yy564, yymsp[-3].minor.yy476);
+                                                                                    yymsp[-8].minor.yy564 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy564, yymsp[-2].minor.yy564);
+                                                                                    yymsp[-8].minor.yy564 = addGroupByClause(pCxt, yymsp[-8].minor.yy564, yymsp[-1].minor.yy476);
+                                                                                    yymsp[-8].minor.yy564 = addHavingClause(pCxt, yymsp[-8].minor.yy564, yymsp[0].minor.yy564);
                                                                                   }
         break;
-      case 341: /* set_quantifier_opt ::= ALL */
-{ yymsp[0].minor.yy537 = false; }
+      case 349: /* set_quantifier_opt ::= ALL */
+{ yymsp[0].minor.yy173 = false; }
         break;
-      case 342: /* select_list ::= NK_STAR */
-{ yymsp[0].minor.yy376 = NULL; }
+      case 350: /* select_list ::= NK_STAR */
+{ yymsp[0].minor.yy476 = NULL; }
         break;
-      case 346: /* select_item ::= common_expression */
+      case 354: /* select_item ::= common_expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy168);
-                                                                                    yylhsminor.yy168 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy168), &t);
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
+                                                                                    yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy564), &t);
                                                                                   }
-  yymsp[0].minor.yy168 = yylhsminor.yy168;
+  yymsp[0].minor.yy564 = yylhsminor.yy564;
         break;
-      case 347: /* select_item ::= common_expression column_alias */
-{ yylhsminor.yy168 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy168), &yymsp[0].minor.yy393); }
-  yymsp[-1].minor.yy168 = yylhsminor.yy168;
+      case 355: /* select_item ::= common_expression column_alias */
+{ yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy564), &yymsp[0].minor.yy21); }
+  yymsp[-1].minor.yy564 = yylhsminor.yy564;
         break;
-      case 348: /* select_item ::= common_expression AS column_alias */
-{ yylhsminor.yy168 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), &yymsp[0].minor.yy393); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 356: /* select_item ::= common_expression AS column_alias */
+{ yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), &yymsp[0].minor.yy21); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 349: /* select_item ::= table_name NK_DOT NK_STAR */
-{ yylhsminor.yy168 = createColumnNode(pCxt, &yymsp[-2].minor.yy393, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 357: /* select_item ::= table_name NK_DOT NK_STAR */
+{ yylhsminor.yy564 = createColumnNode(pCxt, &yymsp[-2].minor.yy21, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 353: /* partition_by_clause_opt ::= PARTITION BY expression_list */
-      case 370: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==370);
-      case 380: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==380);
-{ yymsp[-2].minor.yy376 = yymsp[0].minor.yy376; }
+      case 361: /* partition_by_clause_opt ::= PARTITION BY expression_list */
+      case 378: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==378);
+      case 388: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==388);
+{ yymsp[-2].minor.yy476 = yymsp[0].minor.yy476; }
         break;
-      case 355: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-{ yymsp[-5].minor.yy168 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy168), releaseRawExprNode(pCxt, yymsp[-1].minor.yy168)); }
+      case 363: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+{ yymsp[-5].minor.yy564 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy564), releaseRawExprNode(pCxt, yymsp[-1].minor.yy564)); }
         break;
-      case 356: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
-{ yymsp[-3].minor.yy168 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy168)); }
+      case 364: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
+{ yymsp[-3].minor.yy564 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy564)); }
         break;
-      case 357: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-5].minor.yy168 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy168), NULL, yymsp[-1].minor.yy168, yymsp[0].minor.yy168); }
+      case 365: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-5].minor.yy564 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy564), NULL, yymsp[-1].minor.yy564, yymsp[0].minor.yy564); }
         break;
-      case 358: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-7].minor.yy168 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy168), releaseRawExprNode(pCxt, yymsp[-3].minor.yy168), yymsp[-1].minor.yy168, yymsp[0].minor.yy168); }
+      case 366: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-7].minor.yy564 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy564), releaseRawExprNode(pCxt, yymsp[-3].minor.yy564), yymsp[-1].minor.yy564, yymsp[0].minor.yy564); }
         break;
-      case 360: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-{ yymsp[-3].minor.yy168 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy168); }
+      case 368: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+{ yymsp[-3].minor.yy564 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy564); }
         break;
-      case 362: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
-{ yymsp[-3].minor.yy168 = createFillNode(pCxt, yymsp[-1].minor.yy382, NULL); }
+      case 370: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+{ yymsp[-3].minor.yy564 = createFillNode(pCxt, yymsp[-1].minor.yy268, NULL); }
         break;
-      case 363: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-{ yymsp[-5].minor.yy168 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy376)); }
+      case 371: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+{ yymsp[-5].minor.yy564 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy476)); }
         break;
-      case 364: /* fill_mode ::= NONE */
-{ yymsp[0].minor.yy382 = FILL_MODE_NONE; }
+      case 372: /* fill_mode ::= NONE */
+{ yymsp[0].minor.yy268 = FILL_MODE_NONE; }
         break;
-      case 365: /* fill_mode ::= PREV */
-{ yymsp[0].minor.yy382 = FILL_MODE_PREV; }
+      case 373: /* fill_mode ::= PREV */
+{ yymsp[0].minor.yy268 = FILL_MODE_PREV; }
         break;
-      case 366: /* fill_mode ::= NULL */
-{ yymsp[0].minor.yy382 = FILL_MODE_NULL; }
+      case 374: /* fill_mode ::= NULL */
+{ yymsp[0].minor.yy268 = FILL_MODE_NULL; }
         break;
-      case 367: /* fill_mode ::= LINEAR */
-{ yymsp[0].minor.yy382 = FILL_MODE_LINEAR; }
+      case 375: /* fill_mode ::= LINEAR */
+{ yymsp[0].minor.yy268 = FILL_MODE_LINEAR; }
         break;
-      case 368: /* fill_mode ::= NEXT */
-{ yymsp[0].minor.yy382 = FILL_MODE_NEXT; }
+      case 376: /* fill_mode ::= NEXT */
+{ yymsp[0].minor.yy268 = FILL_MODE_NEXT; }
         break;
-      case 371: /* group_by_list ::= expression */
-{ yylhsminor.yy376 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); }
-  yymsp[0].minor.yy376 = yylhsminor.yy376;
+      case 379: /* group_by_list ::= expression */
+{ yylhsminor.yy476 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); }
+  yymsp[0].minor.yy476 = yylhsminor.yy476;
         break;
-      case 372: /* group_by_list ::= group_by_list NK_COMMA expression */
-{ yylhsminor.yy376 = addNodeToList(pCxt, yymsp[-2].minor.yy376, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy168))); }
-  yymsp[-2].minor.yy376 = yylhsminor.yy376;
+      case 380: /* group_by_list ::= group_by_list NK_COMMA expression */
+{ yylhsminor.yy476 = addNodeToList(pCxt, yymsp[-2].minor.yy476, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy564))); }
+  yymsp[-2].minor.yy476 = yylhsminor.yy476;
         break;
-      case 375: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+      case 383: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
 { 
-                                                                                    yylhsminor.yy168 = addOrderByClause(pCxt, yymsp[-3].minor.yy168, yymsp[-2].minor.yy376);
-                                                                                    yylhsminor.yy168 = addSlimitClause(pCxt, yylhsminor.yy168, yymsp[-1].minor.yy168);
-                                                                                    yylhsminor.yy168 = addLimitClause(pCxt, yylhsminor.yy168, yymsp[0].minor.yy168);
+                                                                                    yylhsminor.yy564 = addOrderByClause(pCxt, yymsp[-3].minor.yy564, yymsp[-2].minor.yy476);
+                                                                                    yylhsminor.yy564 = addSlimitClause(pCxt, yylhsminor.yy564, yymsp[-1].minor.yy564);
+                                                                                    yylhsminor.yy564 = addLimitClause(pCxt, yylhsminor.yy564, yymsp[0].minor.yy564);
                                                                                   }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 377: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-{ yylhsminor.yy168 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy168, yymsp[0].minor.yy168); }
-  yymsp[-3].minor.yy168 = yylhsminor.yy168;
+      case 385: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+{ yylhsminor.yy564 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy564, yymsp[0].minor.yy564); }
+  yymsp[-3].minor.yy564 = yylhsminor.yy564;
         break;
-      case 382: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
-      case 386: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==386);
-{ yymsp[-1].minor.yy168 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+      case 390: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+      case 394: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==394);
+{ yymsp[-1].minor.yy564 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
         break;
-      case 383: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-      case 387: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==387);
-{ yymsp[-3].minor.yy168 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+      case 391: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+      case 395: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==395);
+{ yymsp[-3].minor.yy564 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 384: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-      case 388: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==388);
-{ yymsp[-3].minor.yy168 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+      case 392: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+      case 396: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==396);
+{ yymsp[-3].minor.yy564 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
         break;
-      case 389: /* subquery ::= NK_LP query_expression NK_RP */
-{ yylhsminor.yy168 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy168); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 397: /* subquery ::= NK_LP query_expression NK_RP */
+{ yylhsminor.yy564 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy564); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 393: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-{ yylhsminor.yy168 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy168), yymsp[-1].minor.yy554, yymsp[0].minor.yy81); }
-  yymsp[-2].minor.yy168 = yylhsminor.yy168;
+      case 401: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+{ yylhsminor.yy564 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy564), yymsp[-1].minor.yy256, yymsp[0].minor.yy525); }
+  yymsp[-2].minor.yy564 = yylhsminor.yy564;
         break;
-      case 394: /* ordering_specification_opt ::= */
-{ yymsp[1].minor.yy554 = ORDER_ASC; }
+      case 402: /* ordering_specification_opt ::= */
+{ yymsp[1].minor.yy256 = ORDER_ASC; }
         break;
-      case 395: /* ordering_specification_opt ::= ASC */
-{ yymsp[0].minor.yy554 = ORDER_ASC; }
+      case 403: /* ordering_specification_opt ::= ASC */
+{ yymsp[0].minor.yy256 = ORDER_ASC; }
         break;
-      case 396: /* ordering_specification_opt ::= DESC */
-{ yymsp[0].minor.yy554 = ORDER_DESC; }
+      case 404: /* ordering_specification_opt ::= DESC */
+{ yymsp[0].minor.yy256 = ORDER_DESC; }
         break;
-      case 397: /* null_ordering_opt ::= */
-{ yymsp[1].minor.yy81 = NULL_ORDER_DEFAULT; }
+      case 405: /* null_ordering_opt ::= */
+{ yymsp[1].minor.yy525 = NULL_ORDER_DEFAULT; }
         break;
-      case 398: /* null_ordering_opt ::= NULLS FIRST */
-{ yymsp[-1].minor.yy81 = NULL_ORDER_FIRST; }
+      case 406: /* null_ordering_opt ::= NULLS FIRST */
+{ yymsp[-1].minor.yy525 = NULL_ORDER_FIRST; }
         break;
-      case 399: /* null_ordering_opt ::= NULLS LAST */
-{ yymsp[-1].minor.yy81 = NULL_ORDER_LAST; }
+      case 407: /* null_ordering_opt ::= NULLS LAST */
+{ yymsp[-1].minor.yy525 = NULL_ORDER_LAST; }
         break;
       default:
         break;
diff --git a/source/libs/parser/test/parserAstTest.cpp b/source/libs/parser/test/parserAstTest.cpp
index 87582f9eba..d7e9b4a24d 100644
--- a/source/libs/parser/test/parserAstTest.cpp
+++ b/source/libs/parser/test/parserAstTest.cpp
@@ -648,6 +648,48 @@ TEST_F(ParserTest, dropQnode) {
   ASSERT_TRUE(run());
 }
 
+TEST_F(ParserTest, createBnode) {
+  setDatabase("root", "test");
+
+  bind("create bnode on dnode 1");
+  ASSERT_TRUE(run());
+}
+
+TEST_F(ParserTest, dropBnode) {
+  setDatabase("root", "test");
+
+  bind("drop bnode on dnode 1");
+  ASSERT_TRUE(run());
+}
+
+TEST_F(ParserTest, createSnode) {
+  setDatabase("root", "test");
+
+  bind("create snode on dnode 1");
+  ASSERT_TRUE(run());
+}
+
+TEST_F(ParserTest, dropSnode) {
+  setDatabase("root", "test");
+
+  bind("drop snode on dnode 1");
+  ASSERT_TRUE(run());
+}
+
+TEST_F(ParserTest, createMnode) {
+  setDatabase("root", "test");
+
+  bind("create mnode on dnode 1");
+  ASSERT_TRUE(run());
+}
+
+TEST_F(ParserTest, dropMnode) {
+  setDatabase("root", "test");
+
+  bind("drop mnode on dnode 1");
+  ASSERT_TRUE(run());
+}
+
 TEST_F(ParserTest, createTopic) {
   setDatabase("root", "test");
 
diff --git a/source/libs/planner/test/plannerTest.cpp b/source/libs/planner/test/plannerTest.cpp
index 5f84eec36a..697c562b1e 100644
--- a/source/libs/planner/test/plannerTest.cpp
+++ b/source/libs/planner/test/plannerTest.cpp
@@ -259,6 +259,16 @@ TEST_F(PlannerTest, orderBy) {
   ASSERT_TRUE(run());
 }
 
+TEST_F(PlannerTest, groupByOrderBy) {
+  setDatabase("root", "test");
+
+  bind("select count(*), sum(c1) from t1 order by sum(c1)");
+  ASSERT_TRUE(run());
+
+  bind("select count(*), sum(c1) a from t1 order by a");
+  ASSERT_TRUE(run());
+}
+
 TEST_F(PlannerTest, distinct) {
   setDatabase("root", "test");
 

From bece2cbd3587dc39dc7f3beb4c8ba0f7653aa759 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 15:01:28 +0800
Subject: [PATCH 61/82] <feat>[query]: add the state window operator
 implementation.

---
 source/libs/executor/inc/executorimpl.h  |  38 ++--
 source/libs/executor/src/executorimpl.c  | 242 +++++++++++------------
 source/libs/executor/src/groupoperator.c |   2 +-
 3 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index b81fdafef0..32a5140da2 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -550,21 +550,21 @@ typedef struct SFillOperatorInfo {
   int32_t           capacity;
 } SFillOperatorInfo;
 
-typedef struct SGroupKeys {
+typedef struct {
   char   *pData;
   bool    isNull;
   int16_t type;
   int32_t bytes;
-}SGroupKeys;
+} SGroupKeys, SStateKeys;
 
 typedef struct SGroupbyOperatorInfo {
   SOptrBasicInfo binfo;
   SArray*        pGroupCols;
   SArray*        pGroupColVals; // current group column values, SArray<SGroupKeys>
   SNode*         pCondition;
-  bool           isInit;       // denote if current val is initialized or not
-  char*          keyBuf;       // group by keys for hash
-  int32_t        groupKeyLen;  // total group by column width
+  bool           isInit;        // denote if current val is initialized or not
+  char*          keyBuf;        // group by keys for hash
+  int32_t        groupKeyLen;   // total group by column width
   SGroupResInfo  groupResInfo;
   SAggSupporter  aggSup;
 } SGroupbyOperatorInfo;
@@ -592,27 +592,33 @@ typedef struct SPartitionOperatorInfo {
   int32_t        pageIndex;     // page index of current group
 } SPartitionOperatorInfo;
 
+typedef struct SWindowRowsSup {
+  STimeWindow      win;
+  TSKEY            prevTs;
+  int32_t          startRowIndex;
+  int32_t          numOfRows;
+} SWindowRowsSup;
+
 typedef struct SSessionAggOperatorInfo {
   SOptrBasicInfo   binfo;
   SAggSupporter    aggSup;
   SGroupResInfo    groupResInfo;
-  STimeWindow      curWindow;        // current time window
-  TSKEY            prevTs;           // previous timestamp
-  int32_t          numOfRows;        // number of rows
-  int32_t          start;            // start row index
+  SWindowRowsSup   winSup;
   bool             reptScan;         // next round scan
   int64_t          gap;              // session window gap
   SColumnInfoData  timeWindowData;   // query time window info for scalar function execution.
 } SSessionAggOperatorInfo;
 
 typedef struct SStateWindowOperatorInfo {
-  SOptrBasicInfo binfo;
-  STimeWindow    curWindow;  // current time window
-  int32_t        numOfRows;  // number of rows
-  int32_t        colIndex;   // start row index
-  int32_t        start;
-  char*          prevData;  // previous data
-  bool           reptScan;
+  SOptrBasicInfo   binfo;
+  SAggSupporter    aggSup;
+  SGroupResInfo    groupResInfo;
+  SWindowRowsSup   winSup;
+  int32_t          colIndex;   // start row index
+  bool             hasKey;
+  SStateKeys       stateKey;
+  SColumnInfoData  timeWindowData;   // query time window info for scalar function execution.
+//  bool             reptScan;
 } SStateWindowOperatorInfo;
 
 typedef struct SSortedMergeOperatorInfo {
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 28a8c7bce8..fb427025ea 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1637,22 +1637,23 @@ static void hashAllIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pRe
   //  updateResultRowInfoActiveIndex(pResultRowInfo, pQueryAttr, pRuntimeEnv->current->lastKey);
 }
 
-static void doKeepTuple(SSessionAggOperatorInfo* pInfo, int64_t ts) {
-  pInfo->curWindow.ekey = ts;
-  pInfo->prevTs         = ts;
-  pInfo->numOfRows     += 1;
+static void doKeepTuple(SWindowRowsSup* pRowSup, int64_t ts) {
+  pRowSup->win.ekey  = ts;
+  pRowSup->prevTs    = ts;
+  pRowSup->numOfRows += 1;
 }
 
-static void doKeepSessionStartInfo(SSessionAggOperatorInfo* pInfo, const int64_t* tsList, int32_t rowIndex) {
-  pInfo->start          = rowIndex;
-  pInfo->numOfRows      = 0;
-  pInfo->curWindow.skey = tsList[rowIndex];
+static void doKeepNewWindowStartInfo(SWindowRowsSup* pRowSup, const int64_t* tsList, int32_t rowIndex) {
+  pRowSup->startRowIndex = rowIndex;
+  pRowSup->numOfRows     = 0;
+  pRowSup->win.skey      = tsList[rowIndex];
 }
 
 // todo handle multiple tables cases.
 static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperatorInfo* pInfo, SSDataBlock* pBlock) {
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
+  // todo find the correct time stamp column slot
   SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, 0);
 
   bool    masterScan = true;
@@ -1660,31 +1661,34 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
   int64_t gid = pBlock->info.groupId;
 
   int64_t gap = pInfo->gap;
-  pInfo->numOfRows = 0;
+
   if (!pInfo->reptScan) {
     pInfo->reptScan = true;
-    pInfo->prevTs   = INT64_MIN;
+    pInfo->winSup.prevTs = INT64_MIN;
   }
 
+  SWindowRowsSup* pRowSup = &pInfo->winSup;
+  pRowSup->numOfRows = 0;
+
   // In case of ascending or descending order scan data, only one time window needs to be kepted for each table.
   TSKEY* tsList = (TSKEY*)pColInfoData->pData;
   for (int32_t j = 0; j < pBlock->info.rows; ++j) {
-    if (pInfo->prevTs == INT64_MIN) {
-      doKeepSessionStartInfo(pInfo, tsList, j);
-      doKeepTuple(pInfo, tsList[j]);
-    } else if (tsList[j] - pInfo->prevTs <= gap && (tsList[j] - pInfo->prevTs) >= 0) {
+    if (pInfo->winSup.prevTs == INT64_MIN) {
+      doKeepNewWindowStartInfo(pRowSup, tsList, j);
+      doKeepTuple(pRowSup, tsList[j]);
+    } else if (tsList[j] - pRowSup->prevTs <= gap && (tsList[j] - pRowSup->prevTs) >= 0) {
       // The gap is less than the threshold, so it belongs to current session window that has been opened already.
-      doKeepTuple(pInfo, tsList[j]);
-      if (j == 0 && pInfo->start != 0) {
-        pInfo->start = 0;
+      doKeepTuple(pRowSup, tsList[j]);
+      if (j == 0 && pRowSup->startRowIndex != 0) {
+        pRowSup->startRowIndex = 0;
       }
     } else {  // start a new session window
       SResultRow* pResult = NULL;
 
       // keep the time window for the closed time window.
-      STimeWindow window = pInfo->curWindow;
+      STimeWindow window = pRowSup->win;
 
-      pInfo->curWindow.ekey = pInfo->curWindow.skey;
+      pRowSup->win.ekey = pRowSup->win.skey;
       int32_t ret = setResultOutputBufByKey_rv(&pInfo->binfo.resultRowInfo, pBlock->info.uid, &window, masterScan,
                                                &pResult, gid, pInfo->binfo.pCtx, numOfOutput, pInfo->binfo.rowCellInfoOffset, &pInfo->aggSup, pTaskInfo);
       if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
@@ -1693,24 +1697,24 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
 
       // pInfo->numOfRows data belong to the current session window
       updateTimeWindowInfo(&pInfo->timeWindowData, &window, false);
-      doApplyFunctions(pInfo->binfo.pCtx, &window, &pInfo->timeWindowData, pInfo->start, pInfo->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
+      doApplyFunctions(pInfo->binfo.pCtx, &window, &pInfo->timeWindowData, pRowSup->startRowIndex, pRowSup->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
 
       // here we start a new session window
-      doKeepSessionStartInfo(pInfo, tsList, j);
-      doKeepTuple(pInfo, tsList[j]);
+      doKeepNewWindowStartInfo(pRowSup, tsList, j);
+      doKeepTuple(pRowSup, tsList[j]);
     }
   }
 
   SResultRow* pResult = NULL;
-  pInfo->curWindow.ekey = tsList[pBlock->info.rows - 1];
-  int32_t ret = setResultOutputBufByKey_rv(&pInfo->binfo.resultRowInfo, pBlock->info.uid, &pInfo->curWindow, masterScan, &pResult,
+  pRowSup->win.ekey = tsList[pBlock->info.rows - 1];
+  int32_t ret = setResultOutputBufByKey_rv(&pInfo->binfo.resultRowInfo, pBlock->info.uid, &pRowSup->win, masterScan, &pResult,
                                            gid, pInfo->binfo.pCtx, numOfOutput, pInfo->binfo.rowCellInfoOffset, &pInfo->aggSup, pTaskInfo);
   if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
     longjmp(pTaskInfo->env, TSDB_CODE_QRY_APP_ERROR);
   }
 
-  updateTimeWindowInfo(&pInfo->timeWindowData, &pInfo->curWindow, false);
-  doApplyFunctions(pInfo->binfo.pCtx, &pInfo->curWindow, &pInfo->timeWindowData, pInfo->start, pInfo->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
+  updateTimeWindowInfo(&pInfo->timeWindowData, &pRowSup->win, false);
+  doApplyFunctions(pInfo->binfo.pCtx, &pRowSup->win, &pInfo->timeWindowData, pRowSup->startRowIndex, pRowSup->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
 }
 
 static void setResultRowKey(SResultRow* pResultRow, char* pData, int16_t type) {
@@ -5641,84 +5645,78 @@ static SSDataBlock* doAllSTableIntervalAgg(SOperatorInfo* pOperator, bool* newgr
     pOperator->status = OP_EXEC_DONE;
   }
 
-  //  SQInfo* pQInfo = pRuntimeEnv->qinfo;
-  //  pQInfo->summary.firstStageMergeTime += (taosGetTimestampUs() - st);
-
   return pIntervalInfo->binfo.pRes;
 }
 
-static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorInfo* pInfo, SSDataBlock* pSDataBlock) {
-  STaskRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
-  STableQueryInfo* item = pRuntimeEnv->current;
-  SColumnInfoData* pColInfoData = taosArrayGet(pSDataBlock->pDataBlock, pInfo->colIndex);
-
+static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorInfo* pInfo, SSDataBlock* pBlock) {
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
   SOptrBasicInfo* pBInfo = &pInfo->binfo;
 
-  bool    masterScan = IS_MAIN_SCAN(pRuntimeEnv);
-  int16_t bytes = pColInfoData->info.bytes;
-  int16_t type = pColInfoData->info.type;
+  SColumnInfoData* pStateColInfoData = taosArrayGet(pBlock->pDataBlock, pInfo->colIndex);
+  int64_t gid = pBlock->info.groupId;
 
-  SColumnInfoData* pTsColInfoData = taosArrayGet(pSDataBlock->pDataBlock, 0);
-  TSKEY*           tsList = (TSKEY*)pTsColInfoData->pData;
-  if (IS_REPEAT_SCAN(pRuntimeEnv) && !pInfo->reptScan) {
-    pInfo->reptScan = true;
-    taosMemoryFreeClear(pInfo->prevData);
-  }
+  bool    masterScan = true;
+  int32_t numOfOutput = pOperator->numOfOutput;
 
-  pInfo->numOfRows = 0;
-  for (int32_t j = 0; j < pSDataBlock->info.rows; ++j) {
-    char* val = ((char*)pColInfoData->pData) + bytes * j;
-    if (isNull(val, type)) {
+  int16_t bytes = pStateColInfoData->info.bytes;
+  int16_t type = pStateColInfoData->info.type;
+
+  SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, 0);
+  TSKEY*           tsList = (TSKEY*)pColInfoData->pData;
+
+  SWindowRowsSup* pRowSup = &pInfo->winSup;
+  pRowSup->numOfRows = 0;
+  
+  for (int32_t j = 0; j < pBlock->info.rows; ++j) {
+    if (colDataIsNull(pStateColInfoData, pBlock->info.rows, j, pBlock->pBlockAgg)) {
       continue;
     }
-    if (pInfo->prevData == NULL) {
-      pInfo->prevData = taosMemoryMalloc(bytes);
-      memcpy(pInfo->prevData, val, bytes);
-      pInfo->numOfRows = 1;
-      pInfo->curWindow.skey = tsList[j];
-      pInfo->curWindow.ekey = tsList[j];
-      pInfo->start = j;
 
-    } else if (memcmp(pInfo->prevData, val, bytes) == 0) {
-      pInfo->curWindow.ekey = tsList[j];
-      pInfo->numOfRows += 1;
-      // pInfo->start = j;
-      if (j == 0 && pInfo->start != 0) {
-        pInfo->numOfRows = 1;
-        pInfo->start = 0;
+    char* val = colDataGetData(pStateColInfoData, j);
+
+    if (!pInfo->hasKey) {
+      memcpy(pInfo->stateKey.pData, val, bytes);
+      pInfo->hasKey = true;
+
+      doKeepNewWindowStartInfo(pRowSup, tsList, j);
+      doKeepTuple(pRowSup, tsList[j]);
+    } else if (memcmp(pInfo->stateKey.pData, val, bytes) == 0) {
+      doKeepTuple(pRowSup, tsList[j]);
+      if (j == 0 && pRowSup->startRowIndex != 0) {
+        pRowSup->startRowIndex = 0;
       }
-    } else {
+    } else {  // a new state window started
       SResultRow* pResult = NULL;
-      pInfo->curWindow.ekey = pInfo->curWindow.skey;
-      int32_t ret = setResultOutputBufByKey(pRuntimeEnv, &pBInfo->resultRowInfo, pSDataBlock->info.uid,
-                                            &pInfo->curWindow, masterScan, &pResult, item->groupIndex, pBInfo->pCtx,
-                                            pOperator->numOfOutput, pBInfo->rowCellInfoOffset);
-      if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-        longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
-      }
-      //      doApplyFunctions(pRuntimeEnv, pBInfo->pCtx, &pInfo->curWindow, pInfo->start, pInfo->numOfRows, tsList,
-      //                       pSDataBlock->info.rows, pOperator->numOfOutput);
 
-      pInfo->curWindow.skey = tsList[j];
-      pInfo->curWindow.ekey = tsList[j];
-      memcpy(pInfo->prevData, val, bytes);
-      pInfo->numOfRows = 1;
-      pInfo->start = j;
+      // keep the time window for the closed time window.
+      STimeWindow window = pRowSup->win;
+
+      pRowSup->win.ekey = pRowSup->win.skey;
+      int32_t ret = setResultOutputBufByKey_rv(&pInfo->binfo.resultRowInfo, pBlock->info.uid, &window, masterScan,
+                                               &pResult, gid, pInfo->binfo.pCtx, numOfOutput, pInfo->binfo.rowCellInfoOffset, &pInfo->aggSup, pTaskInfo);
+      if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
+        longjmp(pTaskInfo->env, TSDB_CODE_QRY_APP_ERROR);
+      }
+
+      updateTimeWindowInfo(&pInfo->timeWindowData, &window, false);
+      doApplyFunctions(pInfo->binfo.pCtx, &window, &pInfo->timeWindowData, pRowSup->startRowIndex, pRowSup->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
+
+      // here we start a new session window
+      doKeepNewWindowStartInfo(pRowSup, tsList, j);
+      doKeepTuple(pRowSup, tsList[j]);
     }
   }
 
   SResultRow* pResult = NULL;
-
-  pInfo->curWindow.ekey = pInfo->curWindow.skey;
-  int32_t ret = setResultOutputBufByKey(pRuntimeEnv, &pBInfo->resultRowInfo, pSDataBlock->info.uid, &pInfo->curWindow,
-                                        masterScan, &pResult, item->groupIndex, pBInfo->pCtx, pOperator->numOfOutput,
-                                        pBInfo->rowCellInfoOffset);
+  pRowSup->win.ekey = tsList[pBlock->info.rows - 1];
+  int32_t ret = setResultOutputBufByKey_rv(&pInfo->binfo.resultRowInfo, pBlock->info.uid, &pRowSup->win, masterScan, &pResult,
+                                           gid, pInfo->binfo.pCtx, numOfOutput, pInfo->binfo.rowCellInfoOffset, &pInfo->aggSup, pTaskInfo);
   if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
+    longjmp(pTaskInfo->env, TSDB_CODE_QRY_APP_ERROR);
   }
 
-  //  doApplyFunctions(pRuntimeEnv, pBInfo->pCtx, &pInfo->curWindow, pInfo->start, pInfo->numOfRows, tsList,
-  //                   pSDataBlock->info.rows, pOperator->numOfOutput);
+  updateTimeWindowInfo(&pInfo->timeWindowData, &pRowSup->win, false);
+  doApplyFunctions(pInfo->binfo.pCtx, &pRowSup->win, &pInfo->timeWindowData, pRowSup->startRowIndex, pRowSup->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
 }
 
 static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator, bool* newgroup) {
@@ -5726,16 +5724,16 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator, bool* newgroup) {
     return NULL;
   }
 
-  SStateWindowOperatorInfo* pWindowInfo = pOperator->info;
+  SStateWindowOperatorInfo* pInfo = pOperator->info;
   SExecTaskInfo*  pTaskInfo = pOperator->pTaskInfo;
-  SOptrBasicInfo* pBInfo    = &pWindowInfo->binfo;
+  SOptrBasicInfo* pBInfo    = &pInfo->binfo;
 
   if (pOperator->status == OP_RES_TO_RETURN) {
-    //    toSDatablock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pBInfo->pRes);
-
-//    if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pRuntimeEnv->groupResInfo)) {
-//      pOperator->status = OP_EXEC_DONE;
-//    }
+    toSDatablock(&pInfo->groupResInfo, pInfo->aggSup.pResultBuf, pBInfo->pRes, pBInfo->capacity, pBInfo->rowCellInfoOffset);
+    if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) {
+      doSetOperatorCompleted(pOperator);
+      return NULL;
+    }
 
     return pBInfo->pRes;
   }
@@ -5753,28 +5751,20 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator, bool* newgroup) {
       break;
     }
 
-//    setInputDataBlock(pOperator, pBInfo->pCtx, pDataBlock, TSDB_ORDER_ASC);
-//    if (pWindowInfo->colIndex == -1) {
-//      pWindowInfo->colIndex = getGroupbyColumnIndex(pRuntimeEnv->pQueryAttr->pGroupbyExpr, pBlock);
-//    }
-    doStateWindowAggImpl(pOperator, pWindowInfo, pBlock);
+    setInputDataBlock(pOperator, pBInfo->pCtx, pBlock, order);
+    doStateWindowAggImpl(pOperator, pInfo, pBlock);
   }
 
-  // restore the value
-//  pQueryAttr->order.order = order;
-//  pQueryAttr->window = win;
-
   pOperator->status = OP_RES_TO_RETURN;
   closeAllResultRows(&pBInfo->resultRowInfo);
-  setTaskStatus(pOperator->pTaskInfo, TASK_COMPLETED);
-  finalizeQueryResult(pBInfo->pCtx, pOperator->numOfOutput);
+  finalizeMultiTupleQueryResult(pBInfo->pCtx, pOperator->numOfOutput, pInfo->aggSup.pResultBuf, &pBInfo->resultRowInfo, pBInfo->rowCellInfoOffset);
 
-//  initGroupResInfo(&pRuntimeEnv->groupResInfo, &pBInfo->resultRowInfo);
-  //  toSDatablock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pBInfo->pRes);
-
-//  if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pRuntimeEnv->groupResInfo)) {
-//    pOperator->status = OP_EXEC_DONE;
-//  }
+  initGroupResInfo(&pInfo->groupResInfo, &pBInfo->resultRowInfo);
+  blockDataEnsureCapacity(pBInfo->pRes, pBInfo->capacity);
+  toSDatablock(&pInfo->groupResInfo, pInfo->aggSup.pResultBuf, pBInfo->pRes, pBInfo->capacity, pBInfo->rowCellInfoOffset);
+  if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) {
+    doSetOperatorCompleted(pOperator);
+  }
 
   return pBInfo->pRes->info.rows == 0 ? NULL : pBInfo->pRes;
 }
@@ -6098,7 +6088,7 @@ void destroyBasicOperatorInfo(void* param, int32_t numOfOutput) {
 void destroyStateWindowOperatorInfo(void* param, int32_t numOfOutput) {
   SStateWindowOperatorInfo* pInfo = (SStateWindowOperatorInfo*)param;
   doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
-  taosMemoryFreeClear(pInfo->prevData);
+  taosMemoryFreeClear(pInfo->stateKey.pData);
 }
 
 void destroyAggOperatorInfo(void* param, int32_t numOfOutput) {
@@ -6332,16 +6322,18 @@ SOperatorInfo* createAllTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, S
 
 SOperatorInfo* createStatewindowOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExpr, int32_t numOfCols, SSDataBlock* pResBlock, SExecTaskInfo* pTaskInfo) {
   SStateWindowOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SStateWindowOperatorInfo));
+  SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
+  if (pInfo == NULL || pOperator == NULL) {
+    goto _error;
+  }
 
   pInfo->colIndex = -1;
-  pInfo->reptScan = false;
-  //  pInfo->binfo.pCtx = createSqlFunctionCtx(pRuntimeEnv, pExpr, numOfOutput, &pInfo->binfo.rowCellInfoOffset);
-  //  pInfo->binfo.pRes = createOutputBuf(pExpr, numOfOutput, pResultInfo->capacity);
+
+  initAggInfo(&pInfo->binfo, &pInfo->aggSup, pExpr, numOfCols, 4096, pResBlock, pTaskInfo->id.str);
   initResultRowInfo(&pInfo->binfo.resultRowInfo, 8);
 
-  SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
-  pOperator->name = "StateWindowOperator";
-  //  pOperator->operatorType = OP_StateWindow;
+  pOperator->name         = "StateWindowOperator";
+  pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_STATE_WINDOW;
   pOperator->blockingOptr = true;
   pOperator->status       = OP_NOT_OPENED;
   pOperator->pExpr        = pExpr;
@@ -6354,6 +6346,10 @@ SOperatorInfo* createStatewindowOperatorInfo(SOperatorInfo* downstream, SExprInf
 
   int32_t code = appendDownstream(pOperator, &downstream, 1);
   return pOperator;
+
+  _error:
+  pTaskInfo->code = TSDB_CODE_SUCCESS;
+  return NULL;
 }
 
 SOperatorInfo* createSessionAggOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols,
@@ -6375,7 +6371,7 @@ SOperatorInfo* createSessionAggOperatorInfo(SOperatorInfo* downstream, SExprInfo
 
   pInfo->gap              = gap;
   pInfo->binfo.pRes       = pResBlock;
-  pInfo->prevTs           = INT64_MIN;
+  pInfo->winSup.prevTs    = INT64_MIN;
   pInfo->reptScan         = false;
   pOperator->name         = "SessionWindowAggOperator";
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW;
@@ -6946,9 +6942,9 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
 
   SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
   SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+  int32_t        num = 0;
 
   if (QUERY_NODE_PHYSICAL_PLAN_PROJECT == type) {
-    int32_t      num = 0;
     SProjectPhysiNode* pProjPhyNode = (SProjectPhysiNode*) pPhyNode;
     SExprInfo*   pExprInfo = createExprInfo(pProjPhyNode->pProjections, NULL, &num);
 
@@ -6957,8 +6953,6 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     SLimit slimit = {.limit = pProjPhyNode->slimit, .offset = pProjPhyNode->soffset};
     return createProjectOperatorInfo(op, pExprInfo, num, pResBlock, &limit, &slimit, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_AGG == type) {
-    int32_t num = 0;
-
     SAggPhysiNode* pAggNode = (SAggPhysiNode*)pPhyNode;
     SExprInfo*     pExprInfo = createExprInfo(pAggNode->pAggFuncs, pAggNode->pGroupKeys, &num);
     SSDataBlock*   pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
@@ -6972,7 +6966,6 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
   } else if (QUERY_NODE_PHYSICAL_PLAN_INTERVAL == type) {
     SIntervalPhysiNode* pIntervalPhyNode = (SIntervalPhysiNode*)pPhyNode;
 
-    int32_t      num = 0;
     SExprInfo*   pExprInfo = createExprInfo(pIntervalPhyNode->window.pFuncs, NULL, &num);
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
 
@@ -6997,7 +6990,6 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
   } else if (QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW == type) {
     SSessionWinodwPhysiNode* pSessionNode = (SSessionWinodwPhysiNode*)pPhyNode;
 
-    int32_t      num = 0;
     SExprInfo*   pExprInfo = createExprInfo(pSessionNode->window.pFuncs, NULL, &num);
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
     return createSessionAggOperatorInfo(op, pExprInfo, num, pResBlock, pSessionNode->gap, pTaskInfo);
@@ -7006,10 +6998,14 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     SArray* pColList = extractPartitionColInfo(pPartNode->pPartitionKeys);
     SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
 
-    int32_t num = 0;
     SExprInfo* pExprInfo = createExprInfo(pPartNode->pTargets, NULL, &num);
-
     return createPartitionOperatorInfo(op, pExprInfo, num, pResBlock, pColList, pTaskInfo, NULL);
+  } else if (QUERY_NODE_STATE_WINDOW == type) {
+    SStateWinodwPhysiNode* pStateNode = (SStateWinodwPhysiNode*) pPhyNode;
+
+    SExprInfo* pExprInfo = createExprInfo(pStateNode->window.pFuncs, NULL, &num);
+    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    return createStatewindowOperatorInfo(op, pExprInfo, num, pResBlock, pTaskInfo);
   } else {
     ASSERT(0);
   } /*else if (pPhyNode->info.type == OP_MultiTableAggregate) {
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index ba1f2dbd76..3eb8ff1b72 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -48,7 +48,7 @@ static int32_t initGroupOptrInfo(SArray** pGroupColVals, int32_t* keyLen, char**
     SColumn* pCol = taosArrayGet(pGroupColList, i);
     (*keyLen) += pCol->bytes;
 
-    struct SGroupKeys key = {0};
+    SGroupKeys key = {0};
     key.bytes  = pCol->bytes;
     key.type   = pCol->type;
     key.isNull = false;

From 44604633179a4499ce01ce12fd767cb9f7d5ae64 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 14:59:41 +0800
Subject: [PATCH 62/82] feat<cluster>: create and delete qnode

---
 include/common/tmsg.h                        |  15 +-
 source/common/src/tmsg.c                     |  12 +-
 source/dnode/mgmt/bm/bmHandle.c              |   4 +-
 source/dnode/mgmt/mm/mmHandle.c              |   2 +-
 source/dnode/mgmt/qm/qmHandle.c              |   9 +-
 source/dnode/mgmt/qm/qmWorker.c              |  32 ++--
 source/dnode/mgmt/sm/smHandle.c              |   4 +-
 source/dnode/mgmt/test/bnode/dbnode.cpp      |  36 ++---
 source/dnode/mgmt/test/mnode/dmnode.cpp      |  12 +-
 source/dnode/mgmt/test/qnode/dqnode.cpp      |  36 ++---
 source/dnode/mgmt/test/snode/dsnode.cpp      |  36 ++---
 source/dnode/mnode/impl/src/mndBnode.c       |  16 +-
 source/dnode/mnode/impl/src/mndDnode.c       |   2 +-
 source/dnode/mnode/impl/src/mndMnode.c       |   8 +-
 source/dnode/mnode/impl/src/mndQnode.c       | 156 +++++++++----------
 source/dnode/mnode/impl/src/mndSnode.c       |  16 +-
 source/dnode/mnode/impl/test/bnode/bnode.cpp |  56 +++----
 source/dnode/mnode/impl/test/mnode/mnode.cpp |  52 +++----
 source/dnode/mnode/impl/test/qnode/qnode.cpp |  56 +++----
 source/dnode/mnode/impl/test/snode/snode.cpp |  56 +++----
 source/dnode/mnode/impl/test/trans/trans.cpp |  20 +--
 source/libs/parser/src/parTranslater.c       |   8 +-
 22 files changed, 314 insertions(+), 330 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index b60ae60ce6..45fdd50db9 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -1023,10 +1023,11 @@ int32_t tDeserializeSMCfgDnodeReq(void* buf, int32_t bufLen, SMCfgDnodeReq* pReq
 
 typedef struct {
   int32_t dnodeId;
-} SMCreateMnodeReq, SMDropMnodeReq, SDDropMnodeReq;
+} SMCreateMnodeReq, SMDropMnodeReq, SDDropMnodeReq, SMCreateQnodeReq, SMDropQnodeReq, SDCreateQnodeReq, SDDropQnodeReq, SMCreateSnodeReq, SMDropSnodeReq,
+    SDCreateSnodeReq, SDDropSnodeReq, SMCreateBnodeReq, SMDropBnodeReq, SDCreateBnodeReq, SDDropBnodeReq;
 
-int32_t tSerializeSMCreateDropMnodeReq(void* buf, int32_t bufLen, SMCreateMnodeReq* pReq);
-int32_t tDeserializeSMCreateDropMnodeReq(void* buf, int32_t bufLen, SMCreateMnodeReq* pReq);
+int32_t tSerializeSCreateDropMQSBNodeReq(void* buf, int32_t bufLen, SMCreateQnodeReq* pReq);
+int32_t tDeserializeSCreateDropMQSBNodeReq(void* buf, int32_t bufLen, SMCreateQnodeReq* pReq);
 
 typedef struct {
   int32_t  dnodeId;
@@ -1037,14 +1038,6 @@ typedef struct {
 int32_t tSerializeSDCreateMnodeReq(void* buf, int32_t bufLen, SDCreateMnodeReq* pReq);
 int32_t tDeserializeSDCreateMnodeReq(void* buf, int32_t bufLen, SDCreateMnodeReq* pReq);
 
-typedef struct {
-  int32_t dnodeId;
-} SMCreateQnodeReq, SMDropQnodeReq, SDCreateQnodeReq, SDDropQnodeReq, SMCreateSnodeReq, SMDropSnodeReq,
-    SDCreateSnodeReq, SDDropSnodeReq, SMCreateBnodeReq, SMDropBnodeReq, SDCreateBnodeReq, SDDropBnodeReq;
-
-int32_t tSerializeSMCreateDropQSBNodeReq(void* buf, int32_t bufLen, SMCreateQnodeReq* pReq);
-int32_t tDeserializeSMCreateDropQSBNodeReq(void* buf, int32_t bufLen, SMCreateQnodeReq* pReq);
-
 typedef struct {
   char    sql[TSDB_SHOW_SQL_LEN];
   int32_t queryId;
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index ca59dcb218..b5d878681e 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -1203,7 +1203,7 @@ int32_t tDeserializeSGetUserAuthRsp(void *buf, int32_t bufLen, SGetUserAuthRsp *
   return 0;
 }
 
-int32_t tSerializeSMCreateDropQSBNodeReq(void *buf, int32_t bufLen, SMCreateQnodeReq *pReq) {
+int32_t tSerializeSCreateDropMQSBNodeReq(void *buf, int32_t bufLen, SMCreateQnodeReq *pReq) {
   SCoder encoder = {0};
   tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
 
@@ -1216,7 +1216,7 @@ int32_t tSerializeSMCreateDropQSBNodeReq(void *buf, int32_t bufLen, SMCreateQnod
   return tlen;
 }
 
-int32_t tDeserializeSMCreateDropQSBNodeReq(void *buf, int32_t bufLen, SMCreateQnodeReq *pReq) {
+int32_t tDeserializeSCreateDropMQSBNodeReq(void *buf, int32_t bufLen, SMCreateQnodeReq *pReq) {
   SCoder decoder = {0};
   tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER);
 
@@ -1257,14 +1257,6 @@ int32_t tDeserializeSDropDnodeReq(void *buf, int32_t bufLen, SDropDnodeReq *pReq
   return 0;
 }
 
-int32_t tSerializeSMCreateDropMnodeReq(void *buf, int32_t bufLen, SMCreateMnodeReq *pReq) {
-  return tSerializeSMCreateDropQSBNodeReq(buf, bufLen, (SMCreateQnodeReq *)pReq);
-}
-
-int32_t tDeserializeSMCreateDropMnodeReq(void *buf, int32_t bufLen, SMCreateMnodeReq *pReq) {
-  return tDeserializeSMCreateDropQSBNodeReq(buf, bufLen, (SMCreateQnodeReq *)pReq);
-}
-
 int32_t tSerializeSMCfgDnodeReq(void *buf, int32_t bufLen, SMCfgDnodeReq *pReq) {
   SCoder encoder = {0};
   tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER);
diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index b73acd14c3..e148f7a00c 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -49,7 +49,7 @@ int32_t bmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDCreateBnodeReq createReq = {0};
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
@@ -68,7 +68,7 @@ int32_t bmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDDropBnodeReq dropReq = {0};
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index 6a4a56de43..44508ad9b8 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -70,7 +70,7 @@ int32_t mmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDDropMnodeReq dropReq = {0};
-  if (tDeserializeSMCreateDropMnodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/qm/qmHandle.c
index 11b4ff0622..8924ad714d 100644
--- a/source/dnode/mgmt/qm/qmHandle.c
+++ b/source/dnode/mgmt/qm/qmHandle.c
@@ -16,8 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "qmInt.h"
 
-void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo) {
-}
+void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo) {}
 
 int32_t qmProcessGetMonQmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonQmInfo qmInfo = {0};
@@ -49,14 +48,14 @@ int32_t qmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDCreateQnodeReq createReq = {0};
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
 
   if (createReq.dnodeId != pDnode->dnodeId) {
     terrno = TSDB_CODE_NODE_INVALID_OPTION;
-    dError("failed to create qnode since %s, input:%d cur:%d", terrstr(), createReq.dnodeId, pDnode->dnodeId);
+    dError("failed to create qnode since %s", terrstr());
     return -1;
   } else {
     return qmOpen(pWrapper);
@@ -68,7 +67,7 @@ int32_t qmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDDropQnodeReq dropReq = {0};
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
diff --git a/source/dnode/mgmt/qm/qmWorker.c b/source/dnode/mgmt/qm/qmWorker.c
index 6c8382aef9..0acf536d8e 100644
--- a/source/dnode/mgmt/qm/qmWorker.c
+++ b/source/dnode/mgmt/qm/qmWorker.c
@@ -25,15 +25,17 @@ static inline void qmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t cod
   tmsgSendRsp(&rsp);
 }
 
-static void qmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
+static void qmProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SQnodeMgmt *pMgmt = pInfo->ahandle;
 
-  dTrace("msg:%p, get from qnode monitor queue", pMsg);
+  dTrace("msg:%p, get from qnode-monitor queue", pMsg);
   SRpcMsg *pRpc = &pMsg->rpcMsg;
   int32_t  code = -1;
 
   if (pMsg->rpcMsg.msgType == TDMT_MON_SM_INFO) {
     code = qmProcessGetMonQmInfoReq(pMgmt->pWrapper, pMsg);
+  } else {
+    terrno = TSDB_CODE_MSG_NOT_PROCESSED;
   }
 
   if (pRpc->msgType & 1U) {
@@ -49,9 +51,11 @@ static void qmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 static void qmProcessQueryQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SQnodeMgmt *pMgmt = pInfo->ahandle;
 
-  dTrace("msg:%p, will be processed in qnode-query queue", pMsg);
-  int32_t code = qndProcessQueryMsg(pMgmt->pQnode, &pMsg->rpcMsg);
-  if (code != 0) {
+  dTrace("msg:%p, get from qnode-query queue", pMsg);
+  SRpcMsg *pRpc = &pMsg->rpcMsg;
+  int32_t  code = qndProcessQueryMsg(pMgmt->pQnode, pRpc);
+
+  if (pRpc->msgType & 1U && code != 0) {
     qmSendRsp(pMgmt->pWrapper, pMsg, code);
   }
 
@@ -63,9 +67,11 @@ static void qmProcessQueryQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 static void qmProcessFetchQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SQnodeMgmt *pMgmt = pInfo->ahandle;
 
-  dTrace("msg:%p, will be processed in qnode-fetch queue", pMsg);
-  int32_t code = qndProcessFetchMsg(pMgmt->pQnode, &pMsg->rpcMsg);
-  if (code != 0) {
+  dTrace("msg:%p, get from qnode-fetch queue", pMsg);
+  SRpcMsg *pRpc = &pMsg->rpcMsg;
+  int32_t  code = qndProcessFetchMsg(pMgmt->pQnode, pRpc);
+
+  if (pRpc->msgType & 1U && code != 0) {
     qmSendRsp(pMgmt->pWrapper, pMsg, code);
   }
 
@@ -92,11 +98,8 @@ int32_t qmProcessFetchMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
 }
 
 int32_t qmProcessMonitorMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
-  SQnodeMgmt    *pMgmt = pWrapper->pMgmt;
-  SSingleWorker *pWorker = &pMgmt->monitorWorker;
-
-  dTrace("msg:%p, put into worker:%s", pMsg, pWorker->name);
-  taosWriteQitem(pWorker->queue, pMsg);
+  SQnodeMgmt *pMgmt = pWrapper->pMgmt;
+  qmPutMsgToWorker(&pMgmt->monitorWorker, pMsg);
   return 0;
 }
 
@@ -125,6 +128,7 @@ int32_t qmPutMsgToFetchQueue(SMgmtWrapper *pWrapper, SRpcMsg *pRpc) {
 int32_t qmGetQueueSize(SMgmtWrapper *pWrapper, int32_t vgId, EQueueType qtype) {
   int32_t     size = -1;
   SQnodeMgmt *pMgmt = pWrapper->pMgmt;
+
   switch (qtype) {
     case QUERY_QUEUE:
       size = taosQueueSize(pMgmt->queryWorker.queue);
@@ -164,7 +168,7 @@ int32_t qmStartWorker(SQnodeMgmt *pMgmt) {
 
   if (tsMultiProcess) {
     SSingleWorkerCfg mCfg = {
-        .min = 1, .max = 1, .name = "qnode-monitor", .fp = (FItem)qmProcessMonQueue, .param = pMgmt};
+        .min = 1, .max = 1, .name = "qnode-monitor", .fp = (FItem)qmProcessMonitorQueue, .param = pMgmt};
     if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start qnode-monitor worker since %s", terrstr());
       return -1;
diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index fed6b6528c..9502176037 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -48,7 +48,7 @@ int32_t smProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDCreateSnodeReq createReq = {0};
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
@@ -67,7 +67,7 @@ int32_t smProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   SRpcMsg *pReq = &pMsg->rpcMsg;
 
   SDDropSnodeReq dropReq = {0};
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
diff --git a/source/dnode/mgmt/test/bnode/dbnode.cpp b/source/dnode/mgmt/test/bnode/dbnode.cpp
index ee81780921..10d72e2e0b 100644
--- a/source/dnode/mgmt/test/bnode/dbnode.cpp
+++ b/source/dnode/mgmt/test/bnode/dbnode.cpp
@@ -33,9 +33,9 @@ TEST_F(DndTestBnode, 01_Create_Bnode) {
     SDCreateBnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -46,9 +46,9 @@ TEST_F(DndTestBnode, 01_Create_Bnode) {
     SDCreateBnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -59,9 +59,9 @@ TEST_F(DndTestBnode, 01_Create_Bnode) {
     SDCreateBnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -74,9 +74,9 @@ TEST_F(DndTestBnode, 01_Create_Bnode) {
     SDCreateBnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_ALREADY_DEPLOYED);
@@ -88,9 +88,9 @@ TEST_F(DndTestBnode, 02_Drop_Bnode) {
     SDDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -101,9 +101,9 @@ TEST_F(DndTestBnode, 02_Drop_Bnode) {
     SDDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -114,9 +114,9 @@ TEST_F(DndTestBnode, 02_Drop_Bnode) {
     SDDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -129,9 +129,9 @@ TEST_F(DndTestBnode, 02_Drop_Bnode) {
     SDDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -142,9 +142,9 @@ TEST_F(DndTestBnode, 02_Drop_Bnode) {
     SDCreateBnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mgmt/test/mnode/dmnode.cpp b/source/dnode/mgmt/test/mnode/dmnode.cpp
index 4072eb90a8..cced7dc75e 100644
--- a/source/dnode/mgmt/test/mnode/dmnode.cpp
+++ b/source/dnode/mgmt/test/mnode/dmnode.cpp
@@ -139,9 +139,9 @@ TEST_F(DndTestMnode, 03_Drop_Mnode) {
     SDDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -152,9 +152,9 @@ TEST_F(DndTestMnode, 03_Drop_Mnode) {
     SDDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -165,9 +165,9 @@ TEST_F(DndTestMnode, 03_Drop_Mnode) {
     SDDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mgmt/test/qnode/dqnode.cpp b/source/dnode/mgmt/test/qnode/dqnode.cpp
index 343814b159..e7d857771e 100644
--- a/source/dnode/mgmt/test/qnode/dqnode.cpp
+++ b/source/dnode/mgmt/test/qnode/dqnode.cpp
@@ -30,9 +30,9 @@ TEST_F(DndTestQnode, 01_Create_Qnode) {
     SDCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -43,9 +43,9 @@ TEST_F(DndTestQnode, 01_Create_Qnode) {
     SDCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -56,9 +56,9 @@ TEST_F(DndTestQnode, 01_Create_Qnode) {
     SDCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -71,9 +71,9 @@ TEST_F(DndTestQnode, 01_Create_Qnode) {
     SDCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -86,9 +86,9 @@ TEST_F(DndTestQnode, 02_Drop_Qnode) {
     SDDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -99,9 +99,9 @@ TEST_F(DndTestQnode, 02_Drop_Qnode) {
     SDDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -112,9 +112,9 @@ TEST_F(DndTestQnode, 02_Drop_Qnode) {
     SDDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -127,9 +127,9 @@ TEST_F(DndTestQnode, 02_Drop_Qnode) {
     SDDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -140,9 +140,9 @@ TEST_F(DndTestQnode, 02_Drop_Qnode) {
     SDCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mgmt/test/snode/dsnode.cpp b/source/dnode/mgmt/test/snode/dsnode.cpp
index 8dfa437fd8..2b971f704b 100644
--- a/source/dnode/mgmt/test/snode/dsnode.cpp
+++ b/source/dnode/mgmt/test/snode/dsnode.cpp
@@ -30,9 +30,9 @@ TEST_F(DndTestSnode, 01_Create_Snode) {
     SDCreateSnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -43,9 +43,9 @@ TEST_F(DndTestSnode, 01_Create_Snode) {
     SDCreateSnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -56,9 +56,9 @@ TEST_F(DndTestSnode, 01_Create_Snode) {
     SDCreateSnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -71,9 +71,9 @@ TEST_F(DndTestSnode, 01_Create_Snode) {
     SDCreateSnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -86,9 +86,9 @@ TEST_F(DndTestSnode, 01_Drop_Snode) {
     SDDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -99,9 +99,9 @@ TEST_F(DndTestSnode, 01_Drop_Snode) {
     SDDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -112,9 +112,9 @@ TEST_F(DndTestSnode, 01_Drop_Snode) {
     SDDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -127,9 +127,9 @@ TEST_F(DndTestSnode, 01_Drop_Snode) {
     SDDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -140,9 +140,9 @@ TEST_F(DndTestSnode, 01_Drop_Snode) {
     SDCreateSnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mnode/impl/src/mndBnode.c b/source/dnode/mnode/impl/src/mndBnode.c
index c4868d9802..b165b0aac0 100644
--- a/source/dnode/mnode/impl/src/mndBnode.c
+++ b/source/dnode/mnode/impl/src/mndBnode.c
@@ -190,13 +190,13 @@ static int32_t mndSetCreateBnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, S
   SDCreateBnodeReq createReq = {0};
   createReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -217,13 +217,13 @@ static int32_t mndSetCreateBnodeUndoActions(STrans *pTrans, SDnodeObj *pDnode, S
   SDDropBnodeReq dropReq = {0};
   dropReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -274,7 +274,7 @@ static int32_t mndProcessCreateBnodeReq(SNodeMsg *pReq) {
   SUserObj        *pUser = NULL;
   SMCreateBnodeReq createReq = {0};
 
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto CREATE_BNODE_OVER;
   }
@@ -340,13 +340,13 @@ static int32_t mndSetDropBnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SBn
   SDDropBnodeReq dropReq = {0};
   dropReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -389,7 +389,7 @@ static int32_t mndProcessDropBnodeReq(SNodeMsg *pReq) {
   SBnodeObj     *pObj = NULL;
   SMDropBnodeReq dropReq = {0};
 
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto DROP_BNODE_OVER;
   }
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 22b1bd51e7..c38106b915 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -554,7 +554,7 @@ static int32_t mndProcessDropDnodeReq(SNodeMsg *pReq) {
   SDnodeObj     *pDnode = NULL;
   SMDropMnodeReq dropReq = {0};
 
-  if (tDeserializeSMCreateDropMnodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto DROP_DNODE_OVER;
   }
diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index c408fea636..8543ac7c7d 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -388,7 +388,7 @@ static int32_t mndProcessCreateMnodeReq(SNodeMsg *pReq) {
   SUserObj        *pUser = NULL;
   SMCreateMnodeReq createReq = {0};
 
-  if (tDeserializeSMCreateDropMnodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto CREATE_MNODE_OVER;
   }
@@ -509,9 +509,9 @@ static int32_t mndSetDropMnodeRedoActions(SMnode *pMnode, STrans *pTrans, SDnode
 
     SDDropMnodeReq dropReq = {0};
     dropReq.dnodeId = pObj->id;
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void   *pReq = taosMemoryMalloc(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     action.epSet = mndGetDnodeEpset(pDnode);
     action.pCont = pReq;
@@ -554,7 +554,7 @@ static int32_t mndProcessDropMnodeReq(SNodeMsg *pReq) {
   SMnodeObj     *pObj = NULL;
   SMDropMnodeReq dropReq = {0};
 
-  if (tDeserializeSMCreateDropMnodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto DROP_MNODE_OVER;
   }
diff --git a/source/dnode/mnode/impl/src/mndQnode.c b/source/dnode/mnode/impl/src/mndQnode.c
index 85718e2037..5204bc95bb 100644
--- a/source/dnode/mnode/impl/src/mndQnode.c
+++ b/source/dnode/mnode/impl/src/mndQnode.c
@@ -21,22 +21,22 @@
 #include "mndTrans.h"
 #include "mndUser.h"
 
-#define TSDB_QNODE_VER_NUMBER 1
-#define TSDB_QNODE_RESERVE_SIZE 64
+#define QNODE_VER_NUMBER   1
+#define QNODE_RESERVE_SIZE 64
 
 static SSdbRaw *mndQnodeActionEncode(SQnodeObj *pObj);
 static SSdbRow *mndQnodeActionDecode(SSdbRaw *pRaw);
 static int32_t  mndQnodeActionInsert(SSdb *pSdb, SQnodeObj *pObj);
-static int32_t  mndQnodeActionDelete(SSdb *pSdb, SQnodeObj *pObj);
 static int32_t  mndQnodeActionUpdate(SSdb *pSdb, SQnodeObj *pOld, SQnodeObj *pNew);
+static int32_t  mndQnodeActionDelete(SSdb *pSdb, SQnodeObj *pObj);
 static int32_t  mndProcessCreateQnodeReq(SNodeMsg *pReq);
-static int32_t  mndProcessDropQnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessCreateQnodeRsp(SNodeMsg *pRsp);
+static int32_t  mndProcessDropQnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessDropQnodeRsp(SNodeMsg *pRsp);
+static int32_t  mndProcessQnodeListReq(SNodeMsg *pReq);
 static int32_t  mndGetQnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveQnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextQnode(SMnode *pMnode, void *pIter);
-static int32_t  mndProcessQnodeListReq(SNodeMsg *pReq);
 
 int32_t mndInitQnode(SMnode *pMnode) {
   SSdbTable table = {.sdbType = SDB_QNODE,
@@ -49,9 +49,9 @@ int32_t mndInitQnode(SMnode *pMnode) {
 
   mndSetMsgHandle(pMnode, TDMT_MND_CREATE_QNODE, mndProcessCreateQnodeReq);
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_QNODE, mndProcessDropQnodeReq);
-  mndSetMsgHandle(pMnode, TDMT_MND_QNODE_LIST, mndProcessQnodeListReq);
   mndSetMsgHandle(pMnode, TDMT_DND_CREATE_QNODE_RSP, mndProcessCreateQnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_DND_DROP_QNODE_RSP, mndProcessDropQnodeRsp);
+  mndSetMsgHandle(pMnode, TDMT_MND_QNODE_LIST, mndProcessQnodeListReq);
 
   mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_QNODE, mndGetQnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_QNODE, mndRetrieveQnodes);
@@ -78,18 +78,18 @@ static void mndReleaseQnode(SMnode *pMnode, SQnodeObj *pObj) {
 static SSdbRaw *mndQnodeActionEncode(SQnodeObj *pObj) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
 
-  SSdbRaw *pRaw = sdbAllocRaw(SDB_QNODE, TSDB_QNODE_VER_NUMBER, sizeof(SQnodeObj) + TSDB_QNODE_RESERVE_SIZE);
-  if (pRaw == NULL) goto QNODE_ENCODE_OVER;
+  SSdbRaw *pRaw = sdbAllocRaw(SDB_QNODE, QNODE_VER_NUMBER, sizeof(SQnodeObj) + QNODE_RESERVE_SIZE);
+  if (pRaw == NULL) goto _OVER;
 
   int32_t dataPos = 0;
-  SDB_SET_INT32(pRaw, dataPos, pObj->id, QNODE_ENCODE_OVER)
-  SDB_SET_INT64(pRaw, dataPos, pObj->createdTime, QNODE_ENCODE_OVER)
-  SDB_SET_INT64(pRaw, dataPos, pObj->updateTime, QNODE_ENCODE_OVER)
-  SDB_SET_RESERVE(pRaw, dataPos, TSDB_QNODE_RESERVE_SIZE, QNODE_ENCODE_OVER)
+  SDB_SET_INT32(pRaw, dataPos, pObj->id, _OVER)
+  SDB_SET_INT64(pRaw, dataPos, pObj->createdTime, _OVER)
+  SDB_SET_INT64(pRaw, dataPos, pObj->updateTime, _OVER)
+  SDB_SET_RESERVE(pRaw, dataPos, QNODE_RESERVE_SIZE, _OVER)
 
   terrno = 0;
 
-QNODE_ENCODE_OVER:
+_OVER:
   if (terrno != 0) {
     mError("qnode:%d, failed to encode to raw:%p since %s", pObj->id, pRaw, terrstr());
     sdbFreeRaw(pRaw);
@@ -104,28 +104,28 @@ static SSdbRow *mndQnodeActionDecode(SSdbRaw *pRaw) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
 
   int8_t sver = 0;
-  if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto QNODE_DECODE_OVER;
+  if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto _OVER;
 
-  if (sver != TSDB_QNODE_VER_NUMBER) {
+  if (sver != QNODE_VER_NUMBER) {
     terrno = TSDB_CODE_SDB_INVALID_DATA_VER;
-    goto QNODE_DECODE_OVER;
+    goto _OVER;
   }
 
   SSdbRow *pRow = sdbAllocRow(sizeof(SQnodeObj));
-  if (pRow == NULL) goto QNODE_DECODE_OVER;
+  if (pRow == NULL) goto _OVER;
 
   SQnodeObj *pObj = sdbGetRowObj(pRow);
-  if (pObj == NULL) goto QNODE_DECODE_OVER;
+  if (pObj == NULL) goto _OVER;
 
   int32_t dataPos = 0;
-  SDB_GET_INT32(pRaw, dataPos, &pObj->id, QNODE_DECODE_OVER)
-  SDB_GET_INT64(pRaw, dataPos, &pObj->createdTime, QNODE_DECODE_OVER)
-  SDB_GET_INT64(pRaw, dataPos, &pObj->updateTime, QNODE_DECODE_OVER)
-  SDB_GET_RESERVE(pRaw, dataPos, TSDB_QNODE_RESERVE_SIZE, QNODE_DECODE_OVER)
+  SDB_GET_INT32(pRaw, dataPos, &pObj->id, _OVER)
+  SDB_GET_INT64(pRaw, dataPos, &pObj->createdTime, _OVER)
+  SDB_GET_INT64(pRaw, dataPos, &pObj->updateTime, _OVER)
+  SDB_GET_RESERVE(pRaw, dataPos, QNODE_RESERVE_SIZE, _OVER)
 
   terrno = 0;
 
-QNODE_DECODE_OVER:
+_OVER:
   if (terrno != 0) {
     mError("qnode:%d, failed to decode from raw:%p since %s", pObj->id, pRaw, terrstr());
     taosMemoryFreeClear(pRow);
@@ -192,13 +192,13 @@ static int32_t mndSetCreateQnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, S
   SDCreateQnodeReq createReq = {0};
   createReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -219,13 +219,13 @@ static int32_t mndSetCreateQnodeUndoActions(STrans *pTrans, SDnodeObj *pDnode, S
   SDDropQnodeReq dropReq = {0};
   dropReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -251,19 +251,19 @@ static int32_t mndCreateQnode(SMnode *pMnode, SNodeMsg *pReq, SDnodeObj *pDnode,
   qnodeObj.updateTime = qnodeObj.createdTime;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_QNODE, &pReq->rpcMsg);
-  if (pTrans == NULL) goto CREATE_QNODE_OVER;
+  if (pTrans == NULL) goto _OVER;
 
   mDebug("trans:%d, used to create qnode:%d", pTrans->id, pCreate->dnodeId);
-  if (mndSetCreateQnodeRedoLogs(pTrans, &qnodeObj) != 0) goto CREATE_QNODE_OVER;
-  if (mndSetCreateQnodeUndoLogs(pTrans, &qnodeObj) != 0) goto CREATE_QNODE_OVER;
-  if (mndSetCreateQnodeCommitLogs(pTrans, &qnodeObj) != 0) goto CREATE_QNODE_OVER;
-  if (mndSetCreateQnodeRedoActions(pTrans, pDnode, &qnodeObj) != 0) goto CREATE_QNODE_OVER;
-  if (mndSetCreateQnodeUndoActions(pTrans, pDnode, &qnodeObj) != 0) goto CREATE_QNODE_OVER;
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto CREATE_QNODE_OVER;
+  if (mndSetCreateQnodeRedoLogs(pTrans, &qnodeObj) != 0) goto _OVER;
+  if (mndSetCreateQnodeUndoLogs(pTrans, &qnodeObj) != 0) goto _OVER;
+  if (mndSetCreateQnodeCommitLogs(pTrans, &qnodeObj) != 0) goto _OVER;
+  if (mndSetCreateQnodeRedoActions(pTrans, pDnode, &qnodeObj) != 0) goto _OVER;
+  if (mndSetCreateQnodeUndoActions(pTrans, pDnode, &qnodeObj) != 0) goto _OVER;
+  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
 
   code = 0;
 
-CREATE_QNODE_OVER:
+_OVER:
   mndTransDrop(pTrans);
   return code;
 }
@@ -276,9 +276,9 @@ static int32_t mndProcessCreateQnodeReq(SNodeMsg *pReq) {
   SUserObj        *pUser = NULL;
   SMCreateQnodeReq createReq = {0};
 
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
-    goto CREATE_QNODE_OVER;
+    goto _OVER;
   }
 
   mDebug("qnode:%d, start to create", createReq.dnodeId);
@@ -286,31 +286,31 @@ static int32_t mndProcessCreateQnodeReq(SNodeMsg *pReq) {
   pObj = mndAcquireQnode(pMnode, createReq.dnodeId);
   if (pObj != NULL) {
     terrno = TSDB_CODE_MND_QNODE_ALREADY_EXIST;
-    goto CREATE_QNODE_OVER;
+    goto _OVER;
   } else if (terrno != TSDB_CODE_MND_QNODE_NOT_EXIST) {
-    goto CREATE_QNODE_OVER;
+    goto _OVER;
   }
 
   pDnode = mndAcquireDnode(pMnode, createReq.dnodeId);
   if (pDnode == NULL) {
     terrno = TSDB_CODE_MND_DNODE_NOT_EXIST;
-    goto CREATE_QNODE_OVER;
+    goto _OVER;
   }
 
   pUser = mndAcquireUser(pMnode, pReq->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
-    goto CREATE_QNODE_OVER;
+    goto _OVER;
   }
 
   if (mndCheckNodeAuth(pUser)) {
-    goto CREATE_QNODE_OVER;
+    goto _OVER;
   }
 
   code = mndCreateQnode(pMnode, pReq, pDnode, &createReq);
   if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
-CREATE_QNODE_OVER:
+_OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("qnode:%d, failed to create since %s", createReq.dnodeId, terrstr());
   }
@@ -318,7 +318,6 @@ CREATE_QNODE_OVER:
   mndReleaseQnode(pMnode, pObj);
   mndReleaseDnode(pMnode, pDnode);
   mndReleaseUser(pMnode, pUser);
-
   return code;
 }
 
@@ -342,13 +341,13 @@ static int32_t mndSetDropQnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SQn
   SDDropQnodeReq dropReq = {0};
   dropReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -369,17 +368,17 @@ static int32_t mndDropQnode(SMnode *pMnode, SNodeMsg *pReq, SQnodeObj *pObj) {
   int32_t code = -1;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_QNODE, &pReq->rpcMsg);
-  if (pTrans == NULL) goto DROP_QNODE_OVER;
+  if (pTrans == NULL) goto _OVER;
 
   mDebug("trans:%d, used to drop qnode:%d", pTrans->id, pObj->id);
-  if (mndSetDropQnodeRedoLogs(pTrans, pObj) != 0) goto DROP_QNODE_OVER;
-  if (mndSetDropQnodeCommitLogs(pTrans, pObj) != 0) goto DROP_QNODE_OVER;
-  if (mndSetDropQnodeRedoActions(pTrans, pObj->pDnode, pObj) != 0) goto DROP_QNODE_OVER;
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto DROP_QNODE_OVER;
+  if (mndSetDropQnodeRedoLogs(pTrans, pObj) != 0) goto _OVER;
+  if (mndSetDropQnodeCommitLogs(pTrans, pObj) != 0) goto _OVER;
+  if (mndSetDropQnodeRedoActions(pTrans, pObj->pDnode, pObj) != 0) goto _OVER;
+  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
 
   code = 0;
 
-DROP_QNODE_OVER:
+_OVER:
   mndTransDrop(pTrans);
   return code;
 }
@@ -391,37 +390,37 @@ static int32_t mndProcessDropQnodeReq(SNodeMsg *pReq) {
   SQnodeObj     *pObj = NULL;
   SMDropQnodeReq dropReq = {0};
 
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
-    goto DROP_QNODE_OVER;
+    goto _OVER;
   }
 
   mDebug("qnode:%d, start to drop", dropReq.dnodeId);
 
   if (dropReq.dnodeId <= 0) {
     terrno = TSDB_CODE_SDB_APP_ERROR;
-    goto DROP_QNODE_OVER;
+    goto _OVER;
   }
 
   pObj = mndAcquireQnode(pMnode, dropReq.dnodeId);
   if (pObj == NULL) {
-    goto DROP_QNODE_OVER;
+    goto _OVER;
   }
 
   pUser = mndAcquireUser(pMnode, pReq->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
-    goto DROP_QNODE_OVER;
+    goto _OVER;
   }
 
   if (mndCheckNodeAuth(pUser)) {
-    goto DROP_QNODE_OVER;
+    goto _OVER;
   }
 
   code = mndDropQnode(pMnode, pReq, pObj);
   if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
-DROP_QNODE_OVER:
+_OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("qnode:%d, failed to drop since %s", dropReq.dnodeId, terrstr());
   }
@@ -433,37 +432,36 @@ DROP_QNODE_OVER:
 }
 
 static int32_t mndProcessQnodeListReq(SNodeMsg *pReq) {
-  int32_t        code = -1;
-  SQnodeListReq  qlistReq = {0};
-  int32_t numOfRows = 0;
-  SMnode    *pMnode = pReq->pNode;
-  SSdb      *pSdb = pMnode->pSdb;
-  SQnodeObj *pObj = NULL;
+  int32_t       code = -1;
+  int32_t       numOfRows = 0;
+  SMnode       *pMnode = pReq->pNode;
+  SSdb         *pSdb = pMnode->pSdb;
+  SQnodeObj    *pObj = NULL;
+  SQnodeListReq qlistReq = {0};
   SQnodeListRsp qlistRsp = {0};
 
   if (tDeserializeSQnodeListReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &qlistReq) != 0) {
-    mError("invalid qnode list msg");
+    mError("failed to parse qnode list req");
     terrno = TSDB_CODE_INVALID_MSG;
-    goto QNODE_LIST_OVER;
+    goto _OVER;
   }
 
   qlistRsp.epSetList = taosArrayInit(5, sizeof(SEpSet));
   if (NULL == qlistRsp.epSetList) {
-    mError("taosArrayInit epSet failed");
+    mError("failed to alloc epSet while process qnode list req");
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto QNODE_LIST_OVER;
+    goto _OVER;
   }
-  
+
   while (true) {
     void *pIter = sdbFetch(pSdb, SDB_QNODE, NULL, (void **)&pObj);
     if (pIter == NULL) break;
 
-    SEpSet epSet = {0};
-    strcpy(epSet.eps[0].fqdn, pObj->pDnode->fqdn);
+    SEpSet epSet = {.numOfEps = 1};
+    tstrncpy(epSet.eps[0].fqdn, pObj->pDnode->fqdn, TSDB_FQDN_LEN);
     epSet.eps[0].port = pObj->pDnode->port;
-    epSet.numOfEps = 1;
 
-    taosArrayPush(qlistRsp.epSetList, &epSet);
+    (void)taosArrayPush(qlistRsp.epSetList, &epSet);
 
     numOfRows++;
     sdbRelease(pSdb, pObj);
@@ -477,19 +475,17 @@ static int32_t mndProcessQnodeListReq(SNodeMsg *pReq) {
   void   *pRsp = taosMemoryMalloc(rspLen);
   if (pRsp == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto QNODE_LIST_OVER;
+    goto _OVER;
   }
-  
+
   tSerializeSQnodeListRsp(pRsp, rspLen, &qlistRsp);
-  
+
   pReq->rspLen = rspLen;
   pReq->pRsp = pRsp;
   code = 0;
 
-QNODE_LIST_OVER:
-
+_OVER:
   tFreeSQnodeListRsp(&qlistRsp);
-  
   return code;
 }
 
diff --git a/source/dnode/mnode/impl/src/mndSnode.c b/source/dnode/mnode/impl/src/mndSnode.c
index 4f24c6f7eb..2381724a50 100644
--- a/source/dnode/mnode/impl/src/mndSnode.c
+++ b/source/dnode/mnode/impl/src/mndSnode.c
@@ -199,13 +199,13 @@ static int32_t mndSetCreateSnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, S
   SDCreateSnodeReq createReq = {0};
   createReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -226,13 +226,13 @@ static int32_t mndSetCreateSnodeUndoActions(STrans *pTrans, SDnodeObj *pDnode, S
   SDDropSnodeReq dropReq = {0};
   dropReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -284,7 +284,7 @@ static int32_t mndProcessCreateSnodeReq(SNodeMsg *pReq) {
   SUserObj        *pUser = NULL;
   SMCreateSnodeReq createReq = {0};
 
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto CREATE_SNODE_OVER;
   }
@@ -351,13 +351,13 @@ static int32_t mndSetDropSnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SSn
   SDDropSnodeReq dropReq = {0};
   dropReq.dnodeId = pDnode->id;
 
-  int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   void   *pReq = taosMemoryMalloc(contLen);
   if (pReq == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -401,7 +401,7 @@ static int32_t mndProcessDropSnodeReq(SNodeMsg *pReq) {
   SSnodeObj     *pObj = NULL;
   SMDropSnodeReq dropReq = {0};
 
-  if (tDeserializeSMCreateDropQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
+  if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     goto DROP_SNODE_OVER;
   }
diff --git a/source/dnode/mnode/impl/test/bnode/bnode.cpp b/source/dnode/mnode/impl/test/bnode/bnode.cpp
index 4d691692ff..33816520f2 100644
--- a/source/dnode/mnode/impl/test/bnode/bnode.cpp
+++ b/source/dnode/mnode/impl/test/bnode/bnode.cpp
@@ -55,9 +55,9 @@ TEST_F(MndTestBnode, 02_Create_Bnode) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -68,9 +68,9 @@ TEST_F(MndTestBnode, 02_Create_Bnode) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -90,9 +90,9 @@ TEST_F(MndTestBnode, 02_Create_Bnode) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -124,9 +124,9 @@ TEST_F(MndTestBnode, 03_Drop_Bnode) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -148,9 +148,9 @@ TEST_F(MndTestBnode, 03_Drop_Bnode) {
     SMDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -169,9 +169,9 @@ TEST_F(MndTestBnode, 03_Drop_Bnode) {
     SMDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -185,9 +185,9 @@ TEST_F(MndTestBnode, 03_Create_Bnode_Rollback) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
@@ -200,9 +200,9 @@ TEST_F(MndTestBnode, 03_Create_Bnode_Rollback) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -214,9 +214,9 @@ TEST_F(MndTestBnode, 03_Create_Bnode_Rollback) {
     SMDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -235,9 +235,9 @@ TEST_F(MndTestBnode, 03_Create_Bnode_Rollback) {
       SMCreateBnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
@@ -255,9 +255,9 @@ TEST_F(MndTestBnode, 04_Drop_Bnode_Rollback) {
     SMDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_BNODE, pReq, contLen);
@@ -270,9 +270,9 @@ TEST_F(MndTestBnode, 04_Drop_Bnode_Rollback) {
     SMCreateBnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -284,9 +284,9 @@ TEST_F(MndTestBnode, 04_Drop_Bnode_Rollback) {
     SMDropBnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -305,9 +305,9 @@ TEST_F(MndTestBnode, 04_Drop_Bnode_Rollback) {
       SMCreateBnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_BNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mnode/impl/test/mnode/mnode.cpp b/source/dnode/mnode/impl/test/mnode/mnode.cpp
index fd8c83e26a..dd2867f7f9 100644
--- a/source/dnode/mnode/impl/test/mnode/mnode.cpp
+++ b/source/dnode/mnode/impl/test/mnode/mnode.cpp
@@ -63,9 +63,9 @@ TEST_F(MndTestMnode, 02_Create_Mnode_Invalid_Id) {
     SMCreateMnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -78,9 +78,9 @@ TEST_F(MndTestMnode, 03_Create_Mnode_Invalid_Id) {
     SMCreateMnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -114,9 +114,9 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     SMCreateMnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -143,9 +143,9 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     SMDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -167,9 +167,9 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     SMDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -183,9 +183,9 @@ TEST_F(MndTestMnode, 03_Create_Mnode_Rollback) {
     SMCreateMnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
@@ -198,9 +198,9 @@ TEST_F(MndTestMnode, 03_Create_Mnode_Rollback) {
     SMCreateMnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -212,9 +212,9 @@ TEST_F(MndTestMnode, 03_Create_Mnode_Rollback) {
     SMDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -233,9 +233,9 @@ TEST_F(MndTestMnode, 03_Create_Mnode_Rollback) {
       SMCreateMnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
@@ -253,9 +253,9 @@ TEST_F(MndTestMnode, 04_Drop_Mnode_Rollback) {
     SMDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_MNODE, pReq, contLen);
@@ -268,9 +268,9 @@ TEST_F(MndTestMnode, 04_Drop_Mnode_Rollback) {
     SMCreateMnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -282,9 +282,9 @@ TEST_F(MndTestMnode, 04_Drop_Mnode_Rollback) {
     SMDropMnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropMnodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -303,9 +303,9 @@ TEST_F(MndTestMnode, 04_Drop_Mnode_Rollback) {
       SMCreateMnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropMnodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropMnodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_MNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mnode/impl/test/qnode/qnode.cpp b/source/dnode/mnode/impl/test/qnode/qnode.cpp
index b8a0e61ca3..be214cacf2 100644
--- a/source/dnode/mnode/impl/test/qnode/qnode.cpp
+++ b/source/dnode/mnode/impl/test/qnode/qnode.cpp
@@ -55,9 +55,9 @@ TEST_F(MndTestQnode, 02_Create_Qnode) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -68,9 +68,9 @@ TEST_F(MndTestQnode, 02_Create_Qnode) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -90,9 +90,9 @@ TEST_F(MndTestQnode, 02_Create_Qnode) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -124,9 +124,9 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -148,9 +148,9 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     SMDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -169,9 +169,9 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     SMDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -185,9 +185,9 @@ TEST_F(MndTestQnode, 03_Create_Qnode_Rollback) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     server2.Stop();
     taosMsleep(1000);
@@ -203,9 +203,9 @@ TEST_F(MndTestQnode, 03_Create_Qnode_Rollback) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -217,9 +217,9 @@ TEST_F(MndTestQnode, 03_Create_Qnode_Rollback) {
     SMDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -239,9 +239,9 @@ TEST_F(MndTestQnode, 03_Create_Qnode_Rollback) {
       SMCreateQnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
@@ -258,9 +258,9 @@ TEST_F(MndTestQnode, 04_Drop_Qnode_Rollback) {
     SMDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_QNODE, pReq, contLen);
@@ -273,9 +273,9 @@ TEST_F(MndTestQnode, 04_Drop_Qnode_Rollback) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, TSDB_CODE_SDB_OBJ_DROPPING);
@@ -286,9 +286,9 @@ TEST_F(MndTestQnode, 04_Drop_Qnode_Rollback) {
     SMDropQnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -307,9 +307,9 @@ TEST_F(MndTestQnode, 04_Drop_Qnode_Rollback) {
       SMCreateQnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
       if (pRsp->code == 0) break;
diff --git a/source/dnode/mnode/impl/test/snode/snode.cpp b/source/dnode/mnode/impl/test/snode/snode.cpp
index a38fb5d604..7d24d89154 100644
--- a/source/dnode/mnode/impl/test/snode/snode.cpp
+++ b/source/dnode/mnode/impl/test/snode/snode.cpp
@@ -55,9 +55,9 @@ TEST_F(MndTestSnode, 02_Create_Snode) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -68,9 +68,9 @@ TEST_F(MndTestSnode, 02_Create_Snode) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -90,9 +90,9 @@ TEST_F(MndTestSnode, 02_Create_Snode) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -124,9 +124,9 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -148,9 +148,9 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     SMDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -169,9 +169,9 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     SMDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -185,9 +185,9 @@ TEST_F(MndTestSnode, 03_Create_Snode_Rollback) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
@@ -200,9 +200,9 @@ TEST_F(MndTestSnode, 03_Create_Snode_Rollback) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -214,9 +214,9 @@ TEST_F(MndTestSnode, 03_Create_Snode_Rollback) {
     SMDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -235,9 +235,9 @@ TEST_F(MndTestSnode, 03_Create_Snode_Rollback) {
       SMCreateSnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
@@ -255,9 +255,9 @@ TEST_F(MndTestSnode, 04_Drop_Snode_Rollback) {
     SMDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_SNODE, pReq, contLen);
@@ -270,9 +270,9 @@ TEST_F(MndTestSnode, 04_Drop_Snode_Rollback) {
     SMCreateSnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -284,9 +284,9 @@ TEST_F(MndTestSnode, 04_Drop_Snode_Rollback) {
     SMDropSnodeReq dropReq = {0};
     dropReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &dropReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &dropReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -305,9 +305,9 @@ TEST_F(MndTestSnode, 04_Drop_Snode_Rollback) {
       SMCreateSnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_SNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
diff --git a/source/dnode/mnode/impl/test/trans/trans.cpp b/source/dnode/mnode/impl/test/trans/trans.cpp
index b37ec85387..40b052400b 100644
--- a/source/dnode/mnode/impl/test/trans/trans.cpp
+++ b/source/dnode/mnode/impl/test/trans/trans.cpp
@@ -136,9 +136,9 @@ TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -155,9 +155,9 @@ TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 1;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -194,9 +194,9 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     server2.Stop();
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
@@ -249,9 +249,9 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
     SMCreateQnodeReq createReq = {0};
     createReq.dnodeId = 2;
 
-    int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+    int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
-    tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+    tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
@@ -274,9 +274,9 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
       SMCreateQnodeReq createReq = {0};
       createReq.dnodeId = 2;
 
-      int32_t contLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+      int32_t contLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
       void*   pReq = rpcMallocCont(contLen);
-      tSerializeSMCreateDropQSBNodeReq(pReq, contLen, &createReq);
+      tSerializeSCreateDropMQSBNodeReq(pReq, contLen, &createReq);
 
       SRpcMsg* pRsp = test.SendReq(TDMT_MND_CREATE_QNODE, pReq, contLen);
       ASSERT_NE(pRsp, nullptr);
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index a286918ce5..0f8fd2774f 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2043,12 +2043,12 @@ static int32_t translateCreateQnode(STranslateContext* pCxt, SCreateQnodeStmt* p
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
   pCxt->pCmdMsg->msgType = TDMT_DND_CREATE_QNODE;
-  pCxt->pCmdMsg->msgLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+  pCxt->pCmdMsg->msgLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
-  tSerializeSMCreateDropQSBNodeReq(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, &createReq);
+  tSerializeSCreateDropMQSBNodeReq(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, &createReq);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -2062,12 +2062,12 @@ static int32_t translateDropQnode(STranslateContext* pCxt, SDropQnodeStmt* pStmt
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
   pCxt->pCmdMsg->msgType = TDMT_DND_DROP_QNODE;
-  pCxt->pCmdMsg->msgLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  pCxt->pCmdMsg->msgLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
-  tSerializeSMCreateDropQSBNodeReq(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, &dropReq);
+  tSerializeSCreateDropMQSBNodeReq(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, &dropReq);
 
   return TSDB_CODE_SUCCESS;
 }

From 3544c8789b04d3c479c28ce5e92bf1e1c19e1550 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Sat, 9 Apr 2022 15:57:39 +0800
Subject: [PATCH 63/82] create/drop/show bnode/snode/mnode frontend implement

---
 source/libs/parser/inc/sql.y               | 5 +----
 source/libs/parser/src/parAstCreater.c     | 6 ++++--
 source/libs/parser/src/sql.c               | 8 +-------
 source/libs/planner/src/planLogicCreater.c | 4 +++-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index bcedd97ec9..6f00c66ece 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -728,10 +728,7 @@ select_list(A) ::= select_sublist(B).
 select_sublist(A) ::= select_item(B).                                             { A = createNodeList(pCxt, B); }
 select_sublist(A) ::= select_sublist(B) NK_COMMA select_item(C).                  { A = addNodeToList(pCxt, B, C); }
 
-select_item(A) ::= common_expression(B).                                          {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, B);
-                                                                                    A = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, B), &t);
-                                                                                  }
+select_item(A) ::= common_expression(B).                                          { A = releaseRawExprNode(pCxt, B); }
 select_item(A) ::= common_expression(B) column_alias(C).                          { A = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, B), &C); }
 select_item(A) ::= common_expression(B) AS column_alias(C).                       { A = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, B), &C); }
 select_item(A) ::= table_name(B) NK_DOT NK_STAR(C).                               { A = createColumnNode(pCxt, &B, &C); }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 731e23e20d..e13d9930f2 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -205,9 +205,11 @@ SNode* createRawExprNodeExt(SAstCreateContext* pCxt, const SToken* pStart, const
 
 SNode* releaseRawExprNode(SAstCreateContext* pCxt, SNode* pNode) {
   CHECK_RAW_EXPR_NODE(pNode);
-  SNode* tmp = ((SRawExprNode*)pNode)->pNode;
+  SRawExprNode* pRawExpr = (SRawExprNode*)pNode;
+  SNode* pExpr = pRawExpr->pNode;
+  strncpy(((SExprNode*)pExpr)->aliasName, pRawExpr->p, pRawExpr->n);
   taosMemoryFreeClear(pNode);
-  return tmp;
+  return pExpr;
 }
 
 SToken getTokenFromRawExprNode(SAstCreateContext* pCxt, SNode* pNode) {
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index 918b7aa41b..05362dbf97 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -3415,6 +3415,7 @@ static YYACTIONTYPE yy_reduce(
 { yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
         break;
       case 260: /* signed_literal ::= duration_literal */
+      case 354: /* select_item ::= common_expression */ yytestcase(yyruleno==354);
       case 398: /* search_condition ::= common_expression */ yytestcase(yyruleno==398);
 { yylhsminor.yy564 = releaseRawExprNode(pCxt, yymsp[0].minor.yy564); }
   yymsp[0].minor.yy564 = yylhsminor.yy564;
@@ -3679,13 +3680,6 @@ static YYACTIONTYPE yy_reduce(
       case 350: /* select_list ::= NK_STAR */
 { yymsp[0].minor.yy476 = NULL; }
         break;
-      case 354: /* select_item ::= common_expression */
-{
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
-                                                                                    yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy564), &t);
-                                                                                  }
-  yymsp[0].minor.yy564 = yylhsminor.yy564;
-        break;
       case 355: /* select_item ::= common_expression column_alias */
 { yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy564), &yymsp[0].minor.yy21); }
   yymsp[-1].minor.yy564 = yylhsminor.yy564;
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 6832cdce7a..596bb64bac 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -72,7 +72,9 @@ static EDealRes doNameExpr(SNode* pNode, void* pContext) {
     case QUERY_NODE_OPERATOR:
     case QUERY_NODE_LOGIC_CONDITION:
     case QUERY_NODE_FUNCTION: {
-      sprintf(((SExprNode*)pNode)->aliasName, "#expr_%p", pNode);
+      if ('\0' == ((SExprNode*)pNode)->aliasName[0]) {
+        sprintf(((SExprNode*)pNode)->aliasName, "#expr_%p", pNode);
+      }
       return DEAL_RES_IGNORE_CHILD;
     }
     default:

From 66ef1daeb9a20a551b46d4544b6b357761b8ce7b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 16:05:20 +0800
Subject: [PATCH 64/82] refactor[cluster]: adjust the error codes

---
 include/util/taoserror.h                | 64 ++++++++++++-------------
 source/dnode/mgmt/bm/bmHandle.c         |  4 +-
 source/dnode/mgmt/dm/dmFile.c           |  2 +-
 source/dnode/mgmt/main/dndExec.c        |  2 +-
 source/dnode/mgmt/main/dndFile.c        |  4 +-
 source/dnode/mgmt/main/dndTransport.c   |  6 +--
 source/dnode/mgmt/mm/mmFile.c           |  2 +-
 source/dnode/mgmt/mm/mmHandle.c         |  6 +--
 source/dnode/mgmt/qm/qmHandle.c         |  4 +-
 source/dnode/mgmt/sm/smHandle.c         |  4 +-
 source/dnode/mgmt/test/bnode/dbnode.cpp |  4 +-
 source/dnode/mgmt/test/mnode/dmnode.cpp |  6 +--
 source/dnode/mgmt/test/qnode/dqnode.cpp |  4 +-
 source/dnode/mgmt/test/snode/dsnode.cpp |  4 +-
 source/dnode/mgmt/test/vnode/vnode.cpp  |  4 +-
 source/dnode/mgmt/vm/vmFile.c           |  2 +-
 source/dnode/mgmt/vm/vmHandle.c         |  4 +-
 source/dnode/mnode/impl/src/mndDb.c     |  6 +--
 source/libs/transport/src/rpcMain.c     |  2 +-
 source/util/src/terror.c                | 37 +++++++-------
 20 files changed, 81 insertions(+), 90 deletions(-)

diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index 5b7aa51881..d009f16f62 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -64,31 +64,35 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_RPC_INVALID_VERSION           TAOS_DEF_ERROR_CODE(0, 0x0016)
 
 //common & util
-#define TSDB_CODE_OPS_NOT_SUPPORT               TAOS_DEF_ERROR_CODE(0, 0x0100)
-#define TSDB_CODE_OUT_OF_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0101)
-#define TSDB_CODE_OUT_OF_RANGE                  TAOS_DEF_ERROR_CODE(0, 0x0102)
-#define TSDB_CODE_INVALID_PTR                   TAOS_DEF_ERROR_CODE(0, 0x0103)
-#define TSDB_CODE_MEMORY_CORRUPTED              TAOS_DEF_ERROR_CODE(0, 0x0104)
-#define TSDB_CODE_FILE_CORRUPTED                TAOS_DEF_ERROR_CODE(0, 0x0106)
-#define TSDB_CODE_CHECKSUM_ERROR                TAOS_DEF_ERROR_CODE(0, 0x0107)
-#define TSDB_CODE_INVALID_MSG                   TAOS_DEF_ERROR_CODE(0, 0x0108)
-#define TSDB_CODE_MSG_NOT_PROCESSED             TAOS_DEF_ERROR_CODE(0, 0x0109)
-#define TSDB_CODE_INVALID_PARA                  TAOS_DEF_ERROR_CODE(0, 0x010A)
-#define TSDB_CODE_REPEAT_INIT                   TAOS_DEF_ERROR_CODE(0, 0x010B)
-#define TSDB_CODE_CFG_NOT_FOUND                 TAOS_DEF_ERROR_CODE(0, 0x010C)
-#define TSDB_CODE_INVALID_CFG                   TAOS_DEF_ERROR_CODE(0, 0x010D)
-#define TSDB_CODE_OUT_OF_SHM_MEM                TAOS_DEF_ERROR_CODE(0, 0x010E)
-#define TSDB_CODE_INVALID_SHM_ID                TAOS_DEF_ERROR_CODE(0, 0x010F)
-#define TSDB_CODE_REF_NO_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0110)
-#define TSDB_CODE_REF_FULL                      TAOS_DEF_ERROR_CODE(0, 0x0111)
-#define TSDB_CODE_REF_ID_REMOVED                TAOS_DEF_ERROR_CODE(0, 0x0112)
-#define TSDB_CODE_REF_INVALID_ID                TAOS_DEF_ERROR_CODE(0, 0x0113)
-#define TSDB_CODE_REF_ALREADY_EXIST             TAOS_DEF_ERROR_CODE(0, 0x0114)
-#define TSDB_CODE_REF_NOT_EXIST                 TAOS_DEF_ERROR_CODE(0, 0x0115)
-#define TSDB_CODE_INVALID_VERSION_NUMBER        TAOS_DEF_ERROR_CODE(0, 0x0120)
-#define TSDB_CODE_INVALID_VERSION_STRING        TAOS_DEF_ERROR_CODE(0, 0x0121)
-#define TSDB_CODE_VERSION_NOT_COMPATIBLE        TAOS_DEF_ERROR_CODE(0, 0x0122)
-#define TSDB_CODE_COMPRESS_ERROR                TAOS_DEF_ERROR_CODE(0, 0x0123)
+#define TSDB_CODE_OUT_OF_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0100)
+#define TSDB_CODE_OUT_OF_RANGE                  TAOS_DEF_ERROR_CODE(0, 0x0101)
+#define TSDB_CODE_OUT_OF_SHM_MEM                TAOS_DEF_ERROR_CODE(0, 0x0102)
+#define TSDB_CODE_INVALID_SHM_ID                TAOS_DEF_ERROR_CODE(0, 0x0103)
+#define TSDB_CODE_INVALID_PTR                   TAOS_DEF_ERROR_CODE(0, 0x0104)
+#define TSDB_CODE_INVALID_MSG                   TAOS_DEF_ERROR_CODE(0, 0x0105)
+#define TSDB_CODE_INVALID_MSG_LEN               TAOS_DEF_ERROR_CODE(0, 0x0106)
+#define TSDB_CODE_INVALID_PARA                  TAOS_DEF_ERROR_CODE(0, 0x0107)
+#define TSDB_CODE_INVALID_CFG                   TAOS_DEF_ERROR_CODE(0, 0x0108)
+#define TSDB_CODE_INVALID_OPTION                TAOS_DEF_ERROR_CODE(0, 0x0109)
+#define TSDB_CODE_INVALID_JSON_FORMAT           TAOS_DEF_ERROR_CODE(0, 0x010A)
+#define TSDB_CODE_INVALID_VERSION_NUMBER        TAOS_DEF_ERROR_CODE(0, 0x010B)
+#define TSDB_CODE_INVALID_VERSION_STRING        TAOS_DEF_ERROR_CODE(0, 0x010C)
+#define TSDB_CODE_VERSION_NOT_COMPATIBLE        TAOS_DEF_ERROR_CODE(0, 0x010D)
+#define TSDB_CODE_MEMORY_CORRUPTED              TAOS_DEF_ERROR_CODE(0, 0x010E)
+#define TSDB_CODE_FILE_CORRUPTED                TAOS_DEF_ERROR_CODE(0, 0x010F)
+#define TSDB_CODE_CHECKSUM_ERROR                TAOS_DEF_ERROR_CODE(0, 0x0110)
+#define TSDB_CODE_COMPRESS_ERROR                TAOS_DEF_ERROR_CODE(0, 0x0111)
+#define TSDB_CODE_OPS_NOT_SUPPORT               TAOS_DEF_ERROR_CODE(0, 0x0112)
+#define TSDB_CODE_MSG_NOT_PROCESSED             TAOS_DEF_ERROR_CODE(0, 0x0113)
+#define TSDB_CODE_CFG_NOT_FOUND                 TAOS_DEF_ERROR_CODE(0, 0x0114)
+#define TSDB_CODE_REPEAT_INIT                   TAOS_DEF_ERROR_CODE(0, 0x0115)
+
+#define TSDB_CODE_REF_NO_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0140)
+#define TSDB_CODE_REF_FULL                      TAOS_DEF_ERROR_CODE(0, 0x0141)
+#define TSDB_CODE_REF_ID_REMOVED                TAOS_DEF_ERROR_CODE(0, 0x0152)
+#define TSDB_CODE_REF_INVALID_ID                TAOS_DEF_ERROR_CODE(0, 0x0153)
+#define TSDB_CODE_REF_ALREADY_EXIST             TAOS_DEF_ERROR_CODE(0, 0x0154)
+#define TSDB_CODE_REF_NOT_EXIST                 TAOS_DEF_ERROR_CODE(0, 0x0155)
 
 //client
 #define TSDB_CODE_TSC_INVALID_OPERATION         TAOS_DEF_ERROR_CODE(0, 0x0200)
@@ -284,17 +288,9 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_INVALID_SMA_OPTION        TAOS_DEF_ERROR_CODE(0, 0x0402)
 
 // dnode
-#define TSDB_CODE_DND_ACTION_IN_PROGRESS        TAOS_DEF_ERROR_CODE(0, 0x04A0)
-#define TSDB_CODE_DND_OFFLINE                   TAOS_DEF_ERROR_CODE(0, 0x04A1)
-#define TSDB_CODE_DND_INVALID_MSG_LEN           TAOS_DEF_ERROR_CODE(0, 0x04A2)
+#define TSDB_CODE_NODE_OFFLINE                  TAOS_DEF_ERROR_CODE(0, 0x04A1)
 #define TSDB_CODE_NODE_ALREADY_DEPLOYED         TAOS_DEF_ERROR_CODE(0, 0x04A3)
 #define TSDB_CODE_NODE_NOT_DEPLOYED             TAOS_DEF_ERROR_CODE(0, 0x04A4)
-#define TSDB_CODE_NODE_PARSE_FILE_ERROR         TAOS_DEF_ERROR_CODE(0, 0x04A5)
-#define TSDB_CODE_NODE_INVALID_OPTION           TAOS_DEF_ERROR_CODE(0, 0x04A6)
-#define TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED    TAOS_DEF_ERROR_CODE(0, 0x04A7)
-#define TSDB_CODE_DND_VNODE_NOT_DEPLOYED        TAOS_DEF_ERROR_CODE(0, 0x04A8)
-#define TSDB_CODE_DND_VNODE_INVALID_OPTION      TAOS_DEF_ERROR_CODE(0, 0x04A9)
-#define TSDB_CODE_DND_VNODE_TOO_MANY_VNODES     TAOS_DEF_ERROR_CODE(0, 0x04AA)
 
 // vnode
 #define TSDB_CODE_VND_ACTION_IN_PROGRESS        TAOS_DEF_ERROR_CODE(0, 0x0500)
diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index e148f7a00c..66163b807b 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -55,7 +55,7 @@ int32_t bmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (createReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to create bnode since %s, input:%d cur:%d", terrstr(), createReq.dnodeId, pDnode->dnodeId);
     return -1;
   } else {
@@ -74,7 +74,7 @@ int32_t bmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (dropReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to drop bnode since %s", terrstr());
     return -1;
   } else {
diff --git a/source/dnode/mgmt/dm/dmFile.c b/source/dnode/mgmt/dm/dmFile.c
index d5105bcb1b..1ac86870e3 100644
--- a/source/dnode/mgmt/dm/dmFile.c
+++ b/source/dnode/mgmt/dm/dmFile.c
@@ -21,7 +21,7 @@ static bool dmIsEpChanged(SDnodeMgmt *pMgmt, int32_t dnodeId, const char *ep);
 static void dmResetDnodes(SDnodeMgmt *pMgmt, SArray *dnodeEps);
 
 int32_t dmReadFile(SDnodeMgmt *pMgmt) {
-  int32_t   code = TSDB_CODE_NODE_PARSE_FILE_ERROR;
+  int32_t   code = TSDB_CODE_INVALID_JSON_FORMAT;
   int32_t   len = 0;
   int32_t   maxLen = 256 * 1024;
   char     *content = taosMemoryCalloc(1, maxLen + 1);
diff --git a/source/dnode/mgmt/main/dndExec.c b/source/dnode/mgmt/main/dndExec.c
index 28b24e97c9..6c0d0456c9 100644
--- a/source/dnode/mgmt/main/dndExec.c
+++ b/source/dnode/mgmt/main/dndExec.c
@@ -90,7 +90,7 @@ static int32_t dndNewProc(SMgmtWrapper *pWrapper, EDndType n) {
 
 static void dndProcessProcHandle(void *handle) {
   dWarn("handle:%p, the child process dies and send an offline rsp", handle);
-  SRpcMsg rpcMsg = {.handle = handle, .code = TSDB_CODE_DND_OFFLINE};
+  SRpcMsg rpcMsg = {.handle = handle, .code = TSDB_CODE_NODE_OFFLINE};
   rpcSendResponse(&rpcMsg);
 }
 
diff --git a/source/dnode/mgmt/main/dndFile.c b/source/dnode/mgmt/main/dndFile.c
index 4c42119ec4..d4d2a3e6ea 100644
--- a/source/dnode/mgmt/main/dndFile.c
+++ b/source/dnode/mgmt/main/dndFile.c
@@ -19,7 +19,7 @@
 #define MAXLEN 1024
 
 int32_t dndReadFile(SMgmtWrapper *pWrapper, bool *pDeployed) {
-  int32_t   code = TSDB_CODE_NODE_PARSE_FILE_ERROR;
+  int32_t   code = TSDB_CODE_INVALID_JSON_FORMAT;
   int64_t   len = 0;
   char      content[MAXLEN + 1] = {0};
   cJSON    *root = NULL;
@@ -159,7 +159,7 @@ int32_t dndReadShmFile(SDnode *pDnode) {
   if (taosReadFile(pFile, content, MAXLEN) > 0) {
     root = cJSON_Parse(content);
     if (root == NULL) {
-      terrno = TSDB_CODE_NODE_PARSE_FILE_ERROR;
+      terrno = TSDB_CODE_INVALID_JSON_FORMAT;
       dError("failed to read %s since invalid json format", file);
       goto _OVER;
     }
diff --git a/source/dnode/mgmt/main/dndTransport.c b/source/dnode/mgmt/main/dndTransport.c
index 3b0aca4b39..5e4f403b1e 100644
--- a/source/dnode/mgmt/main/dndTransport.c
+++ b/source/dnode/mgmt/main/dndTransport.c
@@ -121,7 +121,7 @@ static void dndProcessMsg(SDnode *pDnode, SRpcMsg *pMsg, SEpSet *pEpSet) {
 
   if (isReq && pMsg->pCont == NULL) {
     dError("req:%s not processed since its empty, handle:%p app:%p", TMSG_INFO(msgType), pMsg->handle, pMsg->ahandle);
-    SRpcMsg rspMsg = {.handle = pMsg->handle, .code = TSDB_CODE_DND_INVALID_MSG_LEN, .ahandle = pMsg->ahandle};
+    SRpcMsg rspMsg = {.handle = pMsg->handle, .code = TSDB_CODE_INVALID_MSG_LEN, .ahandle = pMsg->ahandle};
     rpcSendResponse(&rspMsg);
     return;
   }
@@ -338,7 +338,7 @@ int32_t dndInitMsgHandle(SDnode *pDnode) {
 
 static int32_t dndSendRpcReq(STransMgmt *pMgmt, const SEpSet *pEpSet, SRpcMsg *pReq) {
   if (pMgmt->clientRpc == NULL) {
-    terrno = TSDB_CODE_DND_OFFLINE;
+    terrno = TSDB_CODE_NODE_OFFLINE;
     return -1;
   }
 
@@ -359,7 +359,7 @@ static void dndSendRpcRsp(SMgmtWrapper *pWrapper, const SRpcMsg *pRsp) {
 
 static int32_t dndSendReq(SMgmtWrapper *pWrapper, const SEpSet *pEpSet, SRpcMsg *pReq) {
   if (dndGetStatus(pWrapper->pDnode) != DND_STAT_RUNNING) {
-    terrno = TSDB_CODE_DND_OFFLINE;
+    terrno = TSDB_CODE_NODE_OFFLINE;
     dError("failed to send rpc msg since %s, handle:%p", terrstr(), pReq->handle);
     return -1;
   }
diff --git a/source/dnode/mgmt/mm/mmFile.c b/source/dnode/mgmt/mm/mmFile.c
index 76aba771cb..57e1c0cb92 100644
--- a/source/dnode/mgmt/mm/mmFile.c
+++ b/source/dnode/mgmt/mm/mmFile.c
@@ -17,7 +17,7 @@
 #include "mmInt.h"
 
 int32_t mmReadFile(SMnodeMgmt *pMgmt, bool *pDeployed) {
-  int32_t   code = TSDB_CODE_NODE_PARSE_FILE_ERROR;
+  int32_t   code = TSDB_CODE_INVALID_JSON_FORMAT;
   int32_t   len = 0;
   int32_t   maxLen = 4096;
   char     *content = taosMemoryCalloc(1, maxLen + 1);
diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mm/mmHandle.c
index 44508ad9b8..eeae9da8b7 100644
--- a/source/dnode/mgmt/mm/mmHandle.c
+++ b/source/dnode/mgmt/mm/mmHandle.c
@@ -57,7 +57,7 @@ int32_t mmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (createReq.replica <= 1 || createReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to create mnode since %s", terrstr());
     return -1;
   } else {
@@ -76,7 +76,7 @@ int32_t mmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (dropReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to drop mnode since %s", terrstr());
     return -1;
   } else {
@@ -95,7 +95,7 @@ int32_t mmProcessAlterReq(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) {
   }
 
   if (alterReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to alter mnode since %s", terrstr());
     return -1;
   } else {
diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/qm/qmHandle.c
index 8924ad714d..96fc338529 100644
--- a/source/dnode/mgmt/qm/qmHandle.c
+++ b/source/dnode/mgmt/qm/qmHandle.c
@@ -54,7 +54,7 @@ int32_t qmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (createReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to create qnode since %s", terrstr());
     return -1;
   } else {
@@ -73,7 +73,7 @@ int32_t qmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (dropReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to drop qnode since %s", terrstr());
     return -1;
   } else {
diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index 9502176037..79fee0f4b7 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -54,7 +54,7 @@ int32_t smProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (createReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to create snode since %s, input:%d cur:%d", terrstr(), createReq.dnodeId, pDnode->dnodeId);
     return -1;
   } else {
@@ -73,7 +73,7 @@ int32_t smProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
   }
 
   if (dropReq.dnodeId != pDnode->dnodeId) {
-    terrno = TSDB_CODE_NODE_INVALID_OPTION;
+    terrno = TSDB_CODE_INVALID_OPTION;
     dError("failed to drop snode since %s", terrstr());
     return -1;
   } else {
diff --git a/source/dnode/mgmt/test/bnode/dbnode.cpp b/source/dnode/mgmt/test/bnode/dbnode.cpp
index 10d72e2e0b..9016bf49ea 100644
--- a/source/dnode/mgmt/test/bnode/dbnode.cpp
+++ b/source/dnode/mgmt/test/bnode/dbnode.cpp
@@ -39,7 +39,7 @@ TEST_F(DndTestBnode, 01_Create_Bnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
@@ -94,7 +94,7 @@ TEST_F(DndTestBnode, 02_Drop_Bnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_BNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
diff --git a/source/dnode/mgmt/test/mnode/dmnode.cpp b/source/dnode/mgmt/test/mnode/dmnode.cpp
index cced7dc75e..e92e51fa39 100644
--- a/source/dnode/mgmt/test/mnode/dmnode.cpp
+++ b/source/dnode/mgmt/test/mnode/dmnode.cpp
@@ -96,7 +96,7 @@ TEST_F(DndTestMnode, 02_Alter_Mnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_ALTER_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
@@ -113,7 +113,7 @@ TEST_F(DndTestMnode, 02_Alter_Mnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_ALTER_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
@@ -145,7 +145,7 @@ TEST_F(DndTestMnode, 03_Drop_Mnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_MNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
diff --git a/source/dnode/mgmt/test/qnode/dqnode.cpp b/source/dnode/mgmt/test/qnode/dqnode.cpp
index e7d857771e..8a0d97abb1 100644
--- a/source/dnode/mgmt/test/qnode/dqnode.cpp
+++ b/source/dnode/mgmt/test/qnode/dqnode.cpp
@@ -36,7 +36,7 @@ TEST_F(DndTestQnode, 01_Create_Qnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
@@ -92,7 +92,7 @@ TEST_F(DndTestQnode, 02_Drop_Qnode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_QNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
diff --git a/source/dnode/mgmt/test/snode/dsnode.cpp b/source/dnode/mgmt/test/snode/dsnode.cpp
index 2b971f704b..a744240a1a 100644
--- a/source/dnode/mgmt/test/snode/dsnode.cpp
+++ b/source/dnode/mgmt/test/snode/dsnode.cpp
@@ -36,7 +36,7 @@ TEST_F(DndTestSnode, 01_Create_Snode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
@@ -92,7 +92,7 @@ TEST_F(DndTestSnode, 01_Drop_Snode) {
 
     SRpcMsg* pRsp = test.SendReq(TDMT_DND_DROP_SNODE, pReq, contLen);
     ASSERT_NE(pRsp, nullptr);
-    ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_INVALID_OPTION);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_OPTION);
   }
 
   {
diff --git a/source/dnode/mgmt/test/vnode/vnode.cpp b/source/dnode/mgmt/test/vnode/vnode.cpp
index 40e7472d42..0daea3f666 100644
--- a/source/dnode/mgmt/test/vnode/vnode.cpp
+++ b/source/dnode/mgmt/test/vnode/vnode.cpp
@@ -67,7 +67,7 @@ TEST_F(DndTestVnode, 01_Create_Vnode) {
       ASSERT_EQ(pRsp->code, 0);
       test.Restart();
     } else {
-      ASSERT_EQ(pRsp->code, TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED);
+      ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_ALREADY_DEPLOYED);
     }
   }
 }
@@ -301,7 +301,7 @@ TEST_F(DndTestVnode, 06_Drop_Vnode) {
       ASSERT_EQ(pRsp->code, 0);
       test.Restart();
     } else {
-      ASSERT_EQ(pRsp->code, TSDB_CODE_DND_VNODE_NOT_DEPLOYED);
+      ASSERT_EQ(pRsp->code, TSDB_CODE_NODE_NOT_DEPLOYED);
     }
   }
 }
\ No newline at end of file
diff --git a/source/dnode/mgmt/vm/vmFile.c b/source/dnode/mgmt/vm/vmFile.c
index d4f906b482..ba59482c1a 100644
--- a/source/dnode/mgmt/vm/vmFile.c
+++ b/source/dnode/mgmt/vm/vmFile.c
@@ -45,7 +45,7 @@ SVnodeObj **vmGetVnodesFromHash(SVnodesMgmt *pMgmt, int32_t *numOfVnodes) {
 }
 
 int32_t vmGetVnodesFromFile(SVnodesMgmt *pMgmt, SWrapperCfg **ppCfgs, int32_t *numOfVnodes) {
-  int32_t      code = TSDB_CODE_NODE_PARSE_FILE_ERROR;
+  int32_t      code = TSDB_CODE_INVALID_JSON_FORMAT;
   int32_t      len = 0;
   int32_t      maxLen = 30000;
   char        *content = taosMemoryCalloc(1, maxLen + 1);
diff --git a/source/dnode/mgmt/vm/vmHandle.c b/source/dnode/mgmt/vm/vmHandle.c
index ecad414fd6..0e74ca656c 100644
--- a/source/dnode/mgmt/vm/vmHandle.c
+++ b/source/dnode/mgmt/vm/vmHandle.c
@@ -139,7 +139,7 @@ int32_t vmProcessCreateVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) {
     tFreeSCreateVnodeReq(&createReq);
     dDebug("vgId:%d, already exist", createReq.vgId);
     vmReleaseVnode(pMgmt, pVnode);
-    terrno = TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED;
+    terrno = TSDB_CODE_NODE_ALREADY_DEPLOYED;
     return -1;
   }
 
@@ -238,7 +238,7 @@ int32_t vmProcessDropVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) {
   SVnodeObj *pVnode = vmAcquireVnode(pMgmt, vgId);
   if (pVnode == NULL) {
     dDebug("vgId:%d, failed to drop since %s", vgId, terrstr());
-    terrno = TSDB_CODE_DND_VNODE_NOT_DEPLOYED;
+    terrno = TSDB_CODE_NODE_NOT_DEPLOYED;
     return -1;
   }
 
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index fd739dc657..260b1db410 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -381,7 +381,7 @@ static int32_t mndSetCreateDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj
       action.pCont = pReq;
       action.contLen = contLen;
       action.msgType = TDMT_DND_CREATE_VNODE;
-      action.acceptableCode = TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED;
+      action.acceptableCode = TSDB_CODE_NODE_ALREADY_DEPLOYED;
       if (mndTransAppendRedoAction(pTrans, &action) != 0) {
         taosMemoryFree(pReq);
         return -1;
@@ -412,7 +412,7 @@ static int32_t mndSetCreateDbUndoActions(SMnode *pMnode, STrans *pTrans, SDbObj
       action.pCont = pReq;
       action.contLen = contLen;
       action.msgType = TDMT_DND_DROP_VNODE;
-      action.acceptableCode = TSDB_CODE_DND_VNODE_NOT_DEPLOYED;
+      action.acceptableCode = TSDB_CODE_NODE_NOT_DEPLOYED;
       if (mndTransAppendUndoAction(pTrans, &action) != 0) {
         taosMemoryFree(pReq);
         return -1;
@@ -880,7 +880,7 @@ static int32_t mndBuildDropVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *
     action.pCont = pReq;
     action.contLen = contLen;
     action.msgType = TDMT_DND_DROP_VNODE;
-    action.acceptableCode = TSDB_CODE_DND_VNODE_NOT_DEPLOYED;
+    action.acceptableCode = TSDB_CODE_NODE_NOT_DEPLOYED;
     if (mndTransAppendRedoAction(pTrans, &action) != 0) {
       taosMemoryFree(pReq);
       return -1;
diff --git a/source/libs/transport/src/rpcMain.c b/source/libs/transport/src/rpcMain.c
index 6beda5bfed..0e425970da 100644
--- a/source/libs/transport/src/rpcMain.c
+++ b/source/libs/transport/src/rpcMain.c
@@ -1211,7 +1211,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead, SRpcReqConte
       rpcSendReqToServer(pRpc, pContext);
       rpcFreeCont(rpcMsg.pCont);
     } else if (pHead->code == TSDB_CODE_RPC_NOT_READY || pHead->code == TSDB_CODE_APP_NOT_READY ||
-               pHead->code == TSDB_CODE_DND_OFFLINE) {
+               pHead->code == TSDB_CODE_NODE_OFFLINE) {
       pContext->code = pHead->code;
       rpcProcessConnError(pContext, NULL);
       rpcFreeCont(rpcMsg.pCont);
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index e02310aab3..e4771c95f8 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -70,21 +70,29 @@ TAOS_DEFINE_ERROR(TSDB_CODE_RPC_FQDN_ERROR,               "Unable to resolve FQD
 TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_VERSION,          "Invalid app version")
 
 //common & util
-TAOS_DEFINE_ERROR(TSDB_CODE_OPS_NOT_SUPPORT,              "Operation not supported")
 TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_MEMORY,                "Out of Memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_RANGE,                 "Out of range")
+TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_SHM_MEM,               "Out of Shared memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_SHM_ID,               "Invalid SHM ID")
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PTR,                  "Invalid pointer")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG,                  "Invalid message")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_LEN,              "Invalid message len")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PARA,                 "Invalid parameters")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CFG,                  "Invalid config option")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_OPTION,               "Invalid option")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_JSON_FORMAT,          "Invalid json format")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VERSION_NUMBER,       "Invalid version number")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VERSION_STRING,       "Invalid version string")
+TAOS_DEFINE_ERROR(TSDB_CODE_VERSION_NOT_COMPATIBLE,       "Version not compatible")
 TAOS_DEFINE_ERROR(TSDB_CODE_MEMORY_CORRUPTED,             "Memory corrupted")
 TAOS_DEFINE_ERROR(TSDB_CODE_FILE_CORRUPTED,               "Data file corrupted")
 TAOS_DEFINE_ERROR(TSDB_CODE_CHECKSUM_ERROR,               "Checksum error")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG,                  "Invalid message")
+TAOS_DEFINE_ERROR(TSDB_CODE_COMPRESS_ERROR,               "Failed to compress msg")
+TAOS_DEFINE_ERROR(TSDB_CODE_OPS_NOT_SUPPORT,              "Operation not supported")
 TAOS_DEFINE_ERROR(TSDB_CODE_MSG_NOT_PROCESSED,            "Message not processed")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PARA,                 "Invalid parameters")
-TAOS_DEFINE_ERROR(TSDB_CODE_REPEAT_INIT,                  "Repeat initialization")
 TAOS_DEFINE_ERROR(TSDB_CODE_CFG_NOT_FOUND,                "Config not found")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CFG,                  "Invalid config option")
-TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_SHM_MEM,               "Out of Share memory")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_SHM_ID,               "Invalid SHM ID")
+TAOS_DEFINE_ERROR(TSDB_CODE_REPEAT_INIT,                  "Repeat initialization")
+
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_NO_MEMORY,                "Ref out of memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_FULL,                     "too many Ref Objs")
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_ID_REMOVED,               "Ref ID is removed")
@@ -92,11 +100,6 @@ TAOS_DEFINE_ERROR(TSDB_CODE_REF_INVALID_ID,               "Invalid Ref ID")
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_ALREADY_EXIST,            "Ref is already there")
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_NOT_EXIST,                "Ref is not there")
 
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VERSION_NUMBER,       "Invalid version number")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VERSION_STRING,       "Invalid version string")
-TAOS_DEFINE_ERROR(TSDB_CODE_VERSION_NOT_COMPATIBLE,       "Version not compatible")
-TAOS_DEFINE_ERROR(TSDB_CODE_COMPRESS_ERROR,               "Failed to compress msg")
-
 //client
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_OPERATION,        "Invalid operation")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_QHANDLE,          "Invalid qhandle")
@@ -277,17 +280,9 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_SMA_NOT_EXIST,            "SMA does not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_SMA_OPTION,       "Invalid sma option")
 
 // dnode
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_ACTION_IN_PROGRESS,       "Action in progress")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_OFFLINE,                  "Dnode is offline")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_INVALID_MSG_LEN,          "Invalid message length")
+TAOS_DEFINE_ERROR(TSDB_CODE_NODE_OFFLINE,                 "Node is offline")
 TAOS_DEFINE_ERROR(TSDB_CODE_NODE_ALREADY_DEPLOYED,        "Node already deployed")
 TAOS_DEFINE_ERROR(TSDB_CODE_NODE_NOT_DEPLOYED,            "Node not deployed")
-TAOS_DEFINE_ERROR(TSDB_CODE_NODE_PARSE_FILE_ERROR,        "Invalid json format")
-TAOS_DEFINE_ERROR(TSDB_CODE_NODE_INVALID_OPTION,          "Invalid node option")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED,   "Vnode already deployed")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_NOT_DEPLOYED,       "Vnode not deployed")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_INVALID_OPTION,     "Vnode option invalid")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_TOO_MANY_VNODES,    "Too many vnodes")
 
 // vnode
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_ACTION_IN_PROGRESS,       "Action in progress")

From 3295507835cb7aba270d5c14364868526145b4f9 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sat, 9 Apr 2022 16:14:01 +0800
Subject: [PATCH 65/82] feature/qnode

---
 source/libs/executor/src/executorimpl.c |   1 +
 source/libs/nodes/src/nodesToSQLFuncs.c |   8 +-
 source/libs/scalar/src/sclvector.c      | 114 +++++++++++++++++++++---
 3 files changed, 107 insertions(+), 16 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 5ba77d4a09..8b84c31f46 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4759,6 +4759,7 @@ static void appendOneRowToDataBlock(SSDataBlock* pBlock, STupleHandle* pTupleHan
 
 SSDataBlock* getSortedBlockData(SSortHandle* pHandle, SSDataBlock* pDataBlock, int32_t capacity) {
   blockDataCleanup(pDataBlock);
+  blockDataEnsureCapacity(pDataBlock, capacity);
 
   while (1) {
     STupleHandle* pTupleHandle = tsortNextTuple(pHandle);
diff --git a/source/libs/nodes/src/nodesToSQLFuncs.c b/source/libs/nodes/src/nodesToSQLFuncs.c
index b8e071ec0d..aa1336b59d 100644
--- a/source/libs/nodes/src/nodesToSQLFuncs.c
+++ b/source/libs/nodes/src/nodesToSQLFuncs.c
@@ -39,8 +39,12 @@ int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
       } else if (colNode->tableName[0]) {
         *len += snprintf(buf + *len, bufSize - *len, "`%s`.", colNode->tableName);
       }
-
-      *len += snprintf(buf + *len, bufSize - *len, "`%s`", colNode->colName);
+      
+      if (colNode->tableAlias[0]) {
+        *len += snprintf(buf + *len, bufSize - *len, "`%s`", colNode->colName);
+      } else {
+        *len += snprintf(buf + *len, bufSize - *len, "%s", colNode->colName);
+      }
       
       return TSDB_CODE_SUCCESS;
     }
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index c5f18fb1a9..2288e1e52b 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -247,14 +247,50 @@ int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) {
         }
 
         bool value = 0;
-        GET_TYPED_DATA(value, int64_t, inType, colDataGetData(pInputCol, i));
-        colDataAppendInt8(pOutputCol, i, (int8_t*) &value);
+        GET_TYPED_DATA(value, bool, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt8(pOutputCol, i, (int8_t *)&value);
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_TINYINT: {
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+
+        int8_t value = 0;
+        GET_TYPED_DATA(value, int8_t, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt8(pOutputCol, i, (int8_t *)&value);
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_SMALLINT:{
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+
+        int16_t value = 0;
+        GET_TYPED_DATA(value, int16_t, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt16(pOutputCol, i, (int16_t *)&value);
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_INT:{
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+
+        int32_t value = 0;
+        GET_TYPED_DATA(value, int32_t, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt32(pOutputCol, i, (int32_t *)&value);
       }
       break;
     }
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_INT:
     case TSDB_DATA_TYPE_BIGINT:
     case TSDB_DATA_TYPE_TIMESTAMP: {
       for (int32_t i = 0; i < pIn->numOfRows; ++i) {
@@ -265,14 +301,50 @@ int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) {
 
         int64_t value = 0;
         GET_TYPED_DATA(value, int64_t, inType, colDataGetData(pInputCol, i));
-        colDataAppendInt64(pOutputCol, i, &value);
+        colDataAppendInt64(pOutputCol, i, (int64_t *)&value);
       }
       break;
     }
-    case TSDB_DATA_TYPE_UTINYINT:
-    case TSDB_DATA_TYPE_USMALLINT:
-    case TSDB_DATA_TYPE_UINT:
-    case TSDB_DATA_TYPE_UBIGINT:
+    case TSDB_DATA_TYPE_UTINYINT:{
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+        
+        uint8_t value = 0;
+        GET_TYPED_DATA(value, uint8_t, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt8(pOutputCol, i, (int8_t *)&value);
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_USMALLINT:{
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+        
+        uint16_t value = 0;
+        GET_TYPED_DATA(value, uint16_t, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt16(pOutputCol, i, (int16_t *)&value);
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_UINT:{
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+        
+        uint32_t value = 0;
+        GET_TYPED_DATA(value, uint32_t, inType, colDataGetData(pInputCol, i));
+        colDataAppendInt32(pOutputCol, i, (int32_t *)&value);
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_UBIGINT: {
       for (int32_t i = 0; i < pIn->numOfRows; ++i) {
         if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
           colDataAppendNULL(pOutputCol, i);
@@ -284,8 +356,21 @@ int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) {
         colDataAppendInt64(pOutputCol, i, (int64_t*)&value);
       }
       break;
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE:
+    }
+    case TSDB_DATA_TYPE_FLOAT:{
+      for (int32_t i = 0; i < pIn->numOfRows; ++i) {
+        if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+          colDataAppendNULL(pOutputCol, i);
+          continue;
+        }
+        
+        float value = 0;
+        GET_TYPED_DATA(value, float, inType, colDataGetData(pInputCol, i));
+        colDataAppendFloat(pOutputCol, i, (float*)&value);
+      }
+      break;  
+    }
+    case TSDB_DATA_TYPE_DOUBLE: {
       for (int32_t i = 0; i < pIn->numOfRows; ++i) {
         if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
           colDataAppendNULL(pOutputCol, i);
@@ -294,9 +379,10 @@ int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) {
         
         double value = 0;
         GET_TYPED_DATA(value, double, inType, colDataGetData(pInputCol, i));
-        colDataAppendDouble(pOutputCol, i, &value);
+        colDataAppendDouble(pOutputCol, i, (double*)&value);
       }
-      break;      
+      break;  
+    }
     default:
       sclError("invalid convert output type:%d", outType);
       return TSDB_CODE_QRY_APP_ERROR;

From 208f639806d7fbbac441a461fd9a6dac6f52362a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 16:19:08 +0800
Subject: [PATCH 66/82] feature[query]:refactor show query processing in mnode.

---
 include/util/tdef.h                         |   2 +
 source/dnode/mnode/impl/inc/mndInt.h        |   1 -
 source/dnode/mnode/impl/inc/mndShow.h       |   1 -
 source/dnode/mnode/impl/src/mndBnode.c      |  41 ------
 source/dnode/mnode/impl/src/mndCluster.c    |  40 ------
 source/dnode/mnode/impl/src/mndConsumer.c   |   1 -
 source/dnode/mnode/impl/src/mndDb.c         | 132 --------------------
 source/dnode/mnode/impl/src/mndDnode.c      |  67 ----------
 source/dnode/mnode/impl/src/mndFunc.c       |   1 -
 source/dnode/mnode/impl/src/mndInfoSchema.c |  12 ++
 source/dnode/mnode/impl/src/mndMnode.c      |  55 --------
 source/dnode/mnode/impl/src/mndProfile.c    |   2 -
 source/dnode/mnode/impl/src/mndQnode.c      |  42 -------
 source/dnode/mnode/impl/src/mndShow.c       |  70 -----------
 source/dnode/mnode/impl/src/mndSma.c        |   1 -
 source/dnode/mnode/impl/src/mndSnode.c      |  42 -------
 source/dnode/mnode/impl/src/mndStb.c        |  67 ++--------
 source/dnode/mnode/impl/src/mndStream.c     |   1 -
 source/dnode/mnode/impl/src/mndTopic.c      |   1 -
 source/dnode/mnode/impl/src/mndTrans.c      |   1 -
 source/dnode/mnode/impl/src/mndUser.c       |   1 -
 source/dnode/mnode/impl/src/mndVgroup.c     |  43 -------
 source/libs/executor/src/executorimpl.c     |  77 +-----------
 23 files changed, 26 insertions(+), 675 deletions(-)

diff --git a/include/util/tdef.h b/include/util/tdef.h
index 2a634e2327..f3cef7c1b5 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -99,6 +99,8 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_INS_TABLE_MNODES                 "mnodes"
 #define TSDB_INS_TABLE_MODULES                "modules"
 #define TSDB_INS_TABLE_QNODES                 "qnodes"
+#define TSDB_INS_TABLE_BNODES                 "bnodes"
+#define TSDB_INS_TABLE_CLUSTER                "cluster"
 #define TSDB_INS_TABLE_USER_DATABASES         "user_databases"
 #define TSDB_INS_TABLE_USER_FUNCTIONS         "user_functions"
 #define TSDB_INS_TABLE_USER_INDEXES           "user_indexes"
diff --git a/source/dnode/mnode/impl/inc/mndInt.h b/source/dnode/mnode/impl/inc/mndInt.h
index 1cb0c78aa5..3500230c45 100644
--- a/source/dnode/mnode/impl/inc/mndInt.h
+++ b/source/dnode/mnode/impl/inc/mndInt.h
@@ -69,7 +69,6 @@ typedef struct {
 
 typedef struct {
   int64_t        showId;
-  ShowMetaFp     metaFps[TSDB_MGMT_TABLE_MAX];
   ShowRetrieveFp retrieveFps[TSDB_MGMT_TABLE_MAX];
   ShowFreeIterFp freeIterFps[TSDB_MGMT_TABLE_MAX];
   SCacheObj     *cache;
diff --git a/source/dnode/mnode/impl/inc/mndShow.h b/source/dnode/mnode/impl/inc/mndShow.h
index 67e277677c..a269fa35c1 100644
--- a/source/dnode/mnode/impl/inc/mndShow.h
+++ b/source/dnode/mnode/impl/inc/mndShow.h
@@ -24,7 +24,6 @@ extern "C" {
 
 int32_t mndInitShow(SMnode *pMnode);
 void    mndCleanupShow(SMnode *pMnode);
-void    mndAddShowMetaHandle(SMnode *pMnode, EShowType showType, ShowMetaFp fp);
 void    mndAddShowRetrieveHandle(SMnode *pMnode, EShowType showType, ShowRetrieveFp fp);
 void    mndAddShowFreeIterHandle(SMnode *pMnode, EShowType msgType, ShowFreeIterFp fp);
 void    mndVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_t capacity, SShowObj *pShow);
diff --git a/source/dnode/mnode/impl/src/mndBnode.c b/source/dnode/mnode/impl/src/mndBnode.c
index c4868d9802..fedc2e404f 100644
--- a/source/dnode/mnode/impl/src/mndBnode.c
+++ b/source/dnode/mnode/impl/src/mndBnode.c
@@ -51,7 +51,6 @@ int32_t mndInitBnode(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_CREATE_BNODE_RSP, mndProcessCreateBnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_DND_DROP_BNODE_RSP, mndProcessDropBnodeRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_BNODE, mndGetBnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_BNODE, mndRetrieveBnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_BNODE, mndCancelGetNextBnode);
 
@@ -440,46 +439,6 @@ static int32_t mndProcessDropBnodeRsp(SNodeMsg *pRsp) {
   return 0;
 }
 
-static int32_t mndGetBnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "id");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "endpoint");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_BNODE);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static int32_t mndRetrieveBnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode    *pMnode = pReq->pNode;
   SSdb      *pSdb = pMnode->pSdb;
diff --git a/source/dnode/mnode/impl/src/mndCluster.c b/source/dnode/mnode/impl/src/mndCluster.c
index 94e1efde61..5a811ea490 100644
--- a/source/dnode/mnode/impl/src/mndCluster.c
+++ b/source/dnode/mnode/impl/src/mndCluster.c
@@ -26,7 +26,6 @@ static int32_t  mndClusterActionInsert(SSdb *pSdb, SClusterObj *pCluster);
 static int32_t  mndClusterActionDelete(SSdb *pSdb, SClusterObj *pCluster);
 static int32_t  mndClusterActionUpdate(SSdb *pSdb, SClusterObj *pOldCluster, SClusterObj *pNewCluster);
 static int32_t  mndCreateDefaultCluster(SMnode *pMnode);
-static int32_t  mndGetClusterMeta(SNodeMsg *pMsg, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveClusters(SNodeMsg *pMsg, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextCluster(SMnode *pMnode, void *pIter);
 
@@ -40,7 +39,6 @@ int32_t mndInitCluster(SMnode *pMnode) {
                      .updateFp = (SdbUpdateFp)mndClusterActionUpdate,
                      .deleteFp = (SdbDeleteFp)mndClusterActionDelete};
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_CLUSTER, mndGetClusterMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_CLUSTER, mndRetrieveClusters);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_CLUSTER, mndCancelGetNextCluster);
   return sdbSetTable(pMnode->pSdb, table);
@@ -180,44 +178,6 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {
   return sdbWrite(pMnode->pSdb, pRaw);
 }
 
-static int32_t mndGetClusterMeta(SNodeMsg *pMsg, SShowObj *pShow, STableMetaRsp *pMeta) {
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_BIGINT;
-  strcpy(pSchema[cols].name, "id");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "name");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = 1;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static int32_t mndRetrieveClusters(SNodeMsg *pMsg, SShowObj *pShow, char *data, int32_t rows) {
   SMnode      *pMnode = pMsg->pNode;
   SSdb        *pSdb = pMnode->pSdb;
diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c
index 6080ec7710..1a865247b9 100644
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
@@ -35,7 +35,6 @@ static int32_t mndConsumerActionInsert(SSdb *pSdb, SMqConsumerObj *pConsumer);
 static int32_t mndConsumerActionDelete(SSdb *pSdb, SMqConsumerObj *pConsumer);
 static int32_t mndConsumerActionUpdate(SSdb *pSdb, SMqConsumerObj *pConsumer, SMqConsumerObj *pNewConsumer);
 static int32_t mndProcessConsumerMetaMsg(SNodeMsg *pMsg);
-static int32_t mndGetConsumerMeta(SNodeMsg *pMsg, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t mndRetrieveConsumer(SNodeMsg *pMsg, SShowObj *pShow, char *data, int32_t rows);
 static void    mndCancelGetNextConsumer(SMnode *pMnode, void *pIter);
 
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index ff2ea162fb..51b94e49ea 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -37,7 +37,6 @@ static int32_t  mndProcessDropDbReq(SNodeMsg *pReq);
 static int32_t  mndProcessUseDbReq(SNodeMsg *pReq);
 static int32_t  mndProcessSyncDbReq(SNodeMsg *pReq);
 static int32_t  mndProcessCompactDbReq(SNodeMsg *pReq);
-static int32_t  mndGetDbMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextDb(SMnode *pMnode, void *pIter);
 static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq);
@@ -59,7 +58,6 @@ int32_t mndInitDb(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_COMPACT_DB, mndProcessCompactDbReq);
   mndSetMsgHandle(pMnode, TDMT_MND_GET_DB_CFG, mndProcessGetDbCfgReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_DB, mndGetDbMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_DB, mndRetrieveDbs);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_DB, mndCancelGetNextDb);
 
@@ -1339,136 +1337,6 @@ SYNC_DB_OVER:
   return code;
 }
 
-static int32_t mndGetDbMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = (TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "name");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "vgroups");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "ntables");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "replica");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "quorum");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "days");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 24 + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "keep0,keep1,keep2");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "cache");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "blocks");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "minrows");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "maxrows");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 1;
-  pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-  strcpy(pSchema[cols].name, "wallevel");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "fsync");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 1;
-  pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-  strcpy(pSchema[cols].name, "comp");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 1;
-  pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-  strcpy(pSchema[cols].name, "cachelast");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 3 + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "precision");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  //  pShow->bytes[cols] = 1;
-  //  pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-  //  strcpy(pSchema[cols].name, "update");
-  //  pSchema[cols].bytes = pShow->bytes[cols];
-  //  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_DB);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 char *mnGetDbStr(char *src) {
   char *pos = strstr(src, TS_PATH_DELIMITER);
   if (pos != NULL) ++pos;
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 22b1bd51e7..023ce34e64 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -58,7 +58,6 @@ static int32_t mndProcessStatusReq(SNodeMsg *pReq);
 static int32_t mndGetConfigMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t mndRetrieveConfigs(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void    mndCancelGetNextConfig(SMnode *pMnode, void *pIter);
-static int32_t mndGetDnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t mndRetrieveDnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void    mndCancelGetNextDnode(SMnode *pMnode, void *pIter);
 
@@ -78,10 +77,8 @@ int32_t mndInitDnode(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_CONFIG_DNODE_RSP, mndProcessConfigDnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_MND_STATUS, mndProcessStatusReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_VARIABLES, mndGetConfigMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_VARIABLES, mndRetrieveConfigs);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_VARIABLES, mndCancelGetNextConfig);
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_DNODE, mndGetDnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_DNODE, mndRetrieveDnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_DNODE, mndCancelGetNextDnode);
 
@@ -710,70 +707,6 @@ static int32_t mndRetrieveConfigs(SNodeMsg *pReq, SShowObj *pShow, char *data, i
 
 static void mndCancelGetNextConfig(SMnode *pMnode, void *pIter) {}
 
-static int32_t mndGetDnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "id");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "endpoint");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "vnodes");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "support_vnodes");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 10 + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 256 + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "offline_reason");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_DNODE);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static int32_t mndRetrieveDnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode    *pMnode = pReq->pNode;
   SSdb      *pSdb = pMnode->pSdb;
diff --git a/source/dnode/mnode/impl/src/mndFunc.c b/source/dnode/mnode/impl/src/mndFunc.c
index be4198f0d6..842e74197b 100644
--- a/source/dnode/mnode/impl/src/mndFunc.c
+++ b/source/dnode/mnode/impl/src/mndFunc.c
@@ -51,7 +51,6 @@ int32_t mndInitFunc(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_FUNC, mndProcessDropFuncReq);
   mndSetMsgHandle(pMnode, TDMT_MND_RETRIEVE_FUNC, mndProcessRetrieveFuncReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_FUNC, mndGetFuncMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_FUNC, mndRetrieveFuncs);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_FUNC, mndCancelGetNextFunc);
 
diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c
index aadd914439..5059a3a458 100644
--- a/source/dnode/mnode/impl/src/mndInfoSchema.c
+++ b/source/dnode/mnode/impl/src/mndInfoSchema.c
@@ -46,6 +46,16 @@ static const SInfosTableSchema qnodesSchema[] = {
     {.name = "endpoint", .bytes = 134, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
 };
+static const SInfosTableSchema bnodesSchema[] = {
+    {.name = "id", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "endpoint", .bytes = 134, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+};
+static const SInfosTableSchema clusterSchema[] = {
+    {.name = "id", .bytes = 8, .type = TSDB_DATA_TYPE_BIGINT},
+    {.name = "name", .bytes = TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+};
 static const SInfosTableSchema userDBSchema[] = {
     {.name = "name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
@@ -183,6 +193,8 @@ static const SInfosTableMeta infosMeta[] = {
     {TSDB_INS_TABLE_MNODES, mnodesSchema, tListLen(mnodesSchema)},
     {TSDB_INS_TABLE_MODULES, modulesSchema, tListLen(modulesSchema)},
     {TSDB_INS_TABLE_QNODES, qnodesSchema, tListLen(qnodesSchema)},
+    {TSDB_INS_TABLE_BNODES, bnodesSchema, tListLen(bnodesSchema)},
+    {TSDB_INS_TABLE_CLUSTER, clusterSchema, tListLen(clusterSchema)},
     {TSDB_INS_TABLE_USER_DATABASES, userDBSchema, tListLen(userDBSchema)},
     {TSDB_INS_TABLE_USER_FUNCTIONS, userFuncSchema, tListLen(userFuncSchema)},
     {TSDB_INS_TABLE_USER_INDEXES, userIdxSchema, tListLen(userIdxSchema)},
diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index c408fea636..9fba98716a 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -35,7 +35,6 @@ static int32_t  mndProcessDropMnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessCreateMnodeRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessAlterMnodeRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessDropMnodeRsp(SNodeMsg *pRsp);
-static int32_t  mndGetMnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveMnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextMnode(SMnode *pMnode, void *pIter);
 
@@ -55,7 +54,6 @@ int32_t mndInitMnode(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_ALTER_MNODE_RSP, mndProcessAlterMnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_DND_DROP_MNODE_RSP, mndProcessDropMnodeRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_MNODE, mndGetMnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_MNODE, mndRetrieveMnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_MNODE, mndCancelGetNextMnode);
 
@@ -610,59 +608,6 @@ static int32_t mndProcessDropMnodeRsp(SNodeMsg *pRsp) {
   return 0;
 }
 
-static int32_t mndGetMnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "id");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "endpoint");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "role");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "role_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_MNODE);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  mndUpdateMnodeRole(pMnode);
-  return 0;
-}
-
 static int32_t mndRetrieveMnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode    *pMnode = pReq->pNode;
   SSdb      *pSdb = pMnode->pSdb;
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index cad89399a3..320671c332 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -77,10 +77,8 @@ int32_t mndInitProfile(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_KILL_QUERY, mndProcessKillQueryReq);
   mndSetMsgHandle(pMnode, TDMT_MND_KILL_CONN, mndProcessKillConnReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_CONNS, mndGetConnsMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_CONNS, mndRetrieveConns);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_CONNS, mndCancelGetNextConn);
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_QUERIES, mndGetQueryMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_QUERIES, mndRetrieveQueries);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_QUERIES, mndCancelGetNextQuery);
 
diff --git a/source/dnode/mnode/impl/src/mndQnode.c b/source/dnode/mnode/impl/src/mndQnode.c
index 85718e2037..147d14e66a 100644
--- a/source/dnode/mnode/impl/src/mndQnode.c
+++ b/source/dnode/mnode/impl/src/mndQnode.c
@@ -33,7 +33,6 @@ static int32_t  mndProcessCreateQnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessDropQnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessCreateQnodeRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessDropQnodeRsp(SNodeMsg *pRsp);
-static int32_t  mndGetQnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveQnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextQnode(SMnode *pMnode, void *pIter);
 static int32_t  mndProcessQnodeListReq(SNodeMsg *pReq);
@@ -53,7 +52,6 @@ int32_t mndInitQnode(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_CREATE_QNODE_RSP, mndProcessCreateQnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_DND_DROP_QNODE_RSP, mndProcessDropQnodeRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_QNODE, mndGetQnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_QNODE, mndRetrieveQnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_QNODE, mndCancelGetNextQnode);
 
@@ -503,46 +501,6 @@ static int32_t mndProcessDropQnodeRsp(SNodeMsg *pRsp) {
   return 0;
 }
 
-static int32_t mndGetQnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "id");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "endpoint");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_QNODE);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static int32_t mndRetrieveQnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode    *pMnode = pReq->pNode;
   SSdb      *pSdb = pMnode->pSdb;
diff --git a/source/dnode/mnode/impl/src/mndShow.c b/source/dnode/mnode/impl/src/mndShow.c
index 5c3167dd79..03e6049d82 100644
--- a/source/dnode/mnode/impl/src/mndShow.c
+++ b/source/dnode/mnode/impl/src/mndShow.c
@@ -22,8 +22,6 @@ static SShowObj *mndCreateShowObj(SMnode *pMnode, SShowReq *pReq);
 static void      mndFreeShowObj(SShowObj *pShow);
 static SShowObj *mndAcquireShowObj(SMnode *pMnode, int64_t showId);
 static void      mndReleaseShowObj(SShowObj *pShow, bool forceRemove);
-static int32_t   mndProcessShowReq(SNodeMsg *pReq);
-static int32_t   mndProcessRetrieveReq(SNodeMsg *pReq);
 static bool      mndCheckRetrieveFinished(SShowObj *pShow);
 static int32_t   mndProcessRetrieveSysTableReq(SNodeMsg *pReq);
 
@@ -37,8 +35,6 @@ int32_t mndInitShow(SMnode *pMnode) {
     return -1;
   }
 
-  mndSetMsgHandle(pMnode, TDMT_MND_SHOW, mndProcessShowReq);
-  mndSetMsgHandle(pMnode, TDMT_MND_SHOW_RETRIEVE, mndProcessRetrieveReq);
   mndSetMsgHandle(pMnode, TDMT_MND_SYSTABLE_RETRIEVE, mndProcessRetrieveSysTableReq);
   return 0;
 }
@@ -117,67 +113,6 @@ static void mndReleaseShowObj(SShowObj *pShow, bool forceRemove) {
   taosCacheRelease(pMgmt->cache, (void **)(&pShow), forceRemove);
 }
 
-static int32_t mndProcessShowReq(SNodeMsg *pReq) {
-  SMnode    *pMnode = pReq->pNode;
-  SShowMgmt *pMgmt = &pMnode->showMgmt;
-  int32_t    code = -1;
-  SShowReq   showReq = {0};
-  SShowRsp   showRsp = {0};
-
-  if (tDeserializeSShowReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &showReq) != 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto SHOW_OVER;
-  }
-
-  if (showReq.type <= TSDB_MGMT_TABLE_START || showReq.type >= TSDB_MGMT_TABLE_MAX) {
-    terrno = TSDB_CODE_MND_INVALID_MSG_TYPE;
-    goto SHOW_OVER;
-  }
-
-  ShowMetaFp metaFp = pMgmt->metaFps[showReq.type];
-  if (metaFp == NULL) {
-    terrno = TSDB_CODE_MND_INVALID_MSG_TYPE;
-    goto SHOW_OVER;
-  }
-
-  SShowObj *pShow = mndCreateShowObj(pMnode, &showReq);
-  if (pShow == NULL) {
-    goto SHOW_OVER;
-  }
-
-  showRsp.showId = pShow->id;
-  showRsp.tableMeta.pSchemas = taosMemoryCalloc(TSDB_MAX_COLUMNS, sizeof(SSchema));
-  if (showRsp.tableMeta.pSchemas == NULL) {
-    mndReleaseShowObj(pShow, true);
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto SHOW_OVER;
-  }
-
-  code = (*metaFp)(pReq, pShow, &showRsp.tableMeta);
-  mDebug("show:0x%" PRIx64 ", get meta finished, numOfRows:%d cols:%d showReq.type:%s, result:%s", pShow->id,
-         pShow->numOfRows, pShow->numOfColumns, mndShowStr(showReq.type), tstrerror(code));
-
-  if (code == 0) {
-    int32_t bufLen = tSerializeSShowRsp(NULL, 0, &showRsp);
-    void   *pBuf = rpcMallocCont(bufLen);
-    tSerializeSShowRsp(pBuf, bufLen, &showRsp);
-    pReq->rspLen = bufLen;
-    pReq->pRsp = pBuf;
-    mndReleaseShowObj(pShow, false);
-  } else {
-    mndReleaseShowObj(pShow, true);
-  }
-
-SHOW_OVER:
-  if (code != 0) {
-    mError("failed to process show-meta req since %s", terrstr());
-  }
-
-  tFreeSShowReq(&showReq);
-  tFreeSShowRsp(&showRsp);
-  return code;
-}
-
 static int32_t mndProcessRetrieveReq(SNodeMsg *pReq) {
   SMnode    *pMnode = pReq->pNode;
   SShowMgmt *pMgmt = &pMnode->showMgmt;
@@ -458,11 +393,6 @@ void mndVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_t capaci
   }
 }
 
-void mndAddShowMetaHandle(SMnode *pMnode, EShowType showType, ShowMetaFp fp) {
-  SShowMgmt *pMgmt = &pMnode->showMgmt;
-  pMgmt->metaFps[showType] = fp;
-}
-
 void mndAddShowRetrieveHandle(SMnode *pMnode, EShowType showType, ShowRetrieveFp fp) {
   SShowMgmt *pMgmt = &pMnode->showMgmt;
   pMgmt->retrieveFps[showType] = fp;
diff --git a/source/dnode/mnode/impl/src/mndSma.c b/source/dnode/mnode/impl/src/mndSma.c
index b402a27a41..49bdcaff87 100644
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
@@ -58,7 +58,6 @@ int32_t mndInitSma(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_VND_CREATE_SMA_RSP, mndProcessVCreateSmaRsp);
   mndSetMsgHandle(pMnode, TDMT_VND_DROP_SMA_RSP, mndProcessVDropSmaRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_INDEX, mndGetSmaMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_INDEX, mndRetrieveSma);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_INDEX, mndCancelGetNextSma);
   return sdbSetTable(pMnode->pSdb, table);
diff --git a/source/dnode/mnode/impl/src/mndSnode.c b/source/dnode/mnode/impl/src/mndSnode.c
index 4f24c6f7eb..a0a27606f1 100644
--- a/source/dnode/mnode/impl/src/mndSnode.c
+++ b/source/dnode/mnode/impl/src/mndSnode.c
@@ -33,7 +33,6 @@ static int32_t  mndProcessCreateSnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessDropSnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessCreateSnodeRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessDropSnodeRsp(SNodeMsg *pRsp);
-static int32_t  mndGetSnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveSnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextSnode(SMnode *pMnode, void *pIter);
 
@@ -51,7 +50,6 @@ int32_t mndInitSnode(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_CREATE_SNODE_RSP, mndProcessCreateSnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_DND_DROP_SNODE_RSP, mndProcessDropSnodeRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_SNODE, mndGetSnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_SNODE, mndRetrieveSnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_SNODE, mndCancelGetNextSnode);
 
@@ -452,46 +450,6 @@ static int32_t mndProcessDropSnodeRsp(SNodeMsg *pRsp) {
   return 0;
 }
 
-static int32_t mndGetSnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "id");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "endpoint");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_SNODE);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static int32_t mndRetrieveSnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode    *pMnode = pReq->pNode;
   SSdb      *pSdb = pMnode->pSdb;
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 85e7ade462..afcea6e732 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -39,7 +39,6 @@ static int32_t  mndProcessVCreateStbRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessVAlterStbRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessVDropStbRsp(SNodeMsg *pRsp);
 static int32_t  mndProcessTableMetaReq(SNodeMsg *pReq);
-static int32_t  mndGetStbMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveStb(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void     mndCancelGetNextStb(SMnode *pMnode, void *pIter);
 
@@ -60,7 +59,6 @@ int32_t mndInitStb(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_VND_DROP_STB_RSP, mndProcessVDropStbRsp);
   mndSetMsgHandle(pMnode, TDMT_MND_TABLE_META, mndProcessTableMetaReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_STB, mndGetStbMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_STB, mndRetrieveStb);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_STB, mndCancelGetNextStb);
 
@@ -508,32 +506,32 @@ static int32_t mndCheckCreateStbReq(SMCreateStbReq *pCreate) {
   }
 
   for (int32_t i = 0; i < pCreate->numOfColumns; ++i) {
-    SField *pField = taosArrayGet(pCreate->pColumns, i);
+    SField *pField1 = taosArrayGet(pCreate->pColumns, i);
     if (pField->type < 0) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
-    if (pField->bytes <= 0) {
+    if (pField1->bytes <= 0) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
-    if (pField->name[0] == 0) {
+    if (pField1->name[0] == 0) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
   }
 
   for (int32_t i = 0; i < pCreate->numOfTags; ++i) {
-    SField *pField = taosArrayGet(pCreate->pTags, i);
-    if (pField->type < 0) {
+    SField *pField1 = taosArrayGet(pCreate->pTags, i);
+    if (pField1->type < 0) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
-    if (pField->bytes <= 0) {
+    if (pField1->bytes <= 0) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
-    if (pField->name[0] == 0) {
+    if (pField1->name[0] == 0) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
@@ -1315,7 +1313,6 @@ static int32_t mndSetDropStbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj *
   SSdb   *pSdb = pMnode->pSdb;
   SVgObj *pVgroup = NULL;
   void   *pIter = NULL;
-  int32_t contLen;
 
   while (1) {
     pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup);
@@ -1628,56 +1625,6 @@ static int32_t mndGetNumOfStbs(SMnode *pMnode, char *dbName, int32_t *pNumOfStbs
   return 0;
 }
 
-static int32_t mndGetStbMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  if (mndGetNumOfStbs(pMnode, pShow->db, &pShow->numOfRows) != 0) {
-    return -1;
-  }
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "name");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "create_time");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "columns");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "tags");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = sdbGetSize(pSdb, SDB_STB);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static void mndExtractTableName(char *tableId, char *name) {
   int32_t pos = -1;
   int32_t num = 0;
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 376a41b0cd..4411db97a5 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -58,7 +58,6 @@ int32_t mndInitStream(SMnode *pMnode) {
   /*mndSetMsgHandle(pMnode, TDMT_MND_DROP_STREAM, mndProcessDropStreamReq);*/
   /*mndSetMsgHandle(pMnode, TDMT_MND_DROP_STREAM_RSP, mndProcessDropStreamInRsp);*/
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_TP, mndGetStreamMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TP, mndRetrieveStream);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TP, mndCancelGetNextStream);
 
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index 13ccc912d6..4d7f00c24c 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -53,7 +53,6 @@ int32_t mndInitTopic(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_TOPIC, mndProcessDropTopicReq);
   mndSetMsgHandle(pMnode, TDMT_VND_DROP_TOPIC_RSP, mndProcessDropTopicInRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_TP, mndGetTopicMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TP, mndRetrieveTopic);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TP, mndCancelGetNextTopic);
 
diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c
index 4e54d56c09..cfaaa304a9 100644
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
@@ -74,7 +74,6 @@ int32_t mndInitTrans(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_TRANS_TIMER, mndProcessTransReq);
   mndSetMsgHandle(pMnode, TDMT_MND_KILL_TRANS, mndProcessKillTransReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndGetTransMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndCancelGetNextTrans);
   return sdbSetTable(pMnode->pSdb, table);
diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c
index 469805387f..6e1aae64ab 100644
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
@@ -54,7 +54,6 @@ int32_t mndInitUser(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_USER, mndProcessDropUserReq);
   mndSetMsgHandle(pMnode, TDMT_MND_GET_USER_AUTH, mndProcessGetUserAuthReq);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_USER, mndGetUserMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_USER, mndRetrieveUsers);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_USER, mndCancelGetNextUser);
   return sdbSetTable(pMnode->pSdb, table);
diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c
index d36617822d..bbe1760feb 100644
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
@@ -38,7 +38,6 @@ static int32_t mndProcessCompactVnodeRsp(SNodeMsg *pRsp);
 static int32_t mndGetVgroupMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t mndRetrieveVgroups(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void    mndCancelGetNextVgroup(SMnode *pMnode, void *pIter);
-static int32_t mndGetVnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t mndRetrieveVnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
 static void    mndCancelGetNextVnode(SMnode *pMnode, void *pIter);
 
@@ -57,10 +56,8 @@ int32_t mndInitVgroup(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_SYNC_VNODE_RSP, mndProcessSyncVnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_DND_COMPACT_VNODE_RSP, mndProcessCompactVnodeRsp);
 
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_VGROUP, mndGetVgroupMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_VGROUP, mndRetrieveVgroups);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_VGROUP, mndCancelGetNextVgroup);
-  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_VNODES, mndGetVnodeMeta);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_VNODES, mndRetrieveVnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_VNODES, mndCancelGetNextVnode);
 
@@ -656,46 +653,6 @@ int32_t mndGetVnodesNum(SMnode *pMnode, int32_t dnodeId) {
   return numOfVnodes;
 }
 
-static int32_t mndGetVnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) {
-  SMnode *pMnode = pReq->pNode;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  int32_t  cols = 0;
-  SSchema *pSchema = pMeta->pSchemas;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "vgId");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = pShow->bytes[cols];
-  cols++;
-
-  pMeta->numOfColumns = cols;
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  int32_t dnodeId = 0;
-  if (pShow->payloadLen > 0) {
-    dnodeId = atoi(pShow->payload);
-  }
-
-  pShow->replica = dnodeId;
-  pShow->numOfRows = mndGetVnodesNum(pMnode, dnodeId);
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  strcpy(pMeta->tbName, mndShowStr(pShow->type));
-
-  return 0;
-}
-
 static int32_t mndRetrieveVnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode *pMnode = pReq->pNode;
   SSdb   *pSdb = pMnode->pSdb;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index fb427025ea..1c1fcab3ee 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -184,8 +184,6 @@ static void getNextTimeWindow(SInterval* pInterval, int32_t precision, int32_t o
 }
 
 static void doSetTagValueToResultBuf(char* output, const char* val, int16_t type, int16_t bytes);
-void        setResultRowOutputBufInitCtx(STaskRuntimeEnv* pRuntimeEnv, SResultRow* pResult, SqlFunctionCtx* pCtx,
-                                         int32_t numOfOutput, int32_t* rowCellInfoOffset);
 static bool functionNeedToExecute(SqlFunctionCtx* pCtx);
 
 static void setBlockStatisInfo(SqlFunctionCtx* pCtx, SSDataBlock* pSDataBlock, SColumn* pColumn);
@@ -674,36 +672,6 @@ static bool chkWindowOutputBufByKey(STaskRuntimeEnv* pRuntimeEnv, SResultRowInfo
   return chkResultRowFromKey(pRuntimeEnv, pResultRowInfo, (char*)&win->skey, TSDB_KEYSIZE, masterscan, groupId);
 }
 
-static int32_t setResultOutputBufByKey(STaskRuntimeEnv* pRuntimeEnv, SResultRowInfo* pResultRowInfo, int64_t tid,
-                                       STimeWindow* win, bool masterscan, SResultRow** pResult, int64_t tableGroupId,
-                                       SqlFunctionCtx* pCtx, int32_t numOfOutput, int32_t* rowCellInfoOffset) {
-  assert(win->skey <= win->ekey);
-  SDiskbasedBuf* pResultBuf = pRuntimeEnv->pResultBuf;
-
-  SResultRow* pResultRow = NULL;//doSetResultOutBufByKey(pRuntimeEnv, pResultRowInfo, tid, (char*)&win->skey, TSDB_KEYSIZE,
-//                                                  masterscan, tableGroupId);
-  if (pResultRow == NULL) {
-    *pResult = NULL;
-    return TSDB_CODE_SUCCESS;
-  }
-
-  // not assign result buffer yet, add new result buffer
-  if (pResultRow->pageId == -1) {
-    int32_t ret = addNewWindowResultBuf(pResultRow, pResultBuf, (int32_t)tableGroupId,
-                                        pRuntimeEnv->pQueryAttr->intermediateResultRowSize);
-    if (ret != TSDB_CODE_SUCCESS) {
-      return -1;
-    }
-  }
-
-  // set time window for current result
-  pResultRow->win = (*win);
-  *pResult = pResultRow;
-  setResultRowOutputBufInitCtx(pRuntimeEnv, pResultRow, pCtx, numOfOutput, rowCellInfoOffset);
-
-  return TSDB_CODE_SUCCESS;
-}
-
 static void setResultRowOutputBufInitCtx_rv(SResultRow* pResult, SqlFunctionCtx* pCtx, int32_t numOfOutput, int32_t* rowCellInfoOffset);
 
 static int32_t setResultOutputBufByKey_rv(SResultRowInfo* pResultRowInfo, int64_t id, STimeWindow* win, bool masterscan,
@@ -1588,8 +1556,8 @@ static void hashAllIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pRe
 
   while (1) {
     // null data, failed to allocate more memory buffer
-    ret = setResultOutputBufByKey(pRuntimeEnv, pResultRowInfo, pSDataBlock->info.uid, &win, masterScan, &pResult,
-                                  tableGroupId, pInfo->binfo.pCtx, numOfOutput, pInfo->binfo.rowCellInfoOffset);
+//    ret = setResultOutputBufByKey(pRuntimeEnv, pResultRowInfo, pSDataBlock->info.uid, &win, masterScan, &pResult,
+//                                  tableGroupId, pInfo->binfo.pCtx, numOfOutput, pInfo->binfo.rowCellInfoOffset);
     if (ret != TSDB_CODE_SUCCESS) {
       longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
     }
@@ -2779,14 +2747,10 @@ static SColumnInfo* doGetTagColumnInfoById(SColumnInfo* pTagColList, int32_t num
 }
 
 void setTagValue(SOperatorInfo* pOperatorInfo, void* pTable, SqlFunctionCtx* pCtx, int32_t numOfOutput) {
-  STaskRuntimeEnv* pRuntimeEnv = pOperatorInfo->pRuntimeEnv;
-
   SExprInfo* pExpr = pOperatorInfo->pExpr;
-  STaskAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
-
   SExprInfo* pExprInfo = &pExpr[0];
   int32_t    functionId = getExprFunctionId(pExprInfo);
-
+#if 0
   if (pQueryAttr->numOfOutput == 1 && functionId == FUNCTION_TS_COMP && pQueryAttr->stableQuery) {
     assert(pExprInfo->base.numOfParams == 1);
 
@@ -2831,6 +2795,8 @@ void setTagValue(SOperatorInfo* pOperatorInfo, void* pTable, SqlFunctionCtx* pCt
   if (pRuntimeEnv->pTsBuf != NULL) {
     setCtxTagForJoin(pRuntimeEnv, &pCtx[0], pExprInfo, pTable);
   }
+#endif
+
 }
 
 void copyToSDataBlock(SSDataBlock* pBlock, int32_t* offset, SGroupResInfo* pGroupResInfo, SDiskbasedBuf* pResBuf) {
@@ -3131,39 +3097,6 @@ void destroyTableQueryInfoImpl(STableQueryInfo* pTableQueryInfo) {
   cleanupResultRowInfo(&pTableQueryInfo->resInfo);
 }
 
-void setResultRowOutputBufInitCtx(STaskRuntimeEnv* pRuntimeEnv, SResultRow* pResult, SqlFunctionCtx* pCtx,
-                                  int32_t numOfOutput, int32_t* rowCellInfoOffset) {
-  // Note: pResult->pos[i]->num == 0, there is only fixed number of results for each group
-  SFilePage* bufPage = getBufPage(pRuntimeEnv->pResultBuf, pResult->pageId);
-
-  int32_t offset = 0;
-  for (int32_t i = 0; i < numOfOutput; ++i) {
-    pCtx[i].resultInfo = getResultCell(pResult, i, rowCellInfoOffset);
-
-    struct SResultRowEntryInfo* pResInfo = pCtx[i].resultInfo;
-    if (isRowEntryCompleted(pResInfo) && isRowEntryInitialized(pResInfo)) {
-      offset += pCtx[i].resDataInfo.bytes;
-      continue;
-    }
-
-    pCtx[i].pOutput = getPosInResultPage(pRuntimeEnv->pQueryAttr, bufPage, pResult->offset, offset);
-    offset += pCtx[i].resDataInfo.bytes;
-
-    int32_t functionId = pCtx[i].functionId;
-    if (functionId < 0) {
-      continue;
-    }
-
-    if (functionId == FUNCTION_TOP || functionId == FUNCTION_BOTTOM || functionId == FUNCTION_DIFF) {
-//      if (i > 0) pCtx[i].pTsOutput = pCtx[i - 1].pOutput;
-    }
-
-    //    if (!pResInfo->initialized) {
-    //      aAggs[functionId].init(&pCtx[i], pResInfo);
-    //    }
-  }
-}
-
 void setResultRowOutputBufInitCtx_rv(SResultRow* pResult, SqlFunctionCtx* pCtx, int32_t numOfOutput, int32_t* rowCellInfoOffset) {
   for (int32_t i = 0; i < numOfOutput; ++i) {
     pCtx[i].resultInfo = getResultCell(pResult, i, rowCellInfoOffset);

From 39dde85ecc393354b8d2a8a4af3f683a981f2991 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 16:32:19 +0800
Subject: [PATCH 67/82] feat<cluster>: create and delete qnode

---
 source/dnode/mnode/impl/src/mndInfoSchema.c | 2 +-
 source/libs/parser/src/parTranslater.c      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c
index 71ee0baaae..76ae7b4fdb 100644
--- a/source/dnode/mnode/impl/src/mndInfoSchema.c
+++ b/source/dnode/mnode/impl/src/mndInfoSchema.c
@@ -44,7 +44,7 @@ static const SInfosTableSchema modulesSchema[] = {
 };
 static const SInfosTableSchema qnodesSchema[] = {
     {.name = "id", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
-    {.name = "endpoint", .bytes = 134, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "endpoint", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
 };
 static const SInfosTableSchema userDBSchema[] = {
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 0f8fd2774f..75f45d189e 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2042,7 +2042,7 @@ static int32_t translateCreateQnode(STranslateContext* pCxt, SCreateQnodeStmt* p
     return TSDB_CODE_OUT_OF_MEMORY;
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
-  pCxt->pCmdMsg->msgType = TDMT_DND_CREATE_QNODE;
+  pCxt->pCmdMsg->msgType = TDMT_MND_CREATE_QNODE;
   pCxt->pCmdMsg->msgLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
@@ -2061,7 +2061,7 @@ static int32_t translateDropQnode(STranslateContext* pCxt, SDropQnodeStmt* pStmt
     return TSDB_CODE_OUT_OF_MEMORY;
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
-  pCxt->pCmdMsg->msgType = TDMT_DND_DROP_QNODE;
+  pCxt->pCmdMsg->msgType = TDMT_MND_DROP_QNODE;
   pCxt->pCmdMsg->msgLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {

From 4da5a8edac2b0659d0ccb9274c88a1282a42dcff Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 16:32:41 +0800
Subject: [PATCH 68/82] test[cluster]: adjust the error codes

---
 tests/script/jenkins/basic.txt     |   3 +
 tests/script/tsim/qnode/basic1.sim | 135 +++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 tests/script/tsim/qnode/basic1.sim

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 716a3d8283..2788428d9f 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -33,6 +33,9 @@
 ./test.sh -f tsim/query/scalarFunction.sim
 ./test.sh -f tsim/query/charScalarFunction.sim
 
+# ---- qnode
+./test.sh -f tsim/qnode/basic1.sim
+
 # ---- show
 ./test.sh -f tsim/show/basic.sim
 
diff --git a/tests/script/tsim/qnode/basic1.sim b/tests/script/tsim/qnode/basic1.sim
new file mode 100644
index 0000000000..3b478cfa46
--- /dev/null
+++ b/tests/script/tsim/qnode/basic1.sim
@@ -0,0 +1,135 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sql connect
+
+print =============== show dnodes
+sql show dnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data02 != master then 
+  return -1
+endi
+
+print =============== create dnodes
+sql create dnode $hostname port 7200
+sleep 2000
+
+sql show dnodes;
+if $rows != 2 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data10 != 2 then 
+  return -1
+endi
+
+print $data02
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data12 != 0 then 
+  return -1
+endi
+
+if $data04 != ready then 
+  return -1
+endi
+
+if $data14 != ready then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data02 != master then 
+  return -1
+endi
+
+print =============== create drop qnode 1
+sql create qnode on dnode 1
+sql show qnodes
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1 then 
+  return -1
+endi
+sql_error create qnode on dnode 1
+
+sql drop qnode on dnode 1
+sql show qnodes
+if $rows != 0 then 
+  return -1
+endi
+sql_error drop qnode on dnode 1
+
+print =============== create drop qnode 2
+sql create qnode on dnode 2
+sql show qnodes
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 2 then 
+  return -1
+endi
+sql_error create qnode on dnode 2
+
+sql drop qnode on dnode 2
+sql show qnodes
+if $rows != 0 then 
+  return -1
+endi
+sql_error drop qnode on dnode 2
+
+print =============== create drop qnodes
+sql create qnode on dnode 1
+sql create qnode on dnode 2
+sql show qnodes
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+
+sleep 2000
+sql show qnodes
+if $rows != 2 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT

From 518964390989c6e3063b6d21258763f31198f395 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Sat, 9 Apr 2022 16:44:31 +0800
Subject: [PATCH 69/82] extract compressed col data format

---
 include/common/tdatablock.h               | 57 ++++++++++++--
 source/dnode/vnode/src/tq/tq.c            | 25 +++---
 source/libs/executor/src/dataDispatcher.c | 94 ++++++-----------------
 3 files changed, 93 insertions(+), 83 deletions(-)

diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 98edd9f0a5..73c06e7cc9 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -17,6 +17,7 @@
 #define _TD_COMMON_EP_H_
 
 #include "tcommon.h"
+#include "tcompression.h"
 #include "tmsg.h"
 
 #ifdef __cplusplus
@@ -115,11 +116,11 @@ static FORCE_INLINE void colDataAppendNULL(SColumnInfoData* pColumnInfoData, uin
 
 static FORCE_INLINE void colDataAppendNNULL(SColumnInfoData* pColumnInfoData, uint32_t start, size_t nRows) {
   if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
-    for(int32_t i = start; i < start + nRows; ++i) {
+    for (int32_t i = start; i < start + nRows; ++i) {
       pColumnInfoData->varmeta.offset[i] = -1;  // it is a null value of VAR type.
     }
   } else {
-    for(int32_t i = start; i < start + nRows; ++i) {
+    for (int32_t i = start; i < start + nRows; ++i) {
       colDataSetNull_f(pColumnInfoData->nullbitmap, i);
     }
   }
@@ -135,7 +136,8 @@ static FORCE_INLINE int32_t colDataAppendInt8(SColumnInfoData* pColumnInfoData,
 }
 
 static FORCE_INLINE int32_t colDataAppendInt16(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int16_t* v) {
-  ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_SMALLINT || pColumnInfoData->info.type == TSDB_DATA_TYPE_USMALLINT);
+  ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_SMALLINT ||
+         pColumnInfoData->info.type == TSDB_DATA_TYPE_USMALLINT);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(int16_t*)p = *(int16_t*)v;
 }
@@ -164,7 +166,6 @@ static FORCE_INLINE int32_t colDataAppendDouble(SColumnInfoData* pColumnInfoData
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(double*)p = *(double*)v;
 }
-
 int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData, bool isNull);
 int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, uint32_t numOfRow1, const SColumnInfoData* pSource,
                         uint32_t numOfRow2);
@@ -200,12 +201,58 @@ void    blockDataCleanup(SSDataBlock* pDataBlock);
 size_t  blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
 void*   blockDataDestroy(SSDataBlock* pBlock);
 
-int32_t blockDataTrimFirstNRows(SSDataBlock *pBlock, size_t n);
+int32_t blockDataTrimFirstNRows(SSDataBlock* pBlock, size_t n);
 
 SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock);
 
 void blockDebugShowData(const SArray* dataBlocks);
 
+static FORCE_INLINE int32_t blockCompressColData(SColumnInfoData* pColRes, int32_t numOfRows, char* data,
+                                            int8_t compressed) {
+  int32_t colSize = colDataGetLength(pColRes, numOfRows);
+  return (*(tDataTypes[pColRes->info.type].compFunc))(pColRes->pData, colSize, numOfRows, data,
+                                                      colSize + COMP_OVERFLOW_BYTES, compressed, NULL, 0);
+}
+
+static FORCE_INLINE void blockCompressEncode(const SSDataBlock* pBlock, char* data, int32_t* dataLen, int32_t numOfCols,
+                                       int8_t needCompress) {
+  int32_t* colSizes = (int32_t*)data;
+
+  data += numOfCols * sizeof(int32_t);
+  *dataLen = (numOfCols * sizeof(int32_t));
+
+  int32_t numOfRows = pBlock->info.rows;
+  for (int32_t col = 0; col < numOfCols; ++col) {
+    SColumnInfoData* pColRes = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, col);
+
+    // copy the null bitmap
+    if (IS_VAR_DATA_TYPE(pColRes->info.type)) {
+      size_t metaSize = numOfRows * sizeof(int32_t);
+      memcpy(data, pColRes->varmeta.offset, metaSize);
+      data += metaSize;
+      (*dataLen) += metaSize;
+    } else {
+      int32_t len = BitmapLen(numOfRows);
+      memcpy(data, pColRes->nullbitmap, len);
+      data += len;
+      (*dataLen) += len;
+    }
+
+    if (needCompress) {
+      colSizes[col] = blockCompressColData(pColRes, numOfRows, data, needCompress);
+      data += colSizes[col];
+      (*dataLen) += colSizes[col];
+    } else {
+      colSizes[col] = colDataGetLength(pColRes, numOfRows);
+      (*dataLen) += colSizes[col];
+      memmove(data, pColRes->pData, colSizes[col]);
+      data += colSizes[col];
+    }
+
+    colSizes[col] = htonl(colSizes[col]);
+  }
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index beefbc3d84..0d4acd4594 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -296,7 +296,7 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
   }
 
   STqTopic* pTopic = NULL;
-  int       sz = taosArrayGetSize(pConsumer->topics);
+  int32_t   sz = taosArrayGetSize(pConsumer->topics);
   for (int32_t i = 0; i < sz; i++) {
     STqTopic* topic = taosArrayGet(pConsumer->topics, i);
     // TODO race condition
@@ -316,7 +316,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
     return 0;
   }
 
-  vDebug("poll topic %s from consumer %ld (epoch %d) vg %d", pTopic->topicName, consumerId, pReq->epoch, pTq->pVnode->vgId);
+  vDebug("poll topic %s from consumer %ld (epoch %d) vg %d", pTopic->topicName, consumerId, pReq->epoch,
+         pTq->pVnode->vgId);
 
   rsp.reqOffset = pReq->currentOffset;
   rsp.skipLogNum = 0;
@@ -326,7 +327,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
     // TODO
     consumerEpoch = atomic_load_32(&pConsumer->epoch);
     if (consumerEpoch > reqEpoch) {
-      vDebug("tmq poll: consumer %ld (epoch %d) vg %d offset %ld, found new consumer epoch %d discard req epoch %d", consumerId, pReq->epoch, pTq->pVnode->vgId, fetchOffset, consumerEpoch, reqEpoch);
+      vDebug("tmq poll: consumer %ld (epoch %d) vg %d offset %ld, found new consumer epoch %d discard req epoch %d",
+             consumerId, pReq->epoch, pTq->pVnode->vgId, fetchOffset, consumerEpoch, reqEpoch);
       break;
     }
     SWalReadHead* pHead;
@@ -334,10 +336,12 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
       // TODO: no more log, set timer to wait blocking time
       // if data inserted during waiting, launch query and
       // response to user
-      vDebug("tmq poll: consumer %ld (epoch %d) vg %d offset %ld, no more log to return", consumerId, pReq->epoch, pTq->pVnode->vgId, fetchOffset);
+      vDebug("tmq poll: consumer %ld (epoch %d) vg %d offset %ld, no more log to return", consumerId, pReq->epoch,
+             pTq->pVnode->vgId, fetchOffset);
       break;
     }
-    vDebug("tmq poll: consumer %ld (epoch %d) iter log, vg %d offset %ld msgType %d", consumerId, pReq->epoch, pTq->pVnode->vgId, fetchOffset, pHead->msgType);
+    vDebug("tmq poll: consumer %ld (epoch %d) iter log, vg %d offset %ld msgType %d", consumerId, pReq->epoch,
+           pTq->pVnode->vgId, fetchOffset, pHead->msgType);
     /*int8_t pos = fetchOffset % TQ_BUFFER_SIZE;*/
     /*pHead = pTopic->pReadhandle->pHead;*/
     if (pHead->msgType == TDMT_VND_SUBMIT) {
@@ -361,7 +365,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
       }
 
       if (taosArrayGetSize(pRes) == 0) {
-        vDebug("tmq poll: consumer %ld (epoch %d) iter log, vg %d skip log %ld since not wanted", consumerId, pReq->epoch, pTq->pVnode->vgId, fetchOffset);
+        vDebug("tmq poll: consumer %ld (epoch %d) iter log, vg %d skip log %ld since not wanted", consumerId,
+               pReq->epoch, pTq->pVnode->vgId, fetchOffset);
         fetchOffset++;
         rsp.skipLogNum++;
         taosArrayDestroy(pRes);
@@ -390,7 +395,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
       pMsg->pCont = buf;
       pMsg->contLen = tlen;
       pMsg->code = 0;
-      vDebug("vg %d offset %ld msgType %d from consumer %ld (epoch %d) actual rsp", pTq->pVnode->vgId, fetchOffset, pHead->msgType, consumerId, pReq->epoch);
+      vDebug("vg %d offset %ld msgType %d from consumer %ld (epoch %d) actual rsp", pTq->pVnode->vgId, fetchOffset,
+             pHead->msgType, consumerId, pReq->epoch);
       tmsgSendRsp(pMsg);
       taosMemoryFree(pHead);
       return 0;
@@ -421,7 +427,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
   pMsg->contLen = tlen;
   pMsg->code = 0;
   tmsgSendRsp(pMsg);
-  vDebug("vg %d offset %ld from consumer %ld (epoch %d) not rsp", pTq->pVnode->vgId, fetchOffset, consumerId, pReq->epoch);
+  vDebug("vg %d offset %ld from consumer %ld (epoch %d) not rsp", pTq->pVnode->vgId, fetchOffset, consumerId,
+         pReq->epoch);
   /*}*/
 
   return 0;
@@ -432,7 +439,7 @@ int32_t tqProcessRebReq(STQ* pTq, char* msg) {
   terrno = TSDB_CODE_SUCCESS;
   tDecodeSMqMVRebReq(msg, &req);
 
-  vDebug("vg %d set from consumer %ld to consumer %ld", req.vgId, req.oldConsumerId ,req.newConsumerId);
+  vDebug("vg %d set from consumer %ld to consumer %ld", req.vgId, req.oldConsumerId, req.newConsumerId);
   STqConsumer* pConsumer = tqHandleGet(pTq->tqMeta, req.oldConsumerId);
   ASSERT(pConsumer);
   ASSERT(pConsumer->consumerId == req.oldConsumerId);
diff --git a/source/libs/executor/src/dataDispatcher.c b/source/libs/executor/src/dataDispatcher.c
index 74ec4e55a6..8a38b9ab48 100644
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
@@ -18,14 +18,14 @@
 #include "executorimpl.h"
 #include "planner.h"
 #include "tcompression.h"
+#include "tdatablock.h"
 #include "tglobal.h"
 #include "tqueue.h"
-#include "tdatablock.h"
 
 typedef struct SDataDispatchBuf {
   int32_t useSize;
   int32_t allocSize;
-  char* pData;
+  char*   pData;
 } SDataDispatchBuf;
 
 typedef struct SDataCacheEntry {
@@ -36,26 +36,25 @@ typedef struct SDataCacheEntry {
 } SDataCacheEntry;
 
 typedef struct SDataDispatchHandle {
-  SDataSinkHandle sink;
-  SDataSinkManager* pManager;
+  SDataSinkHandle     sink;
+  SDataSinkManager*   pManager;
   SDataBlockDescNode* pSchema;
-  STaosQueue* pDataBlocks;
-  SDataDispatchBuf nextOutput;
-  int32_t status;
-  bool queryEnd;
-  uint64_t useconds;
-  TdThreadMutex mutex;
+  STaosQueue*         pDataBlocks;
+  SDataDispatchBuf    nextOutput;
+  int32_t             status;
+  bool                queryEnd;
+  uint64_t            useconds;
+  TdThreadMutex       mutex;
 } SDataDispatchHandle;
 
-static bool needCompress(const SSDataBlock* pData, const SDataBlockDescNode* pSchema) {
+static bool needCompress(const SSDataBlock* pData, int32_t numOfCols) {
   if (tsCompressColData < 0 || 0 == pData->info.rows) {
     return false;
   }
 
-  int32_t numOfCols = LIST_LENGTH(pSchema->pSlots);
   for (int32_t col = 0; col < numOfCols; ++col) {
     SColumnInfoData* pColRes = taosArrayGet(pData->pDataBlock, col);
-    int32_t colSize = pColRes->info.bytes * pData->info.rows;
+    int32_t          colSize = pColRes->info.bytes * pData->info.rows;
     if (NEEDTO_COMPRESS_QUERY(colSize)) {
       return true;
     }
@@ -64,51 +63,6 @@ static bool needCompress(const SSDataBlock* pData, const SDataBlockDescNode* pSc
   return false;
 }
 
-static int32_t compressColData(SColumnInfoData *pColRes, int32_t numOfRows, char *data, int8_t compressed) {
-  int32_t colSize = colDataGetLength(pColRes, numOfRows);
-  return (*(tDataTypes[pColRes->info.type].compFunc))(
-      pColRes->pData, colSize, numOfRows, data, colSize + COMP_OVERFLOW_BYTES, compressed, NULL, 0);
-}
-
-static void copyData(const SInputData* pInput, const SDataBlockDescNode* pSchema, char* data, int8_t compressed, int32_t * dataLen) {
-  int32_t numOfCols = LIST_LENGTH(pSchema->pSlots);
-  int32_t * colSizes = (int32_t*)data;
-
-  data += numOfCols * sizeof(int32_t);
-  *dataLen = (numOfCols * sizeof(int32_t));
-
-  int32_t numOfRows = pInput->pData->info.rows;
-  for (int32_t col = 0; col < numOfCols; ++col) {
-    SColumnInfoData* pColRes = taosArrayGet(pInput->pData->pDataBlock, col);
-
-    // copy the null bitmap
-    if (IS_VAR_DATA_TYPE(pColRes->info.type)) {
-      size_t metaSize = numOfRows * sizeof(int32_t);
-      memcpy(data, pColRes->varmeta.offset, metaSize);
-      data += metaSize;
-      (*dataLen) += metaSize;
-    } else {
-      int32_t len = BitmapLen(numOfRows);
-      memcpy(data, pColRes->nullbitmap, len);
-      data += len;
-      (*dataLen) += len;
-    }
-
-    if (compressed) {
-      colSizes[col] = compressColData(pColRes, numOfRows, data, compressed);
-      data += colSizes[col];
-      (*dataLen) += colSizes[col];
-    } else {
-      colSizes[col] = colDataGetLength(pColRes, numOfRows);
-      (*dataLen) += colSizes[col];
-      memmove(data, pColRes->pData, colSizes[col]);
-      data += colSizes[col];
-    }
-
-    colSizes[col] = htonl(colSizes[col]);
-  }
-}
-
 // data format:
 // +----------------+--------------------------------------+-------------+-----------+-------------+-----------+
 // |SDataCacheEntry | column#1 length, column#2 length ... | col1 bitmap | col1 data | col2 bitmap | col2 data | ....
@@ -117,16 +71,17 @@ static void copyData(const SInputData* pInput, const SDataBlockDescNode* pSchema
 // The length of bitmap is decided by number of rows of this data block, and the length of each column data is
 // recorded in the first segment, next to the struct header
 static void toDataCacheEntry(const SDataDispatchHandle* pHandle, const SInputData* pInput, SDataDispatchBuf* pBuf) {
+  int32_t numOfCols = LIST_LENGTH(pHandle->pSchema->pSlots);
+
   SDataCacheEntry* pEntry = (SDataCacheEntry*)pBuf->pData;
-  pEntry->compressed = (int8_t)needCompress(pInput->pData, pHandle->pSchema);
-  pEntry->numOfRows  = pInput->pData->info.rows;
-  pEntry->dataLen    = 0;
+  pEntry->compressed = (int8_t)needCompress(pInput->pData, numOfCols);
+  pEntry->numOfRows = pInput->pData->info.rows;
+  pEntry->dataLen = 0;
 
   pBuf->useSize = sizeof(SRetrieveTableRsp);
-  copyData(pInput, pHandle->pSchema, pEntry->data, pEntry->compressed, &pEntry->dataLen);
+  blockCompressEncode(pInput->pData, pEntry->data, &pEntry->dataLen, numOfCols, pEntry->compressed);
 
-  pEntry->dataLen = pEntry->dataLen;
-  pBuf->useSize  += pEntry->dataLen;
+  pBuf->useSize += pEntry->dataLen;
 }
 
 static bool allocBuf(SDataDispatchHandle* pDispatcher, const SInputData* pInput, SDataDispatchBuf* pBuf) {
@@ -140,7 +95,7 @@ static bool allocBuf(SDataDispatchHandle* pDispatcher, const SInputData* pInput,
   // NOTE: there are four bytes of an integer more than the required buffer space.
   // struct size + data payload + length for each column + bitmap length
   pBuf->allocSize = sizeof(SRetrieveTableRsp) + blockDataGetSerialMetaSize(pInput->pData) +
-      ceil(blockDataGetSerialRowSize(pInput->pData) * pInput->pData->info.rows);
+                    ceil(blockDataGetSerialRowSize(pInput->pData) * pInput->pData->info.rows);
 
   pBuf->pData = taosMemoryMalloc(pBuf->allocSize);
   if (pBuf->pData == NULL) {
@@ -153,8 +108,9 @@ static bool allocBuf(SDataDispatchHandle* pDispatcher, const SInputData* pInput,
 static int32_t updateStatus(SDataDispatchHandle* pDispatcher) {
   taosThreadMutexLock(&pDispatcher->mutex);
   int32_t blockNums = taosQueueSize(pDispatcher->pDataBlocks);
-  int32_t status = (0 == blockNums ? DS_BUF_EMPTY :
-      (blockNums < pDispatcher->pManager->cfg.maxDataBlockNumPerQuery ? DS_BUF_LOW : DS_BUF_FULL));
+  int32_t status =
+      (0 == blockNums ? DS_BUF_EMPTY
+                      : (blockNums < pDispatcher->pManager->cfg.maxDataBlockNumPerQuery ? DS_BUF_LOW : DS_BUF_FULL));
   pDispatcher->status = status;
   taosThreadMutexUnlock(&pDispatcher->mutex);
   return status;
@@ -169,7 +125,7 @@ static int32_t getStatus(SDataDispatchHandle* pDispatcher) {
 
 static int32_t putDataBlock(SDataSinkHandle* pHandle, const SInputData* pInput, bool* pContinue) {
   SDataDispatchHandle* pDispatcher = (SDataDispatchHandle*)pHandle;
-  SDataDispatchBuf* pBuf = taosAllocateQitem(sizeof(SDataDispatchBuf));
+  SDataDispatchBuf*    pBuf = taosAllocateQitem(sizeof(SDataDispatchBuf));
   if (NULL == pBuf || !allocBuf(pDispatcher, pInput, pBuf)) {
     return TSDB_CODE_QRY_OUT_OF_MEMORY;
   }
@@ -200,7 +156,7 @@ static void getDataLength(SDataSinkHandle* pHandle, int32_t* pLen, bool* pQueryE
   memcpy(&pDispatcher->nextOutput, pBuf, sizeof(SDataDispatchBuf));
   taosFreeQitem(pBuf);
   *pLen = ((SDataCacheEntry*)(pDispatcher->nextOutput.pData))->dataLen;
-  *pQueryEnd = pDispatcher->queryEnd;    
+  *pQueryEnd = pDispatcher->queryEnd;
 }
 
 static int32_t getDataBlock(SDataSinkHandle* pHandle, SOutputData* pOutput) {

From a1c218d381dd71d006826350da9eccc0ee786ee8 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 16:59:03 +0800
Subject: [PATCH 70/82] feat[cluster]: create and drop bnode

---
 source/dnode/mgmt/bm/bmHandle.c        |  3 +-
 source/dnode/mgmt/bm/bmWorker.c        | 43 +++++++-----
 source/dnode/mgmt/qm/qmWorker.c        |  8 +--
 source/dnode/mnode/impl/src/mndBnode.c | 97 +++++++++++++-------------
 4 files changed, 78 insertions(+), 73 deletions(-)

diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/bm/bmHandle.c
index 66163b807b..645a1d09c2 100644
--- a/source/dnode/mgmt/bm/bmHandle.c
+++ b/source/dnode/mgmt/bm/bmHandle.c
@@ -16,8 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "bmInt.h"
 
-void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo) {
-}
+void bmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonBmInfo *bmInfo) {}
 
 int32_t bmProcessGetMonBmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) {
   SMonBmInfo bmInfo = {0};
diff --git a/source/dnode/mgmt/bm/bmWorker.c b/source/dnode/mgmt/bm/bmWorker.c
index cf2d7ac939..3481078d51 100644
--- a/source/dnode/mgmt/bm/bmWorker.c
+++ b/source/dnode/mgmt/bm/bmWorker.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "bmInt.h"
 
-static void bmSendErrorRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+static void bmSendErrorRsp(SNodeMsg *pMsg, int32_t code) {
   SRpcMsg rpcRsp = {.handle = pMsg->rpcMsg.handle, .ahandle = pMsg->rpcMsg.ahandle, .code = code};
   tmsgSendRsp(&rpcRsp);
 
@@ -25,15 +25,17 @@ static void bmSendErrorRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code)
   taosFreeQitem(pMsg);
 }
 
-static void bmSendErrorRsps(SMgmtWrapper *pWrapper, STaosQall *qall, int32_t numOfMsgs, int32_t code) {
+static void bmSendErrorRsps(STaosQall *qall, int32_t numOfMsgs, int32_t code) {
   for (int32_t i = 0; i < numOfMsgs; ++i) {
     SNodeMsg *pMsg = NULL;
     taosGetQitem(qall, (void **)&pMsg);
-    bmSendErrorRsp(pWrapper, pMsg, code);
+    if (pMsg != NULL) {
+      bmSendErrorRsp(pMsg, code);
+    }
   }
 }
 
-static inline void bmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+static inline void bmSendRsp(SNodeMsg *pMsg, int32_t code) {
   SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
                  .ahandle = pMsg->rpcMsg.ahandle,
                  .code = code,
@@ -42,20 +44,22 @@ static inline void bmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t cod
   tmsgSendRsp(&rsp);
 }
 
-static void bmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
+static void bmProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SBnodeMgmt *pMgmt = pInfo->ahandle;
 
-  dTrace("msg:%p, get from bnode monitor queue", pMsg);
+  dTrace("msg:%p, get from bnode-monitor queue", pMsg);
   SRpcMsg *pRpc = &pMsg->rpcMsg;
   int32_t  code = -1;
 
   if (pMsg->rpcMsg.msgType == TDMT_MON_BM_INFO) {
     code = bmProcessGetMonBmInfoReq(pMgmt->pWrapper, pMsg);
+  } else {
+    terrno = TSDB_CODE_MSG_NOT_PROCESSED;
   }
 
   if (pRpc->msgType & 1U) {
     if (code != 0 && terrno != 0) code = terrno;
-    bmSendRsp(pMgmt->pWrapper, pMsg, code);
+    bmSendRsp(pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -64,21 +68,22 @@ static void bmProcessMonQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 }
 
 static void bmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
-  SBnodeMgmt   *pMgmt = pInfo->ahandle;
-  SMgmtWrapper *pWrapper = pMgmt->pWrapper;
+  SBnodeMgmt *pMgmt = pInfo->ahandle;
 
   SArray *pArray = taosArrayInit(numOfMsgs, sizeof(SNodeMsg *));
   if (pArray == NULL) {
-    bmSendErrorRsps(pWrapper, qall, numOfMsgs, TSDB_CODE_OUT_OF_MEMORY);
+    bmSendErrorRsps(qall, numOfMsgs, TSDB_CODE_OUT_OF_MEMORY);
     return;
   }
 
   for (int32_t i = 0; i < numOfMsgs; ++i) {
     SNodeMsg *pMsg = NULL;
     taosGetQitem(qall, (void **)&pMsg);
-    dTrace("msg:%p, will be processed in bnode queue", pMsg);
-    if (taosArrayPush(pArray, &pMsg) == NULL) {
-      bmSendErrorRsp(pWrapper, pMsg, TSDB_CODE_OUT_OF_MEMORY);
+    if (pMsg != NULL) {
+      dTrace("msg:%p, get from bnode-write queue", pMsg);
+      if (taosArrayPush(pArray, &pMsg) == NULL) {
+        bmSendErrorRsp(pMsg, TSDB_CODE_OUT_OF_MEMORY);
+      }
     }
   }
 
@@ -86,9 +91,11 @@ static void bmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
 
   for (size_t i = 0; i < numOfMsgs; i++) {
     SNodeMsg *pMsg = *(SNodeMsg **)taosArrayGet(pArray, i);
-    dTrace("msg:%p, is freed", pMsg);
-    rpcFreeCont(pMsg->rpcMsg.pCont);
-    taosFreeQitem(pMsg);
+    if (pMsg != NULL) {
+      dTrace("msg:%p, is freed", pMsg);
+      rpcFreeCont(pMsg->rpcMsg.pCont);
+      taosFreeQitem(pMsg);
+    }
   }
   taosArrayDestroy(pArray);
 }
@@ -120,12 +127,12 @@ int32_t bmStartWorker(SBnodeMgmt *pMgmt) {
 
   if (tsMultiProcess) {
     SSingleWorkerCfg mCfg = {
-        .min = 1, .max = 1, .name = "bnode-monitor", .fp = (FItem)bmProcessMonQueue, .param = pMgmt};
+        .min = 1, .max = 1, .name = "bnode-monitor", .fp = (FItem)bmProcessMonitorQueue, .param = pMgmt};
     if (tSingleWorkerInit(&pMgmt->monitorWorker, &mCfg) != 0) {
       dError("failed to start bnode-monitor worker since %s", terrstr());
       return -1;
     }
-   }
+  }
 
   dDebug("bnode workers are initialized");
   return 0;
diff --git a/source/dnode/mgmt/qm/qmWorker.c b/source/dnode/mgmt/qm/qmWorker.c
index 0acf536d8e..974052cdf6 100644
--- a/source/dnode/mgmt/qm/qmWorker.c
+++ b/source/dnode/mgmt/qm/qmWorker.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "qmInt.h"
 
-static inline void qmSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+static inline void qmSendRsp(SNodeMsg *pMsg, int32_t code) {
   SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
                  .ahandle = pMsg->rpcMsg.ahandle,
                  .code = code,
@@ -40,7 +40,7 @@ static void qmProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 
   if (pRpc->msgType & 1U) {
     if (code != 0 && terrno != 0) code = terrno;
-    qmSendRsp(pMgmt->pWrapper, pMsg, code);
+    qmSendRsp(pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -56,7 +56,7 @@ static void qmProcessQueryQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   int32_t  code = qndProcessQueryMsg(pMgmt->pQnode, pRpc);
 
   if (pRpc->msgType & 1U && code != 0) {
-    qmSendRsp(pMgmt->pWrapper, pMsg, code);
+    qmSendRsp(pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -72,7 +72,7 @@ static void qmProcessFetchQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   int32_t  code = qndProcessFetchMsg(pMgmt->pQnode, pRpc);
 
   if (pRpc->msgType & 1U && code != 0) {
-    qmSendRsp(pMgmt->pWrapper, pMsg, code);
+    qmSendRsp(pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
diff --git a/source/dnode/mnode/impl/src/mndBnode.c b/source/dnode/mnode/impl/src/mndBnode.c
index b165b0aac0..a8b1ec393b 100644
--- a/source/dnode/mnode/impl/src/mndBnode.c
+++ b/source/dnode/mnode/impl/src/mndBnode.c
@@ -21,17 +21,17 @@
 #include "mndTrans.h"
 #include "mndUser.h"
 
-#define TSDB_BNODE_VER_NUMBER   1
-#define TSDB_BNODE_RESERVE_SIZE 64
+#define BNODE_VER_NUMBER   1
+#define BNODE_RESERVE_SIZE 64
 
 static SSdbRaw *mndBnodeActionEncode(SBnodeObj *pObj);
 static SSdbRow *mndBnodeActionDecode(SSdbRaw *pRaw);
 static int32_t  mndBnodeActionInsert(SSdb *pSdb, SBnodeObj *pObj);
-static int32_t  mndBnodeActionDelete(SSdb *pSdb, SBnodeObj *pObj);
 static int32_t  mndBnodeActionUpdate(SSdb *pSdb, SBnodeObj *pOld, SBnodeObj *pNew);
+static int32_t  mndBnodeActionDelete(SSdb *pSdb, SBnodeObj *pObj);
 static int32_t  mndProcessCreateBnodeReq(SNodeMsg *pReq);
-static int32_t  mndProcessDropBnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessCreateBnodeRsp(SNodeMsg *pRsp);
+static int32_t  mndProcessDropBnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessDropBnodeRsp(SNodeMsg *pRsp);
 static int32_t  mndGetBnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveBnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
@@ -76,18 +76,18 @@ static void mndReleaseBnode(SMnode *pMnode, SBnodeObj *pObj) {
 static SSdbRaw *mndBnodeActionEncode(SBnodeObj *pObj) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
 
-  SSdbRaw *pRaw = sdbAllocRaw(SDB_BNODE, TSDB_BNODE_VER_NUMBER, sizeof(SBnodeObj) + TSDB_BNODE_RESERVE_SIZE);
-  if (pRaw == NULL) goto BNODE_ENCODE_OVER;
+  SSdbRaw *pRaw = sdbAllocRaw(SDB_BNODE, BNODE_VER_NUMBER, sizeof(SBnodeObj) + BNODE_RESERVE_SIZE);
+  if (pRaw == NULL) goto _OVER;
 
   int32_t dataPos = 0;
-  SDB_SET_INT32(pRaw, dataPos, pObj->id, BNODE_ENCODE_OVER)
-  SDB_SET_INT64(pRaw, dataPos, pObj->createdTime, BNODE_ENCODE_OVER)
-  SDB_SET_INT64(pRaw, dataPos, pObj->updateTime, BNODE_ENCODE_OVER)
-  SDB_SET_RESERVE(pRaw, dataPos, TSDB_BNODE_RESERVE_SIZE, BNODE_ENCODE_OVER)
+  SDB_SET_INT32(pRaw, dataPos, pObj->id, _OVER)
+  SDB_SET_INT64(pRaw, dataPos, pObj->createdTime, _OVER)
+  SDB_SET_INT64(pRaw, dataPos, pObj->updateTime, _OVER)
+  SDB_SET_RESERVE(pRaw, dataPos, BNODE_RESERVE_SIZE, _OVER)
 
   terrno = 0;
 
-BNODE_ENCODE_OVER:
+_OVER:
   if (terrno != 0) {
     mError("bnode:%d, failed to encode to raw:%p since %s", pObj->id, pRaw, terrstr());
     sdbFreeRaw(pRaw);
@@ -102,28 +102,28 @@ static SSdbRow *mndBnodeActionDecode(SSdbRaw *pRaw) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
 
   int8_t sver = 0;
-  if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto BNODE_DECODE_OVER;
+  if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto _OVER;
 
-  if (sver != TSDB_BNODE_VER_NUMBER) {
+  if (sver != BNODE_VER_NUMBER) {
     terrno = TSDB_CODE_SDB_INVALID_DATA_VER;
-    goto BNODE_DECODE_OVER;
+    goto _OVER;
   }
 
   SSdbRow *pRow = sdbAllocRow(sizeof(SBnodeObj));
-  if (pRow == NULL) goto BNODE_DECODE_OVER;
+  if (pRow == NULL) goto _OVER;
 
   SBnodeObj *pObj = sdbGetRowObj(pRow);
-  if (pObj == NULL) goto BNODE_DECODE_OVER;
+  if (pObj == NULL) goto _OVER;
 
   int32_t dataPos = 0;
-  SDB_GET_INT32(pRaw, dataPos, &pObj->id, BNODE_DECODE_OVER)
-  SDB_GET_INT64(pRaw, dataPos, &pObj->createdTime, BNODE_DECODE_OVER)
-  SDB_GET_INT64(pRaw, dataPos, &pObj->updateTime, BNODE_DECODE_OVER)
-  SDB_GET_RESERVE(pRaw, dataPos, TSDB_BNODE_RESERVE_SIZE, BNODE_DECODE_OVER)
+  SDB_GET_INT32(pRaw, dataPos, &pObj->id, _OVER)
+  SDB_GET_INT64(pRaw, dataPos, &pObj->createdTime, _OVER)
+  SDB_GET_INT64(pRaw, dataPos, &pObj->updateTime, _OVER)
+  SDB_GET_RESERVE(pRaw, dataPos, BNODE_RESERVE_SIZE, _OVER)
 
   terrno = 0;
 
-BNODE_DECODE_OVER:
+_OVER:
   if (terrno != 0) {
     mError("bnode:%d, failed to decode from raw:%p since %s", pObj->id, pRaw, terrstr());
     taosMemoryFreeClear(pRow);
@@ -249,19 +249,19 @@ static int32_t mndCreateBnode(SMnode *pMnode, SNodeMsg *pReq, SDnodeObj *pDnode,
   bnodeObj.updateTime = bnodeObj.createdTime;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_BNODE, &pReq->rpcMsg);
-  if (pTrans == NULL) goto CREATE_BNODE_OVER;
+  if (pTrans == NULL) goto _OVER;
 
   mDebug("trans:%d, used to create bnode:%d", pTrans->id, pCreate->dnodeId);
-  if (mndSetCreateBnodeRedoLogs(pTrans, &bnodeObj) != 0) goto CREATE_BNODE_OVER;
-  if (mndSetCreateBnodeUndoLogs(pTrans, &bnodeObj) != 0) goto CREATE_BNODE_OVER;
-  if (mndSetCreateBnodeCommitLogs(pTrans, &bnodeObj) != 0) goto CREATE_BNODE_OVER;
-  if (mndSetCreateBnodeRedoActions(pTrans, pDnode, &bnodeObj) != 0) goto CREATE_BNODE_OVER;
-  if (mndSetCreateBnodeUndoActions(pTrans, pDnode, &bnodeObj) != 0) goto CREATE_BNODE_OVER;
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto CREATE_BNODE_OVER;
+  if (mndSetCreateBnodeRedoLogs(pTrans, &bnodeObj) != 0) goto _OVER;
+  if (mndSetCreateBnodeUndoLogs(pTrans, &bnodeObj) != 0) goto _OVER;
+  if (mndSetCreateBnodeCommitLogs(pTrans, &bnodeObj) != 0) goto _OVER;
+  if (mndSetCreateBnodeRedoActions(pTrans, pDnode, &bnodeObj) != 0) goto _OVER;
+  if (mndSetCreateBnodeUndoActions(pTrans, pDnode, &bnodeObj) != 0) goto _OVER;
+  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
 
   code = 0;
 
-CREATE_BNODE_OVER:
+_OVER:
   mndTransDrop(pTrans);
   return code;
 }
@@ -276,7 +276,7 @@ static int32_t mndProcessCreateBnodeReq(SNodeMsg *pReq) {
 
   if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
-    goto CREATE_BNODE_OVER;
+    goto _OVER;
   }
 
   mDebug("bnode:%d, start to create", createReq.dnodeId);
@@ -284,31 +284,31 @@ static int32_t mndProcessCreateBnodeReq(SNodeMsg *pReq) {
   pObj = mndAcquireBnode(pMnode, createReq.dnodeId);
   if (pObj != NULL) {
     terrno = TSDB_CODE_MND_BNODE_ALREADY_EXIST;
-    goto CREATE_BNODE_OVER;
+    goto _OVER;
   } else if (terrno != TSDB_CODE_MND_BNODE_NOT_EXIST) {
-    goto CREATE_BNODE_OVER;
+    goto _OVER;
   }
 
   pDnode = mndAcquireDnode(pMnode, createReq.dnodeId);
   if (pDnode == NULL) {
     terrno = TSDB_CODE_MND_DNODE_NOT_EXIST;
-    goto CREATE_BNODE_OVER;
+    goto _OVER;
   }
 
   pUser = mndAcquireUser(pMnode, pReq->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
-    goto CREATE_BNODE_OVER;
+    goto _OVER;
   }
 
   if (mndCheckNodeAuth(pUser)) {
-    goto CREATE_BNODE_OVER;
+    goto _OVER;
   }
 
   code = mndCreateBnode(pMnode, pReq, pDnode, &createReq);
   if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
-CREATE_BNODE_OVER:
+_OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("bnode:%d, failed to create since %s", createReq.dnodeId, terrstr());
   }
@@ -316,7 +316,6 @@ CREATE_BNODE_OVER:
   mndReleaseBnode(pMnode, pObj);
   mndReleaseDnode(pMnode, pDnode);
   mndReleaseUser(pMnode, pUser);
-
   return code;
 }
 
@@ -367,17 +366,17 @@ static int32_t mndDropBnode(SMnode *pMnode, SNodeMsg *pReq, SBnodeObj *pObj) {
   int32_t code = -1;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_BNODE, &pReq->rpcMsg);
-  if (pTrans == NULL) goto DROP_BNODE_OVER;
+  if (pTrans == NULL) goto _OVER;
 
   mDebug("trans:%d, used to drop bnode:%d", pTrans->id, pObj->id);
-  if (mndSetDropBnodeRedoLogs(pTrans, pObj) != 0) goto DROP_BNODE_OVER;
-  if (mndSetDropBnodeCommitLogs(pTrans, pObj) != 0) goto DROP_BNODE_OVER;
-  if (mndSetDropBnodeRedoActions(pTrans, pObj->pDnode, pObj) != 0) goto DROP_BNODE_OVER;
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto DROP_BNODE_OVER;
+  if (mndSetDropBnodeRedoLogs(pTrans, pObj) != 0) goto _OVER;
+  if (mndSetDropBnodeCommitLogs(pTrans, pObj) != 0) goto _OVER;
+  if (mndSetDropBnodeRedoActions(pTrans, pObj->pDnode, pObj) != 0) goto _OVER;
+  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
 
   code = 0;
 
-DROP_BNODE_OVER:
+_OVER:
   mndTransDrop(pTrans);
   return code;
 }
@@ -391,35 +390,35 @@ static int32_t mndProcessDropBnodeReq(SNodeMsg *pReq) {
 
   if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
-    goto DROP_BNODE_OVER;
+    goto _OVER;
   }
 
   mDebug("bnode:%d, start to drop", dropReq.dnodeId);
 
   if (dropReq.dnodeId <= 0) {
     terrno = TSDB_CODE_SDB_APP_ERROR;
-    goto DROP_BNODE_OVER;
+    goto _OVER;
   }
 
   pObj = mndAcquireBnode(pMnode, dropReq.dnodeId);
   if (pObj == NULL) {
-    goto DROP_BNODE_OVER;
+    goto _OVER;
   }
 
   pUser = mndAcquireUser(pMnode, pReq->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
-    goto DROP_BNODE_OVER;
+    goto _OVER;
   }
 
   if (mndCheckNodeAuth(pUser)) {
-    goto DROP_BNODE_OVER;
+    goto _OVER;
   }
 
   code = mndDropBnode(pMnode, pReq, pObj);
   if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
-DROP_BNODE_OVER:
+_OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("bnode:%d, failed to drop since %s", dropReq.dnodeId, terrstr());
   }

From 6810e82fb5b4c8b6519141b20483c40eb79a7138 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 17:23:05 +0800
Subject: [PATCH 71/82] feat[cluster]: create and drop snode

---
 source/dnode/mgmt/sm/smHandle.c        |   2 +-
 source/dnode/mgmt/sm/smWorker.c        |  15 ++--
 source/dnode/mnode/impl/src/mndSnode.c | 105 ++++++++++++-------------
 3 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/sm/smHandle.c
index 79fee0f4b7..36345cf490 100644
--- a/source/dnode/mgmt/sm/smHandle.c
+++ b/source/dnode/mgmt/sm/smHandle.c
@@ -55,7 +55,7 @@ int32_t smProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
 
   if (createReq.dnodeId != pDnode->dnodeId) {
     terrno = TSDB_CODE_INVALID_OPTION;
-    dError("failed to create snode since %s, input:%d cur:%d", terrstr(), createReq.dnodeId, pDnode->dnodeId);
+    dError("failed to create snode since %s", terrstr());
     return -1;
   } else {
     return smOpen(pWrapper);
diff --git a/source/dnode/mgmt/sm/smWorker.c b/source/dnode/mgmt/sm/smWorker.c
index a29d5d1abc..cf343423b7 100644
--- a/source/dnode/mgmt/sm/smWorker.c
+++ b/source/dnode/mgmt/sm/smWorker.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "smInt.h"
 
-static inline void smSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t code) {
+static inline void smSendRsp(SNodeMsg *pMsg, int32_t code) {
   SRpcMsg rsp = {.handle = pMsg->rpcMsg.handle,
                  .ahandle = pMsg->rpcMsg.ahandle,
                  .code = code,
@@ -28,17 +28,19 @@ static inline void smSendRsp(SMgmtWrapper *pWrapper, SNodeMsg *pMsg, int32_t cod
 static void smProcessMonitorQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SSnodeMgmt *pMgmt = pInfo->ahandle;
 
-  dTrace("msg:%p, get from snode monitor queue", pMsg);
+  dTrace("msg:%p, get from snode-monitor queue", pMsg);
   SRpcMsg *pRpc = &pMsg->rpcMsg;
   int32_t  code = -1;
 
   if (pMsg->rpcMsg.msgType == TDMT_MON_SM_INFO) {
     code = smProcessGetMonSmInfoReq(pMgmt->pWrapper, pMsg);
+  } else {
+    terrno = TSDB_CODE_MSG_NOT_PROCESSED;
   }
 
   if (pRpc->msgType & 1U) {
     if (code != 0 && terrno != 0) code = terrno;
-    smSendRsp(pMgmt->pWrapper, pMsg, code);
+    smSendRsp(pMsg, code);
   }
 
   dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -53,7 +55,7 @@ static void smProcessUniqueQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t num
     SNodeMsg *pMsg = NULL;
     taosGetQitem(qall, (void **)&pMsg);
 
-    dTrace("msg:%p, will be processed in snode unique queue", pMsg);
+    dTrace("msg:%p, get from snode-unique queue", pMsg);
     sndProcessUMsg(pMgmt->pSnode, &pMsg->rpcMsg);
 
     dTrace("msg:%p, is freed", pMsg);
@@ -65,7 +67,7 @@ static void smProcessUniqueQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t num
 static void smProcessSharedQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SSnodeMgmt *pMgmt = pInfo->ahandle;
 
-  dTrace("msg:%p, will be processed in snode shared queue", pMsg);
+  dTrace("msg:%p, get from snode-shared queue", pMsg);
   sndProcessSMsg(pMgmt->pSnode, &pMsg->rpcMsg);
 
   dTrace("msg:%p, is freed", pMsg);
@@ -88,7 +90,6 @@ int32_t smStartWorker(SSnodeMgmt *pMgmt) {
     }
 
     SMultiWorkerCfg cfg = {.max = 1, .name = "snode-unique", .fp = smProcessUniqueQueue, .param = pMgmt};
-
     if (tMultiWorkerInit(pUniqueWorker, &cfg) != 0) {
       dError("failed to start snode-unique worker since %s", terrstr());
       return -1;
@@ -193,7 +194,7 @@ int32_t smProcessSharedMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
 }
 
 int32_t smProcessExecMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
-  int32_t     workerType = smGetSWTypeFromMsg(&pMsg->rpcMsg);
+  int32_t workerType = smGetSWTypeFromMsg(&pMsg->rpcMsg);
   if (workerType == SND_WORKER_TYPE__SHARED) {
     return smProcessSharedMsg(pWrapper, pMsg);
   } else {
diff --git a/source/dnode/mnode/impl/src/mndSnode.c b/source/dnode/mnode/impl/src/mndSnode.c
index 2381724a50..87e5962f6b 100644
--- a/source/dnode/mnode/impl/src/mndSnode.c
+++ b/source/dnode/mnode/impl/src/mndSnode.c
@@ -21,17 +21,17 @@
 #include "mndTrans.h"
 #include "mndUser.h"
 
-#define TSDB_SNODE_VER_NUMBER   1
-#define TSDB_SNODE_RESERVE_SIZE 64
+#define SNODE_VER_NUMBER   1
+#define SNODE_RESERVE_SIZE 64
 
 static SSdbRaw *mndSnodeActionEncode(SSnodeObj *pObj);
 static SSdbRow *mndSnodeActionDecode(SSdbRaw *pRaw);
 static int32_t  mndSnodeActionInsert(SSdb *pSdb, SSnodeObj *pObj);
-static int32_t  mndSnodeActionDelete(SSdb *pSdb, SSnodeObj *pObj);
 static int32_t  mndSnodeActionUpdate(SSdb *pSdb, SSnodeObj *pOld, SSnodeObj *pNew);
+static int32_t  mndSnodeActionDelete(SSdb *pSdb, SSnodeObj *pObj);
 static int32_t  mndProcessCreateSnodeReq(SNodeMsg *pReq);
-static int32_t  mndProcessDropSnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessCreateSnodeRsp(SNodeMsg *pRsp);
+static int32_t  mndProcessDropSnodeReq(SNodeMsg *pReq);
 static int32_t  mndProcessDropSnodeRsp(SNodeMsg *pRsp);
 static int32_t  mndGetSnodeMeta(SNodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta);
 static int32_t  mndRetrieveSnodes(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
@@ -61,11 +61,9 @@ int32_t mndInitSnode(SMnode *pMnode) {
 void mndCleanupSnode(SMnode *pMnode) {}
 
 SEpSet mndAcquireEpFromSnode(SMnode *pMnode, const SSnodeObj *pSnode) {
-  SEpSet epSet;
-  memcpy(epSet.eps->fqdn, pSnode->pDnode->fqdn, 128);
-  epSet.eps->port = pSnode->pDnode->port;
-  epSet.numOfEps = 1;
-  epSet.inUse = 0;
+  SEpSet epSet = {.numOfEps = 1, .inUse = 0};
+  memcpy(epSet.eps[0].fqdn, pSnode->pDnode->fqdn, TSDB_FQDN_LEN);
+  epSet.eps[0].port = pSnode->pDnode->port;
   return epSet;
 }
 
@@ -85,18 +83,18 @@ static void mndReleaseSnode(SMnode *pMnode, SSnodeObj *pObj) {
 static SSdbRaw *mndSnodeActionEncode(SSnodeObj *pObj) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
 
-  SSdbRaw *pRaw = sdbAllocRaw(SDB_SNODE, TSDB_SNODE_VER_NUMBER, sizeof(SSnodeObj) + TSDB_SNODE_RESERVE_SIZE);
-  if (pRaw == NULL) goto SNODE_ENCODE_OVER;
+  SSdbRaw *pRaw = sdbAllocRaw(SDB_SNODE, SNODE_VER_NUMBER, sizeof(SSnodeObj) + SNODE_RESERVE_SIZE);
+  if (pRaw == NULL) goto _OVER;
 
   int32_t dataPos = 0;
-  SDB_SET_INT32(pRaw, dataPos, pObj->id, SNODE_ENCODE_OVER)
-  SDB_SET_INT64(pRaw, dataPos, pObj->createdTime, SNODE_ENCODE_OVER)
-  SDB_SET_INT64(pRaw, dataPos, pObj->updateTime, SNODE_ENCODE_OVER)
-  SDB_SET_RESERVE(pRaw, dataPos, TSDB_SNODE_RESERVE_SIZE, SNODE_ENCODE_OVER)
+  SDB_SET_INT32(pRaw, dataPos, pObj->id, _OVER)
+  SDB_SET_INT64(pRaw, dataPos, pObj->createdTime, _OVER)
+  SDB_SET_INT64(pRaw, dataPos, pObj->updateTime, _OVER)
+  SDB_SET_RESERVE(pRaw, dataPos, SNODE_RESERVE_SIZE, _OVER)
 
   terrno = 0;
 
-SNODE_ENCODE_OVER:
+_OVER:
   if (terrno != 0) {
     mError("snode:%d, failed to encode to raw:%p since %s", pObj->id, pRaw, terrstr());
     sdbFreeRaw(pRaw);
@@ -111,28 +109,28 @@ static SSdbRow *mndSnodeActionDecode(SSdbRaw *pRaw) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
 
   int8_t sver = 0;
-  if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto SNODE_DECODE_OVER;
+  if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto _OVER;
 
-  if (sver != TSDB_SNODE_VER_NUMBER) {
+  if (sver != SNODE_VER_NUMBER) {
     terrno = TSDB_CODE_SDB_INVALID_DATA_VER;
-    goto SNODE_DECODE_OVER;
+    goto _OVER;
   }
 
   SSdbRow *pRow = sdbAllocRow(sizeof(SSnodeObj));
-  if (pRow == NULL) goto SNODE_DECODE_OVER;
+  if (pRow == NULL) goto _OVER;
 
   SSnodeObj *pObj = sdbGetRowObj(pRow);
-  if (pObj == NULL) goto SNODE_DECODE_OVER;
+  if (pObj == NULL) goto _OVER;
 
   int32_t dataPos = 0;
-  SDB_GET_INT32(pRaw, dataPos, &pObj->id, SNODE_DECODE_OVER)
-  SDB_GET_INT64(pRaw, dataPos, &pObj->createdTime, SNODE_DECODE_OVER)
-  SDB_GET_INT64(pRaw, dataPos, &pObj->updateTime, SNODE_DECODE_OVER)
-  SDB_GET_RESERVE(pRaw, dataPos, TSDB_SNODE_RESERVE_SIZE, SNODE_DECODE_OVER)
+  SDB_GET_INT32(pRaw, dataPos, &pObj->id, _OVER)
+  SDB_GET_INT64(pRaw, dataPos, &pObj->createdTime, _OVER)
+  SDB_GET_INT64(pRaw, dataPos, &pObj->updateTime, _OVER)
+  SDB_GET_RESERVE(pRaw, dataPos, SNODE_RESERVE_SIZE, _OVER)
 
   terrno = 0;
 
-SNODE_DECODE_OVER:
+_OVER:
   if (terrno != 0) {
     mError("snode:%d, failed to decode from raw:%p since %s", pObj->id, pRaw, terrstr());
     taosMemoryFreeClear(pRow);
@@ -258,20 +256,20 @@ static int32_t mndCreateSnode(SMnode *pMnode, SNodeMsg *pReq, SDnodeObj *pDnode,
   snodeObj.updateTime = snodeObj.createdTime;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_SNODE, &pReq->rpcMsg);
-  if (pTrans == NULL) goto CREATE_SNODE_OVER;
+  if (pTrans == NULL) goto _OVER;
 
   mDebug("trans:%d, used to create snode:%d", pTrans->id, pCreate->dnodeId);
 
-  if (mndSetCreateSnodeRedoLogs(pTrans, &snodeObj) != 0) goto CREATE_SNODE_OVER;
-  if (mndSetCreateSnodeUndoLogs(pTrans, &snodeObj) != 0) goto CREATE_SNODE_OVER;
-  if (mndSetCreateSnodeCommitLogs(pTrans, &snodeObj) != 0) goto CREATE_SNODE_OVER;
-  if (mndSetCreateSnodeRedoActions(pTrans, pDnode, &snodeObj) != 0) goto CREATE_SNODE_OVER;
-  if (mndSetCreateSnodeUndoActions(pTrans, pDnode, &snodeObj) != 0) goto CREATE_SNODE_OVER;
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto CREATE_SNODE_OVER;
+  if (mndSetCreateSnodeRedoLogs(pTrans, &snodeObj) != 0) goto _OVER;
+  if (mndSetCreateSnodeUndoLogs(pTrans, &snodeObj) != 0) goto _OVER;
+  if (mndSetCreateSnodeCommitLogs(pTrans, &snodeObj) != 0) goto _OVER;
+  if (mndSetCreateSnodeRedoActions(pTrans, pDnode, &snodeObj) != 0) goto _OVER;
+  if (mndSetCreateSnodeUndoActions(pTrans, pDnode, &snodeObj) != 0) goto _OVER;
+  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
 
   code = 0;
 
-CREATE_SNODE_OVER:
+_OVER:
   mndTransDrop(pTrans);
   return code;
 }
@@ -286,7 +284,7 @@ static int32_t mndProcessCreateSnodeReq(SNodeMsg *pReq) {
 
   if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
-    goto CREATE_SNODE_OVER;
+    goto _OVER;
   }
 
   mDebug("snode:%d, start to create", createReq.dnodeId);
@@ -294,31 +292,31 @@ static int32_t mndProcessCreateSnodeReq(SNodeMsg *pReq) {
   pObj = mndAcquireSnode(pMnode, createReq.dnodeId);
   if (pObj != NULL) {
     terrno = TSDB_CODE_MND_SNODE_ALREADY_EXIST;
-    goto CREATE_SNODE_OVER;
+    goto _OVER;
   } else if (terrno != TSDB_CODE_MND_SNODE_NOT_EXIST) {
-    goto CREATE_SNODE_OVER;
+    goto _OVER;
   }
 
   pDnode = mndAcquireDnode(pMnode, createReq.dnodeId);
   if (pDnode == NULL) {
     terrno = TSDB_CODE_MND_DNODE_NOT_EXIST;
-    goto CREATE_SNODE_OVER;
+    goto _OVER;
   }
 
   pUser = mndAcquireUser(pMnode, pReq->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
-    goto CREATE_SNODE_OVER;
+    goto _OVER;
   }
 
   if (mndCheckNodeAuth(pUser)) {
-    goto CREATE_SNODE_OVER;
+    goto _OVER;
   }
 
   code = mndCreateSnode(pMnode, pReq, pDnode, &createReq);
   if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
-CREATE_SNODE_OVER:
+_OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("snode:%d, failed to create since %s", createReq.dnodeId, terrstr());
     return -1;
@@ -327,7 +325,6 @@ CREATE_SNODE_OVER:
   mndReleaseSnode(pMnode, pObj);
   mndReleaseDnode(pMnode, pDnode);
   mndReleaseUser(pMnode, pUser);
-
   return code;
 }
 
@@ -378,18 +375,18 @@ static int32_t mndDropSnode(SMnode *pMnode, SNodeMsg *pReq, SSnodeObj *pObj) {
   int32_t code = -1;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_SNODE, &pReq->rpcMsg);
-  if (pTrans == NULL) goto DROP_SNODE_OVER;
+  if (pTrans == NULL) goto _OVER;
 
   mDebug("trans:%d, used to drop snode:%d", pTrans->id, pObj->id);
 
-  if (mndSetDropSnodeRedoLogs(pTrans, pObj) != 0) goto DROP_SNODE_OVER;
-  if (mndSetDropSnodeCommitLogs(pTrans, pObj) != 0) goto DROP_SNODE_OVER;
-  if (mndSetDropSnodeRedoActions(pTrans, pObj->pDnode, pObj) != 0) goto DROP_SNODE_OVER;
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto DROP_SNODE_OVER;
+  if (mndSetDropSnodeRedoLogs(pTrans, pObj) != 0) goto _OVER;
+  if (mndSetDropSnodeCommitLogs(pTrans, pObj) != 0) goto _OVER;
+  if (mndSetDropSnodeRedoActions(pTrans, pObj->pDnode, pObj) != 0) goto _OVER;
+  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
 
   code = 0;
 
-DROP_SNODE_OVER:
+_OVER:
   mndTransDrop(pTrans);
   return code;
 }
@@ -403,35 +400,35 @@ static int32_t mndProcessDropSnodeReq(SNodeMsg *pReq) {
 
   if (tDeserializeSCreateDropMQSBNodeReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
-    goto DROP_SNODE_OVER;
+    goto _OVER;
   }
 
   mDebug("snode:%d, start to drop", dropReq.dnodeId);
 
   if (dropReq.dnodeId <= 0) {
     terrno = TSDB_CODE_SDB_APP_ERROR;
-    goto DROP_SNODE_OVER;
+    goto _OVER;
   }
 
   pObj = mndAcquireSnode(pMnode, dropReq.dnodeId);
   if (pObj == NULL) {
-    goto DROP_SNODE_OVER;
+    goto _OVER;
   }
 
   pUser = mndAcquireUser(pMnode, pReq->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
-    goto DROP_SNODE_OVER;
+    goto _OVER;
   }
 
   if (mndCheckNodeAuth(pUser)) {
-    goto DROP_SNODE_OVER;
+    goto _OVER;
   }
 
   code = mndDropSnode(pMnode, pReq, pObj);
   if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
-DROP_SNODE_OVER:
+_OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("snode:%d, failed to drop since %s", dropReq.dnodeId, terrstr());
   }

From 2a88060067642d53ba9a7a62e5cc289da68373f0 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 17:52:29 +0800
Subject: [PATCH 72/82] feat[cluster]: create and drop snode bnode

---
 source/dnode/mnode/impl/src/mndInfoSchema.c | 12 ++++++++++++
 source/libs/executor/src/scanoperator.c     |  4 ++++
 source/libs/nodes/src/nodesUtilFuncs.c      |  2 ++
 source/libs/parser/src/parTranslater.c      |  4 ++--
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c
index 76ae7b4fdb..331516ca09 100644
--- a/source/dnode/mnode/impl/src/mndInfoSchema.c
+++ b/source/dnode/mnode/impl/src/mndInfoSchema.c
@@ -47,6 +47,16 @@ static const SInfosTableSchema qnodesSchema[] = {
     {.name = "endpoint", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
 };
+static const SInfosTableSchema snodesSchema[] = {
+    {.name = "id", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "endpoint", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+};
+static const SInfosTableSchema bnodesSchema[] = {
+    {.name = "id", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "endpoint", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+};
 static const SInfosTableSchema userDBSchema[] = {
     {.name = "name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
@@ -184,6 +194,8 @@ static const SInfosTableMeta infosMeta[] = {
     {TSDB_INS_TABLE_MNODES, mnodesSchema, tListLen(mnodesSchema)},
     {TSDB_INS_TABLE_MODULES, modulesSchema, tListLen(modulesSchema)},
     {TSDB_INS_TABLE_QNODES, qnodesSchema, tListLen(qnodesSchema)},
+    {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema)},
+    {TSDB_INS_TABLE_BNODES, bnodesSchema, tListLen(snodesSchema)},
     {TSDB_INS_TABLE_USER_DATABASES, userDBSchema, tListLen(userDBSchema)},
     {TSDB_INS_TABLE_USER_FUNCTIONS, userFuncSchema, tListLen(userFuncSchema)},
     {TSDB_INS_TABLE_USER_INDEXES, userIdxSchema, tListLen(userIdxSchema)},
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 9eb37d7667..4179999c4b 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -783,6 +783,10 @@ SOperatorInfo* createSysTableScanOperatorInfo(void* pSysTableReadHandle, SSDataB
     tableType = TSDB_MGMT_TABLE_MODULE;
   } else if (strncasecmp(name, TSDB_INS_TABLE_QNODES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_QNODE;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_SNODES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_SNODE;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_BNODES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_BNODE;
   } else if (strncasecmp(name, TSDB_INS_TABLE_USER_FUNCTIONS, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_FUNC;
   } else if (strncasecmp(name, TSDB_INS_TABLE_USER_INDEXES, tListLen(pName->tname)) == 0) {
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index fb96f84d8a..d21eec0a41 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -158,6 +158,8 @@ SNodeptr nodesMakeNode(ENodeType type) {
     case QUERY_NODE_SHOW_FUNCTIONS_STMT:
     case QUERY_NODE_SHOW_INDEXES_STMT:
     case QUERY_NODE_SHOW_STREAMS_STMT:
+    case QUERY_NODE_SHOW_BNODES_STMT:
+    case QUERY_NODE_SHOW_SNODES_STMT:
       return makeNode(type, sizeof(SShowStmt));
     case QUERY_NODE_LOGIC_PLAN_SCAN:
       return makeNode(type, sizeof(SScanLogicNode));
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index c73e7d6587..a1010196a8 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2059,7 +2059,7 @@ static int32_t translateCreateComponentNode(STranslateContext* pCxt, SCreateComp
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
   pCxt->pCmdMsg->msgType = getCreateComponentNodeMsgType(nodeType(pStmt));
-  pCxt->pCmdMsg->msgLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &createReq);
+  pCxt->pCmdMsg->msgLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &createReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
     return TSDB_CODE_OUT_OF_MEMORY;
@@ -2094,7 +2094,7 @@ static int32_t translateDropComponentNode(STranslateContext* pCxt, SDropComponen
   }
   pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
   pCxt->pCmdMsg->msgType = getDropComponentNodeMsgType(nodeType(pStmt));
-  pCxt->pCmdMsg->msgLen = tSerializeSMCreateDropQSBNodeReq(NULL, 0, &dropReq);
+  pCxt->pCmdMsg->msgLen = tSerializeSCreateDropMQSBNodeReq(NULL, 0, &dropReq);
   pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
   if (NULL == pCxt->pCmdMsg->pMsg) {
     return TSDB_CODE_OUT_OF_MEMORY;

From a0460538ac3404eed371e8c7a1dcfd78d5554ae3 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 9 Apr 2022 17:52:38 +0800
Subject: [PATCH 73/82] test[cluster]: create and drop snode bnode

---
 tests/script/jenkins/basic.txt     |   6 ++
 tests/script/tsim/bnode/basic1.sim | 135 +++++++++++++++++++++++++++++
 tests/script/tsim/snode/basic1.sim | 135 +++++++++++++++++++++++++++++
 3 files changed, 276 insertions(+)
 create mode 100644 tests/script/tsim/bnode/basic1.sim
 create mode 100644 tests/script/tsim/snode/basic1.sim

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 2788428d9f..61e9b0b650 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -36,6 +36,12 @@
 # ---- qnode
 ./test.sh -f tsim/qnode/basic1.sim
 
+# ---- snode
+./test.sh -f tsim/snode/basic1.sim
+
+# ---- bnode
+./test.sh -f tsim/bnode/basic1.sim
+
 # ---- show
 ./test.sh -f tsim/show/basic.sim
 
diff --git a/tests/script/tsim/bnode/basic1.sim b/tests/script/tsim/bnode/basic1.sim
new file mode 100644
index 0000000000..0ce0c2bc5d
--- /dev/null
+++ b/tests/script/tsim/bnode/basic1.sim
@@ -0,0 +1,135 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sql connect
+
+print =============== show dnodes
+sql show dnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data02 != master then 
+  return -1
+endi
+
+print =============== create dnodes
+sql create dnode $hostname port 7200
+sleep 2000
+
+sql show dnodes;
+if $rows != 2 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data10 != 2 then 
+  return -1
+endi
+
+print $data02
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data12 != 0 then 
+  return -1
+endi
+
+if $data04 != ready then 
+  return -1
+endi
+
+if $data14 != ready then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data02 != master then 
+  return -1
+endi
+
+print =============== create drop bnode 1
+sql create bnode on dnode 1
+sql show bnodes
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1 then 
+  return -1
+endi
+sql_error create bnode on dnode 1
+
+sql drop bnode on dnode 1
+sql show bnodes
+if $rows != 0 then 
+  return -1
+endi
+sql_error drop bnode on dnode 1
+
+print =============== create drop bnode 2
+sql create bnode on dnode 2
+sql show bnodes
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 2 then 
+  return -1
+endi
+sql_error create bnode on dnode 2
+
+sql drop bnode on dnode 2
+sql show bnodes
+if $rows != 0 then 
+  return -1
+endi
+sql_error drop bnode on dnode 2
+
+print =============== create drop bnodes
+sql create bnode on dnode 1
+sql create bnode on dnode 2
+sql show bnodes
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+
+sleep 2000
+sql show bnodes
+if $rows != 2 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
diff --git a/tests/script/tsim/snode/basic1.sim b/tests/script/tsim/snode/basic1.sim
new file mode 100644
index 0000000000..3b478cfa46
--- /dev/null
+++ b/tests/script/tsim/snode/basic1.sim
@@ -0,0 +1,135 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sql connect
+
+print =============== show dnodes
+sql show dnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data02 != master then 
+  return -1
+endi
+
+print =============== create dnodes
+sql create dnode $hostname port 7200
+sleep 2000
+
+sql show dnodes;
+if $rows != 2 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data10 != 2 then 
+  return -1
+endi
+
+print $data02
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data12 != 0 then 
+  return -1
+endi
+
+if $data04 != ready then 
+  return -1
+endi
+
+if $data14 != ready then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data02 != master then 
+  return -1
+endi
+
+print =============== create drop qnode 1
+sql create qnode on dnode 1
+sql show qnodes
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1 then 
+  return -1
+endi
+sql_error create qnode on dnode 1
+
+sql drop qnode on dnode 1
+sql show qnodes
+if $rows != 0 then 
+  return -1
+endi
+sql_error drop qnode on dnode 1
+
+print =============== create drop qnode 2
+sql create qnode on dnode 2
+sql show qnodes
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 2 then 
+  return -1
+endi
+sql_error create qnode on dnode 2
+
+sql drop qnode on dnode 2
+sql show qnodes
+if $rows != 0 then 
+  return -1
+endi
+sql_error drop qnode on dnode 2
+
+print =============== create drop qnodes
+sql create qnode on dnode 1
+sql create qnode on dnode 2
+sql show qnodes
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+
+sleep 2000
+sql show qnodes
+if $rows != 2 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT

From 241e7d461a62b6ec61e6fedd82012d0301af5af6 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 18:15:42 +0800
Subject: [PATCH 74/82] test:disable scalarFunction.sim temporarily.

---
 tests/script/tsim/testCaseSuite.sim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/script/tsim/testCaseSuite.sim b/tests/script/tsim/testCaseSuite.sim
index 4245529343..c1b8c01767 100644
--- a/tests/script/tsim/testCaseSuite.sim
+++ b/tests/script/tsim/testCaseSuite.sim
@@ -21,7 +21,7 @@ run tsim/insert/null.sim
 
 run tsim/query/interval.sim
 run tsim/query/interval-offset.sim
-run tsim/query/scalarFunction.sim
+#run tsim/query/scalarFunction.sim
 
 run tsim/show/basic.sim
 

From 7254263a295969187f69ab4ec899daf06ff1d046 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Sat, 9 Apr 2022 18:21:03 +0800
Subject: [PATCH 75/82] use 1 bit in bitmap for super block

---
 include/common/tdataformat.h               |  30 ++-
 include/common/trow.h                      | 246 +++++++++++++----
 source/common/src/tdataformat.c            |  11 +-
 source/common/src/trow.c                   | 290 ++++++++++++++++++---
 source/dnode/vnode/src/inc/tsdb.h          |   9 +-
 source/dnode/vnode/src/tsdb/tsdbCommit.c   |  43 ++-
 source/dnode/vnode/src/tsdb/tsdbFile.c     |   4 +-
 source/dnode/vnode/src/tsdb/tsdbRead.c     |   6 +-
 source/dnode/vnode/src/tsdb/tsdbReadImpl.c |  21 +-
 source/dnode/vnode/src/tsdb/tsdbSma.c      |  10 +-
 10 files changed, 538 insertions(+), 132 deletions(-)

diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h
index 991cb55e50..8e07d4e669 100644
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -131,12 +131,17 @@ typedef struct {
   STColumn    *columns;
 } STSchemaBuilder;
 
-#define TD_VTYPE_BITS  2  // val type
-#define TD_VTYPE_PARTS 4  // 8 bits / TD_VTYPE_BITS = 4
-#define TD_VTYPE_OPTR  3  // TD_VTYPE_PARTS - 1, utilize to get remainder
+// use 2 bits for bitmap(default: STSRow/sub block)
+#define TD_VTYPE_BITS        2
+#define TD_VTYPE_PARTS       4  // PARTITIONS: 1 byte / 2 bits
+#define TD_VTYPE_OPTR        3  // OPERATOR: 4 - 1, utilize to get remainder
+#define TD_BITMAP_BYTES(cnt) (((cnt) + TD_VTYPE_OPTR) >> 2)
 
-#define TD_BITMAP_BYTES(cnt) (ceil((double)(cnt) / TD_VTYPE_PARTS))
-#define TD_BIT_TO_BYTES(cnt) (ceil((double)(cnt) / 8))
+// use 1 bit for bitmap(super block)
+#define TD_VTYPE_BITS_I        1
+#define TD_VTYPE_PARTS_I       8  // PARTITIONS: 1 byte / 1 bit
+#define TD_VTYPE_OPTR_I        7  // OPERATOR: 8 - 1, utilize to get remainder
+#define TD_BITMAP_BYTES_I(cnt) (((cnt) + TD_VTYPE_OPTR_I) >> 3)
 
 int32_t   tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, schema_ver_t version);
 void      tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder);
@@ -367,9 +372,10 @@ static FORCE_INLINE void tdCopyColOfRowBySchema(SDataRow dst, STSchema *pDstSche
 // ----------------- Data column structure
 // SDataCol arrangement: data => bitmap => dataOffset
 typedef struct SDataCol {
-  int8_t          type;        // column type
-  uint8_t         bitmap : 1;  // 0: has bitmap if has NULL/NORM rows, 1: no bitmap if all rows are NORM
-  uint8_t         reserve : 7;
+  int8_t          type;            // column type
+  uint8_t         bitmap : 1;      // 0: no bitmap if all rows are NORM, 1: has bitmap if has NULL/NORM rows
+  uint8_t         bitmapMode : 1;  // default is 0(2 bits), otherwise 1(1 bit)
+  uint8_t         reserve : 6;
   int16_t         colId;      // column ID
   int32_t         bytes;      // column data bytes defined
   int32_t         offset;     // data offset in a SDataRow (including the header size)
@@ -381,6 +387,8 @@ typedef struct SDataCol {
   TSKEY           ts;         // only used in last NULL column
 } SDataCol;
 
+
+
 #define isAllRowsNull(pCol) ((pCol)->len == 0)
 #define isAllRowsNone(pCol) ((pCol)->len == 0)
 static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; }
@@ -421,10 +429,14 @@ typedef struct {
   col_id_t  numOfCols;  // Total number of cols
   int32_t   maxPoints;  // max number of points
   int32_t   numOfRows;
-  int32_t   sversion;  // TODO: set sversion
+  int32_t   bitmapMode : 1;  // default is 0(2 bits), otherwise 1(1 bit)
+  int32_t   sversion : 31;   // TODO: set sversion(not used yet)
   SDataCol *cols;
 } SDataCols;
 
+static FORCE_INLINE bool tdDataColsIsBitmapI(SDataCols *pCols) { return pCols->bitmapMode != 0; }
+static FORCE_INLINE void tdDataColsSetBitmapI(SDataCols *pCols) { pCols->bitmapMode = 1; }
+
 #define keyCol(pCols)              (&((pCols)->cols[0]))                    // Key column
 #define dataColsTKeyAt(pCols, idx) ((TKEY *)(keyCol(pCols)->pData))[(idx)]  // the idx row of column-wised data
 #define dataColsKeyAt(pCols, idx)  tdGetKey(dataColsTKeyAt(pCols, idx))
diff --git a/include/common/trow.h b/include/common/trow.h
index 7cde8c50c5..b7ffcd14c6 100644
--- a/include/common/trow.h
+++ b/include/common/trow.h
@@ -40,21 +40,20 @@ extern "C" {
 #define TD_ROW_KV 0x01U
 
 /**
- * @brief val type
- *  - for data from client input and STSRow in memory, 3 types of val none/null/norm available
- *  - for data in
+ * @brief value type
+ *  - for data from client input and STSRow in memory, 3 types of value none/null/norm available
  */
-#define TD_VTYPE_NONE 0x0U   // none or unknown/undefined
+#define TD_VTYPE_NORM 0x00U  // normal val: not none, not null(no need assign value)
 #define TD_VTYPE_NULL 0x01U  // null val
-#define TD_VTYPE_NORM 0x02U  // normal val: not none, not null
-#define TD_VTYPE_MAX 0x03U   //
+#define TD_VTYPE_NONE 0x02U  // none or unknown/undefined
+#define TD_VTYPE_MAX  0x03U  //
 
-#define TD_VTYPE_NONE_BYTE 0x0U
+#define TD_VTYPE_NORM_BYTE 0x0U
 #define TD_VTYPE_NULL_BYTE 0x55U
-#define TD_VTYPE_NORM_BYTE 0xAAU
+#define TD_VTYPE_NONE_BYTE 0xAAU
 
-#define TD_ROWS_ALL_NORM 0x01U
-#define TD_ROWS_NULL_NORM 0x0U
+#define TD_ROWS_ALL_NORM  0x00U
+#define TD_ROWS_NULL_NORM 0x01U
 
 #define TD_COL_ROWS_NORM(c) ((c)->bitmap == TD_ROWS_ALL_NORM)  // all rows of SDataCol/SBlockCol is NORM
 #define TD_SET_COL_ROWS_BTIMAP(c, v) ((c)->bitmap = (v))
@@ -126,15 +125,15 @@ typedef struct {
     uint32_t info;
     struct {
       /// row type
-      uint32_t type : 2;
+      uint16_t type : 2;
       /// is delete row(0 not delete, 1 delete)
-      uint32_t del : 1;
+      uint16_t del : 1;
       /// endian(0 little endian, 1 big endian)
-      uint32_t endian : 1;
+      uint16_t endian : 1;
       /// reserved for back compatibility
-      uint32_t reserve : 12;
+      uint16_t reserve : 12;
       /// row schema version
-      uint32_t sver : 16;
+      uint16_t sver;
     };
   };
   /// row total length
@@ -216,11 +215,16 @@ static FORCE_INLINE void *tdKVRowColVal(STSRow *pRow, SKvRowIdx *pIdx) { return
 
 #define TD_ROW_OFFSET(p) ((p)->toffset);  // During ParseInsert when without STSchema, how to get the offset for STpRow?
 
+void                        tdMergeBitmap(uint8_t *srcBitmap, int32_t srcLen, uint8_t *dstBitmap);
 static FORCE_INLINE void    tdRowCopy(void *dst, STSRow *row) { memcpy(dst, row, TD_ROW_LEN(row)); }
-static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType);
-int32_t                     tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType);
-static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT *pValType);
-int32_t tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int32_t numOfRows, int32_t maxPoints);
+static FORCE_INLINE int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT valType);
+static FORCE_INLINE int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT valType);
+static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType, int8_t bitmapMode);
+int32_t                     tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType, int8_t bitmapMode);
+static FORCE_INLINE int32_t tdGetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT *pValType);
+static FORCE_INLINE int32_t tdGetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT *pValType);
+int32_t tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int32_t numOfRows, int32_t maxPoints,
+                             int8_t bitmapMode);
 static FORCE_INLINE int32_t tdAppendColValToTpRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val,
                                                   bool isCopyVarData, int8_t colType, int16_t colIdx, int32_t offset);
 static FORCE_INLINE int32_t tdAppendColValToKvRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val,
@@ -259,15 +263,32 @@ static FORCE_INLINE void *tdGetBitmapAddr(STSRow *pRow, uint8_t rowType, uint32_
   return NULL;
 }
 
+static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType, int8_t bitmapMode) {
+  switch (bitmapMode) {
+    case 0:
+      tdSetBitmapValTypeII(pBitmap, colIdx, valType);
+      break;
+    case -1:
+    case 1:
+      tdSetBitmapValTypeI(pBitmap, colIdx, valType);
+      break;
+    default:
+      TASSERT(0);
+      terrno = TSDB_CODE_INVALID_PARA;
+      return TSDB_CODE_FAILED;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
 /**
- * @brief
+ * @brief Use 2 bits at default
  *
  * @param pBitmap
  * @param colIdx The relative index of colId, may have minus value as parameter.
  * @param valType
  * @return FORCE_INLINE
  */
-static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType) {
+static FORCE_INLINE int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT valType) {
   if (!pBitmap || colIdx < 0) {
     TASSERT(0);
     terrno = TSDB_CODE_INVALID_PARA;
@@ -276,18 +297,140 @@ static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TD
   int16_t nBytes = colIdx / TD_VTYPE_PARTS;
   int16_t nOffset = colIdx & TD_VTYPE_OPTR;
   char   *pDestByte = (char *)POINTER_SHIFT(pBitmap, nBytes);
+  // use literal value directly and not use formula to simplify the codes
   switch (nOffset) {
     case 0:
-      *pDestByte = ((*pDestByte) & 0x3F) | (valType << 6);
+      // *pDestByte = ((*pDestByte) & 0x3F) | (valType << 6);
+      // set the value and clear other partitions for offset 0
+      *pDestByte = (valType << 6);
       break;
     case 1:
-      *pDestByte = ((*pDestByte) & 0xCF) | (valType << 4);
+      // *pDestByte = ((*pDestByte) & 0xCF) | (valType << 4);
+      *pDestByte |= (valType << 4);
       break;
     case 2:
-      *pDestByte = ((*pDestByte) & 0xF3) | (valType << 2);
+      // *pDestByte = ((*pDestByte) & 0xF3) | (valType << 2);
+      *pDestByte |= (valType << 2);
       break;
     case 3:
-      *pDestByte = ((*pDestByte) & 0xFC) | valType;
+      // *pDestByte = ((*pDestByte) & 0xFC) | valType;
+      *pDestByte |= (valType);
+      break;
+    default:
+      TASSERT(0);
+      terrno = TSDB_CODE_INVALID_PARA;
+      return terrno;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT *pValType, int8_t bitmapMode) {
+  switch (bitmapMode) {
+    case 0:
+      tdGetBitmapValTypeII(pBitmap, colIdx, pValType);
+      break;
+    case -1:
+    case 1:
+      tdGetBitmapValTypeI(pBitmap, colIdx, pValType);
+      break;
+    default:
+      TASSERT(0);
+      terrno = TSDB_CODE_INVALID_PARA;
+      return TSDB_CODE_FAILED;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+/**
+ * @brief Use 2 bits at default
+ *
+ * @param pBitmap
+ * @param colIdx The relative index of colId, may have minus value as parameter.
+ * @param pValType
+ * @return FORCE_INLINE
+ */
+static FORCE_INLINE int32_t tdGetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT *pValType) {
+  if (!pBitmap || colIdx < 0) {
+    TASSERT(0);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+  int16_t nBytes = colIdx / TD_VTYPE_PARTS;
+  int16_t nOffset = colIdx & TD_VTYPE_OPTR;
+  char   *pDestByte = (char *)POINTER_SHIFT(pBitmap, nBytes);
+  // use literal value directly and not use formula to simplify the codes
+  switch (nOffset) {
+    case 0:
+      *pValType = (((*pDestByte) & 0xC0) >> 6);
+      break;
+    case 1:
+      *pValType = (((*pDestByte) & 0x30) >> 4);
+      break;
+    case 2:
+      *pValType = (((*pDestByte) & 0x0C) >> 2);
+      break;
+    case 3:
+      *pValType = ((*pDestByte) & 0x03);
+      break;
+    default:
+      TASSERT(0);
+      terrno = TSDB_CODE_INVALID_PARA;
+      return terrno;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+/**
+ * @brief
+ *
+ * @param pBitmap
+ * @param colIdx The relative index of colId, may have minus value as parameter.
+ * @param valType
+ * @return FORCE_INLINE
+ */
+static FORCE_INLINE int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT valType) {
+  if (!pBitmap || colIdx < 0) {
+    TASSERT(0);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+  int16_t nBytes = colIdx / TD_VTYPE_PARTS_I;
+  int16_t nOffset = colIdx & TD_VTYPE_OPTR_I;
+  char   *pDestByte = (char *)POINTER_SHIFT(pBitmap, nBytes);
+  // use literal value directly and not use formula to simplify the codes
+  switch (nOffset) {
+    case 0:
+      // *pDestByte = ((*pDestByte) & 0x7F) | (valType << 7);
+      // set the value and clear other partitions for offset 0
+      *pDestByte = (valType << 7);
+      break;
+    case 1:
+      // *pDestByte = ((*pDestByte) & 0xBF) | (valType << 6);
+      *pDestByte |= (valType << 6);
+      break;
+    case 2:
+      // *pDestByte = ((*pDestByte) & 0xDF) | (valType << 5);
+      *pDestByte |= (valType << 5);
+      break;
+    case 3:
+      // *pDestByte = ((*pDestByte) & 0xEF) | (valType << 4);
+      *pDestByte |= (valType << 4);
+      break;
+    case 4:
+      // *pDestByte = ((*pDestByte) & 0xF7) | (valType << 3);
+      *pDestByte |= (valType << 3);
+      break;
+    case 5:
+      // *pDestByte = ((*pDestByte) & 0xFB) | (valType << 2);
+      *pDestByte |= (valType << 2);
+      break;
+    case 6:
+      // *pDestByte = ((*pDestByte) & 0xFD) | (valType << 1);
+      *pDestByte |= (valType << 1);
+      break;
+    case 7:
+      // *pDestByte = ((*pDestByte) & 0xFE) | valType;
+      *pDestByte |= (valType);
       break;
     default:
       TASSERT(0);
@@ -305,27 +448,40 @@ static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TD
  * @param pValType
  * @return FORCE_INLINE
  */
-static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT *pValType) {
+static FORCE_INLINE int32_t tdGetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT *pValType) {
   if (!pBitmap || colIdx < 0) {
     TASSERT(0);
     terrno = TSDB_CODE_INVALID_PARA;
     return terrno;
   }
-  int16_t nBytes = colIdx / TD_VTYPE_PARTS;
-  int16_t nOffset = colIdx & TD_VTYPE_OPTR;
+  int16_t nBytes = colIdx / TD_VTYPE_PARTS_I;
+  int16_t nOffset = colIdx & TD_VTYPE_OPTR_I;
   char   *pDestByte = (char *)POINTER_SHIFT(pBitmap, nBytes);
+  // use literal value directly and not use formula to simplify the codes
   switch (nOffset) {
     case 0:
-      *pValType = (((*pDestByte) & 0xC0) >> 6);
+      *pValType = (((*pDestByte) & 0x80) >> 7);
       break;
     case 1:
-      *pValType = (((*pDestByte) & 0x30) >> 4);
+      *pValType = (((*pDestByte) & 0x40) >> 6);
       break;
     case 2:
-      *pValType = (((*pDestByte) & 0x0C) >> 2);
+      *pValType = (((*pDestByte) & 0x20) >> 5);
       break;
     case 3:
-      *pValType = ((*pDestByte) & 0x03);
+      *pValType = (((*pDestByte) & 0x10) >> 4);
+      break;
+    case 4:
+      *pValType = (((*pDestByte) & 0x08) >> 3);
+      break;
+    case 5:
+      *pValType = (((*pDestByte) & 0x04) >> 2);
+      break;
+    case 6:
+      *pValType = (((*pDestByte) & 0x02) >> 1);
+      break;
+    case 7:
+      *pValType = ((*pDestByte) & 0x01);
       break;
     default:
       TASSERT(0);
@@ -552,7 +708,7 @@ static FORCE_INLINE int32_t tdAppendColValToTpRow(SRowBuilder *pBuilder, TDRowVa
   --colIdx;
 
 #ifdef TD_SUPPORT_BITMAP
-  if (tdSetBitmapValType(pBuilder->pBitmap, colIdx, valType) != TSDB_CODE_SUCCESS) {
+  if (tdSetBitmapValType(pBuilder->pBitmap, colIdx, valType, 0) != TSDB_CODE_SUCCESS) {
     return terrno;
   }
 #endif
@@ -610,7 +766,7 @@ static FORCE_INLINE int32_t tdAppendColValToKvRow(SRowBuilder *pBuilder, TDRowVa
   --colIdx;
 
 #ifdef TD_SUPPORT_BITMAP
-  if (tdSetBitmapValType(pBuilder->pBitmap, colIdx, valType) != TSDB_CODE_SUCCESS) {
+  if (tdSetBitmapValType(pBuilder->pBitmap, colIdx, valType, 0) != TSDB_CODE_SUCCESS) {
     return terrno;
   }
 #endif
@@ -691,12 +847,6 @@ static FORCE_INLINE int32_t tdAppendColValToRow(SRowBuilder *pBuilder, col_id_t
   if (colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
     TD_ROW_KEY(pRow) = *(TSKEY *)val;
     // The primary TS key is Norm all the time, thus its valType is not stored in bitmap.
-    // #ifdef TD_SUPPORT_BITMAP
-    //     pBitmap = tdGetBitmapAddr(pRow, pRow->type, pBuilder->flen, pRow->ncols);
-    //     if (tdSetBitmapValType(pBitmap, colIdx, valType) != TSDB_CODE_SUCCESS) {
-    //       return terrno;
-    //     }
-    // #endif
     return TSDB_CODE_SUCCESS;
   }
   // TODO:  We can avoid the type judegement by FP, but would prevent the inline scheme.
@@ -712,7 +862,7 @@ static FORCE_INLINE int32_t tdAppendColValToRow(SRowBuilder *pBuilder, col_id_t
 static FORCE_INLINE int32_t tdGetTpRowValOfCol(SCellVal *output, STSRow *pRow, void *pBitmap, int8_t colType,
                                                int32_t offset, int16_t colIdx) {
 #ifdef TD_SUPPORT_BITMAP
-  if (tdGetBitmapValType(pBitmap, colIdx, &output->valType) != TSDB_CODE_SUCCESS) {
+  if (tdGetBitmapValType(pBitmap, colIdx, &output->valType, 0) != TSDB_CODE_SUCCESS) {
     output->valType = TD_VTYPE_NONE;
     return terrno;
   }
@@ -748,7 +898,7 @@ static FORCE_INLINE int32_t tdGetKvRowValOfCol(SCellVal *output, STSRow *pRow, v
                                                int16_t colIdx) {
 #ifdef TD_SUPPORT_BITMAP
   TASSERT(colIdx < tdRowGetNCols(pRow) - 1);
-  if (tdGetBitmapValType(pBitmap, colIdx, &output->valType) != TSDB_CODE_SUCCESS) {
+  if (tdGetBitmapValType(pBitmap, colIdx, &output->valType, 0) != TSDB_CODE_SUCCESS) {
     output->valType = TD_VTYPE_NONE;
     return terrno;
   }
@@ -868,7 +1018,7 @@ static FORCE_INLINE bool tdGetTpRowDataOfCol(STSRowIter *pIter, col_type_t colTy
   }
 
 #ifdef TD_SUPPORT_BITMAP
-  if (tdGetBitmapValType(pIter->pBitmap, pIter->colIdx - 1, &pVal->valType) != TSDB_CODE_SUCCESS) {
+  if (tdGetBitmapValType(pIter->pBitmap, pIter->colIdx - 1, &pVal->valType, 0) != TSDB_CODE_SUCCESS) {
     pVal->valType = TD_VTYPE_NONE;
   }
 #else
@@ -905,7 +1055,7 @@ static FORCE_INLINE bool tdGetKvRowValOfColEx(STSRowIter *pIter, col_id_t colId,
 #ifdef TD_SUPPORT_BITMAP
   int16_t colIdx = -1;
   if (pKvIdx) colIdx = POINTER_DISTANCE(TD_ROW_COL_IDX(pRow), pKvIdx) / sizeof(SKvRowIdx);
-  if (tdGetBitmapValType(pIter->pBitmap, colIdx, &pVal->valType) != TSDB_CODE_SUCCESS) {
+  if (tdGetBitmapValType(pIter->pBitmap, colIdx, &pVal->valType, 0) != TSDB_CODE_SUCCESS) {
     pVal->valType = TD_VTYPE_NONE;
   }
 #else
@@ -962,7 +1112,7 @@ static FORCE_INLINE bool tdSTSRowIterNext(STSRowIter *pIter, col_id_t colId, col
 STSRow *mergeTwoRows(void *buffer, STSRow *row1, STSRow *row2, STSchema *pSchema1, STSchema *pSchema2);
 
 // Get the data pointer from a column-wised data
-static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, int32_t row) {
+static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, int32_t row, int8_t bitmapMode) {
   if (isAllRowsNone(pCol)) {
     pVal->valType = TD_VTYPE_NULL;
 #ifdef TD_SUPPORT_READ2
@@ -975,7 +1125,7 @@ static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, in
 
   if (TD_COL_ROWS_NORM(pCol)) {
     pVal->valType = TD_VTYPE_NORM;
-  } else if (tdGetBitmapValType(pCol->pBitmap, row, &(pVal->valType)) < 0) {
+  } else if (tdGetBitmapValType(pCol->pBitmap, row, &(pVal->valType), bitmapMode) < 0) {
     return terrno;
   }
 
@@ -1018,14 +1168,14 @@ static FORCE_INLINE bool tdSKvRowGetVal(STSRow *pRow, col_id_t colId, uint32_t o
   return true;
 }
 
-static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int32_t rows) {
+static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int32_t rows, int8_t bitmapMode) {
   ASSERT(rows > 0);
   int32_t result = 0;
 
   if (IS_VAR_DATA_TYPE(pDataCol->type)) {
     result += pDataCol->dataOff[rows - 1];
     SCellVal val = {0};
-    if (tdGetColDataOfRow(&val, pDataCol, rows - 1) < 0) {
+    if (tdGetColDataOfRow(&val, pDataCol, rows - 1, bitmapMode) < 0) {
       TASSERT(0);
     }
 
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index c1225012ac..f6614633fb 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -266,6 +266,8 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, int maxPoints) {
 
   pDataCol->len = 0;
 }
+
+#if 0
 // value from timestamp should be TKEY here instead of TSKEY
 int dataColAppendVal(SDataCol *pCol, const void *value, int numOfRows, int maxPoints) {
   ASSERT(pCol != NULL && value != NULL);
@@ -297,7 +299,7 @@ int dataColAppendVal(SDataCol *pCol, const void *value, int numOfRows, int maxPo
   }
   return 0;
 }
-
+#endif
 static FORCE_INLINE const void *tdGetColDataOfRowUnsafe(SDataCol *pCol, int row) {
   if (IS_VAR_DATA_TYPE(pCol->type)) {
     return POINTER_SHIFT(pCol->pData, pCol->dataOff[row]);
@@ -314,6 +316,7 @@ bool isNEleNull(SDataCol *pCol, int nEle) {
   return true;
 }
 
+#if 0
 static FORCE_INLINE void dataColSetNullAt(SDataCol *pCol, int index) {
   if (IS_VAR_DATA_TYPE(pCol->type)) {
     pCol->dataOff[index] = pCol->len;
@@ -326,7 +329,7 @@ static FORCE_INLINE void dataColSetNullAt(SDataCol *pCol, int index) {
   }
 }
 
-static void dataColSetNEleNull(SDataCol *pCol, int nEle) {
+static void dataColSetNEleNull(SDataCol *pCol, int nEle, int8_t bitmapMode) {
   if (IS_VAR_DATA_TYPE(pCol->type)) {
     pCol->len = 0;
     for (int i = 0; i < nEle; ++i) {
@@ -337,7 +340,7 @@ static void dataColSetNEleNull(SDataCol *pCol, int nEle) {
     pCol->len = TYPE_BYTES[pCol->type] * nEle;
   }
 }
-
+#endif
 void *dataColSetOffset(SDataCol *pCol, int nEle) {
   ASSERT(((pCol->type == TSDB_DATA_TYPE_BINARY) || (pCol->type == TSDB_DATA_TYPE_NCHAR)));
 
@@ -364,6 +367,7 @@ SDataCols *tdNewDataCols(int maxCols, int maxRows) {
   pCols->maxCols = maxCols;
   pCols->numOfRows = 0;
   pCols->numOfCols = 0;
+  // pCols->bitmapMode = 0; // calloc already set 0
 
   if (maxCols > 0) {
     pCols->cols = (SDataCol *)taosMemoryCalloc(maxCols, sizeof(SDataCol));
@@ -472,6 +476,7 @@ SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) {
 void tdResetDataCols(SDataCols *pCols) {
   if (pCols != NULL) {
     pCols->numOfRows = 0;
+    pCols->bitmapMode = 0;
     for (int i = 0; i < pCols->maxCols; ++i) {
       dataColReset(pCols->cols + i);
     }
diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index 0d5a874c1c..d9c48bfe76 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -22,11 +22,224 @@ const uint8_t tdVTypeByte[3] = {
     TD_VTYPE_NULL_BYTE,  // TD_VTYPE_NULL
 };
 
+// declaration
+static uint8_t tdGetBitmapByte(uint8_t byte);
+
+// implementation
+/**
+ * @brief Compress bitmap bytes comprised of 2-bits to counterpart of 1-bit.
+ * e.g.
+ * TD_VTYPE_NORM 0x00U(00000000) to 00000000 Normal
+ * TD_VTYPE_NULL 0x01U(00000001) to 00000001 Null
+ * TD_VTYPE_NONE 0x02U(00000010) to 00000001 Null
+ *
+ * 00000000 0x00 0x00
+ * 01000000 0x40 0x08
+ * 10000000 0x80 0x08
+ *  ...
+ * @param byte
+ * @return uint8_t
+ */
+static uint8_t tdGetMergedBitmapByte(uint8_t byte) {
+  switch (byte) {
+    case 0x00:
+      return 0x00;
+    case 0x40:
+      return 0x08;
+    case 0x80:
+      return 0x08;
+    case 0x10:
+      return 0x04;
+    case 0x50:
+      return 0x0c;
+    case 0x90:
+      return 0x0c;
+    case 0x20:
+      return 0x04;
+    case 0x60:
+      return 0x0c;
+    case 0xa0:
+      return 0x0c;
+    case 0x04:
+      return 0x02;
+    case 0x44:
+      return 0x0a;
+    case 0x84:
+      return 0x0a;
+    case 0x14:
+      return 0x06;
+    case 0x54:
+      return 0x0e;
+    case 0x94:
+      return 0x0e;
+    case 0x24:
+      return 0x06;
+    case 0x64:
+      return 0x0e;
+    case 0xa4:
+      return 0x0e;
+    case 0x08:
+      return 0x02;
+    case 0x48:
+      return 0x0a;
+    case 0x88:
+      return 0x0a;
+    case 0x18:
+      return 0x06;
+    case 0x58:
+      return 0x0e;
+    case 0x98:
+      return 0x0e;
+    case 0x28:
+      return 0x06;
+    case 0x68:
+      return 0x0e;
+    case 0xa8:
+      return 0x0e;
+    case 0x01:
+      return 0x01;
+    case 0x41:
+      return 0x09;
+    case 0x81:
+      return 0x09;
+    case 0x11:
+      return 0x05;
+    case 0x51:
+      return 0x0d;
+    case 0x91:
+      return 0x0d;
+    case 0x21:
+      return 0x05;
+    case 0x61:
+      return 0x0d;
+    case 0xa1:
+      return 0x0d;
+    case 0x05:
+      return 0x03;
+    case 0x45:
+      return 0x0b;
+    case 0x85:
+      return 0x0b;
+    case 0x15:
+      return 0x07;
+    case 0x55:
+      return 0x0f;
+    case 0x95:
+      return 0x0f;
+    case 0x25:
+      return 0x07;
+    case 0x65:
+      return 0x0f;
+    case 0xa5:
+      return 0x0f;
+    case 0x09:
+      return 0x03;
+    case 0x49:
+      return 0x0b;
+    case 0x89:
+      return 0x0b;
+    case 0x19:
+      return 0x07;
+    case 0x59:
+      return 0x0f;
+    case 0x99:
+      return 0x0f;
+    case 0x29:
+      return 0x07;
+    case 0x69:
+      return 0x0f;
+    case 0xa9:
+      return 0x0f;
+    case 0x02:
+      return 0x01;
+    case 0x42:
+      return 0x09;
+    case 0x82:
+      return 0x09;
+    case 0x12:
+      return 0x05;
+    case 0x52:
+      return 0x0d;
+    case 0x92:
+      return 0x0d;
+    case 0x22:
+      return 0x05;
+    case 0x62:
+      return 0x0d;
+    case 0xa2:
+      return 0x0d;
+    case 0x06:
+      return 0x03;
+    case 0x46:
+      return 0x0b;
+    case 0x86:
+      return 0x0b;
+    case 0x16:
+      return 0x07;
+    case 0x56:
+      return 0x0f;
+    case 0x96:
+      return 0x0f;
+    case 0x26:
+      return 0x07;
+    case 0x66:
+      return 0x0f;
+    case 0xa6:
+      return 0x0f;
+    case 0x0a:
+      return 0x03;
+    case 0x4a:
+      return 0x0b;
+    case 0x8a:
+      return 0x0b;
+    case 0x1a:
+      return 0x07;
+    case 0x5a:
+      return 0x0f;
+    case 0x9a:
+      return 0x0f;
+    case 0x2a:
+      return 0x07;
+    case 0x6a:
+      return 0x0f;
+    case 0xaa:
+      return 0x0f;
+    default:
+      // make sure the bitmap area is set to 0 firstly
+      ASSERT(0);
+      return 0x0f;  // return NULL bitmap for exception
+  }
+}
+
+/**
+ * @brief Merge bitmap from 2 bits to 1 bits, and the memory buffer should be guaranteed by the invoker.
+ *
+ * @param srcBitmap
+ * @param srcLen
+ * @param dstBitmap
+ */
+void tdMergeBitmap(uint8_t *srcBitmap, int32_t srcLen, uint8_t *dstBitmap) {
+  int32_t i = 0, j = 0;
+
+  if (srcLen > 0) {
+    dstBitmap[j] = (tdGetMergedBitmapByte(srcBitmap[i]) << 4);
+  }
+
+  while ((++i) < srcLen) {
+    if ((i & 1) == 0) {
+      dstBitmap[j] = (tdGetMergedBitmapByte(srcBitmap[i]) << 4);
+    } else {
+      dstBitmap[j] |= tdGetMergedBitmapByte(srcBitmap[i]);
+      ++j;
+    }
+  }
+}
+
 // static void dataColSetNEleNull(SDataCol *pCol, int nEle);
 static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, int limit1, SDataCols *src2, int *iter2,
                                int limit2, int tRows, bool forceSetNull);
 
-static FORCE_INLINE void dataColSetNullAt(SDataCol *pCol, int index, bool setBitmap) {
+static FORCE_INLINE void dataColSetNullAt(SDataCol *pCol, int index, bool setBitmap, int8_t bitmapMode) {
   if (IS_VAR_DATA_TYPE(pCol->type)) {
     pCol->dataOff[index] = pCol->len;
     char *ptr = POINTER_SHIFT(pCol->pData, pCol->len);
@@ -37,7 +250,7 @@ static FORCE_INLINE void dataColSetNullAt(SDataCol *pCol, int index, bool setBit
     pCol->len += TYPE_BYTES[pCol->type];
   }
   if (setBitmap) {
-    tdSetBitmapValType(pCol->pBitmap, index, TD_VTYPE_NONE);
+    tdSetBitmapValType(pCol->pBitmap, index, TD_VTYPE_NONE, bitmapMode);
   }
 }
 
@@ -53,7 +266,7 @@ static FORCE_INLINE void dataColSetNullAt(SDataCol *pCol, int index, bool setBit
 //   }
 // }
 
-int32_t tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType) {
+int32_t tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType, int8_t bitmapMode) {
   TASSERT(valType < TD_VTYPE_MAX);
   int16_t nBytes = nEle / TD_VTYPE_PARTS;
   for (int i = 0; i < nBytes; ++i) {
@@ -63,12 +276,12 @@ int32_t tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType) {
   int16_t nLeft = nEle - nBytes * TD_VTYPE_BITS;
 
   for (int j = 0; j < nLeft; ++j) {
-    tdSetBitmapValType(pBitmap, j, valType);
+    tdSetBitmapValType(pBitmap, j, valType, bitmapMode);
   }
   return TSDB_CODE_SUCCESS;
 }
 
-static FORCE_INLINE void dataColSetNoneAt(SDataCol *pCol, int index, bool setBitmap) {
+static FORCE_INLINE void dataColSetNoneAt(SDataCol *pCol, int index, bool setBitmap, int8_t bitmapMode) {
   if (IS_VAR_DATA_TYPE(pCol->type)) {
     pCol->dataOff[index] = pCol->len;
     char *ptr = POINTER_SHIFT(pCol->pData, pCol->len);
@@ -79,22 +292,22 @@ static FORCE_INLINE void dataColSetNoneAt(SDataCol *pCol, int index, bool setBit
     pCol->len += TYPE_BYTES[pCol->type];
   }
   if (setBitmap) {
-    tdSetBitmapValType(pCol->pBitmap, index, TD_VTYPE_NONE);
+    tdSetBitmapValType(pCol->pBitmap, index, TD_VTYPE_NONE, bitmapMode);
   }
 }
 
-static void dataColSetNEleNone(SDataCol *pCol, int nEle) {
+static void dataColSetNEleNone(SDataCol *pCol, int nEle, int8_t bitmapMode) {
   if (IS_VAR_DATA_TYPE(pCol->type)) {
     pCol->len = 0;
     for (int i = 0; i < nEle; ++i) {
-      dataColSetNoneAt(pCol, i, false);
+      dataColSetNoneAt(pCol, i, false, bitmapMode);
     }
   } else {
     setNullN(pCol->pData, pCol->type, pCol->bytes, nEle);
     pCol->len = TYPE_BYTES[pCol->type] * nEle;
   }
 #ifdef TD_SUPPORT_BITMAP
-  tdSetBitmapValTypeN(pCol->pBitmap, nEle, TD_VTYPE_NONE);
+  tdSetBitmapValTypeN(pCol->pBitmap, nEle, TD_VTYPE_NONE, bitmapMode);
 #endif
 }
 
@@ -126,7 +339,18 @@ STSRow *tdRowDup(STSRow *row) {
   return trow;
 }
 
-int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int numOfRows, int maxPoints) {
+/**
+ * @brief 
+ * 
+ * @param pCol 
+ * @param valType 
+ * @param val 
+ * @param numOfRows 
+ * @param maxPoints 
+ * @param bitmapMode  default is 0(2 bits), otherwise 1(1 bit)
+ * @return int 
+ */
+int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int numOfRows, int maxPoints, int8_t bitmapMode) {
   TASSERT(pCol != NULL);
 
   // Assume that the columns not specified during insert/upsert mean None.
@@ -139,7 +363,7 @@ int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int
     if (tdAllocMemForCol(pCol, maxPoints) < 0) return -1;
     if (numOfRows > 0) {
       // Find the first not None value, fill all previous values as None
-      dataColSetNEleNone(pCol, numOfRows);
+      dataColSetNEleNone(pCol, numOfRows, bitmapMode);
     }
   }
   if (!tdValTypeIsNorm(valType)) {
@@ -161,7 +385,8 @@ int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int
     pCol->len += pCol->bytes;
   }
 #ifdef TD_SUPPORT_BITMAP
-  tdSetBitmapValType(pCol->pBitmap, numOfRows, valType);
+
+    tdSetBitmapValType(pCol->pBitmap, numOfRows, valType, bitmapMode);
 #endif
   return 0;
 }
@@ -175,14 +400,13 @@ static int32_t tdAppendTpRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols
   void *pBitmap = tdGetBitmapAddrTp(pRow, pSchema->flen);
 
   SDataCol *pDataCol = &(pCols->cols[0]);
-  if (pDataCol->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
-    tdAppendValToDataCol(pDataCol, TD_VTYPE_NORM, &pRow->ts, pCols->numOfRows, pCols->maxPoints);
-  }
+  ASSERT(pDataCol->colId == PRIMARYKEY_TIMESTAMP_COL_ID);
+  tdAppendValToDataCol(pDataCol, TD_VTYPE_NORM, &pRow->ts, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
 
   while (dcol < pCols->numOfCols) {
     pDataCol = &(pCols->cols[dcol]);
     if (rcol >= schemaNCols(pSchema)) {
-      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints);
+      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
       ++dcol;
       continue;
     }
@@ -193,13 +417,13 @@ static int32_t tdAppendTpRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols
       if (tdGetTpRowValOfCol(&sVal, pRow, pBitmap, pRowCol->type, pRowCol->offset - sizeof(TSKEY), rcol - 1) < 0) {
         return terrno;
       }
-      tdAppendValToDataCol(pDataCol, sVal.valType, sVal.val, pCols->numOfRows, pCols->maxPoints);
+      tdAppendValToDataCol(pDataCol, sVal.valType, sVal.val, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
       ++dcol;
       ++rcol;
     } else if (pRowCol->colId < pDataCol->colId) {
       ++rcol;
     } else {
-      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints);
+      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
       ++dcol;
     }
   }
@@ -218,14 +442,13 @@ static int32_t tdAppendKvRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols
   void *pBitmap = tdGetBitmapAddrKv(pRow, tdRowGetNCols(pRow));
 
   SDataCol *pDataCol = &(pCols->cols[0]);
-  if (pDataCol->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
-    tdAppendValToDataCol(pDataCol, TD_VTYPE_NORM, &pRow->ts, pCols->numOfRows, pCols->maxPoints);
-  }
+  ASSERT(pDataCol->colId == PRIMARYKEY_TIMESTAMP_COL_ID);
+  tdAppendValToDataCol(pDataCol, TD_VTYPE_NORM, &pRow->ts, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
 
   while (dcol < pCols->numOfCols) {
     pDataCol = &(pCols->cols[dcol]);
     if (rcol >= tRowCols || rcol >= tSchemaCols) {
-      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints);
+      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
       ++dcol;
       continue;
     }
@@ -240,13 +463,13 @@ static int32_t tdAppendKvRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols
       if (tdGetKvRowValOfCol(&sVal, pRow, pBitmap, pIdx->offset, colIdx) < 0) {
         return terrno;
       }
-      tdAppendValToDataCol(pDataCol, sVal.valType, sVal.val, pCols->numOfRows, pCols->maxPoints);
+      tdAppendValToDataCol(pDataCol, sVal.valType, sVal.val, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
       ++dcol;
       ++rcol;
     } else if (pIdx->colId < pDataCol->colId) {
       ++rcol;
     } else {
-      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints);
+      tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode);
       ++dcol;
     }
   }
@@ -291,10 +514,10 @@ int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *
       for (int j = 0; j < source->numOfCols; j++) {
         if (source->cols[j].len > 0 || target->cols[j].len > 0) {
           SCellVal sVal = {0};
-          if (tdGetColDataOfRow(&sVal, source->cols + j, i + (*pOffset)) < 0) {
+          if (tdGetColDataOfRow(&sVal, source->cols + j, i + (*pOffset), source->bitmapMode) < 0) {
             TASSERT(0);
           }
-          tdAppendValToDataCol(target->cols + j, sVal.valType, sVal.val, target->numOfRows, target->maxPoints);
+          tdAppendValToDataCol(target->cols + j, sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode);
         }
       }
       ++target->numOfRows;
@@ -338,10 +561,10 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i
         ASSERT(target->cols[i].type == src1->cols[i].type);
         if (src1->cols[i].len > 0 || target->cols[i].len > 0) {
           SCellVal sVal = {0};
-          if (tdGetColDataOfRow(&sVal, src1->cols + i, *iter1) < 0) {
+          if (tdGetColDataOfRow(&sVal, src1->cols + i, *iter1, src1->bitmapMode) < 0) {
             TASSERT(0);
           }
-          tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints);
+          tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode);
         }
       }
 
@@ -353,18 +576,18 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i
         for (int i = 0; i < src2->numOfCols; i++) {
           SCellVal sVal = {0};
           ASSERT(target->cols[i].type == src2->cols[i].type);
-          if (tdGetColDataOfRow(&sVal, src2->cols + i, *iter2) < 0) {
+          if (tdGetColDataOfRow(&sVal, src2->cols + i, *iter2, src2->bitmapMode) < 0) {
             TASSERT(0);
           }
           if (src2->cols[i].len > 0 && !tdValTypeIsNull(sVal.valType)) {
-            tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints);
+            tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode);
           } else if (!forceSetNull && key1 == key2 && src1->cols[i].len > 0) {
-            if (tdGetColDataOfRow(&sVal, src1->cols + i, *iter1) < 0) {
+            if (tdGetColDataOfRow(&sVal, src1->cols + i, *iter1, src1->bitmapMode) < 0) {
               TASSERT(0);
             }
-            tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints);
+            tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode);
           } else if (target->cols[i].len > 0) {
-            dataColSetNullAt(&target->cols[i], target->numOfRows, true);
+            dataColSetNullAt(&target->cols[i], target->numOfRows, true, target->bitmapMode);
           }
         }
         target->numOfRows++;
@@ -480,6 +703,7 @@ SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) {
   if (pRet == NULL) return NULL;
 
   pRet->numOfCols = pDataCols->numOfCols;
+  pRet->bitmapMode = pDataCols->bitmapMode;
   pRet->sversion = pDataCols->sversion;
   if (keepData) pRet->numOfRows = pDataCols->numOfRows;
 
diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index 97a0832b9c..b85caad4c8 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -264,6 +264,9 @@ typedef struct {
 
 #define SBlock SBlockV0  // latest SBlock definition
 
+static FORCE_INLINE bool tsdbIsSupBlock(SBlock *pBlock) { return pBlock->numOfSubBlocks == 1; }
+static FORCE_INLINE bool tsdbIsSubBlock(SBlock *pBlock) { return pBlock->numOfSubBlocks == 0; }
+
 #endif
 
 typedef struct {
@@ -276,7 +279,7 @@ typedef struct {
 #ifdef TD_REFACTOR_3
 typedef struct {
   int16_t  colId;
-  uint16_t bitmap : 1;  // 0: has bitmap if has NULL/NORM rows, 1: no bitmap if all rows are NORM
+  uint16_t bitmap : 1;  // 0: no bitmap if all rows are NORM, 1: has bitmap if has NULL/NORM rows
   uint16_t reserve : 15;
   int32_t  len;
   uint32_t type : 8;
@@ -295,7 +298,7 @@ typedef struct {
   int16_t  colId;
   uint16_t type : 6;
   uint16_t blen : 10;   // bitmap length(TODO: full UT for the bitmap compress of various data input)
-  uint32_t bitmap : 1;  // 0: has bitmap if has NULL/NORM rows, 1: no bitmap if all rows are NORM
+  uint32_t bitmap : 1;  // 0: no bitmap if all rows are NORM, 1: has bitmap if has NULL/NORM rows
   uint32_t len : 31;    // data length + bitmap length
   uint32_t offset;
 } SBlockColV0;
@@ -404,7 +407,7 @@ int   tsdbSetReadTable(SReadH *pReadh, STable *pTable);
 int   tsdbLoadBlockInfo(SReadH *pReadh, void *pTarget);
 int   tsdbLoadBlockData(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlockInfo);
 int   tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo, const int16_t *colIds,
-                            int numOfColsIds);
+                            int numOfColsIds, bool mergeBitmap);
 int   tsdbLoadBlockStatis(SReadH *pReadh, SBlock *pBlock);
 int   tsdbEncodeSBlockIdx(void **buf, SBlockIdx *pIdx);
 void *tsdbDecodeSBlockIdx(void *buf, SBlockIdx *pIdx);
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 42d29209f5..21ad1ec076 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -1280,7 +1280,7 @@ int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFile *pDF
   uint32_t tsizeAggr = (uint32_t)tsdbBlockAggrSize(nColsNotAllNull, SBlockVerLatest);
   int32_t  keyLen = 0;
   int32_t  nBitmaps = (int32_t)TD_BITMAP_BYTES(rowsToWrite);
-  // int32_t  tBitmaps = 0;
+  int32_t  sBitmaps = isSuper ? (int32_t)TD_BITMAP_BYTES_I(rowsToWrite) : nBitmaps;
 
   for (int ncol = 0; ncol < pDataCols->numOfCols; ++ncol) {
     // All not NULL columns finish
@@ -1292,25 +1292,13 @@ int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFile *pDF
     if (ncol != 0 && (pDataCol->colId != pBlockCol->colId)) continue;
 
     int32_t flen;  // final length
-    int32_t tlen = dataColGetNEleLen(pDataCol, rowsToWrite);
+    int32_t tlen = dataColGetNEleLen(pDataCol, rowsToWrite, pDataCols->bitmapMode);
 
 #ifdef TD_SUPPORT_BITMAP
     int32_t tBitmaps = 0;
     int32_t tBitmapsLen = 0;
     if ((ncol != 0) && !TD_COL_ROWS_NORM(pBlockCol)) {
-      tBitmaps = nBitmaps;
-#if 0
-      if (IS_VAR_DATA_TYPE(pDataCol->type)) {
-        tBitmaps = nBitmaps;
-        tlen += tBitmaps;
-      } else {
-        tBitmaps = (int32_t)ceil((double)nBitmaps / TYPE_BYTES[pDataCol->type]);
-        tlen += tBitmaps * TYPE_BYTES[pDataCol->type];
-      }
-#endif
-      // move bitmap parts ahead
-      // TODO: put bitmap part to the 1st location(pBitmap points to pData) to avoid the memmove
-      // memcpy(POINTER_SHIFT(pDataCol->pData, pDataCol->len), pDataCol->pBitmap, nBitmaps);
+      tBitmaps = sBitmaps;
     }
 #endif
 
@@ -1340,6 +1328,9 @@ int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFile *pDF
                                                       tlen + COMP_OVERFLOW_BYTES);
       if (tBitmaps > 0) {
         bptr = POINTER_SHIFT(pBlockData, lsize + flen);
+        if (isSuper && !tdDataColsIsBitmapI(pDataCols)) {
+          tdMergeBitmap((uint8_t *)pDataCol->pBitmap, nBitmaps, (uint8_t *)pDataCol->pBitmap);
+        }
         tBitmapsLen =
             tsCompressTinyint((char *)pDataCol->pBitmap, tBitmaps, tBitmaps, bptr, tBitmaps + COMP_OVERFLOW_BYTES,
                               pCfg->compression, *ppCBuf, tBitmaps + COMP_OVERFLOW_BYTES);
@@ -1506,7 +1497,7 @@ static int tsdbMergeMemData(SCommitH *pCommith, SCommitIter *pIter, int bidx) {
   }
 
   SSkipListIterator titer = *(pIter->pIter);
-  if (tsdbLoadBlockDataCols(&(pCommith->readh), pBlock, NULL, &colId, 1) < 0) return -1;
+  if (tsdbLoadBlockDataCols(&(pCommith->readh), pBlock, NULL, &colId, 1, false) < 0) return -1;
 
   tsdbLoadDataFromCache(pIter->pTable, &titer, keyLimit, INT32_MAX, NULL, pCommith->readh.pDCols[0]->cols[0].pData,
                         pCommith->readh.pDCols[0]->numOfRows, pCfg->update, &mInfo);
@@ -1656,6 +1647,8 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt
   ASSERT(maxRows > 0 && dataColsKeyLast(pDataCols) <= maxKey);
   tdResetDataCols(pTarget);
 
+  pTarget->bitmapMode = pDataCols->bitmapMode;
+
   while (true) {
     key1 = (*iter >= pDataCols->numOfRows) ? INT64_MAX : dataColsKeyAt(pDataCols, *iter);
     STSRow *row = tsdbNextIterRow(pCommitIter->pIter);
@@ -1668,17 +1661,17 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt
     if (key1 == INT64_MAX && key2 == INT64_MAX) break;
 
     if (key1 < key2) {
-      for (int i = 0; i < pDataCols->numOfCols; i++) {
+      for (int i = 0; i < pDataCols->numOfCols; ++i) {
         // TODO: dataColAppendVal may fail
         SCellVal sVal = {0};
-        if (tdGetColDataOfRow(&sVal, pDataCols->cols + i, *iter) < 0) {
+        if (tdGetColDataOfRow(&sVal, pDataCols->cols + i, *iter, pDataCols->bitmapMode) < 0) {
           TASSERT(0);
         }
-        tdAppendValToDataCol(pTarget->cols + i, sVal.valType, sVal.val, pTarget->numOfRows, pTarget->maxPoints);
+        tdAppendValToDataCol(pTarget->cols + i, sVal.valType, sVal.val, pTarget->numOfRows, pTarget->maxPoints, pTarget->bitmapMode);
       }
 
-      pTarget->numOfRows++;
-      (*iter)++;
+      ++pTarget->numOfRows;
+      ++(*iter);
     } else if (key1 > key2) {
       if (pSchema == NULL || schemaVersion(pSchema) != TD_ROW_SVER(row)) {
         pSchema = tsdbGetTableSchemaImpl(pCommitIter->pTable, false, false, TD_ROW_SVER(row));
@@ -1691,13 +1684,13 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt
     } else {
       if (update != TD_ROW_OVERWRITE_UPDATE) {
         // copy disk data
-        for (int i = 0; i < pDataCols->numOfCols; i++) {
+        for (int i = 0; i < pDataCols->numOfCols; ++i) {
           // TODO: dataColAppendVal may fail
           SCellVal sVal = {0};
-          if (tdGetColDataOfRow(&sVal, pDataCols->cols + i, *iter) < 0) {
+          if (tdGetColDataOfRow(&sVal, pDataCols->cols + i, *iter, pDataCols->bitmapMode) < 0) {
             TASSERT(0);
           }
-          tdAppendValToDataCol(pTarget->cols + i, sVal.valType, sVal.val, pTarget->numOfRows, pTarget->maxPoints);
+          tdAppendValToDataCol(pTarget->cols + i, sVal.valType, sVal.val, pTarget->numOfRows, pTarget->maxPoints, pTarget->bitmapMode);
         }
 
         if (update == TD_ROW_DISCARD_UPDATE) pTarget->numOfRows++;
@@ -1711,7 +1704,7 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt
 
         tdAppendSTSRowToDataCol(row, pSchema, pTarget, update == TD_ROW_OVERWRITE_UPDATE);
       }
-      (*iter)++;
+      ++(*iter);
       tSkipListIterNext(pCommitIter->pIter);
     }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbFile.c b/source/dnode/vnode/src/tsdb/tsdbFile.c
index a2dab19141..6f96aff848 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFile.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFile.c
@@ -406,7 +406,7 @@ int tsdbUpdateDFileHeader(SDFile *pDFile) {
   }
 
   void *ptr = buf;
-  taosEncodeFixedU32(&ptr, 0);
+  // taosEncodeFixedU32(&ptr, 0); // fver moved to SDFInfo and saved to current
   tsdbEncodeDFInfo(&ptr, &(pDFile->info));
 
   taosCalcChecksumAppend(0, (uint8_t *)buf, TSDB_FILE_HEAD_SIZE);
@@ -437,7 +437,7 @@ int tsdbLoadDFileHeader(SDFile *pDFile, SDFInfo *pInfo) {
   }
 
   void *pBuf = buf;
-  pBuf = taosDecodeFixedU32(pBuf, &_version);
+  // pBuf = taosDecodeFixedU32(pBuf, &_version);
   pBuf = tsdbDecodeDFInfo(pBuf, pInfo);
   return 0;
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index de6a05df46..68b86028cf 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -1112,7 +1112,7 @@ static int32_t doLoadFileDataBlock(STsdbReadHandle* pTsdbReadHandle, SBlock* pBl
 
   int16_t* colIds = pTsdbReadHandle->defaultLoadColumn->pData;
 
-  int32_t ret = tsdbLoadBlockDataCols(&(pTsdbReadHandle->rhelper), pBlock, pCheckInfo->pCompInfo, colIds, (int)(QH_GET_NUM_OF_COLS(pTsdbReadHandle)));
+  int32_t ret = tsdbLoadBlockDataCols(&(pTsdbReadHandle->rhelper), pBlock, pCheckInfo->pCompInfo, colIds, (int)(QH_GET_NUM_OF_COLS(pTsdbReadHandle)), true);
   if (ret != TSDB_CODE_SUCCESS) {
     int32_t c = terrno;
     assert(c != TSDB_CODE_SUCCESS);
@@ -1401,7 +1401,7 @@ static int32_t doCopyRowsFromFileBlock(STsdbReadHandle* pTsdbReadHandle, int32_t
 //        memmove(pData, (char*)src->pData + bytes * start, bytes * num);
         for(int32_t k = start; k < num + start; ++k) {
           SCellVal sVal = {0};
-          if (tdGetColDataOfRow(&sVal, src, k) < 0) {
+          if (tdGetColDataOfRow(&sVal, src, k, pCols->bitmapMode) < 0) {
             TASSERT(0);
           }
 
@@ -1415,7 +1415,7 @@ static int32_t doCopyRowsFromFileBlock(STsdbReadHandle* pTsdbReadHandle, int32_t
         // todo refactor, only copy one-by-one
         for (int32_t k = start; k < num + start; ++k) {
           SCellVal sVal = {0};
-          if(tdGetColDataOfRow(&sVal, src, k) < 0){
+          if(tdGetColDataOfRow(&sVal, src, k, pCols->bitmapMode) < 0){
             TASSERT(0);
           }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
index 8b718dbb0e..87459593b5 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
@@ -276,7 +276,7 @@ int tsdbLoadBlockData(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo) {
 }
 
 int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo, const int16_t *colIds,
-                          int numOfColsIds) {
+                          int numOfColsIds, bool mergeBitmap) {
   ASSERT(pBlock->numOfSubBlocks > 0);
   int8_t update = pReadh->pRepo->config.update;
 
@@ -298,6 +298,16 @@ int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo,
       return -1;
   }
 
+  if (mergeBitmap && !tdDataColsIsBitmapI(pReadh->pDCols[0])) {
+    for (int i = 0; i < numOfColsIds; ++i) {
+      SDataCol *pDataCol = pReadh->pDCols[0]->cols + i;
+      if (pDataCol->bitmap) {
+        ASSERT(pDataCol->colId != PRIMARYKEY_TIMESTAMP_COL_ID);
+        tdMergeBitmap(pDataCol->pBitmap, TD_BITMAP_BYTES(pReadh->pDCols[0]->numOfRows), pDataCol->pBitmap);
+      }
+    }
+  }
+
   ASSERT(pReadh->pDCols[0]->numOfRows == pBlock->numOfRows);
   ASSERT(dataColsKeyFirst(pReadh->pDCols[0]) == pBlock->keyFirst);
   ASSERT(dataColsKeyLast(pReadh->pDCols[0]) == pBlock->keyLast);
@@ -499,6 +509,11 @@ static int tsdbLoadBlockDataImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *pDat
   SDFile *pDFile = (pBlock->last) ? TSDB_READ_LAST_FILE(pReadh) : TSDB_READ_DATA_FILE(pReadh);
 
   tdResetDataCols(pDataCols);
+
+  if(tsdbIsSupBlock(pBlock)) {
+    tdDataColsSetBitmapI(pDataCols);
+  }
+
   if (tsdbMakeRoom((void **)(&TSDB_READ_BUF(pReadh)), pBlock->len) < 0) return -1;
 
   SBlockData *pBlockData = (SBlockData *)TSDB_READ_BUF(pReadh);
@@ -692,6 +707,10 @@ static int tsdbLoadBlockDataColsImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *
 
   tdResetDataCols(pDataCols);
 
+  if(tsdbIsSupBlock(pBlock)) {
+    tdDataColsSetBitmapI(pDataCols);
+  }
+
   // If only load timestamp column, no need to load SBlockData part
   if (numOfColIds > 1 && tsdbLoadBlockOffset(pReadh, pBlock) < 0) return -1;
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index 902a2d8d35..07b7d62165 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -465,16 +465,16 @@ static int32_t tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t
  * @return int32_t
  */
 int32_t tsdbUpdateExpiredWindowImpl(STsdb *pTsdb, SSubmitReq *pMsg) {
+  if (atomic_load_16(&REPO_TSMA_NUM(pTsdb)) <= 0) {
+    tsdbTrace("vgId:%d not update expire window since no tSma", REPO_ID(pTsdb));
+    return TSDB_CODE_SUCCESS;
+  }
+
   if (!pTsdb->pMeta) {
     terrno = TSDB_CODE_INVALID_PTR;
     return TSDB_CODE_FAILED;
   }
 
-  if (atomic_load_16(&REPO_TSMA_NUM(pTsdb)) <= 0) {
-    tsdbWarn("vgId:%d not update expire window since no tSma", REPO_ID(pTsdb));
-    return TSDB_CODE_SUCCESS;
-  }
-
   if (tdScanAndConvertSubmitMsg(pMsg) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_FAILED;
   }

From 7e82f381af9aa3a67f4da1e3f74018de98b27509 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 9 Apr 2022 18:24:01 +0800
Subject: [PATCH 76/82] handle except

---
 source/libs/transport/src/transCli.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 0ab2f4e010..d456cb23a4 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -262,8 +262,9 @@ void cliHandleResp(SCliConn* conn) {
     CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle);
     if (pMsg == NULL) {
       transMsg.ahandle = transCtxDumpVal(&conn->ctx, transMsg.msgType);
-      tDebug("cli conn %p construct ahandle %p by %d, persist: 1", conn, transMsg.ahandle, transMsg.msgType);
+      tDebug("cli conn %p construct ahandle %p by %s, persist: 1", conn, transMsg.ahandle, TMSG_INFO(transMsg.msgType));
       if (!CONN_RELEASE_BY_SERVER(conn) && transMsg.ahandle == NULL) {
+        transMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
         transMsg.ahandle = transCtxDumpBrokenlinkVal(&conn->ctx, (int32_t*)&(transMsg.msgType));
         tDebug("cli conn %p construct ahandle %p due brokenlink, persist: 1", conn, transMsg.ahandle);
       }

From c5dadcdb99467572e97dfa94ad09fe02bb01e330 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 18:39:25 +0800
Subject: [PATCH 77/82] <fix>[query]:fix an error reported by compiler.

---
 source/dnode/mnode/impl/src/mndInfoSchema.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c
index d13ac5246e..d60e7f5cf9 100644
--- a/source/dnode/mnode/impl/src/mndInfoSchema.c
+++ b/source/dnode/mnode/impl/src/mndInfoSchema.c
@@ -57,11 +57,6 @@ static const SInfosTableSchema bnodesSchema[] = {
     {.name = "endpoint", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
 };
-static const SInfosTableSchema bnodesSchema[] = {
-    {.name = "id", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
-    {.name = "endpoint", .bytes = 134, .type = TSDB_DATA_TYPE_BINARY},
-    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
-};
 static const SInfosTableSchema clusterSchema[] = {
     {.name = "id", .bytes = 8, .type = TSDB_DATA_TYPE_BIGINT},
     {.name = "name", .bytes = TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},

From 20b36401ac3d657a73d35950e90b47d849c0de33 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 19:03:31 +0800
Subject: [PATCH 78/82] fix[query]:fix limit/offset bug.

---
 source/common/src/tdatablock.c            | 20 +++++++++-----------
 source/libs/executor/src/dataDispatcher.c |  3 +--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 66e7386b9b..053a1a1ee6 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -84,6 +84,14 @@ int32_t colDataGetLength(const SColumnInfoData* pColumnInfoData, int32_t numOfRo
   }
 }
 
+int32_t colDataGetFullLength(const SColumnInfoData* pColumnInfoData, int32_t numOfRows) {
+  if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
+    return pColumnInfoData->varmeta.length + sizeof(int32_t) * numOfRows;
+  } else {
+    return pColumnInfoData->info.bytes * numOfRows + BitmapLen(numOfRows);
+  }
+}
+
 void colDataTrim(SColumnInfoData* pColumnInfoData) {
   // TODO
 }
@@ -353,13 +361,7 @@ size_t blockDataGetSize(const SSDataBlock* pBlock) {
 
   for (int32_t i = 0; i < numOfCols; ++i) {
     SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
-    total += colDataGetLength(pColInfoData, pBlock->info.rows);
-
-    if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
-      total += sizeof(int32_t) * pBlock->info.rows;
-    } else {
-      total += BitmapLen(pBlock->info.rows);
-    }
+    total += colDataGetFullLength(pColInfoData, pBlock->info.rows);
   }
 
   return total;
@@ -656,10 +658,6 @@ double blockDataGetSerialRowSize(const SSDataBlock* pBlock) {
   return rowSize;
 }
 
-int32_t getAllowedRowsForPage(const SSDataBlock* pBlock, size_t pgSize) {
-  return (int32_t) ((pgSize - blockDataGetSerialMetaSize(pBlock))/ blockDataGetSerialRowSize(pBlock));
-}
-
 typedef struct SSDataBlockSortHelper {
   SArray*      orderInfo;  // SArray<SBlockOrderInfo>
   SSDataBlock* pDataBlock;
diff --git a/source/libs/executor/src/dataDispatcher.c b/source/libs/executor/src/dataDispatcher.c
index bd96ab9e56..1edebcd7db 100644
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
@@ -94,8 +94,7 @@ static bool allocBuf(SDataDispatchHandle* pDispatcher, const SInputData* pInput,
 
   // NOTE: there are four bytes of an integer more than the required buffer space.
   // struct size + data payload + length for each column + bitmap length
-  pBuf->allocSize = sizeof(SRetrieveTableRsp) + blockDataGetSerialMetaSize(pInput->pData) +
-                    ceil(blockDataGetSerialRowSize(pInput->pData) * pInput->pData->info.rows);
+  pBuf->allocSize = sizeof(SRetrieveTableRsp) + blockDataGetSerialMetaSize(pInput->pData) + blockDataGetSize(pInput->pData);
 
   pBuf->pData = taosMemoryMalloc(pBuf->allocSize);
   if (pBuf->pData == NULL) {

From 4c182340d0ae52fdc62db8fff9242a4266d9a721 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 19:32:50 +0800
Subject: [PATCH 79/82] fix[query]:disable the assignment of table uid to
 ssdatablock.

---
 source/dnode/vnode/src/tq/tqRead.c | 2 +-
 tests/script/tsim/tmq/basic1.sim   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index fee8bdf27e..c69f8ce09a 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -88,7 +88,7 @@ int tqRetrieveDataBlockInfo(STqReadHandle* pHandle, SDataBlockInfo* pBlockInfo)
 
   pBlockInfo->numOfCols = taosArrayGetSize(pHandle->pColIdList);
   pBlockInfo->rows = pHandle->pBlock->numOfRows;
-  pBlockInfo->uid = pHandle->pBlock->uid;
+//  pBlockInfo->uid = pHandle->pBlock->uid; // the uid can not be assigned to pBlockData.
   return 0;
 }
 
diff --git a/tests/script/tsim/tmq/basic1.sim b/tests/script/tsim/tmq/basic1.sim
index cfcb1ac992..bc827d79f4 100644
--- a/tests/script/tsim/tmq/basic1.sim
+++ b/tests/script/tsim/tmq/basic1.sim
@@ -151,6 +151,7 @@ print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/
 system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_stb_function" -k "group.id:tg2"
 print cmd result----> $system_content
 if $system_content != @{consume success: 20, 0}@ then
+  print expect @{consume success: 20, 0}@, actual: $system_content
   return -1
 endi
 

From d63bff3ffca2b7e5ce0e93a3133583ffccf6d652 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 22:29:05 +0800
Subject: [PATCH 80/82] test[cluster]:disable mnode unit test temporarily.

---
 source/dnode/mnode/impl/test/CMakeLists.txt | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/dnode/mnode/impl/test/CMakeLists.txt b/source/dnode/mnode/impl/test/CMakeLists.txt
index 61201f33c3..d2aa44f372 100644
--- a/source/dnode/mnode/impl/test/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/CMakeLists.txt
@@ -1,17 +1,17 @@
 enable_testing()
 
-add_subdirectory(user)
-add_subdirectory(acct)
-add_subdirectory(trans)
-add_subdirectory(qnode)
-add_subdirectory(snode)
-add_subdirectory(bnode)
-add_subdirectory(show)
-add_subdirectory(profile)
+#add_subdirectory(user)
+#add_subdirectory(acct)
+#add_subdirectory(trans)
+#add_subdirectory(qnode)
+#add_subdirectory(snode)
+#add_subdirectory(bnode)
+#add_subdirectory(show)
+#add_subdirectory(profile)
 add_subdirectory(dnode)
-add_subdirectory(mnode)
+#add_subdirectory(mnode)
 add_subdirectory(db)
 add_subdirectory(stb)
-add_subdirectory(sma)
-add_subdirectory(func)
-add_subdirectory(topic)
+#add_subdirectory(sma)
+#add_subdirectory(func)
+#add_subdirectory(topic)

From 08f0b057217f9c7b8a068ae8bf54d23915f55dff Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 23:28:16 +0800
Subject: [PATCH 81/82] <fix>[query]:fix bug in filter, and update a query
 related test script.

---
 source/libs/executor/src/executorimpl.c |  1 +
 tests/script/tsim/query/stddev.sim      | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index e3e2c650d8..ee5c675989 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3166,6 +3166,7 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock) {
   }
 
   pBlock->info.rows = numOfRow;
+  blockDataUpdateTsWindow(pBlock);
 }
 
 void doSetTableGroupOutputBuf(SAggOperatorInfo* pAggInfo, int32_t numOfOutput, int32_t tableGroupId, SExecTaskInfo* pTaskInfo) {
diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim
index adab1c354d..70a9719b40 100644
--- a/tests/script/tsim/query/stddev.sim
+++ b/tests/script/tsim/query/stddev.sim
@@ -89,13 +89,14 @@ if $data00 != 5.766281297 then
 endi
 
 print =============== step5
-sql select stddev(tbcol) as b from $tb interval(1m)
+sql select _wstartts, stddev(tbcol) as b from $tb interval(1m)
 print ===> $data01 
-if $data01 != 0.000000000 then 
+if $data01 != 0.000000000 then
+  print expect 0.000000000, actual: $data01
   return -1
 endi
 
-sql select stddev(tbcol) as b from $tb interval(1d)
+sql select _wstartts, stddev(tbcol) as b from $tb interval(1d)
 print ===> $data01
 if $data01 != 5.766281297 then 
   return -1
@@ -105,19 +106,24 @@ print =============== step6
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 
-sql select stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
+print select _wstartts, stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
+sql select _wstartts, stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data01
 if $data01 != 0.000000000 then 
   return -1
 endi
-if $rows != 5 then 
+
+print $data00 , $data10 ,  $data20 , $data30 , $data40  , $data50 , $data60
+
+if $rows != 5 then
+  print expect 5, actual: $rows
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 

From 9c9082ce3ff53250f3fa4d1203a43a19b17a97c0 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 23:58:49 +0800
Subject: [PATCH 82/82] fix[query]: fix the filter not active bug.

---
 source/libs/scalar/src/filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index e3c64af978..2e47e19023 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -3715,7 +3715,7 @@ bool filterExecute(SFilterInfo *info, SSDataBlock *pSrc, int8_t** p, SColumnData
 
     FLT_ERR_RET(scalarCalculate(info->sclCtx.node, pList, &output));
     taosArrayDestroy(pList);
-    return true;
+    return false;
   }
 
   return (*info->func)(info, pSrc->info.rows, p, statis, numOfCols);