From e0393347920bf12328688a7824ef227321e30162 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 10 Aug 2022 20:18:54 +0800
Subject: [PATCH 01/98] opti: logic in get table list

---
 source/common/src/tdatablock.c      |   2 +
 source/libs/executor/src/executil.c | 154 ++++++++++++++++++++++++++--
 2 files changed, 148 insertions(+), 8 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index dba30bb876..7692e02a37 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1343,12 +1343,14 @@ SSDataBlock* createDataBlock() {
   SSDataBlock* pBlock = taosMemoryCalloc(1, sizeof(SSDataBlock));
   if (pBlock == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
   }
 
   pBlock->pDataBlock = taosArrayInit(4, sizeof(SColumnInfoData));
   if (pBlock->pDataBlock == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     taosMemoryFree(pBlock);
+    return NULL;
   }
 
   return pBlock;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 34247d3b47..2b2c4cc201 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -298,6 +298,143 @@ int32_t isQualifiedTable(STableKeyInfo* info, SNode* pTagCond, void* metaHandle,
   return TSDB_CODE_SUCCESS;
 }
 
+typedef struct tagFilterAssist{
+  SHashObj *colHash;
+  int32_t   index;
+  SArray   *cInfoList;
+}tagFilterAssist;
+
+static EDealRes getColumn(SNode* pNode, void* pContext) {
+  if (QUERY_NODE_COLUMN == nodeType(pNode)) {
+    tagFilterAssist *pData = (tagFilterAssist *)pContext;
+    SColumnNode* pSColumnNode = (SColumnNode*)pNode;
+    void *data = taosHashGet(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId));
+    if(!data){
+      taosHashPut(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId), &pNode, sizeof(pNode));
+      pSColumnNode->slotId = pData->index++;
+      SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes};
+      taosArrayPush(pData->cInfoList, &cInfo);
+    }
+
+    return DEAL_RES_END;
+  }
+  return DEAL_RES_CONTINUE;
+}
+
+static int32_t createResultData(SDataType* pType, int32_t numOfRows, SScalarParam* pParam) {
+  SColumnInfoData* pColumnData = taosMemoryCalloc(1, sizeof(SColumnInfoData));
+  if (pColumnData == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return terrno;
+  }
+
+  pColumnData->info.type      = pType->type;
+  pColumnData->info.bytes     = pType->bytes;
+  pColumnData->info.scale     = pType->scale;
+  pColumnData->info.precision = pType->precision;
+
+  int32_t code = colInfoDataEnsureCapacity(pColumnData, numOfRows);
+  if (code != TSDB_CODE_SUCCESS) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    taosMemoryFree(pColumnData);
+    return terrno;
+  }
+
+  pParam->columnData = pColumnData;
+  pParam->colAlloced = true;
+  return TSDB_CODE_SUCCESS;
+}
+
+SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* pTagCond){
+  int32_t code = TSDB_CODE_SUCCESS;
+  SArray* pBlockList = NULL;
+  SSDataBlock* pResBlock = NULL;
+  SScalarParam output = {0};
+
+  tagFilterAssist ctx = {0};
+  ctx.colHash = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_SMALLINT), false, HASH_NO_LOCK);
+  if(ctx.colHash == NULL){
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto end;
+  }
+  ctx.index = 0;
+  ctx.cInfoList = taosArrayInit(4, sizeof(SColumnInfo));
+  if(ctx.cInfoList == NULL){
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto end;
+  }
+  nodesWalkExprPostOrder(pTagCond, getColumn, (void *)&ctx);
+
+  pResBlock = createDataBlock();
+  if (pResBlock == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto end;
+  }
+
+  for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
+    SColumnInfoData colInfo = {{0}, 0};
+    colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
+    blockDataAppendColInfo(pResBlock, &colInfo);
+  }
+
+  int32_t rows = taosArrayGetSize(pTableList);
+  code = blockDataEnsureCapacity(pResBlock, rows);
+  if (code != TSDB_CODE_SUCCESS) {
+    terrno = code;
+    goto end;
+  }
+
+  for (int32_t i = 0; i < rows; i++) {
+    STableKeyInfo* info = taosArrayGet(pTableList, i);
+
+    SMetaReader mr = {0};
+    metaReaderInit(&mr, metaHandle, 0);
+    code = metaGetTableEntryByUid(&mr, info->uid);
+    if (TSDB_CODE_SUCCESS == code) {
+      for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
+        SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
+        STagVal tagVal = {0};
+        tagVal.cid = pColInfo->info.colId;
+        const char* p = metaGetTableTagVal(&mr.me, pColInfo->info.type, &tagVal);
+
+        if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
+          char* tmp = taosMemoryCalloc(tagVal.nData + VARSTR_HEADER_SIZE, 1);
+          memcpy(varDataVal(tmp), tagVal.pData, tagVal.nData);
+          varDataSetLen(tmp, tagVal.nData);
+          colDataAppend(pColInfo, i, tmp, p == NULL);
+          taosMemoryFree(tmp);
+        } else {
+          colDataAppend(pColInfo, i, p, p == NULL);
+        }
+      }
+
+    }
+    metaReaderClear(&mr);
+  }
+
+  pBlockList = taosArrayInit(2, POINTER_BYTES);
+  taosArrayPush(pBlockList, &pResBlock);
+
+  SDataType type = {.type = TSDB_DATA_TYPE_BOOL, .bytes = sizeof(bool)};
+  code = createResultData(&type, rows, &output);
+  if (code != TSDB_CODE_SUCCESS) {
+    goto end;
+  }
+
+  code = scalarCalculate(pTagCond, pBlockList, &output);
+  if(code != TSDB_CODE_SUCCESS){
+    terrno = code;
+  }
+
+end:
+  taosArrayDestroy(pBlockList);
+  taosHashCleanup(ctx.colHash);
+  taosArrayDestroy(ctx.cInfoList);
+  blockDataDestroy(pResBlock);
+  taosArrayDestroy(pBlockList);
+  return output.columnData;
+}
+
 int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, SNode* pTagIndexCond,
                      STableListInfo* pListInfo) {
   int32_t code = TSDB_CODE_SUCCESS;
@@ -347,22 +484,23 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
   }
 
   if (pTagCond) {
+    SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->pTableList, pTagCond);
+    if(terrno != TDB_CODE_SUCCESS){
+      colDataDestroy(pColInfoData);
+      return terrno;
+    }
+
     int32_t i = 0;
     while (i < taosArrayGetSize(pListInfo->pTableList)) {
-      STableKeyInfo* info = taosArrayGet(pListInfo->pTableList, i);
+      void* var = POINTER_SHIFT(pColInfoData->pData, i * pColInfoData->info.bytes);
 
-      bool qualified = true;
-      code = isQualifiedTable(info, pTagCond, metaHandle, &qualified);
-      if (code != TSDB_CODE_SUCCESS) {
-        return code;
-      }
-
-      if (!qualified) {
+      if (*(bool*)var == false) {
         taosArrayRemove(pListInfo->pTableList, i);
         continue;
       }
       i++;
     }
+    colDataDestroy(pColInfoData);
   }
 
   pListInfo->pGroupList = taosArrayInit(4, POINTER_BYTES);

From e7f4755386f19c149dc8569372a75700b1237556 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 10 Aug 2022 20:26:59 +0800
Subject: [PATCH 02/98] opti: add log for time cost

---
 source/libs/executor/src/executil.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 2b2c4cc201..63bd30120e 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -384,6 +384,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     goto end;
   }
 
+  int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
     STableKeyInfo* info = taosArrayGet(pTableList, i);
 
@@ -411,6 +412,8 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     }
     metaReaderClear(&mr);
   }
+  int64_t st1 = taosGetTimestampUs();
+  qDebug("generate tag block rows:%d, cost:%lf ms", rows, st1-st);
 
   pBlockList = taosArrayInit(2, POINTER_BYTES);
   taosArrayPush(pBlockList, &pResBlock);
@@ -425,6 +428,8 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
   if(code != TSDB_CODE_SUCCESS){
     terrno = code;
   }
+  int64_t st2 = taosGetTimestampUs();
+  qDebug("calculate tag block rows:%d, cost:%lf ms", rows, st2-st1);
 
 end:
   taosArrayDestroy(pBlockList);

From 8be139626889e79f7aab95ba99530c1fbfcb440e Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 10 Aug 2022 21:31:08 +0800
Subject: [PATCH 03/98] opti: add log for time cost

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

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 63bd30120e..2a2a387e31 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -412,6 +412,8 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     }
     metaReaderClear(&mr);
   }
+  pResBlock->info.rows = rows;
+
   int64_t st1 = taosGetTimestampUs();
   qDebug("generate tag block rows:%d, cost:%lf ms", rows, st1-st);
 
@@ -432,7 +434,6 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
   qDebug("calculate tag block rows:%d, cost:%lf ms", rows, st2-st1);
 
 end:
-  taosArrayDestroy(pBlockList);
   taosHashCleanup(ctx.colHash);
   taosArrayDestroy(ctx.cInfoList);
   blockDataDestroy(pResBlock);

From 4f03e2e4f5f4c550805e43b2107f40786eb994d6 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 11 Aug 2022 14:35:38 +0800
Subject: [PATCH 04/98] opti:logic for get table list

---
 source/libs/executor/src/executil.c | 48 ++++++++++++++++-------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 2a2a387e31..4713eaefe5 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -315,8 +315,6 @@ static EDealRes getColumn(SNode* pNode, void* pContext) {
       SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes};
       taosArrayPush(pData->cInfoList, &cInfo);
     }
-
-    return DEAL_RES_END;
   }
   return DEAL_RES_CONTINUE;
 }
@@ -388,34 +386,42 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
   for (int32_t i = 0; i < rows; i++) {
     STableKeyInfo* info = taosArrayGet(pTableList, i);
 
+//    int64_t stt = taosGetTimestampUs();
     SMetaReader mr = {0};
     metaReaderInit(&mr, metaHandle, 0);
     code = metaGetTableEntryByUid(&mr, info->uid);
-    if (TSDB_CODE_SUCCESS == code) {
-      for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
-        SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
-        STagVal tagVal = {0};
-        tagVal.cid = pColInfo->info.colId;
-        const char* p = metaGetTableTagVal(&mr.me, pColInfo->info.type, &tagVal);
+//    int64_t stt1 = taosGetTimestampUs();
+//    qDebug("generate tag get meta rows:%d, cost:%ld ms", rows, stt1-stt);
 
-        if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
-          char* tmp = taosMemoryCalloc(tagVal.nData + VARSTR_HEADER_SIZE, 1);
-          memcpy(varDataVal(tmp), tagVal.pData, tagVal.nData);
-          varDataSetLen(tmp, tagVal.nData);
-          colDataAppend(pColInfo, i, tmp, p == NULL);
-          taosMemoryFree(tmp);
-        } else {
-          colDataAppend(pColInfo, i, p, p == NULL);
-        }
+    for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
+      SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
+      STagVal tagVal = {0};
+      tagVal.cid = pColInfo->info.colId;
+//        int64_t t1 = taosGetTimestampUs();
+      const char* p = metaGetTableTagVal(&mr.me, pColInfo->info.type, &tagVal);
+//        int64_t t2 = taosGetTimestampUs();
+//        qDebug("generate tag inner1 rows:%d, cost:%ld ms", rows, t2-t1);
+
+      if (p == NULL){
+        colDataAppend(pColInfo, i, p, true);
+      } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
+        char *tmp = (char*)(tagVal.pData - VARSTR_HEADER_SIZE);
+        varDataSetLen(tmp, tagVal.nData);
+        colDataAppend(pColInfo, i, tmp, p == NULL);
+      } else {
+        colDataAppend(pColInfo, i, p, false);
       }
-
+//        int64_t t3 = taosGetTimestampUs();
+//        qDebug("generate tag inner2 rows:%d, cost:%ld ms", rows, t3-t2);
     }
+//    int64_t stt2 = taosGetTimestampUs();
+//    qDebug("generate tag get block rows:%d, cost:%ld us", rows, stt2-stt1);
     metaReaderClear(&mr);
   }
   pResBlock->info.rows = rows;
 
   int64_t st1 = taosGetTimestampUs();
-  qDebug("generate tag block rows:%d, cost:%lf ms", rows, st1-st);
+  qDebug("generate tag block rows:%d, cost:%ld us", rows, st1-st);
 
   pBlockList = taosArrayInit(2, POINTER_BYTES);
   taosArrayPush(pBlockList, &pResBlock);
@@ -431,7 +437,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     terrno = code;
   }
   int64_t st2 = taosGetTimestampUs();
-  qDebug("calculate tag block rows:%d, cost:%lf ms", rows, st2-st1);
+  qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
 
 end:
   taosHashCleanup(ctx.colHash);
@@ -489,7 +495,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
     taosArrayPush(pListInfo->pTableList, &info);
   }
 
-  if (pTagCond) {
+  if (pTagCond && taosArrayGetSize(pListInfo->pTableList) > 0) {
     SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->pTableList, pTagCond);
     if(terrno != TDB_CODE_SUCCESS){
       colDataDestroy(pColInfoData);

From 32f9bc0dd0ac02d948b5999747f3090c51cb6bf1 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 11 Aug 2022 18:29:28 +0800
Subject: [PATCH 05/98] opti:logic for get table list

---
 source/dnode/vnode/inc/vnode.h          |  1 +
 source/dnode/vnode/src/meta/metaQuery.c | 52 +++++++++++++++++++++++++
 source/libs/executor/src/executil.c     | 19 ++++++++-
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 18a7583f4c..e969634a9f 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -91,6 +91,7 @@ typedef struct SMetaEntry  SMetaEntry;
 void        metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
 void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
+//int32_t     metaGetTableEntryByUidTest(void *pReader, SArray *uidList);
 int32_t     metaReadNext(SMetaReader *pReader);
 const void *metaGetTableTagVal(SMetaEntry *pEntry, int16_t type, STagVal *tagVal);
 int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index eed0ae5e14..f5771c17bd 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -53,6 +53,58 @@ _err:
   return -1;
 }
 
+int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
+
+  SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
+  SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
+  SMeta  *pMeta = meta;
+  int64_t version;
+
+  int64_t stt1 = taosGetTimestampUs();
+  for(int i = 0; i < taosArrayGetSize(uidList); i++) {
+    void* ppVal = NULL;
+    int vlen = 0;
+    uint64_t *  uid = taosArrayGet(uidList, i);
+    // query uid.idx
+    if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
+      continue;
+    }
+    version = *(int64_t *)ppVal;
+
+    STbDbKey tbDbKey = {.version = version, .uid = *uid};
+    taosArrayPush(uidVersion, &tbDbKey);
+  }
+  int64_t stt2 = taosGetTimestampUs();
+  qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
+
+  for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
+    SMetaReader pReader = {0};
+
+    STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
+    // query table.db
+    if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
+      continue;
+    }
+    taosArrayPush(readerList, &pReader);
+  }
+  int64_t stt3 = taosGetTimestampUs();
+  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
+
+  for(int i = 0; i < taosArrayGetSize(readerList); i++){
+    SMetaReader* pReader  = taosArrayGet(readerList, i);
+    metaReaderInit(pReader, meta, 0);
+    // decode the entry
+    tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
+
+    if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
+    }
+    metaReaderClear(pReader);
+  }
+  int64_t stt4 = taosGetTimestampUs();
+  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt4-stt3);
+  return 0;
+}
+
 int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
   SMeta  *pMeta = pReader->pMeta;
   int64_t version;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 4713eaefe5..f798433f51 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -382,6 +382,20 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     goto end;
   }
 
+//  int64_t stt = taosGetTimestampUs();
+//  SArray* arrAssist = taosArrayInit(rows, sizeof(SMetaReader));
+//  SArray* uidList = taosArrayInit(rows, sizeof(uint64_t));
+//  for (int32_t i = 0; i < rows; i++) {
+//    STableKeyInfo* info = taosArrayGet(pTableList, i);
+//    taosArrayPush(uidList, &info->uid);
+//  }
+
+//  code = metaGetTableEntryByUidTest(metaHandle, uidList);
+
+//
+//  int64_t stt1 = taosGetTimestampUs();
+//  qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
+
   int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
     STableKeyInfo* info = taosArrayGet(pTableList, i);
@@ -392,7 +406,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     code = metaGetTableEntryByUid(&mr, info->uid);
 //    int64_t stt1 = taosGetTimestampUs();
 //    qDebug("generate tag get meta rows:%d, cost:%ld ms", rows, stt1-stt);
-
+//    SMetaReader *mr = taosArrayGet(arrAssist, i);
     for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
       SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
       STagVal tagVal = {0};
@@ -465,6 +479,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
       SIndexMetaArg metaArg = {
           .metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid};
 
+      int64_t stt = taosGetTimestampUs();
       SArray*       res = taosArrayInit(8, sizeof(uint64_t));
       SIdxFltStatus status = SFLT_NOT_INDEX;
       code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
@@ -481,6 +496,8 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
         taosArrayPush(pListInfo->pTableList, &info);
       }
       taosArrayDestroy(res);
+      int64_t stt1 = taosGetTimestampUs();
+      qDebug("generate table list, cost:%ld us", stt1-stt);
     } else {
       code = vnodeGetAllTableList(pVnode, tableUid, pListInfo->pTableList);
     }

From e102f81f923963b7684a6003cf742da43aea6d5a Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 12 Aug 2022 11:33:53 +0800
Subject: [PATCH 06/98] opti:use suid+uid->tags index to optimize time cost

---
 source/dnode/vnode/inc/vnode.h          |  4 +-
 source/dnode/vnode/src/meta/metaQuery.c | 70 +++++++++++++++++++---
 source/dnode/vnode/src/meta/metaTable.c |  5 +-
 source/libs/executor/src/executil.c     | 79 ++++++++++---------------
 source/libs/executor/src/scanoperator.c |  4 +-
 5 files changed, 103 insertions(+), 59 deletions(-)

diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index e969634a9f..6ad47799e1 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -91,9 +91,9 @@ typedef struct SMetaEntry  SMetaEntry;
 void        metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
 void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
-//int32_t     metaGetTableEntryByUidTest(void *pReader, SArray *uidList);
+int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *tags);
 int32_t     metaReadNext(SMetaReader *pReader);
-const void *metaGetTableTagVal(SMetaEntry *pEntry, int16_t type, STagVal *tagVal);
+const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
 int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
 
 typedef struct SMetaFltParam {
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index f5771c17bd..df22913a0d 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -59,6 +59,7 @@ int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
   SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
   SMeta  *pMeta = meta;
   int64_t version;
+  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
 
   int64_t stt1 = taosGetTimestampUs();
   for(int i = 0; i < taosArrayGetSize(uidList); i++) {
@@ -73,10 +74,31 @@ int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
 
     STbDbKey tbDbKey = {.version = version, .uid = *uid};
     taosArrayPush(uidVersion, &tbDbKey);
+    taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
   }
   int64_t stt2 = taosGetTimestampUs();
   qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
 
+  TBC        *pCur = NULL;
+  tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
+  tdbTbcMoveToFirst(pCur);
+  void *pKey = NULL;
+  int   kLen = 0;
+
+  while(1){
+    SMetaReader pReader = {0};
+    int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
+    if (ret < 0) break;
+    STbDbKey *tmp = (STbDbKey*)pKey;
+    int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
+    if(ver == NULL || *ver != tmp->version) continue;
+    taosArrayPush(readerList, &pReader);
+  }
+  tdbTbcClose(pCur);
+
+  taosArrayClear(readerList);
+  int64_t stt3 = taosGetTimestampUs();
+  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
   for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
     SMetaReader pReader = {0};
 
@@ -87,8 +109,8 @@ int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
     }
     taosArrayPush(readerList, &pReader);
   }
-  int64_t stt3 = taosGetTimestampUs();
-  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
+  int64_t stt4 = taosGetTimestampUs();
+  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
 
   for(int i = 0; i < taosArrayGetSize(readerList); i++){
     SMetaReader* pReader  = taosArrayGet(readerList, i);
@@ -100,8 +122,8 @@ int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
     }
     metaReaderClear(pReader);
   }
-  int64_t stt4 = taosGetTimestampUs();
-  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt4-stt3);
+  int64_t stt5 = taosGetTimestampUs();
+  qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
   return 0;
 }
 
@@ -801,9 +823,8 @@ SArray *metaGetSmaTbUids(SMeta *pMeta) {
 
 #endif
 
-const void *metaGetTableTagVal(SMetaEntry *pEntry, int16_t type, STagVal *val) {
-  ASSERT(pEntry->type == TSDB_CHILD_TABLE);
-  STag *tag = (STag *)pEntry->ctbEntry.pTags;
+const void *metaGetTableTagVal(void *pTag, int16_t type, STagVal *val) {
+  STag *tag = (STag*) pTag;
   if (type == TSDB_DATA_TYPE_JSON) {
     return tag;
   }
@@ -940,3 +961,38 @@ END:
 
   return ret;
 }
+
+int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *tags) {
+  SMCtbCursor *pCur = metaOpenCtbCursor(pMeta, suid);
+
+  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
+  size_t len = taosArrayGetSize(uidList);
+  if(len > 0){
+    for(int i = 0; i < len; i++){
+      int64_t *uid = taosArrayGet(uidList, i);
+      taosHashPut(uHash, uid, sizeof(int64_t), &i, sizeof(i));
+    }
+  }
+  while (1) {
+    tb_uid_t id = metaCtbCursorNext(pCur);
+    if (id == 0) {
+      break;
+    }
+
+    if(len > 0 && taosHashGet(uHash, &id, sizeof(int64_t)) == NULL){
+      continue;
+    }
+
+    void* tag = taosMemoryMalloc(pCur->vLen);
+    memcpy(tag, pCur->pVal, pCur->vLen);
+    taosArrayPush(tags, &tag);
+
+    if(len == 0){
+      taosArrayPush(uidList, &id);
+    }
+  }
+
+  taosHashCleanup(uHash);
+  metaCloseCtbCursor(pCur);
+  return TSDB_CODE_SUCCESS;
+}
diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 7427f79509..86e2f38697 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -864,6 +864,9 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
     metaUpdateTagIdx(pMeta, &ctbEntry);
   }
 
+  SCtbIdxKey ctbIdxKey = {.suid = ctbEntry.ctbEntry.suid, .uid = uid};
+  tdbTbUpsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), ctbEntry.ctbEntry.pTags, ((STag*)(ctbEntry.ctbEntry.pTags))->len, &pMeta->txn);
+
   tDecoderClear(&dc1);
   tDecoderClear(&dc2);
   if (ctbEntry.ctbEntry.pTags) taosMemoryFree((void *)ctbEntry.ctbEntry.pTags);
@@ -1061,7 +1064,7 @@ static int metaUpdateTtlIdx(SMeta *pMeta, const SMetaEntry *pME) {
 
 static int metaUpdateCtbIdx(SMeta *pMeta, const SMetaEntry *pME) {
   SCtbIdxKey ctbIdxKey = {.suid = pME->ctbEntry.suid, .uid = pME->uid};
-  return tdbTbInsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), NULL, 0, &pMeta->txn);
+  return tdbTbInsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), pME->ctbEntry.pTags, ((STag*)(pME->ctbEntry.pTags))->len, &pMeta->txn);
 }
 
 int metaCreateTagIdxKey(tb_uid_t suid, int32_t cid, const void *pTagData, int32_t nTagData, int8_t type, tb_uid_t uid,
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index f798433f51..c8d607185e 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -221,7 +221,7 @@ EDealRes doTranslateTagExpr(SNode** pNode, void* pContext) {
 
     STagVal tagVal = {0};
     tagVal.cid = pSColumnNode->colId;
-    const char* p = metaGetTableTagVal(&mr->me, pSColumnNode->node.resType.type, &tagVal);
+    const char* p = metaGetTableTagVal(mr->me.ctbEntry.pTags, pSColumnNode->node.resType.type, &tagVal);
     if (p == NULL) {
       res->node.resType.type = TSDB_DATA_TYPE_NULL;
     } else if (pSColumnNode->node.resType.type == TSDB_DATA_TYPE_JSON) {
@@ -343,10 +343,11 @@ static int32_t createResultData(SDataType* pType, int32_t numOfRows, SScalarPara
   return TSDB_CODE_SUCCESS;
 }
 
-SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* pTagCond){
+SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidList, SNode* pTagCond){
   int32_t code = TSDB_CODE_SUCCESS;
   SArray* pBlockList = NULL;
   SSDataBlock* pResBlock = NULL;
+  SArray* tags = NULL;
   SScalarParam output = {0};
 
   tagFilterAssist ctx = {0};
@@ -375,35 +376,30 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     blockDataAppendColInfo(pResBlock, &colInfo);
   }
 
-  int32_t rows = taosArrayGetSize(pTableList);
+  int64_t stt = taosGetTimestampUs();
+  tags = taosArrayInit(8, POINTER_BYTES);
+  code = metaGetTableTags(metaHandle, suid, uidList, tags);
+  if (code != TSDB_CODE_SUCCESS) {
+    terrno = code;
+    goto end;
+  }
+
+  int32_t rows = taosArrayGetSize(uidList);
+
+  int64_t stt1 = taosGetTimestampUs();
+  qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
+
   code = blockDataEnsureCapacity(pResBlock, rows);
   if (code != TSDB_CODE_SUCCESS) {
     terrno = code;
     goto end;
   }
 
-//  int64_t stt = taosGetTimestampUs();
-//  SArray* arrAssist = taosArrayInit(rows, sizeof(SMetaReader));
-//  SArray* uidList = taosArrayInit(rows, sizeof(uint64_t));
-//  for (int32_t i = 0; i < rows; i++) {
-//    STableKeyInfo* info = taosArrayGet(pTableList, i);
-//    taosArrayPush(uidList, &info->uid);
-//  }
-
-//  code = metaGetTableEntryByUidTest(metaHandle, uidList);
-
-//
-//  int64_t stt1 = taosGetTimestampUs();
-//  qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
-
   int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
-    STableKeyInfo* info = taosArrayGet(pTableList, i);
-
+    uint64_t* uid = taosArrayGet(uidList, i);
+    void* tag = taosArrayGet(tags, i);
 //    int64_t stt = taosGetTimestampUs();
-    SMetaReader mr = {0};
-    metaReaderInit(&mr, metaHandle, 0);
-    code = metaGetTableEntryByUid(&mr, info->uid);
 //    int64_t stt1 = taosGetTimestampUs();
 //    qDebug("generate tag get meta rows:%d, cost:%ld ms", rows, stt1-stt);
 //    SMetaReader *mr = taosArrayGet(arrAssist, i);
@@ -412,7 +408,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
       STagVal tagVal = {0};
       tagVal.cid = pColInfo->info.colId;
 //        int64_t t1 = taosGetTimestampUs();
-      const char* p = metaGetTableTagVal(&mr.me, pColInfo->info.type, &tagVal);
+      const char* p = metaGetTableTagVal(tag, pColInfo->info.type, &tagVal);
 //        int64_t t2 = taosGetTimestampUs();
 //        qDebug("generate tag inner1 rows:%d, cost:%ld ms", rows, t2-t1);
 
@@ -430,7 +426,6 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
     }
 //    int64_t stt2 = taosGetTimestampUs();
 //    qDebug("generate tag get block rows:%d, cost:%ld us", rows, stt2-stt1);
-    metaReaderClear(&mr);
   }
   pResBlock->info.rows = rows;
 
@@ -454,6 +449,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
   qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
 
 end:
+  taosArrayDestroy(tags);
   taosHashCleanup(ctx.colHash);
   taosArrayDestroy(ctx.cInfoList);
   blockDataDestroy(pResBlock);
@@ -471,8 +467,8 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
   }
 
   uint64_t tableUid = pScanNode->uid;
-
   pListInfo->suid = pScanNode->suid;
+  SArray* res = taosArrayInit(8, sizeof(uint64_t));
 
   if (pScanNode->tableType == TSDB_SUPER_TABLE) {
     if (pTagIndexCond) {
@@ -480,42 +476,24 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
           .metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid};
 
       int64_t stt = taosGetTimestampUs();
-      SArray*       res = taosArrayInit(8, sizeof(uint64_t));
       SIdxFltStatus status = SFLT_NOT_INDEX;
       code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
       if (code != 0 || status == SFLT_NOT_INDEX) {
         qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
-        //        code = TSDB_CODE_INDEX_REBUILDING;
-        code = vnodeGetAllTableList(pVnode, tableUid, pListInfo->pTableList);
-      } else {
-        qDebug("success to get tableIds, size:%d, suid:%" PRIu64, (int)taosArrayGetSize(res), tableUid);
       }
 
-      for (int i = 0; i < taosArrayGetSize(res); i++) {
-        STableKeyInfo info = {.uid = *(uint64_t*)taosArrayGet(res, i), .groupId = 0};
-        taosArrayPush(pListInfo->pTableList, &info);
-      }
-      taosArrayDestroy(res);
       int64_t stt1 = taosGetTimestampUs();
       qDebug("generate table list, cost:%ld us", stt1-stt);
-    } else {
-      code = vnodeGetAllTableList(pVnode, tableUid, pListInfo->pTableList);
-    }
-
-    if (code != TSDB_CODE_SUCCESS) {
-      qError("failed to get tableIds, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
-      terrno = code;
-      return code;
     }
   } else {  // Create one table group.
-    STableKeyInfo info = {.uid = tableUid, .groupId = 0};
-    taosArrayPush(pListInfo->pTableList, &info);
+    taosArrayPush(res, &tableUid);
   }
 
-  if (pTagCond && taosArrayGetSize(pListInfo->pTableList) > 0) {
-    SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->pTableList, pTagCond);
+  if (pTagCond) {
+    SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->suid, res, pTagCond);
     if(terrno != TDB_CODE_SUCCESS){
       colDataDestroy(pColInfoData);
+      taosArrayDestroy(res);
       return terrno;
     }
 
@@ -532,6 +510,13 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
     colDataDestroy(pColInfoData);
   }
 
+  for (int i = 0; i < taosArrayGetSize(res); i++) {
+    STableKeyInfo info = {.uid = *(uint64_t*)taosArrayGet(res, i), .groupId = 0};
+    taosArrayPush(pListInfo->pTableList, &info);
+  }
+
+  taosArrayDestroy(res);
+
   pListInfo->pGroupList = taosArrayInit(4, POINTER_BYTES);
   if (pListInfo->pGroupList == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index a211542de1..61f6474190 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -439,7 +439,7 @@ int32_t addTagPseudoColumnData(SReadHandle* pHandle, SExprInfo* pPseudoExpr, int
     } else {  // these are tags
       STagVal tagVal = {0};
       tagVal.cid = pExpr->base.pParam[0].pCol->colId;
-      const char* p = metaGetTableTagVal(&mr.me, pColInfoData->info.type, &tagVal);
+      const char* p = metaGetTableTagVal(mr.me.ctbEntry.pTags, pColInfoData->info.type, &tagVal);
 
       char* data = NULL;
       if (pColInfoData->info.type != TSDB_DATA_TYPE_JSON && p != NULL) {
@@ -2569,7 +2569,7 @@ static SSDataBlock* doTagScan(SOperatorInfo* pOperator) {
       } else {  // it is a tag value
         STagVal val = {0};
         val.cid = pExprInfo[j].base.pParam[0].pCol->colId;
-        const char* p = metaGetTableTagVal(&mr.me, pDst->info.type, &val);
+        const char* p = metaGetTableTagVal(mr.me.ctbEntry.pTags, pDst->info.type, &val);
 
         char* data = NULL;
         if (pDst->info.type != TSDB_DATA_TYPE_JSON && p != NULL) {

From 95ef68bbc1c8720c3badb1f587529a34adbd89bd Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 12 Aug 2022 11:39:19 +0800
Subject: [PATCH 07/98] opti:use suid+uid->tags index to optimize time cost

---
 source/libs/executor/src/executil.c | 2 +-
 source/util/src/tarray.c            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index c8d607185e..eb6222f15b 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -449,7 +449,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidLi
   qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
 
 end:
-  taosArrayDestroy(tags);
+  taosArrayDestroyP(tags, taosMemoryFree);
   taosHashCleanup(ctx.colHash);
   taosArrayDestroy(ctx.cInfoList);
   blockDataDestroy(pResBlock);
diff --git a/source/util/src/tarray.c b/source/util/src/tarray.c
index 3c4a0a20bd..454739348e 100644
--- a/source/util/src/tarray.c
+++ b/source/util/src/tarray.c
@@ -386,6 +386,7 @@ void* taosArrayDestroy(SArray* pArray) {
 }
 
 void taosArrayDestroyP(SArray* pArray, FDelete fp) {
+  if(!pArray) return;
   for (int32_t i = 0; i < pArray->size; i++) {
     fp(*(void**)TARRAY_GET_ELEM(pArray, i));
   }

From eec58b8ef0ee974dd41533d4000edb8a8ac32b5b Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 12 Aug 2022 13:53:24 +0800
Subject: [PATCH 08/98] opti:use suid+uid->tags index to optimize time cost

---
 source/common/src/tdatablock.c         |  1 +
 source/dnode/vnode/src/meta/metaOpen.c |  2 +-
 source/libs/executor/src/executil.c    | 13 ++++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 7692e02a37..196376e675 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1425,6 +1425,7 @@ size_t blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize) {
 }
 
 void colDataDestroy(SColumnInfoData* pColData) {
+  if(!pColData) return;
   if (IS_VAR_DATA_TYPE(pColData->info.type)) {
     taosMemoryFreeClear(pColData->varmeta.offset);
   } else {
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index 941d2c6d72..89071d0881 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -87,7 +87,7 @@ int metaOpen(SVnode *pVnode, SMeta **ppMeta) {
   }
 
   // open pCtbIdx
-  ret = tdbTbOpen("ctb.idx", sizeof(SCtbIdxKey), 0, ctbIdxKeyCmpr, pMeta->pEnv, &pMeta->pCtbIdx);
+  ret = tdbTbOpen("ctb.idx", sizeof(SCtbIdxKey), -1, ctbIdxKeyCmpr, pMeta->pEnv, &pMeta->pCtbIdx);
   if (ret < 0) {
     metaError("vgId:%d, failed to open meta child table index since %s", TD_VID(pVnode), tstrerror(terrno));
     goto _err;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index eb6222f15b..81192cf2b7 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -385,7 +385,9 @@ SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidLi
   }
 
   int32_t rows = taosArrayGetSize(uidList);
-
+  if(rows == 0){
+    goto end;
+  }
   int64_t stt1 = taosGetTimestampUs();
   qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
 
@@ -397,8 +399,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidLi
 
   int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
-    uint64_t* uid = taosArrayGet(uidList, i);
-    void* tag = taosArrayGet(tags, i);
+    void* tag = taosArrayGetP(tags, i);
 //    int64_t stt = taosGetTimestampUs();
 //    int64_t stt1 = taosGetTimestampUs();
 //    qDebug("generate tag get meta rows:%d, cost:%ld ms", rows, stt1-stt);
@@ -498,16 +499,18 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
     }
 
     int32_t i = 0;
-    while (i < taosArrayGetSize(pListInfo->pTableList)) {
+    while (i < taosArrayGetSize(res) && pColInfoData) {
       void* var = POINTER_SHIFT(pColInfoData->pData, i * pColInfoData->info.bytes);
 
       if (*(bool*)var == false) {
-        taosArrayRemove(pListInfo->pTableList, i);
+        taosArrayRemove(res, i);
         continue;
       }
       i++;
     }
     colDataDestroy(pColInfoData);
+  }else{
+    vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
   }
 
   for (int i = 0; i < taosArrayGetSize(res); i++) {

From 78e87a0aaec281f4efaae19aa06616ae2809d037 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 12 Aug 2022 14:38:54 +0800
Subject: [PATCH 09/98] fix:memory leak

---
 source/libs/executor/src/executil.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 81192cf2b7..42383887ab 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -343,7 +343,7 @@ static int32_t createResultData(SDataType* pType, int32_t numOfRows, SScalarPara
   return TSDB_CODE_SUCCESS;
 }
 
-SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidList, SNode* pTagCond){
+static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidList, SNode* pTagCond){
   int32_t code = TSDB_CODE_SUCCESS;
   SArray* pBlockList = NULL;
   SSDataBlock* pResBlock = NULL;
@@ -400,18 +400,11 @@ SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidLi
   int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
     void* tag = taosArrayGetP(tags, i);
-//    int64_t stt = taosGetTimestampUs();
-//    int64_t stt1 = taosGetTimestampUs();
-//    qDebug("generate tag get meta rows:%d, cost:%ld ms", rows, stt1-stt);
-//    SMetaReader *mr = taosArrayGet(arrAssist, i);
     for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
       SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
       STagVal tagVal = {0};
       tagVal.cid = pColInfo->info.colId;
-//        int64_t t1 = taosGetTimestampUs();
       const char* p = metaGetTableTagVal(tag, pColInfo->info.type, &tagVal);
-//        int64_t t2 = taosGetTimestampUs();
-//        qDebug("generate tag inner1 rows:%d, cost:%ld ms", rows, t2-t1);
 
       if (p == NULL){
         colDataAppend(pColInfo, i, p, true);
@@ -422,11 +415,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray* uidLi
       } else {
         colDataAppend(pColInfo, i, p, false);
       }
-//        int64_t t3 = taosGetTimestampUs();
-//        qDebug("generate tag inner2 rows:%d, cost:%ld ms", rows, t3-t2);
     }
-//    int64_t stt2 = taosGetTimestampUs();
-//    qDebug("generate tag get block rows:%d, cost:%ld us", rows, stt2-stt1);
   }
   pResBlock->info.rows = rows;
 
@@ -494,6 +483,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
     SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->suid, res, pTagCond);
     if(terrno != TDB_CODE_SUCCESS){
       colDataDestroy(pColInfoData);
+      taosMemoryFreeClear(pColInfoData);
       taosArrayDestroy(res);
       return terrno;
     }
@@ -509,6 +499,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
       i++;
     }
     colDataDestroy(pColInfoData);
+    taosMemoryFreeClear(pColInfoData);
   }else{
     vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
   }

From 4f97d72502bfba48732bbdbb3c532172ec4357cb Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 12 Aug 2022 15:02:34 +0800
Subject: [PATCH 10/98] fix:memory leak

---
 source/libs/executor/src/executil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 42383887ab..c157eded69 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -474,6 +474,8 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
 
       int64_t stt1 = taosGetTimestampUs();
       qDebug("generate table list, cost:%ld us", stt1-stt);
+    }else if(!pTagCond){
+      vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
     }
   } else {  // Create one table group.
     taosArrayPush(res, &tableUid);
@@ -500,8 +502,6 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
     }
     colDataDestroy(pColInfoData);
     taosMemoryFreeClear(pColInfoData);
-  }else{
-    vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
   }
 
   for (int i = 0; i < taosArrayGetSize(res); i++) {

From ae7550eb8639ac616d86ff5dcee5a7d23d20ad5b Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Fri, 12 Aug 2022 21:00:48 +0800
Subject: [PATCH 11/98] enh: rsma exec in async mode

---
 include/common/tmsg.h                         |   4 +
 source/dnode/vnode/inc/vnode.h                |   1 +
 source/dnode/vnode/src/inc/sma.h              |  12 +-
 source/dnode/vnode/src/inc/vnodeInt.h         |   2 +-
 source/dnode/vnode/src/sma/smaEnv.c           |   5 +-
 source/dnode/vnode/src/sma/smaRollup.c        |  80 +++++++++--
 source/dnode/vnode/src/tsdb/tsdbRead.c        |  26 ----
 source/dnode/vnode/src/vnd/vnodeQuery.c       |  19 +++
 source/dnode/vnode/src/vnd/vnodeSvr.c         |   4 +-
 source/libs/executor/inc/executil.h           |   3 +-
 source/libs/executor/inc/executorimpl.h       |   2 +-
 source/libs/executor/inc/tsimplehash.h        |  42 ++++--
 source/libs/executor/src/executil.c           |   9 +-
 source/libs/executor/src/executorimpl.c       |  22 +--
 source/libs/executor/src/scanoperator.c       |   4 +-
 source/libs/executor/src/timewindowoperator.c |  54 ++++----
 source/libs/executor/src/tsimplehash.c        | 126 ++++++++++++------
 .../libs/executor/test/tSimpleHashTests.cpp   |  14 +-
 18 files changed, 273 insertions(+), 156 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index df127af256..24092c7e44 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2658,6 +2658,10 @@ typedef struct {
   SEpSet  epSet;
 } SVgEpSet;
 
+typedef struct {
+  int32_t padding;
+} SRSmaExecMsg;
+
 typedef struct {
   int64_t suid;
   int8_t  level;
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 18a7583f4c..e93a62b27b 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -63,6 +63,7 @@ void    vnodeGetInfo(SVnode *pVnode, const char **dbname, int32_t *vgId);
 int32_t vnodeProcessCreateTSma(SVnode *pVnode, void *pCont, uint32_t contLen);
 int32_t vnodeGetAllTableList(SVnode *pVnode, uint64_t uid, SArray *list);
 int32_t vnodeGetCtbIdList(SVnode *pVnode, int64_t suid, SArray *list);
+int32_t vnodeGetStbIdList(SVnode *pVnode, int64_t suid, SArray* list);
 void   *vnodeGetIdx(SVnode *pVnode);
 void   *vnodeGetIvtIdx(SVnode *pVnode);
 
diff --git a/source/dnode/vnode/src/inc/sma.h b/source/dnode/vnode/src/inc/sma.h
index 944d7759b2..fb8352d543 100644
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
@@ -122,17 +122,19 @@ struct SRSmaInfoItem {
 };
 
 struct SRSmaInfo {
-  STSchema *pTSchema;
-  int64_t   suid;
-  int64_t   refId;  // refId of SRSmaStat
-  int8_t    delFlag;
+  STSchema   *pTSchema;
+  STaosQueue *queue;  // buffer queue of SubmitReq
+  STaosQall  *qall;
+  int64_t     suid;
+  int64_t     refId;  // refId of SRSmaStat
+  int8_t      delFlag;
   T_REF_DECLARE()
   SRSmaInfoItem items[TSDB_RETENTION_L2];
   void         *taskInfo[TSDB_RETENTION_L2];   // qTaskInfo_t
   void         *iTaskInfo[TSDB_RETENTION_L2];  // immutable
 };
 
-#define RSMA_INFO_HEAD_LEN     32
+#define RSMA_INFO_HEAD_LEN     offsetof(SRSmaInfo, items)
 #define RSMA_INFO_IS_DEL(r)    ((r)->delFlag == 1)
 #define RSMA_INFO_SET_DEL(r)   ((r)->delFlag = 1)
 #define RSMA_INFO_QTASK(r, i)  ((r)->taskInfo[i])
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 43bb92ec23..513f4da33c 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -169,7 +169,7 @@ int32_t tqProcessTaskDispatchRsp(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRecoverRsp(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRetrieveReq(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRetrieveRsp(STQ* pTq, SRpcMsg* pMsg);
-int32_t tsdbGetStbIdList(SMeta* pMeta, int64_t suid, SArray* list);
+
 
 SSubmitReq* tdBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid,
                             const char* stbFullName, int32_t vgId, SBatchDeleteReq* pDeleteReq);
diff --git a/source/dnode/vnode/src/sma/smaEnv.c b/source/dnode/vnode/src/sma/smaEnv.c
index ccb6ad3a72..50db1123ae 100644
--- a/source/dnode/vnode/src/sma/smaEnv.c
+++ b/source/dnode/vnode/src/sma/smaEnv.c
@@ -264,8 +264,6 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
     atomic_store_8(RSMA_TRIGGER_STAT(pStat), TASK_TRIGGER_STAT_CANCELLED);
 
     // step 2: destroy the rsma info and associated fetch tasks
-    // TODO: use taosHashSetFreeFp when taosHashSetFreeFp is ready.
-#if 1
     if (taosHashGetSize(RSMA_INFO_HASH(pStat)) > 0) {
       void *infoHash = taosHashIterate(RSMA_INFO_HASH(pStat), NULL);
       while (infoHash) {
@@ -274,7 +272,6 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
         infoHash = taosHashIterate(RSMA_INFO_HASH(pStat), infoHash);
       }
     }
-#endif
     taosHashCleanup(RSMA_INFO_HASH(pStat));
 
     // step 3: wait all triggered fetch tasks finished
@@ -292,7 +289,7 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
         nLoops = 0;
       }
     }
-
+    
     // step 4: free pStat
     taosMemoryFreeClear(pStat);
   }
diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index b7a2efd489..1660223d77 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -139,6 +139,14 @@ void *tdFreeRSmaInfo(SSma *pSma, SRSmaInfo *pInfo, bool isDeepFree) {
     if (isDeepFree) {
       taosMemoryFreeClear(pInfo->pTSchema);
     }
+
+    if (isDeepFree) {
+      if (pInfo->queue) taosCloseQueue(pInfo->queue);
+      if (pInfo->qall) taosFreeQall(pInfo->qall);
+      pInfo->queue = NULL;
+      pInfo->qall = NULL;
+    }
+
     taosMemoryFree(pInfo);
   }
 
@@ -179,7 +187,7 @@ static int32_t tdUpdateTbUidListImpl(SSma *pSma, tb_uid_t *suid, SArray *tbUids)
 
   for (int32_t i = 0; i < TSDB_RETENTION_L2; ++i) {
     if (pRSmaInfo->taskInfo[i]) {
-      if ((qUpdateQualifiedTableId(pRSmaInfo->taskInfo[i], tbUids, true) < 0)) {
+      if (((terrno = qUpdateQualifiedTableId(pRSmaInfo->taskInfo[i], tbUids, true)) < 0)) {
         tdReleaseRSmaInfo(pSma, pRSmaInfo);
         smaError("vgId:%d, update tbUidList failed for uid:%" PRIi64 " level %d since %s", SMA_VID(pSma), *suid, i,
                  terrstr());
@@ -351,6 +359,12 @@ int32_t tdProcessRSmaCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, con
     goto _err;
   }
   pRSmaInfo->pTSchema = pTSchema;
+  if (!(pRSmaInfo->queue = taosOpenQueue())) {
+    goto _err;
+  }
+  if (!(pRSmaInfo->qall = taosAllocateQall())) {
+    goto _err;
+  }
   pRSmaInfo->suid = suid;
   pRSmaInfo->refId = RSMA_REF_ID(pStat);
   T_REF_INIT_VAL(pRSmaInfo, 1);
@@ -615,7 +629,7 @@ static int32_t tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSm
   while (1) {
     uint64_t ts;
     int32_t  code = qExecTaskOpt(taskInfo, pResList, &ts);
-    if (code < 0) {      
+    if (code < 0) {
       if (code == TSDB_CODE_QRY_IN_EXEC) {
         break;
       } else {
@@ -662,10 +676,9 @@ static int32_t tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSm
         goto _err;
       }
       taosMemoryFreeClear(pReq);
-      
+
       smaDebug("vgId:%d, process submit req for rsma table %" PRIi64 " level %" PRIi8 " version:%" PRIi64,
                SMA_VID(pSma), suid, pItem->level, output->info.version);
-
     }
   }
 
@@ -841,30 +854,45 @@ int32_t tdProcessRSmaSubmit(SSma *pSma, void *pMsg, int32_t inputType) {
   return TSDB_CODE_SUCCESS;
 }
 
+/**
+ * @brief retrieve rsma meta and init
+ *
+ * @param pSma
+ * @param nTables number of tables of rsma
+ * @return int32_t
+ */
 static int32_t tdRSmaRestoreQTaskInfoInit(SSma *pSma, int64_t *nTables) {
-  SVnode *pVnode = pSma->pVnode;
+  SVnode     *pVnode = pSma->pVnode;
+  SArray     *suidList = NULL;
+  STbUidStore uidStore = {0};
+  SMetaReader mr = {0};
 
-  SArray *suidList = taosArrayInit(1, sizeof(tb_uid_t));
-  if (tsdbGetStbIdList(SMA_META(pSma), 0, suidList) < 0) {
-    taosArrayDestroy(suidList);
+  if (!(suidList = taosArrayInit(1, sizeof(tb_uid_t)))) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  if (vnodeGetStbIdList(pSma->pVnode, 0, suidList) < 0) {
     smaError("vgId:%d, failed to restore rsma env since get stb id list error: %s", TD_VID(pVnode), terrstr());
-    return TSDB_CODE_FAILED;
+    goto _err;
   }
 
   int64_t arrSize = taosArrayGetSize(suidList);
 
-  if (nTables) {
-    *nTables = arrSize;
-  }
-
   if (arrSize == 0) {
+    if (nTables) {
+      *nTables = 0;
+    }
     taosArrayDestroy(suidList);
     smaDebug("vgId:%d, no need to restore rsma env since empty stb id list", TD_VID(pVnode));
     return TSDB_CODE_SUCCESS;
   }
 
-  SMetaReader mr = {0};
+  int64_t nRsmaTables = 0;
   metaReaderInit(&mr, SMA_META(pSma), 0);
+  if (!(uidStore.tbUids = taosArrayInit(1024, sizeof(tb_uid_t)))) {
+    goto _err;
+  }
   for (int64_t i = 0; i < arrSize; ++i) {
     tb_uid_t suid = *(tb_uid_t *)taosArrayGet(suidList, i);
     smaDebug("vgId:%d, rsma restore, suid is %" PRIi64, TD_VID(pVnode), suid);
@@ -877,6 +905,7 @@ static int32_t tdRSmaRestoreQTaskInfoInit(SSma *pSma, int64_t *nTables) {
     ASSERT(mr.me.type == TSDB_SUPER_TABLE);
     ASSERT(mr.me.uid == suid);
     if (TABLE_IS_ROLLUP(mr.me.flags)) {
+      ++nRsmaTables;
       SRSmaParam *param = &mr.me.stbEntry.rsmaParam;
       for (int i = 0; i < TSDB_RETENTION_L2; ++i) {
         smaDebug("vgId:%d, rsma restore, table:%" PRIi64 " level:%d, maxdelay:%" PRIi64 " watermark:%" PRIi64
@@ -887,17 +916,40 @@ static int32_t tdRSmaRestoreQTaskInfoInit(SSma *pSma, int64_t *nTables) {
         smaError("vgId:%d, rsma restore env failed for %" PRIi64 " since %s", TD_VID(pVnode), suid, terrstr());
         goto _err;
       }
+
+      // reload all ctbUids for suid
+      uidStore.suid = suid;
+      if (vnodeGetCtbIdList(pVnode, suid, uidStore.tbUids) < 0) {
+        smaError("vgId:%d, rsma restore, get ctb idlist failed for %" PRIi64 " since %s", TD_VID(pVnode), suid,
+                 terrstr());
+        goto _err;
+      }
+
+      if (tdUpdateTbUidList(pVnode->pSma, &uidStore) < 0) {
+        smaError("vgId:%d, rsma restore, update tb uid list failed for %" PRIi64 " since %s", TD_VID(pVnode), suid,
+                 terrstr());
+        goto _err;
+      }
+
+      taosArrayClear(uidStore.tbUids);
+
       smaDebug("vgId:%d, rsma restore env success for %" PRIi64, TD_VID(pVnode), suid);
     }
   }
 
   metaReaderClear(&mr);
   taosArrayDestroy(suidList);
+  tdUidStoreDestory(&uidStore);
+
+  if (nTables) {
+    *nTables = nRsmaTables;
+  }
 
   return TSDB_CODE_SUCCESS;
 _err:
   metaReaderClear(&mr);
   taosArrayDestroy(suidList);
+  tdUidStoreDestory(&uidStore);
 
   return TSDB_CODE_FAILED;
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 0831f3d75a..335b311d00 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -2585,32 +2585,6 @@ void* tsdbGetIvtIdx(SMeta* pMeta) {
 
 uint64_t getReaderMaxVersion(STsdbReader* pReader) { return pReader->verRange.maxVer; }
 
-/**
- * @brief Get all suids since suid
- *
- * @param pMeta
- * @param suid return all suids in one vnode if suid is 0
- * @param list
- * @return int32_t
- */
-int32_t tsdbGetStbIdList(SMeta* pMeta, int64_t suid, SArray* list) {
-  SMStbCursor* pCur = metaOpenStbCursor(pMeta, suid);
-  if (!pCur) {
-    return TSDB_CODE_FAILED;
-  }
-
-  while (1) {
-    tb_uid_t id = metaStbCursorNext(pCur);
-    if (id == 0) {
-      break;
-    }
-
-    taosArrayPush(list, &id);
-  }
-
-  metaCloseStbCursor(pCur);
-  return TSDB_CODE_SUCCESS;
-}
 
 // ====================================== EXPOSED APIs ======================================
 int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* pTableList, STsdbReader** ppReader,
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index d55f1796ad..8d799e919d 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -424,6 +424,25 @@ int32_t vnodeGetCtbIdList(SVnode *pVnode, int64_t suid, SArray *list) {
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t vnodeGetStbIdList(SVnode* pVnode, int64_t suid, SArray* list) {
+  SMStbCursor* pCur = metaOpenStbCursor(pVnode->pMeta, suid);
+  if (!pCur) {
+    return TSDB_CODE_FAILED;
+  }
+
+  while (1) {
+    tb_uid_t id = metaStbCursorNext(pCur);
+    if (id == 0) {
+      break;
+    }
+
+    taosArrayPush(list, &id);
+  }
+
+  metaCloseStbCursor(pCur);
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t vnodeGetCtbNum(SVnode *pVnode, int64_t suid, int64_t *num) {
   SMCtbCursor *pCur = metaOpenCtbCursor(pVnode->pMeta, suid);
   if (!pCur) {
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index d5c5e18668..3a25933ec4 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -522,7 +522,9 @@ static int32_t vnodeProcessCreateTbReq(SVnode *pVnode, int64_t version, void *pR
   }
 
   tqUpdateTbUidList(pVnode->pTq, tbUids, true);
-  tdUpdateTbUidList(pVnode->pSma, pStore);
+  if (tdUpdateTbUidList(pVnode->pSma, pStore) < 0) {
+    goto _exit;
+  }
   tdUidStoreFree(pStore);
 
   // prepare rsp
diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index 52c73f85f5..58b2c1b095 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -22,6 +22,7 @@
 #include "tbuffer.h"
 #include "tcommon.h"
 #include "tpagedbuf.h"
+#include "tsimplehash.h"
 
 #define SET_RES_WINDOW_KEY(_k, _ori, _len, _uid)     \
   do {                                               \
@@ -102,7 +103,7 @@ static FORCE_INLINE void setResultBufPageDirty(SDiskbasedBuf* pBuf, SResultRowPo
   setBufPageDirty(pPage, true);
 }
 
-void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SHashObj* pHashmap, int32_t order);
+void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, int32_t order);
 void cleanupGroupResInfo(SGroupResInfo* pGroupResInfo);
 
 void initMultiResInfoFromArrayList(SGroupResInfo* pGroupResInfo, SArray* pArrayList);
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 410bab341c..b7b0d5123e 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -296,7 +296,7 @@ enum {
 };
 
 typedef struct SAggSupporter {
-    SHashObj*      pResultRowHashTable;  // quick locate the window object for each result
+    SSHashObj*     pResultRowHashTable;  // quick locate the window object for each result
     char*          keyBuf;               // window key buffer
     SDiskbasedBuf* pResultBuf;           // query result buffer based on blocked-wised disk file
     int32_t        resultRowSize;        // the result buffer size for each result row, with the meta data size for each row
diff --git a/source/libs/executor/inc/tsimplehash.h b/source/libs/executor/inc/tsimplehash.h
index a56f8e8c04..4c5a80e2f1 100644
--- a/source/libs/executor/inc/tsimplehash.h
+++ b/source/libs/executor/inc/tsimplehash.h
@@ -17,7 +17,6 @@
 #define TDENGINE_TSIMPLEHASH_H
 
 #include "tarray.h"
-#include "tlockfree.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,6 +26,10 @@ typedef uint32_t (*_hash_fn_t)(const char *, uint32_t);
 typedef int32_t (*_equal_fn_t)(const void *, const void *, size_t len);
 typedef void (*_hash_free_fn_t)(void *);
 
+/**
+ * @brief single thread hash
+ * 
+ */
 typedef struct SSHashObj SSHashObj;
 
 /**
@@ -36,7 +39,7 @@ typedef struct SSHashObj SSHashObj;
  * @param fn          hash function to generate the hash value
  * @return
  */
-SSHashObj *tSimpleHashInit(size_t capacity, _hash_fn_t fn, size_t keyLen, size_t dataLen);
+SSHashObj *tSimpleHashInit(size_t capacity, _hash_fn_t fn);
 
 /**
  * return the size of hash table
@@ -48,22 +51,26 @@ int32_t tSimpleHashGetSize(const SSHashObj *pHashObj);
 int32_t tSimpleHashPrint(const SSHashObj *pHashObj);
 
 /**
- * put element into hash table, if the element with the same key exists, update it
- * @param pHashObj
- * @param key
- * @param data
- * @return
+ * @brief put element into hash table, if the element with the same key exists, update it
+ * 
+ * @param pHashObj 
+ * @param key 
+ * @param keyLen 
+ * @param data 
+ * @param dataLen 
+ * @return int32_t 
  */
-int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, const void *data);
+int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, const void *data, size_t dataLen);
 
 /**
  * return the payload data with the specified key
  *
  * @param pHashObj
  * @param key
+ * @param keyLen
  * @return
  */
-void *tSimpleHashGet(SSHashObj *pHashObj, const void *key);
+void *tSimpleHashGet(SSHashObj *pHashObj, const void *key, size_t keyLen);
 
 /**
  * remove item with the specified key
@@ -71,7 +78,7 @@ void *tSimpleHashGet(SSHashObj *pHashObj, const void *key);
  * @param key
  * @param keyLen
  */
-int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key);
+int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key, size_t keyLen);
 
 /**
  * Clear the hash table.
@@ -98,7 +105,7 @@ size_t tSimpleHashGetMemSize(const SSHashObj *pHashObj);
  * @param keyLen
  * @return
  */
-void *tSimpleHashGetKey(const SSHashObj* pHashObj, void *data, size_t* keyLen);
+void *tSimpleHashGetKey(void *data, size_t* keyLen);
 
 /**
  * Create the hash table iterator
@@ -109,7 +116,18 @@ void *tSimpleHashGetKey(const SSHashObj* pHashObj, void *data, size_t* keyLen);
  */
 void *tSimpleHashIterate(const SSHashObj *pHashObj, void *data, int32_t *iter);
 
+/**
+ * Create the hash table iterator
+ * 
+ * @param pHashObj 
+ * @param data 
+ * @param key 
+ * @param iter 
+ * @return void* 
+ */
+void *tSimpleHashIterateKV(const SSHashObj *pHashObj, void *data, void **key, int32_t *iter);
+
 #ifdef __cplusplus
 }
 #endif
-#endif  // TDENGINE_TSIMPLEHASH_H
+#endif  // TDENGINE_TSIMPLEHASH_H
\ No newline at end of file
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 34247d3b47..2e6bd312f3 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -97,7 +97,7 @@ int32_t resultrowComparAsc(const void* p1, const void* p2) {
 
 static int32_t resultrowComparDesc(const void* p1, const void* p2) { return resultrowComparAsc(p2, p1); }
 
-void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SHashObj* pHashmap, int32_t order) {
+void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, int32_t order) {
   if (pGroupResInfo->pRows != NULL) {
     taosArrayDestroy(pGroupResInfo->pRows);
   }
@@ -106,9 +106,10 @@ void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SHashObj* pHashmap, int
   void* pData = NULL;
   pGroupResInfo->pRows = taosArrayInit(10, POINTER_BYTES);
 
-  size_t keyLen = 0;
-  while ((pData = taosHashIterate(pHashmap, pData)) != NULL) {
-    void* key = taosHashGetKey(pData, &keyLen);
+  size_t  keyLen = 0;
+  int32_t iter = 0;
+  while ((pData = tSimpleHashIterate(pHashmap, pData, &iter)) != NULL) {
+    void* key = tSimpleHashGetKey(pData, &keyLen);
 
     SResKeyPos* p = taosMemoryMalloc(keyLen + sizeof(SResultRowPosition));
 
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index be129cb6b4..4709d1818c 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -250,7 +250,7 @@ SResultRow* doSetResultOutBufByKey(SDiskbasedBuf* pResultBuf, SResultRowInfo* pR
   SET_RES_WINDOW_KEY(pSup->keyBuf, pData, bytes, groupId);
 
   SResultRowPosition* p1 =
-      (SResultRowPosition*)taosHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)tSimpleHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
 
   SResultRow* pResult = NULL;
 
@@ -292,7 +292,7 @@ SResultRow* doSetResultOutBufByKey(SDiskbasedBuf* pResultBuf, SResultRowInfo* pR
 
     // add a new result set for a new group
     SResultRowPosition pos = {.pageId = pResult->pageId, .offset = pResult->offset};
-    taosHashPut(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), &pos,
+    tSimpleHashPut(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), &pos,
                 sizeof(SResultRowPosition));
   }
 
@@ -301,7 +301,7 @@ SResultRow* doSetResultOutBufByKey(SDiskbasedBuf* pResultBuf, SResultRowInfo* pR
 
   // too many time window in query
   if (pTaskInfo->execModel == OPTR_EXEC_MODEL_BATCH &&
-      taosHashGetSize(pSup->pResultRowHashTable) > MAX_INTERVAL_TIME_WINDOW) {
+      tSimpleHashGetSize(pSup->pResultRowHashTable) > MAX_INTERVAL_TIME_WINDOW) {
     longjmp(pTaskInfo->env, TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW);
   }
 
@@ -3013,7 +3013,7 @@ int32_t aggEncodeResultRow(SOperatorInfo* pOperator, char** result, int32_t* len
   }
   SOptrBasicInfo* pInfo = (SOptrBasicInfo*)(pOperator->info);
   SAggSupporter*  pSup = (SAggSupporter*)POINTER_SHIFT(pOperator->info, sizeof(SOptrBasicInfo));
-  int32_t         size = taosHashGetSize(pSup->pResultRowHashTable);
+  int32_t         size = tSimpleHashGetSize(pSup->pResultRowHashTable);
   size_t          keyLen = sizeof(uint64_t) * 2;  // estimate the key length
   int32_t         totalSize =
       sizeof(int32_t) + sizeof(int32_t) + size * (sizeof(int32_t) + keyLen + sizeof(int32_t) + pSup->resultRowSize);
@@ -3041,9 +3041,10 @@ int32_t aggEncodeResultRow(SOperatorInfo* pOperator, char** result, int32_t* len
   setBufPageDirty(pPage, true);
   releaseBufPage(pSup->pResultBuf, pPage);
 
-  void* pIter = taosHashIterate(pSup->pResultRowHashTable, NULL);
+  int32_t iter = 0;
+  void*   pIter = tSimpleHashIterate(pSup->pResultRowHashTable, NULL, &iter);
   while (pIter) {
-    void*               key = taosHashGetKey(pIter, &keyLen);
+    void*               key = tSimpleHashGetKey(pIter, &keyLen);
     SResultRowPosition* p1 = (SResultRowPosition*)pIter;
 
     pPage = (SFilePage*)getBufPage(pSup->pResultBuf, p1->pageId);
@@ -3075,7 +3076,7 @@ int32_t aggEncodeResultRow(SOperatorInfo* pOperator, char** result, int32_t* len
     memcpy(*result + offset, pRow, pSup->resultRowSize);
     offset += pSup->resultRowSize;
 
-    pIter = taosHashIterate(pSup->pResultRowHashTable, pIter);
+    pIter = tSimpleHashIterate(pSup->pResultRowHashTable, pIter, &iter);
   }
 
   *(int32_t*)(*result) = offset;
@@ -3110,7 +3111,7 @@ int32_t aggDecodeResultRow(SOperatorInfo* pOperator, char* result) {
 
     // add a new result set for a new group
     SResultRowPosition pos = {.pageId = resultRow->pageId, .offset = resultRow->offset};
-    taosHashPut(pSup->pResultRowHashTable, result + offset, keyLen, &pos, sizeof(SResultRowPosition));
+    tSimpleHashPut(pSup->pResultRowHashTable, result + offset, keyLen, &pos, sizeof(SResultRowPosition));
 
     offset += keyLen;
     int32_t valueLen = *(int32_t*)(result + offset);
@@ -3407,7 +3408,8 @@ int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t n
 
   pAggSup->resultRowSize = getResultRowSize(pCtx, numOfOutput);
   pAggSup->keyBuf = taosMemoryCalloc(1, keyBufSize + POINTER_BYTES + sizeof(int64_t));
-  pAggSup->pResultRowHashTable = taosHashInit(10, hashFn, true, HASH_NO_LOCK);
+  // pAggSup->pResultRowHashTable = taosHashInit(10, hashFn, true, HASH_NO_LOCK);
+  pAggSup->pResultRowHashTable = tSimpleHashInit(100000, hashFn);
 
   if (pAggSup->keyBuf == NULL || pAggSup->pResultRowHashTable == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
@@ -3433,7 +3435,7 @@ int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t n
 
 void cleanupAggSup(SAggSupporter* pAggSup) {
   taosMemoryFreeClear(pAggSup->keyBuf);
-  taosHashCleanup(pAggSup->pResultRowHashTable);
+  tSimpleHashCleanup(pAggSup->pResultRowHashTable);
   destroyDiskbasedBuf(pAggSup->pResultBuf);
 }
 
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index d8de8df163..c404fca597 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -178,8 +178,8 @@ static SResultRow* getTableGroupOutputBuf(SOperatorInfo* pOperator, uint64_t gro
 
   STableScanInfo* pTableScanInfo = pOperator->info;
 
-  SResultRowPosition* p1 =
-      (SResultRowPosition*)taosHashGet(pTableScanInfo->pdInfo.pAggSup->pResultRowHashTable, buf, GET_RES_WINDOW_KEY_LEN(sizeof(groupId)));
+  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(pTableScanInfo->pdInfo.pAggSup->pResultRowHashTable, buf,
+                                                               GET_RES_WINDOW_KEY_LEN(sizeof(groupId)));
 
   if (p1 == NULL) {
     return NULL;
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 6778e97d7a..abc1a76d74 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1383,7 +1383,7 @@ bool doClearWindow(SAggSupporter* pAggSup, SExprSupp* pSup, char* pData, int16_t
                    int32_t numOfOutput) {
   SET_RES_WINDOW_KEY(pAggSup->keyBuf, pData, bytes, groupId);
   SResultRowPosition* p1 =
-      (SResultRowPosition*)taosHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)tSimpleHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   if (!p1) {
     // window has been closed
     return false;
@@ -1396,14 +1396,14 @@ bool doDeleteIntervalWindow(SAggSupporter* pAggSup, TSKEY ts, uint64_t groupId)
   size_t bytes = sizeof(TSKEY);
   SET_RES_WINDOW_KEY(pAggSup->keyBuf, &ts, bytes, groupId);
   SResultRowPosition* p1 =
-      (SResultRowPosition*)taosHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)tSimpleHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   if (!p1) {
     // window has been closed
     return false;
   }
   // SFilePage* bufPage = getBufPage(pAggSup->pResultBuf, p1->pageId);
   // dBufSetBufPageRecycled(pAggSup->pResultBuf, bufPage);
-  taosHashRemove(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+  tSimpleHashRemove(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   return true;
 }
 
@@ -1453,11 +1453,12 @@ static void doClearWindows(SAggSupporter* pAggSup, SExprSupp* pSup1, SInterval*
   }
 }
 
-static int32_t getAllIntervalWindow(SHashObj* pHashMap, SHashObj* resWins) {
+static int32_t getAllIntervalWindow(SSHashObj* pHashMap, SHashObj* resWins) {
   void*  pIte = NULL;
   size_t keyLen = 0;
-  while ((pIte = taosHashIterate(pHashMap, pIte)) != NULL) {
-    void*    key = taosHashGetKey(pIte, &keyLen);
+  int32_t iter = 0;
+  while ((pIte = tSimpleHashIterate(pHashMap, pIte, &iter)) != NULL) {
+    void*    key = tSimpleHashGetKey(pIte, &keyLen);
     uint64_t groupId = *(uint64_t*)key;
     ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
     TSKEY               ts = *(int64_t*)((char*)key + sizeof(uint64_t));
@@ -1470,16 +1471,18 @@ static int32_t getAllIntervalWindow(SHashObj* pHashMap, SHashObj* resWins) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t closeIntervalWindow(SHashObj* pHashMap, STimeWindowAggSupp* pSup, SInterval* pInterval,
+static int32_t closeIntervalWindow(SSHashObj* pHashMap, STimeWindowAggSupp* pSup, SInterval* pInterval,
                                    SHashObj* pPullDataMap, SHashObj* closeWins, SArray* pRecyPages,
                                    SDiskbasedBuf* pDiscBuf) {
   qDebug("===stream===close interval window");
   void*  pIte = NULL;
-  size_t keyLen = 0;
-  while ((pIte = taosHashIterate(pHashMap, pIte)) != NULL) {
-    void*    key = taosHashGetKey(pIte, &keyLen);
+  void*   key = NULL;
+  size_t  keyLen = GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY));
+  int32_t iter = 0;
+  while ((pIte = tSimpleHashIterateKV(pHashMap, pIte, &key, &iter)) != NULL) {
+    // void*    key = tSimpleHashGetKey(pIte, &keyLen);
     uint64_t groupId = *(uint64_t*)key;
-    ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
+    // ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
     TSKEY       ts = *(int64_t*)((char*)key + sizeof(uint64_t));
     STimeWindow win;
     win.skey = ts;
@@ -1515,7 +1518,7 @@ static int32_t closeIntervalWindow(SHashObj* pHashMap, STimeWindowAggSupp* pSup,
       }
       char keyBuf[GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY))];
       SET_RES_WINDOW_KEY(keyBuf, &ts, sizeof(TSKEY), groupId);
-      taosHashRemove(pHashMap, keyBuf, keyLen);
+      tSimpleHashRemove(pHashMap, keyBuf, keyLen);
     }
   }
   return TSDB_CODE_SUCCESS;
@@ -2853,7 +2856,7 @@ bool hasIntervalWindow(SAggSupporter* pSup, TSKEY ts, uint64_t groupId) {
   int32_t bytes = sizeof(TSKEY);
   SET_RES_WINDOW_KEY(pSup->keyBuf, &ts, bytes, groupId);
   SResultRowPosition* p1 =
-      (SResultRowPosition*)taosHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)tSimpleHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   return p1 != NULL;
 }
 
@@ -2894,8 +2897,9 @@ static void rebuildIntervalWindow(SStreamFinalIntervalOperatorInfo* pInfo, SExpr
 
 bool isDeletedWindow(STimeWindow* pWin, uint64_t groupId, SAggSupporter* pSup) {
   SET_RES_WINDOW_KEY(pSup->keyBuf, &pWin->skey, sizeof(int64_t), groupId);
-  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(pSup->pResultRowHashTable, pSup->keyBuf,
-                                                            GET_RES_WINDOW_KEY_LEN(sizeof(int64_t)));
+  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(pSup->pResultRowHashTable, pSup->keyBuf,
+                                                               GET_RES_WINDOW_KEY_LEN(sizeof(int64_t)));
+
   return p1 == NULL;
 }
 
@@ -3023,7 +3027,7 @@ static void doHashInterval(SOperatorInfo* pOperatorInfo, SSDataBlock* pSDataBloc
 }
 
 static void clearStreamIntervalOperator(SStreamFinalIntervalOperatorInfo* pInfo) {
-  taosHashClear(pInfo->aggSup.pResultRowHashTable);
+  tSimpleHashClear(pInfo->aggSup.pResultRowHashTable);
   clearDiskbasedBuf(pInfo->aggSup.pResultBuf);
   cleanupResultRowInfo(&pInfo->binfo.resultRowInfo);
   initResultRowInfo(&pInfo->binfo.resultRowInfo);
@@ -4938,14 +4942,14 @@ static int32_t outputMergeAlignedIntervalResult(SOperatorInfo* pOperatorInfo, ui
   SExprSupp*                pSup = &pOperatorInfo->exprSupp;
 
   SET_RES_WINDOW_KEY(iaInfo->aggSup.keyBuf, &wstartTs, TSDB_KEYSIZE, tableGroupId);
-  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
-                                                            GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(
+      iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
   ASSERT(p1 != NULL);
 
   finalizeResultRowIntoResultDataBlock(iaInfo->aggSup.pResultBuf, p1, pSup->pCtx, pSup->pExprInfo, pSup->numOfExprs,
                                        pSup->rowEntryInfoOffset, pResultBlock, pTaskInfo);
-  taosHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
-  ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
+  tSimpleHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -4968,7 +4972,7 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR
 
   // there is an result exists
   if (miaInfo->curTs != INT64_MIN) {
-    ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
+    ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
 
     if (ts != miaInfo->curTs) {
       outputMergeAlignedIntervalResult(pOperatorInfo, tableGroupId, pResultBlock, miaInfo->curTs);
@@ -4976,7 +4980,7 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR
     }
   } else {
     miaInfo->curTs = ts;
-    ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
+    ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
   }
 
   STimeWindow win = {0};
@@ -5053,7 +5057,7 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
     if (pBlock == NULL) {
       // close last unfinalized time window
       if (miaInfo->curTs != INT64_MIN) {
-        ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
+        ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
         outputMergeAlignedIntervalResult(pOperator, miaInfo->groupId, pRes, miaInfo->curTs);
         miaInfo->curTs = INT64_MIN;
       }
@@ -5231,12 +5235,12 @@ static int32_t finalizeWindowResult(SOperatorInfo* pOperatorInfo, uint64_t table
   SExprSupp*                     pExprSup = &pOperatorInfo->exprSupp;
 
   SET_RES_WINDOW_KEY(iaInfo->aggSup.keyBuf, &win->skey, TSDB_KEYSIZE, tableGroupId);
-  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
+  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
                                                             GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
   ASSERT(p1 != NULL);
   finalizeResultRowIntoResultDataBlock(iaInfo->aggSup.pResultBuf, p1, pExprSup->pCtx, pExprSup->pExprInfo,
                                        pExprSup->numOfExprs, pExprSup->rowEntryInfoOffset, pResultBlock, pTaskInfo);
-  taosHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  tSimpleHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/source/libs/executor/src/tsimplehash.c b/source/libs/executor/src/tsimplehash.c
index 7989ad2b5a..dbb50f958d 100644
--- a/source/libs/executor/src/tsimplehash.c
+++ b/source/libs/executor/src/tsimplehash.c
@@ -14,7 +14,6 @@
  */
 
 #include "tsimplehash.h"
-#include "os.h"
 #include "taoserror.h"
 
 #define SHASH_DEFAULT_LOAD_FACTOR 0.75
@@ -31,19 +30,21 @@
     taosMemoryFreeClear(_n); \
   } while (0);
 
+#pragma pack(push, 4)
 typedef struct SHNode {
   struct SHNode *next;
+  uint32_t       keyLen : 20;
+  uint32_t       dataLen : 12;
   char           data[];
 } SHNode;
+#pragma pack(pop)
 
 struct SSHashObj {
   SHNode    **hashList;
   size_t      capacity;  // number of slots
-  int64_t     size;      // number of elements in hash table
-  _hash_fn_t  hashFp;    // hash function
-  _equal_fn_t equalFp;   // equal function
-  int32_t     keyLen;
-  int32_t     dataLen;
+  int64_t     size;     // number of elements in hash table
+  _hash_fn_t  hashFp;   // hash function
+  _equal_fn_t equalFp;  // equal function
 };
 
 static FORCE_INLINE int32_t taosHashCapacity(int32_t length) {
@@ -54,7 +55,7 @@ static FORCE_INLINE int32_t taosHashCapacity(int32_t length) {
   return i;
 }
 
-SSHashObj *tSimpleHashInit(size_t capacity, _hash_fn_t fn, size_t keyLen, size_t dataLen) {
+SSHashObj *tSimpleHashInit(size_t capacity, _hash_fn_t fn) {
   ASSERT(fn != NULL);
 
   if (capacity == 0) {
@@ -74,8 +75,6 @@ SSHashObj *tSimpleHashInit(size_t capacity, _hash_fn_t fn, size_t keyLen, size_t
   pHashObj->hashFp = fn;
   ASSERT((pHashObj->capacity & (pHashObj->capacity - 1)) == 0);
 
-  pHashObj->keyLen = keyLen;
-  pHashObj->dataLen = dataLen;
 
   pHashObj->hashList = (SHNode **)taosMemoryCalloc(pHashObj->capacity, sizeof(void *));
   if (!pHashObj->hashList) {
@@ -93,16 +92,17 @@ int32_t tSimpleHashGetSize(const SSHashObj *pHashObj) {
   return (int32_t)atomic_load_64((int64_t *)&pHashObj->size);
 }
 
-static SHNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, size_t dsize, uint32_t hashVal) {
-  SHNode *pNewNode = taosMemoryMalloc(sizeof(SHNode) + keyLen + dsize);
+static SHNode *doCreateHashNode(const void *key, size_t keyLen, const void *data, size_t dataLen, uint32_t hashVal) {
+  SHNode *pNewNode = taosMemoryMalloc(sizeof(SHNode) + keyLen + dataLen);
   if (!pNewNode) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return NULL;
   }
-
+  pNewNode->keyLen = keyLen;
+  pNewNode->dataLen = dataLen;
   pNewNode->next = NULL;
-  memcpy(GET_SHASH_NODE_DATA(pNewNode), pData, dsize);
-  memcpy(GET_SHASH_NODE_KEY(pNewNode, dsize), key, keyLen);
+  memcpy(GET_SHASH_NODE_DATA(pNewNode), data, dataLen);
+  memcpy(GET_SHASH_NODE_KEY(pNewNode, dataLen), key, keyLen);
   return pNewNode;
 }
 
@@ -141,8 +141,8 @@ static void taosHashTableResize(SSHashObj *pHashObj) {
     SHNode *pPrev = NULL;
 
     while (pNode != NULL) {
-      void    *key = GET_SHASH_NODE_KEY(pNode, pHashObj->dataLen);
-      uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)pHashObj->keyLen);
+      void    *key = GET_SHASH_NODE_KEY(pNode, pNode->dataLen);
+      uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)pNode->keyLen);
 
       int32_t newIdx = HASH_INDEX(hashVal, pHashObj->capacity);
       pNext = pNode->next;
@@ -170,12 +170,12 @@ static void taosHashTableResize(SSHashObj *pHashObj) {
   //         ((double)pHashObj->size) / pHashObj->capacity, (et - st) / 1000.0);
 }
 
-int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, const void *data) {
+int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, const void *data, size_t dataLen) {
   if (!pHashObj || !key) {
     return -1;
   }
 
-  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)pHashObj->keyLen);
+  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)keyLen);
 
   // need the resize process, write lock applied
   if (SHASH_NEED_RESIZE(pHashObj)) {
@@ -186,7 +186,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, const void *data) {
 
   SHNode *pNode = pHashObj->hashList[slot];
   if (!pNode) {
-    SHNode *pNewNode = doCreateHashNode(key, pHashObj->keyLen, data, pHashObj->dataLen, hashVal);
+    SHNode *pNewNode = doCreateHashNode(key, keyLen, data, dataLen, hashVal);
     if (!pNewNode) {
       return -1;
     }
@@ -197,14 +197,14 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, const void *data) {
   }
 
   while (pNode) {
-    if ((*(pHashObj->equalFp))(GET_SHASH_NODE_KEY(pNode, pHashObj->dataLen), key, pHashObj->keyLen) == 0) {
+    if ((*(pHashObj->equalFp))(GET_SHASH_NODE_KEY(pNode, pNode->dataLen), key, keyLen) == 0) {
       break;
     }
     pNode = pNode->next;
   }
 
   if (!pNode) {
-    SHNode *pNewNode = doCreateHashNode(key, pHashObj->keyLen, data, pHashObj->dataLen, hashVal);
+    SHNode *pNewNode = doCreateHashNode(key, keyLen, data, dataLen, hashVal);
     if (!pNewNode) {
       return -1;
     }
@@ -212,16 +212,16 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, const void *data) {
     pHashObj->hashList[slot] = pNewNode;
     atomic_add_fetch_64(&pHashObj->size, 1);
   } else {  // update data
-    memcpy(GET_SHASH_NODE_DATA(pNode), data, pHashObj->dataLen);
+    memcpy(GET_SHASH_NODE_DATA(pNode), data, dataLen);
   }
 
   return 0;
 }
 
-static FORCE_INLINE SHNode *doSearchInEntryList(SSHashObj *pHashObj, const void *key, int32_t index) {
+static FORCE_INLINE SHNode *doSearchInEntryList(SSHashObj *pHashObj, const void *key, size_t keyLen, int32_t index) {
   SHNode *pNode = pHashObj->hashList[index];
   while (pNode) {
-    if ((*(pHashObj->equalFp))(GET_SHASH_NODE_KEY(pNode, pHashObj->dataLen), key, pHashObj->keyLen) == 0) {
+    if ((*(pHashObj->equalFp))(GET_SHASH_NODE_KEY(pNode, pNode->dataLen), key, keyLen) == 0) {
       break;
     }
 
@@ -233,12 +233,12 @@ static FORCE_INLINE SHNode *doSearchInEntryList(SSHashObj *pHashObj, const void
 
 static FORCE_INLINE bool taosHashTableEmpty(const SSHashObj *pHashObj) { return tSimpleHashGetSize(pHashObj) == 0; }
 
-void *tSimpleHashGet(SSHashObj *pHashObj, const void *key) {
+void *tSimpleHashGet(SSHashObj *pHashObj, const void *key, size_t keyLen) {
   if (!pHashObj || taosHashTableEmpty(pHashObj) || !key) {
     return NULL;
   }
 
-  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)pHashObj->keyLen);
+  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)keyLen);
 
   int32_t slot = HASH_INDEX(hashVal, pHashObj->capacity);
   SHNode *pNode = pHashObj->hashList[slot];
@@ -247,7 +247,7 @@ void *tSimpleHashGet(SSHashObj *pHashObj, const void *key) {
   }
 
   char *data = NULL;
-  pNode = doSearchInEntryList(pHashObj, key, slot);
+  pNode = doSearchInEntryList(pHashObj, key, keyLen, slot);
   if (pNode != NULL) {
     data = GET_SHASH_NODE_DATA(pNode);
   }
@@ -255,19 +255,19 @@ void *tSimpleHashGet(SSHashObj *pHashObj, const void *key) {
   return data;
 }
 
-int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key) {
+int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key, size_t keyLen) {
   if (!pHashObj || !key) {
     return TSDB_CODE_FAILED;
   }
 
-  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)pHashObj->keyLen);
+  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)keyLen);
 
   int32_t slot = HASH_INDEX(hashVal, pHashObj->capacity);
 
   SHNode *pNode = pHashObj->hashList[slot];
   SHNode *pPrev = NULL;
   while (pNode) {
-    if ((*(pHashObj->equalFp))(GET_SHASH_NODE_KEY(pNode, pHashObj->dataLen), key, pHashObj->keyLen) == 0) {
+    if ((*(pHashObj->equalFp))(GET_SHASH_NODE_KEY(pNode, pNode->dataLen), key, keyLen) == 0) {
       if (!pPrev) {
         pHashObj->hashList[slot] = pNode->next;
       } else {
@@ -312,6 +312,7 @@ void tSimpleHashCleanup(SSHashObj *pHashObj) {
 
   tSimpleHashClear(pHashObj);
   taosMemoryFreeClear(pHashObj->hashList);
+  taosMemoryFree(pHashObj);
 }
 
 size_t tSimpleHashGetMemSize(const SSHashObj *pHashObj) {
@@ -322,23 +323,13 @@ size_t tSimpleHashGetMemSize(const SSHashObj *pHashObj) {
   return (pHashObj->capacity * sizeof(void *)) + sizeof(SHNode) * tSimpleHashGetSize(pHashObj) + sizeof(SSHashObj);
 }
 
-void *tSimpleHashGetKey(const SSHashObj *pHashObj, void *data, size_t *keyLen) {
-#if 0
-  int32_t offset = offsetof(SHNode, data);
-  SHNode *node = ((SHNode *)(char *)data - offset);
+void *tSimpleHashGetKey(void *data, size_t *keyLen) {
+  SHNode *node = (SHNode *)((char *)data - offsetof(SHNode, data));
   if (keyLen) {
-    *keyLen = pHashObj->keyLen;
+    *keyLen = node->keyLen;
   }
 
-  return POINTER_SHIFT(data, pHashObj->dataLen);
-
-  return GET_SHASH_NODE_KEY(node, pHashObj->dataLen);
-#endif
-  if (keyLen) {
-    *keyLen = pHashObj->keyLen;
-  }
-
-  return POINTER_SHIFT(data, pHashObj->dataLen);
+  return POINTER_SHIFT(data, node->dataLen);
 }
 
 void *tSimpleHashIterate(const SSHashObj *pHashObj, void *data, int32_t *iter) {
@@ -376,5 +367,52 @@ void *tSimpleHashIterate(const SSHashObj *pHashObj, void *data, int32_t *iter) {
     return GET_SHASH_NODE_DATA(pNode);
   }
 
+  return NULL;
+}
+
+void *tSimpleHashIterateKV(const SSHashObj *pHashObj, void *data, void **key, int32_t *iter) {
+  if (!pHashObj) {
+    return NULL;
+  }
+
+  SHNode *pNode = NULL;
+
+  if (!data) {
+    for (int32_t i = 0; i < pHashObj->capacity; ++i) {
+      pNode = pHashObj->hashList[i];
+      if (!pNode) {
+        continue;
+      }
+      *iter = i;
+      if (key) {
+        *key = GET_SHASH_NODE_KEY(pNode, pNode->dataLen);
+      }
+      return GET_SHASH_NODE_DATA(pNode);
+    }
+    return NULL;
+  }
+
+  pNode = (SHNode *)((char *)data - offsetof(SHNode, data));
+
+  if (pNode->next) {
+    if (key) {
+      *key = GET_SHASH_NODE_KEY(pNode->next, pNode->next->dataLen);
+    }
+    return GET_SHASH_NODE_DATA(pNode->next);
+  }
+
+  ++(*iter);
+  for (int32_t i = *iter; i < pHashObj->capacity; ++i) {
+    pNode = pHashObj->hashList[i];
+    if (!pNode) {
+      continue;
+    }
+    *iter = i;
+    if (key) {
+      *key = GET_SHASH_NODE_KEY(pNode, pNode->dataLen);
+    }
+    return GET_SHASH_NODE_DATA(pNode);
+  }
+
   return NULL;
 }
\ No newline at end of file
diff --git a/source/libs/executor/test/tSimpleHashTests.cpp b/source/libs/executor/test/tSimpleHashTests.cpp
index a17a7146ea..acb6d434b4 100644
--- a/source/libs/executor/test/tSimpleHashTests.cpp
+++ b/source/libs/executor/test/tSimpleHashTests.cpp
@@ -32,31 +32,33 @@
 
 TEST(testCase, tSimpleHashTest) {
   SSHashObj *pHashObj =
-      tSimpleHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), sizeof(int64_t), sizeof(int64_t));
+      tSimpleHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT));
 
   assert(pHashObj != nullptr);
 
   ASSERT_EQ(0, tSimpleHashGetSize(pHashObj));
 
+  size_t keyLen = sizeof(int64_t);
+  size_t dataLen = sizeof(int64_t);
+
   int64_t originKeySum = 0;
   for (int64_t i = 1; i <= 100; ++i) {
     originKeySum += i;
-    tSimpleHashPut(pHashObj, (const void *)&i, (const void *)&i);
+    tSimpleHashPut(pHashObj, (const void *)&i, keyLen, (const void *)&i, dataLen);
     ASSERT_EQ(i, tSimpleHashGetSize(pHashObj));
   }
 
   for (int64_t i = 1; i <= 100; ++i) {
-    void *data = tSimpleHashGet(pHashObj, (const void *)&i);
+    void *data = tSimpleHashGet(pHashObj, (const void *)&i, keyLen);
     ASSERT_EQ(i, *(int64_t *)data);
   }
 
-
   void   *data = NULL;
   int32_t iter = 0;
   int64_t keySum = 0;
   int64_t dataSum = 0;
   while ((data = tSimpleHashIterate(pHashObj, data, &iter))) {
-    void *key = tSimpleHashGetKey(pHashObj, data, NULL);
+    void *key = tSimpleHashGetKey(data, NULL);
     keySum += *(int64_t *)key;
     dataSum += *(int64_t *)data;
   }
@@ -65,7 +67,7 @@ TEST(testCase, tSimpleHashTest) {
   ASSERT_EQ(keySum, originKeySum);
 
   for (int64_t i = 1; i <= 100; ++i) {
-    tSimpleHashRemove(pHashObj, (const void *)&i);
+    tSimpleHashRemove(pHashObj, (const void *)&i, keyLen);
     ASSERT_EQ(100 - i, tSimpleHashGetSize(pHashObj));
   }
 

From 37f6d1195c26e715e260cbbe5c9b598c10ce37b8 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 12 Aug 2022 21:57:29 +0800
Subject: [PATCH 12/98] fix:error in get table list

---
 source/dnode/vnode/src/meta/metaTable.c |  1 +
 source/libs/executor/src/executil.c     | 85 ++++++++++++++++++-------
 2 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 4a92b5233a..a253381449 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -1065,6 +1065,7 @@ static int metaUpdateTtlIdx(SMeta *pMeta, const SMetaEntry *pME) {
 
 static int metaUpdateCtbIdx(SMeta *pMeta, const SMetaEntry *pME) {
   SCtbIdxKey ctbIdxKey = {.suid = pME->ctbEntry.suid, .uid = pME->uid};
+
   return tdbTbInsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), pME->ctbEntry.pTags, ((STag*)(pME->ctbEntry.pTags))->len, &pMeta->txn);
 }
 
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index c157eded69..2a43751707 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -304,18 +304,37 @@ typedef struct tagFilterAssist{
   SArray   *cInfoList;
 }tagFilterAssist;
 
-static EDealRes getColumn(SNode* pNode, void* pContext) {
-  if (QUERY_NODE_COLUMN == nodeType(pNode)) {
-    tagFilterAssist *pData = (tagFilterAssist *)pContext;
-    SColumnNode* pSColumnNode = (SColumnNode*)pNode;
-    void *data = taosHashGet(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId));
-    if(!data){
-      taosHashPut(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId), &pNode, sizeof(pNode));
-      pSColumnNode->slotId = pData->index++;
-      SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes};
-      taosArrayPush(pData->cInfoList, &cInfo);
+static EDealRes getColumn(SNode** pNode, void* pContext) {
+  SColumnNode* pSColumnNode = NULL;
+  if (QUERY_NODE_COLUMN == nodeType((*pNode))) {
+    pSColumnNode = *(SColumnNode**)pNode;
+  }else if(QUERY_NODE_FUNCTION == nodeType((*pNode))){
+    SFunctionNode* pFuncNode = *(SFunctionNode**)(pNode);
+    if (pFuncNode->funcType == FUNCTION_TYPE_TBNAME) {
+      pSColumnNode = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
+      if (NULL == pSColumnNode) {
+        return DEAL_RES_ERROR;
+      }
+      pSColumnNode->colId = -1;
+      pSColumnNode->colType = COLUMN_TYPE_TBNAME;
+      pSColumnNode->node.resType.type = TSDB_DATA_TYPE_VARCHAR;
+      pSColumnNode->node.resType.bytes = TSDB_TABLE_FNAME_LEN - 1 + VARSTR_HEADER_SIZE;
+      nodesDestroyNode(*pNode);
+      *pNode = (SNode*)pSColumnNode;
     }
+  }else{
+    return DEAL_RES_CONTINUE;
   }
+
+  tagFilterAssist *pData = (tagFilterAssist *)pContext;
+  void *data = taosHashGet(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId));
+  if(!data){
+    taosHashPut(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId), pNode, sizeof((*pNode)));
+    pSColumnNode->slotId = pData->index++;
+    SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes};
+    taosArrayPush(pData->cInfoList, &cInfo);
+  }
+
   return DEAL_RES_CONTINUE;
 }
 
@@ -362,7 +381,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     goto end;
   }
-  nodesWalkExprPostOrder(pTagCond, getColumn, (void *)&ctx);
+
+  nodesRewriteExprPostOrder(&pTagCond, getColumn, (void *)&ctx);
 
   pResBlock = createDataBlock();
   if (pResBlock == NULL) {
@@ -400,20 +420,30 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
   int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
     void* tag = taosArrayGetP(tags, i);
+    int64_t* uid = taosArrayGet(uidList, i);
     for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
       SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
-      STagVal tagVal = {0};
-      tagVal.cid = pColInfo->info.colId;
-      const char* p = metaGetTableTagVal(tag, pColInfo->info.type, &tagVal);
+      if(pColInfo->info.colId == -1){     // tbname
+        char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
+        metaGetTableNameByUid(metaHandle, *uid, str);
+        colDataAppend(pColInfo, i, str, false);
+        qDebug("tbnameget uid:%ld, tbname:%s", *uid, str+2);
+      }else{
+        STagVal tagVal = {0};
+        tagVal.cid = pColInfo->info.colId;
+        const char* p = metaGetTableTagVal(tag, pColInfo->info.type, &tagVal);
 
-      if (p == NULL){
-        colDataAppend(pColInfo, i, p, true);
-      } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
-        char *tmp = (char*)(tagVal.pData - VARSTR_HEADER_SIZE);
-        varDataSetLen(tmp, tagVal.nData);
-        colDataAppend(pColInfo, i, tmp, p == NULL);
-      } else {
-        colDataAppend(pColInfo, i, p, false);
+        if (p == NULL){
+          colDataAppend(pColInfo, i, p, true);
+        } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
+          char *tmp = taosMemoryMalloc(tagVal.nData + VARSTR_HEADER_SIZE);
+          varDataSetLen(tmp, tagVal.nData);
+          memcpy(tmp + VARSTR_HEADER_SIZE, tagVal.pData, tagVal.nData);
+          colDataAppend(pColInfo, i, tmp, false);
+          taosMemoryFree(tmp);
+        } else {
+          colDataAppend(pColInfo, i, (const char*)&tagVal.i64, false);
+        }
       }
     }
   }
@@ -491,14 +521,20 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
     }
 
     int32_t i = 0;
-    while (i < taosArrayGetSize(res) && pColInfoData) {
-      void* var = POINTER_SHIFT(pColInfoData->pData, i * pColInfoData->info.bytes);
+    int32_t j = 0;
+    int32_t len = taosArrayGetSize(res);
+    while (i < taosArrayGetSize(res) && j < len && pColInfoData) {
+      void* var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes);
 
+      int64_t* uid = taosArrayGet(res, i);
+      qDebug("tbnameget get uid:%ld, res:%d", *uid, *(bool*)var);
       if (*(bool*)var == false) {
         taosArrayRemove(res, i);
+        j++;
         continue;
       }
       i++;
+      j++;
     }
     colDataDestroy(pColInfoData);
     taosMemoryFreeClear(pColInfoData);
@@ -507,6 +543,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
   for (int i = 0; i < taosArrayGetSize(res); i++) {
     STableKeyInfo info = {.uid = *(uint64_t*)taosArrayGet(res, i), .groupId = 0};
     taosArrayPush(pListInfo->pTableList, &info);
+    qDebug("tbnameget get uid:%ld", info.uid);
   }
 
   taosArrayDestroy(res);

From dab6c81769d5292f9b149d6d0cc0d443e925a7d1 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Mon, 15 Aug 2022 00:16:44 +0800
Subject: [PATCH 13/98] enh: rsma batch process

---
 include/common/tmsg.h                       |   2 +-
 include/common/tmsgdef.h                    |   1 +
 include/util/taoserror.h                    |   1 +
 source/dnode/mgmt/mgmt_vnode/src/vmHandle.c |   1 +
 source/dnode/vnode/src/inc/sma.h            |  53 +--
 source/dnode/vnode/src/inc/vnodeInt.h       |   1 +
 source/dnode/vnode/src/sma/smaCommit.c      | 145 +++++----
 source/dnode/vnode/src/sma/smaEnv.c         |   4 +-
 source/dnode/vnode/src/sma/smaRollup.c      | 339 +++++++++++++++++---
 source/dnode/vnode/src/sma/smaTimeRange.c   |   2 +-
 source/dnode/vnode/src/sma/smaUtil.c        |  32 +-
 source/dnode/vnode/src/vnd/vnodeSvr.c       |   2 +
 source/libs/executor/src/executor.c         |   2 +-
 source/libs/executor/src/tsimplehash.c      |  13 +-
 source/util/src/terror.c                    |   1 +
 15 files changed, 425 insertions(+), 174 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 4454c061ae..a283b7c9c1 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2660,7 +2660,7 @@ typedef struct {
 } SVgEpSet;
 
 typedef struct {
-  int32_t padding;
+  // padding
 } SRSmaExecMsg;
 
 typedef struct {
diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index 6462c7afbf..2bf840fd01 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -201,6 +201,7 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_SUBMIT_RSMA, "vnode-submit-rsma", SSubmitReq, SSubmitRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_FETCH_RSMA, "vnode-fetch-rsma", SRSmaFetchMsg, NULL)
+  TD_DEF_MSG_TYPE(TDMT_VND_EXEC_RSMA, "vnode-exec-rsma", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_DELETE, "delete-data", SVDeleteReq, SVDeleteRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_BATCH_DEL, "batch-delete", SBatchDeleteReq, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_ALTER_CONFIG, "alter-config", NULL, NULL)
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index 3ca6978156..2d41874912 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -614,6 +614,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_RSMA_REMOVE_EXISTS             TAOS_DEF_ERROR_CODE(0, 0x3154)
 #define TSDB_CODE_RSMA_FETCH_MSG_MSSED_UP        TAOS_DEF_ERROR_CODE(0, 0x3155)
 #define TSDB_CODE_RSMA_EMPTY_INFO                TAOS_DEF_ERROR_CODE(0, 0x3156)
+#define TSDB_CODE_RSMA_INVALID_SCHEMA            TAOS_DEF_ERROR_CODE(0, 0x3157)
 
 //index
 #define TSDB_CODE_INDEX_REBUILDING               TAOS_DEF_ERROR_CODE(0, 0x3200)
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index 7c6807ab87..1b4efeca7a 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -338,6 +338,7 @@ SArray *vmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_SCH_MERGE_QUERY, vmPutMsgToQueryQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_SCH_QUERY_CONTINUE, vmPutMsgToQueryQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_FETCH_RSMA, vmPutMsgToQueryQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_VND_EXEC_RSMA, vmPutMsgToQueryQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_SCH_FETCH, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_SCH_MERGE_FETCH, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_TABLE, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
diff --git a/source/dnode/vnode/src/inc/sma.h b/source/dnode/vnode/src/inc/sma.h
index fb8352d543..bc204e032d 100644
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
@@ -57,9 +57,10 @@ typedef struct {
   void   *tmrHandle;  // shared by all fetch tasks
 } SSmaMgmt;
 
-#define SMA_ENV_LOCK(env) (&(env)->lock)
-#define SMA_ENV_TYPE(env) ((env)->type)
-#define SMA_ENV_STAT(env) ((env)->pStat)
+#define SMA_ENV_LOCK(env)  (&(env)->lock)
+#define SMA_ENV_TYPE(env)  ((env)->type)
+#define SMA_ENV_STAT(env)  ((env)->pStat)
+#define SMA_RSMA_STAT(sma) ((SRSmaStat *)SMA_ENV_STAT((SSmaEnv *)(sma)->pRSmaEnv))
 
 struct STSmaStat {
   int8_t    state;  // ETsdbSmaStat
@@ -86,17 +87,19 @@ struct SQTaskFWriter {
 };
 
 struct SRSmaStat {
-  SSma     *pSma;
-  int64_t   commitAppliedVer;  // vnode applied version for async commit
-  int64_t   refId;             // shared by fetch tasks
-  SRWLatch  lock;              // r/w lock for rsma fs(e.g. qtaskinfo)
-  int8_t    triggerStat;       // shared by fetch tasks
-  int8_t    commitStat;        // 0 not in committing, 1 in committing
-  SArray   *aTaskFile;         // qTaskFiles committed recently(for recovery/snapshot r/w)
-  SHashObj *rsmaInfoHash;      // key: stbUid, value: SRSmaInfo;
-  SHashObj *iRsmaInfoHash;     // key: stbUid, value: SRSmaInfo; immutable rsmaInfoHash
+  SSma            *pSma;
+  int64_t          commitAppliedVer;  // vnode applied version for async commit
+  int64_t          refId;             // shared by fetch tasks
+  volatile int64_t qBufSize;          // queue buffer size
+  SRWLatch         lock;              // r/w lock for rsma fs(e.g. qtaskinfo)
+  int8_t           triggerStat;       // shared by fetch tasks
+  int8_t           commitStat;        // 0 not in committing, 1 in committing
+  int8_t           execStat;          // 0 not in exec , 1 in exec
+  SArray          *aTaskFile;         // qTaskFiles committed recently(for recovery/snapshot r/w)
+  SHashObj        *rsmaInfoHash;      // key: stbUid, value: SRSmaInfo;
 };
 
+
 struct SSmaStat {
   union {
     STSmaStat tsmaStat;  // time-range-wise sma
@@ -105,10 +108,9 @@ struct SSmaStat {
   T_REF_DECLARE()
 };
 
-#define SMA_TSMA_STAT(s)      (&(s)->tsmaStat)
-#define SMA_RSMA_STAT(s)      (&(s)->rsmaStat)
+#define SMA_STAT_TSMA(s)      (&(s)->tsmaStat)
+#define SMA_STAT_RSMA(s)      (&(s)->rsmaStat)
 #define RSMA_INFO_HASH(r)     ((r)->rsmaInfoHash)
-#define RSMA_IMU_INFO_HASH(r) ((r)->iRsmaInfoHash)
 #define RSMA_TRIGGER_STAT(r)  (&(r)->triggerStat)
 #define RSMA_COMMIT_STAT(r)   (&(r)->commitStat)
 #define RSMA_REF_ID(r)        ((r)->refId)
@@ -122,23 +124,25 @@ struct SRSmaInfoItem {
 };
 
 struct SRSmaInfo {
-  STSchema   *pTSchema;
-  STaosQueue *queue;  // buffer queue of SubmitReq
-  STaosQall  *qall;
-  int64_t     suid;
-  int64_t     refId;  // refId of SRSmaStat
-  int8_t      delFlag;
+  STSchema *pTSchema;
+  int64_t   suid;
+  int64_t   refId;  // refId of SRSmaStat
+  int8_t    delFlag;
   T_REF_DECLARE()
   SRSmaInfoItem items[TSDB_RETENTION_L2];
   void         *taskInfo[TSDB_RETENTION_L2];   // qTaskInfo_t
-  void         *iTaskInfo[TSDB_RETENTION_L2];  // immutable
+  STaosQueue   *queue;                         // buffer queue of SubmitReq
+  STaosQall    *qall;                          // buffer qall of SubmitReq
+  void         *iTaskInfo[TSDB_RETENTION_L2];  // immutable qTaskInfo_t
+  STaosQueue   *iQueue;                        // immutable buffer queue of SubmitReq
+  STaosQall    *iQall;                         // immutable buffer qall of SubmitReq
 };
 
 #define RSMA_INFO_HEAD_LEN     offsetof(SRSmaInfo, items)
 #define RSMA_INFO_IS_DEL(r)    ((r)->delFlag == 1)
 #define RSMA_INFO_SET_DEL(r)   ((r)->delFlag = 1)
 #define RSMA_INFO_QTASK(r, i)  ((r)->taskInfo[i])
-#define RSMA_INFO_IQTASK(r, i) ((r)->iTaskInfo[i])
+#define RSMA_INFO_IQTASK(r, i)  ((r)->iTaskInfo[i])
 #define RSMA_INFO_ITEM(r, i)   (&(r)->items[i])
 
 enum {
@@ -230,12 +234,13 @@ static FORCE_INLINE void tdSmaStatSetDropped(STSmaStat *pTStat) {
 
 void           tdRSmaQTaskInfoGetFileName(int32_t vid, int64_t version, char *outputName);
 void           tdRSmaQTaskInfoGetFullName(int32_t vid, int64_t version, const char *path, char *outputName);
-int32_t        tdCloneRSmaInfo(SSma *pSma, SRSmaInfo **pDest, SRSmaInfo *pSrc);
+int32_t        tdCloneRSmaInfo(SSma *pSma, SRSmaInfo *pInfo);
 void           tdFreeQTaskInfo(qTaskInfo_t *taskHandle, int32_t vgId, int32_t level);
 static int32_t tdDestroySmaState(SSmaStat *pSmaStat, int8_t smaType);
 void          *tdFreeSmaState(SSmaStat *pSmaStat, int8_t smaType);
 void          *tdFreeRSmaInfo(SSma *pSma, SRSmaInfo *pInfo, bool isDeepFree);
 int32_t        tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash);
+int32_t        tdRSmaProcessExecImpl(SSma *pSma);
 
 int32_t tdProcessRSmaCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, const char *tbName);
 int32_t tdProcessRSmaRestoreImpl(SSma *pSma, int8_t type, int64_t qtaskFileVer);
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 1cc8e1bb27..f85a3d8361 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -188,6 +188,7 @@ int32_t smaAsyncCommit(SSma* pSma);
 int32_t smaAsyncPostCommit(SSma* pSma);
 int32_t smaDoRetention(SSma* pSma, int64_t now);
 int32_t smaProcessFetch(SSma* pSma, void* pMsg);
+int32_t smaProcessExec(SSma* pSma, void* pMsg);
 
 int32_t tdProcessTSmaCreate(SSma* pSma, int64_t version, const char* msg);
 int32_t tdProcessTSmaInsert(SSma* pSma, int64_t indexUid, const char* msg);
diff --git a/source/dnode/vnode/src/sma/smaCommit.c b/source/dnode/vnode/src/sma/smaCommit.c
index 373cfdfb47..807c033489 100644
--- a/source/dnode/vnode/src/sma/smaCommit.c
+++ b/source/dnode/vnode/src/sma/smaCommit.c
@@ -83,8 +83,7 @@ int32_t smaBegin(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaStat  *pStat = SMA_ENV_STAT(pSmaEnv);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pStat);
+  SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
 
   int8_t rsmaTriggerStat =
       atomic_val_compare_exchange_8(RSMA_TRIGGER_STAT(pRSmaStat), TASK_TRIGGER_STAT_PAUSED, TASK_TRIGGER_STAT_ACTIVE);
@@ -122,8 +121,8 @@ static int32_t tdProcessRSmaSyncPreCommitImpl(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaStat  *pStat = SMA_ENV_STAT(pSmaEnv);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pStat);
+  SSmaStat *pStat = SMA_ENV_STAT(pSmaEnv);
+  SRSmaStat *pRSmaStat = SMA_STAT_RSMA(pStat);
 
   // step 1: set rsma stat paused
   atomic_store_8(RSMA_TRIGGER_STAT(pRSmaStat), TASK_TRIGGER_STAT_PAUSED);
@@ -289,8 +288,7 @@ static int32_t tdProcessRSmaSyncPostCommitImpl(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaEnv   *pSmaEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(SMA_ENV_STAT(pSmaEnv));
+  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
 
   // cleanup outdated qtaskinfo files
   tdCleanupQTaskInfoFiles(pSma, pRSmaStat);
@@ -314,7 +312,7 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma) {
   }
 
   SSmaStat  *pStat = SMA_ENV_STAT(pEnv);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pStat);
+  SRSmaStat *pRSmaStat = SMA_STAT_RSMA(pStat);
 
   // step 1: set rsma stat
   atomic_store_8(RSMA_TRIGGER_STAT(pRSmaStat), TASK_TRIGGER_STAT_PAUSED);
@@ -336,24 +334,30 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma) {
     }
   }
 
-  // step 3:  swap rsmaInfoHash and iRsmaInfoHash
+  // step 3: consume the SubmitReq in buffer
+  if (tdRSmaProcessExecImpl(pSma) < 0) {
+    return TSDB_CODE_FAILED;
+  }
+
+  // step 4:  swap rsmaInfoHash and iRsmaInfoHash
   // lock
   taosWLockLatch(SMA_ENV_LOCK(pEnv));
 
   ASSERT(RSMA_INFO_HASH(pRSmaStat));
-  ASSERT(!RSMA_IMU_INFO_HASH(pRSmaStat));
 
-  RSMA_IMU_INFO_HASH(pRSmaStat) = RSMA_INFO_HASH(pRSmaStat);
-  RSMA_INFO_HASH(pRSmaStat) =
-      taosHashInit(RSMA_TASK_INFO_HASH_SLOT, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_ENTRY_LOCK);
+  void *pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), NULL);
 
-  if (!RSMA_INFO_HASH(pRSmaStat)) {
-    // unlock
-    taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-    smaError("vgId:%d, rsma async commit failed since %s", SMA_VID(pSma), terrstr());
-    return TSDB_CODE_FAILED;
+  while (pIter) {
+    SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
+    TSWAP(pInfo->iQall, pInfo->qall);
+    TSWAP(pInfo->iQueue, pInfo->queue);
+    TSWAP(pInfo->iTaskInfo[0], pInfo->taskInfo[0]);
+    TSWAP(pInfo->iTaskInfo[1], pInfo->taskInfo[1]);
+    pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), pIter);
   }
 
+  atomic_store_64(&pRSmaStat->qBufSize, 0);
+
   // unlock
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
 
@@ -375,11 +379,9 @@ static int32_t tdProcessRSmaAsyncCommitImpl(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaStat  *pStat = SMA_ENV_STAT(pSmaEnv);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pStat);
-
   // perform persist task for qTaskInfo
-  tdRSmaPersistExecImpl(pRSmaStat, RSMA_IMU_INFO_HASH(pRSmaStat));
+  SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
+  tdRSmaPersistExecImpl(pRSmaStat, RSMA_INFO_HASH(pRSmaStat));
 
   return TSDB_CODE_SUCCESS;
 }
@@ -396,65 +398,68 @@ static int32_t tdProcessRSmaAsyncPostCommitImpl(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaStat  *pStat = SMA_ENV_STAT(pEnv);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pStat);
+  SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
+  SArray    *rsmaDeleted = NULL;
 
-  // step 1: merge rsmaInfoHash and iRsmaInfoHash
+  // step 1: merge qTaskInfo and iQTaskInfo
   // lock
   taosWLockLatch(SMA_ENV_LOCK(pEnv));
-#if 0
-  if (taosHashGetSize(RSMA_INFO_HASH(pRSmaStat)) <= 0) {
-    // just switch the hash pointer if rsmaInfoHash is empty
-    if (taosHashGetSize(RSMA_IMU_INFO_HASH(pRSmaStat)) > 0) {
-      SHashObj *infoHash = RSMA_INFO_HASH(pRSmaStat);
-      RSMA_INFO_HASH(pRSmaStat) = RSMA_IMU_INFO_HASH(pRSmaStat);
-      RSMA_IMU_INFO_HASH(pRSmaStat) = infoHash;
-    }
-  } else {
-#endif
-#if 1
-  void *pIter = taosHashIterate(RSMA_IMU_INFO_HASH(pRSmaStat), NULL);
+
+  void *pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), NULL);
   while (pIter) {
     tb_uid_t *pSuid = (tb_uid_t *)taosHashGetKey(pIter, NULL);
-
-    if (!taosHashGet(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t))) {
-      SRSmaInfo *pRSmaInfo = *(SRSmaInfo **)pIter;
-      if (RSMA_INFO_IS_DEL(pRSmaInfo)) {
-        int32_t refVal = T_REF_VAL_GET(pRSmaInfo);
-        if (refVal == 0) {
-          tdFreeRSmaInfo(pSma, pRSmaInfo, true);
-          smaDebug(
-              "vgId:%d, rsma async post commit, free rsma info since already deleted and ref is 0 for "
-              "table:%" PRIi64,
-              SMA_VID(pSma), *pSuid);
-        } else {
-          smaDebug(
-              "vgId:%d, rsma async post commit, not free rsma info since ref is %d although already deleted for "
-              "table:%" PRIi64,
-              SMA_VID(pSma), refVal, *pSuid);
+    SRSmaInfo *pRSmaInfo = *(SRSmaInfo **)pIter;
+    if (RSMA_INFO_IS_DEL(pRSmaInfo)) {
+      int32_t refVal = T_REF_VAL_GET(pRSmaInfo);
+      if (refVal == 0) {
+        if(!rsmaDeleted) {
+          if((rsmaDeleted = taosArrayInit(1, sizeof(tb_uid_t)))){
+            taosArrayPush(rsmaDeleted, pSuid);
+          }
         }
-
-        pIter = taosHashIterate(RSMA_IMU_INFO_HASH(pRSmaStat), pIter);
-        continue;
+      } else {
+        smaDebug(
+            "vgId:%d, rsma async post commit, not free rsma info since ref is %d although already deleted for "
+            "table:%" PRIi64,
+            SMA_VID(pSma), refVal, *pSuid);
       }
-      taosHashPut(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t), pIter, sizeof(pIter));
-      smaDebug("vgId:%d, rsma async post commit, migrated from iRsmaInfoHash for table:%" PRIi64, SMA_VID(pSma),
-               *pSuid);
-    } else {
-      // free the resources
-      SRSmaInfo *pRSmaInfo = *(SRSmaInfo **)pIter;
-      tdFreeRSmaInfo(pSma, pRSmaInfo, false);
-      smaDebug("vgId:%d, rsma async post commit, free rsma info since already COW for table:%" PRIi64, SMA_VID(pSma),
-               *pSuid);
+
+      pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), pIter);
+      continue;
     }
 
-    pIter = taosHashIterate(RSMA_IMU_INFO_HASH(pRSmaStat), pIter);
-  }
-#endif
-  // }
+    if (pRSmaInfo->taskInfo[0]) {
+      if (pRSmaInfo->iTaskInfo[0]) {
+        SRSmaInfo *pRSmaInfo = *(SRSmaInfo **)pRSmaInfo->iTaskInfo[0];
+        tdFreeRSmaInfo(pSma, pRSmaInfo, true);
+        pRSmaInfo->iTaskInfo[0] = NULL;
+      }
+    } else {
+      TSWAP(pRSmaInfo->taskInfo[0], pRSmaInfo->iTaskInfo[0]);
+    }
 
-  taosHashCleanup(RSMA_IMU_INFO_HASH(pRSmaStat));
-  RSMA_IMU_INFO_HASH(pRSmaStat) = NULL;
+    taosHashPut(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t), pIter, sizeof(pIter));
+    smaDebug("vgId:%d, rsma async post commit, migrated from iRsmaInfoHash for table:%" PRIi64, SMA_VID(pSma), *pSuid);
+
+    pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), pIter);
+  }
+
+  if (taosArrayGetSize(rsmaDeleted) > 0) {
+    for (int32_t i = 0; i < taosArrayGetSize(rsmaDeleted); ++i) {
+      tb_uid_t *pSuid = taosArrayGet(rsmaDeleted, i);
+      void     *pRSmaInfo = taosHashGet(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t));
+      if ((pRSmaInfo = *(SRSmaInfo **)pRSmaInfo)) {
+        tdFreeRSmaInfo(pSma, pRSmaInfo, true);
+        smaDebug(
+            "vgId:%d, rsma async post commit, free rsma info since already deleted and ref is 0 for "
+            "table:%" PRIi64,
+            SMA_VID(pSma), *pSuid);
+      }
+      taosHashRemove(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t));
+    }
+    // remove suid in files
+    taosArrayDestroy(rsmaDeleted);
+  }
 
   // unlock
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
diff --git a/source/dnode/vnode/src/sma/smaEnv.c b/source/dnode/vnode/src/sma/smaEnv.c
index 50db1123ae..73f8060559 100644
--- a/source/dnode/vnode/src/sma/smaEnv.c
+++ b/source/dnode/vnode/src/sma/smaEnv.c
@@ -315,9 +315,9 @@ void *tdFreeSmaState(SSmaStat *pSmaStat, int8_t smaType) {
 int32_t tdDestroySmaState(SSmaStat *pSmaStat, int8_t smaType) {
   if (pSmaStat) {
     if (smaType == TSDB_SMA_TYPE_TIME_RANGE) {
-      tdDestroyTSmaStat(SMA_TSMA_STAT(pSmaStat));
+      tdDestroyTSmaStat(SMA_STAT_TSMA(pSmaStat));
     } else if (smaType == TSDB_SMA_TYPE_ROLLUP) {
-      SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSmaStat);
+      SRSmaStat *pRSmaStat = &pSmaStat->rsmaStat;
       int32_t    vid = SMA_VID(pRSmaStat->pSma);
       int64_t    refId = RSMA_REF_ID(pRSmaStat);
       if (taosRemoveRef(smaMgmt.rsetId, RSMA_REF_ID(pRSmaStat)) < 0) {
diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index 1660223d77..41393eb52f 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -17,6 +17,7 @@
 
 #define RSMA_QTASKINFO_BUFSIZE  32768
 #define RSMA_QTASKINFO_HEAD_LEN (sizeof(int32_t) + sizeof(int8_t) + sizeof(int64_t))  // len + type + suid
+#define RSMA_QTASKEXEC_BUFSIZ   1  // * 1048576                                           // 8 MB
 
 SSmaMgmt smaMgmt = {
     .inited = 0,
@@ -27,17 +28,18 @@ SSmaMgmt smaMgmt = {
 #define TD_RSMAINFO_DEL_FILE      "rsmainfo.del"
 typedef struct SRSmaQTaskInfoItem SRSmaQTaskInfoItem;
 typedef struct SRSmaQTaskInfoIter SRSmaQTaskInfoIter;
+typedef struct SRSmaExecQItem     SRSmaExecQItem;
 
 static int32_t    tdUidStorePut(STbUidStore *pStore, tb_uid_t suid, tb_uid_t *uid);
 static int32_t    tdUpdateTbUidListImpl(SSma *pSma, tb_uid_t *suid, SArray *tbUids);
 static int32_t    tdSetRSmaInfoItemParams(SSma *pSma, SRSmaParam *param, SRSmaStat *pStat, SRSmaInfo *pRSmaInfo,
                                           int8_t idx);
-static int32_t    tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t inputType, SRSmaInfo *pInfo, tb_uid_t suid,
-                                    int8_t level);
+static int32_t    tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
+                                    tb_uid_t suid, int8_t level);
 static SRSmaInfo *tdAcquireRSmaInfoBySuid(SSma *pSma, int64_t suid);
 static void       tdReleaseRSmaInfo(SSma *pSma, SRSmaInfo *pInfo);
 static int32_t    tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSmaInfoItem *pItem, STSchema *pTSchema,
-                                             int64_t suid, int8_t blkType);
+                                             int64_t suid);
 static void       tdRSmaFetchTrigger(void *param, void *tmrId);
 static int32_t    tdRSmaFetchSend(SSma *pSma, SRSmaInfo *pInfo, int8_t level);
 static int32_t    tdRSmaQTaskInfoIterInit(SRSmaQTaskInfoIter *pIter, STFile *pTFile);
@@ -76,6 +78,11 @@ struct SRSmaQTaskInfoIter {
   int32_t nBufPos;
 };
 
+struct SRSmaExecQItem {
+  void *pRSmaInfo;
+  void *qall;
+};
+
 void tdRSmaQTaskInfoGetFileName(int32_t vgId, int64_t version, char *outputName) {
   tdGetVndFileName(vgId, NULL, VNODE_RSMA_DIR, TD_QTASKINFO_FNAME_PREFIX, version, outputName);
 }
@@ -143,8 +150,12 @@ void *tdFreeRSmaInfo(SSma *pSma, SRSmaInfo *pInfo, bool isDeepFree) {
     if (isDeepFree) {
       if (pInfo->queue) taosCloseQueue(pInfo->queue);
       if (pInfo->qall) taosFreeQall(pInfo->qall);
+      if (pInfo->iQueue) taosCloseQueue(pInfo->iQueue);
+      if (pInfo->iQall) taosFreeQall(pInfo->iQall);
       pInfo->queue = NULL;
       pInfo->qall = NULL;
+      pInfo->iQueue = NULL;
+      pInfo->iQall = NULL;
     }
 
     taosMemoryFree(pInfo);
@@ -362,9 +373,18 @@ int32_t tdProcessRSmaCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, con
   if (!(pRSmaInfo->queue = taosOpenQueue())) {
     goto _err;
   }
+  smaError("vgId:%d init bufSize:%" PRIi64 ", qMemSize:%" PRIi64, SMA_VID(pSma), atomic_load_64(&pStat->qBufSize),
+           taosQueueMemorySize(pRSmaInfo->queue));
+
   if (!(pRSmaInfo->qall = taosAllocateQall())) {
     goto _err;
   }
+  if (!(pRSmaInfo->iQueue = taosOpenQueue())) {
+    goto _err;
+  }
+  if (!(pRSmaInfo->iQall = taosAllocateQall())) {
+    goto _err;
+  }
   pRSmaInfo->suid = suid;
   pRSmaInfo->refId = RSMA_REF_ID(pStat);
   T_REF_INIT_VAL(pRSmaInfo, 1);
@@ -433,8 +453,7 @@ int32_t tdProcessRSmaDrop(SSma *pSma, SVDropStbReq *pReq) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaStat  *pStat = SMA_ENV_STAT(pSmaEnv);
-  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pStat);
+  SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
 
   SRSmaInfo *pRSmaInfo = tdAcquireRSmaInfoBySuid(pSma, pReq->suid);
 
@@ -619,7 +638,7 @@ _end:
 }
 
 static int32_t tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSmaInfoItem *pItem, STSchema *pTSchema,
-                                          int64_t suid, int8_t blkType) {
+                                          int64_t suid) {
   SArray *pResList = taosArrayInit(1, POINTER_BYTES);
   if (pResList == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -690,8 +709,50 @@ _err:
   return TSDB_CODE_FAILED;
 }
 
-static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t inputType, SRSmaInfo *pInfo, tb_uid_t suid,
-                                 int8_t level) {
+/**
+ * @brief Copy msg to rsmaQueueBuffer
+ *
+ * @param pSma
+ * @param pMsg
+ * @param inputType
+ * @param pInfo
+ * @param suid
+ * @return int32_t
+ */
+static int32_t tdExecuteRSmaImplAsync(SSma *pSma, const void *pMsg, int32_t inputType, SRSmaInfo *pInfo,
+                                      tb_uid_t suid) {
+  const SSubmitReq *pReq = (const SSubmitReq *)pMsg;
+
+  void *qItem = taosAllocateQitem(pReq->length, DEF_QITEM);
+  if (!qItem) {
+    return TSDB_CODE_FAILED;
+  }
+
+  memcpy(qItem, pMsg, pReq->header.contLen);
+
+  taosWriteQitem(pInfo->queue, qItem);
+
+  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
+  int64_t    size = atomic_fetch_add_64(&pRSmaStat->qBufSize, taosQueueMemorySize(pInfo->queue));
+  smaError("vgId:%d originSize:%" PRIi64 ", after push size is:%" PRIi64, SMA_VID(pSma), size,
+           atomic_load_64(&pRSmaStat->qBufSize));
+  return TSDB_CODE_SUCCESS;
+}
+
+/**
+ * @brief sync mode
+ *
+ * @param pSma
+ * @param pMsg
+ * @param msgSize
+ * @param inputType
+ * @param pInfo
+ * @param suid
+ * @param level
+ * @return int32_t
+ */
+static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
+                                 tb_uid_t suid, int8_t level) {
   int32_t idx = level - 1;
   if (!pInfo || !RSMA_INFO_QTASK(pInfo, idx)) {
     smaDebug("vgId:%d, no qTaskInfo to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level, suid);
@@ -705,14 +766,13 @@ static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t inputType
   smaDebug("vgId:%d, execute rsma %" PRIi8 " task for qTaskInfo:%p suid:%" PRIu64, SMA_VID(pSma), level,
            RSMA_INFO_QTASK(pInfo, idx), suid);
 
-  if (qSetMultiStreamInput(RSMA_INFO_QTASK(pInfo, idx), pMsg, 1, inputType) < 0) {  // INPUT__DATA_SUBMIT
+  if (qSetMultiStreamInput(RSMA_INFO_QTASK(pInfo, idx), pMsg, msgSize, inputType) < 0) {  // INPUT__DATA_SUBMIT
     smaError("vgId:%d, rsma %" PRIi8 " qSetStreamInput failed since %s", SMA_VID(pSma), level, tstrerror(terrno));
     return TSDB_CODE_FAILED;
   }
 
   SRSmaInfoItem *pItem = RSMA_INFO_ITEM(pInfo, idx);
-  tdRSmaFetchAndSubmitResult(pSma, RSMA_INFO_QTASK(pInfo, idx), pItem, pInfo->pTSchema, suid,
-                             STREAM_INPUT__DATA_SUBMIT);
+  tdRSmaFetchAndSubmitResult(pSma, RSMA_INFO_QTASK(pInfo, idx), pItem, pInfo->pTSchema, suid);
   atomic_store_8(&pItem->triggerStat, TASK_TRIGGER_STAT_ACTIVE);
 
   if (smaMgmt.tmrHandle) {
@@ -752,8 +812,15 @@ static SRSmaInfo *tdAcquireRSmaInfoBySuid(SSma *pSma, int64_t suid) {
       taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
       return NULL;
     }
+    if (!pRSmaInfo->taskInfo[0]) {
+      if (tdCloneRSmaInfo(pSma, pRSmaInfo) < 0) {
+        taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
+        return NULL;
+      }
+    }
     tdRefRSmaInfo(pSma, pRSmaInfo);
     taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
+    ASSERT(pRSmaInfo->suid == suid);
     return pRSmaInfo;
   }
   taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
@@ -762,41 +829,9 @@ static SRSmaInfo *tdAcquireRSmaInfoBySuid(SSma *pSma, int64_t suid) {
     return NULL;
   }
 
-  // clone the SRSmaInfo from iRsmaInfoHash to rsmaInfoHash if in committing stat
-  SRSmaInfo *pCowRSmaInfo = NULL;
-  // lock
-  taosWLockLatch(SMA_ENV_LOCK(pEnv));
-  if (!(pCowRSmaInfo = taosHashGet(RSMA_INFO_HASH(pStat), &suid, sizeof(tb_uid_t)))) {  // 2-phase lock
-    void *iRSmaInfo = taosHashGet(RSMA_IMU_INFO_HASH(pStat), &suid, sizeof(tb_uid_t));
-    if (iRSmaInfo) {
-      SRSmaInfo *pIRSmaInfo = *(SRSmaInfo **)iRSmaInfo;
-      if (pIRSmaInfo && !RSMA_INFO_IS_DEL(pIRSmaInfo)) {
-        if (tdCloneRSmaInfo(pSma, &pCowRSmaInfo, pIRSmaInfo) < 0) {
-          // unlock
-          taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-          smaError("vgId:%d, clone rsma info failed for suid:%" PRIu64 " since %s", SMA_VID(pSma), suid, terrstr());
-          return NULL;
-        }
-        smaDebug("vgId:%d, clone rsma info succeed for suid:%" PRIu64, SMA_VID(pSma), suid);
-        if (taosHashPut(RSMA_INFO_HASH(pStat), &suid, sizeof(tb_uid_t), &pCowRSmaInfo, sizeof(pCowRSmaInfo)) < 0) {
-          // unlock
-          taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-          smaError("vgId:%d, clone rsma info failed for suid:%" PRIu64 " since %s", SMA_VID(pSma), suid, terrstr());
-          return NULL;
-        }
-      }
-    }
-  } else {
-    pCowRSmaInfo = *(SRSmaInfo **)pCowRSmaInfo;
-    ASSERT(!pCowRSmaInfo);
-  }
-
-  if (pCowRSmaInfo) {
-    tdRefRSmaInfo(pSma, pCowRSmaInfo);
-  }
   // unlock
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-  return pCowRSmaInfo;
+  return pRSmaInfo;
 }
 
 static FORCE_INLINE void tdReleaseRSmaInfo(SSma *pSma, SRSmaInfo *pInfo) {
@@ -805,10 +840,47 @@ static FORCE_INLINE void tdReleaseRSmaInfo(SSma *pSma, SRSmaInfo *pInfo) {
   }
 }
 
+/**
+ * @brief async mode
+ *
+ * @param pSma
+ * @param pMsg
+ * @param inputType
+ * @param suid
+ * @return int32_t
+ */
+static int32_t tdExecuteRSmaAsync(SSma *pSma, const void *pMsg, int32_t inputType, tb_uid_t suid) {
+  SRSmaInfo *pRSmaInfo = tdAcquireRSmaInfoBySuid(pSma, suid);
+  if (!pRSmaInfo) {
+    smaDebug("vgId:%d, execute rsma, no rsma info for suid:%" PRIu64, SMA_VID(pSma), suid);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (inputType == STREAM_INPUT__DATA_SUBMIT) {
+    if (tdExecuteRSmaImplAsync(pSma, pMsg, inputType, pRSmaInfo, suid) < 0) {
+      tdReleaseRSmaInfo(pSma, pRSmaInfo);
+      return TSDB_CODE_FAILED;
+    }
+  }
+
+  tdReleaseRSmaInfo(pSma, pRSmaInfo);
+  return TSDB_CODE_SUCCESS;
+}
+
+#if 0
+/**
+ * @brief sync mode
+ * 
+ * @param pSma 
+ * @param pMsg 
+ * @param inputType 
+ * @param suid 
+ * @return int32_t 
+ */
 static int32_t tdExecuteRSma(SSma *pSma, const void *pMsg, int32_t inputType, tb_uid_t suid) {
   SRSmaInfo *pRSmaInfo = tdAcquireRSmaInfoBySuid(pSma, suid);
   if (!pRSmaInfo) {
-    smaError("vgId:%d, execute rsma, no rsma info for suid:%" PRIu64, SMA_VID(pSma), suid);
+    smaDebug("vgId:%d, execute rsma, no rsma info for suid:%" PRIu64, SMA_VID(pSma), suid);
     return TSDB_CODE_SUCCESS;
   }
 
@@ -820,6 +892,47 @@ static int32_t tdExecuteRSma(SSma *pSma, const void *pMsg, int32_t inputType, tb
   tdReleaseRSmaInfo(pSma, pRSmaInfo);
   return TSDB_CODE_SUCCESS;
 }
+#endif
+
+static int32_t tdRSmaExecCheck(SSma *pSma) {
+  SRSmaStat *pRsmaStat = SMA_RSMA_STAT(pSma);
+  int64_t    bufSize = atomic_load_64(&pRsmaStat->qBufSize);
+
+  if ((pRsmaStat->execStat == 1) || (bufSize < RSMA_QTASKEXEC_BUFSIZ)) {
+    smaError("vgId:%d, return directly as execStat:%" PRIi8 ", bufSize:%" PRIi64, SMA_VID(pSma), pRsmaStat->execStat,
+             bufSize);
+    return TSDB_CODE_SUCCESS;
+  }
+  smaError("vgId:%d, go on exec as execStat:%" PRIi8 ", bufSize:%" PRIi64, SMA_VID(pSma), pRsmaStat->execStat, bufSize);
+
+  pRsmaStat->execStat = 1;
+
+  SRSmaExecMsg fetchMsg;
+  int32_t      contLen = sizeof(SMsgHead);
+  void        *pBuf = rpcMallocCont(0 + contLen);
+
+  ((SMsgHead *)pBuf)->vgId = SMA_VID(pSma);
+  ((SMsgHead *)pBuf)->contLen = sizeof(SMsgHead);
+
+  SRpcMsg rpcMsg = {
+      .code = 0,
+      .msgType = TDMT_VND_EXEC_RSMA,
+      .pCont = pBuf,
+      .contLen = contLen,
+  };
+
+  if ((terrno = tmsgPutToQueue(&pSma->pVnode->msgCb, QUERY_QUEUE, &rpcMsg)) != 0) {
+    smaError("vgId:%d, failed to put rsma exec msg into query-queue since %s", SMA_VID(pSma), terrstr());
+    goto _err;
+  }
+
+  smaDebug("vgId:%d, success to put rsma fetch msg into query-queue", SMA_VID(pSma));
+
+  return TSDB_CODE_SUCCESS;
+_err:
+  pRsmaStat->execStat = 0;
+  return TSDB_CODE_FAILED;
+}
 
 int32_t tdProcessRSmaSubmit(SSma *pSma, void *pMsg, int32_t inputType) {
   SSmaEnv *pEnv = SMA_RSMA_ENV(pSma);
@@ -839,16 +952,18 @@ int32_t tdProcessRSmaSubmit(SSma *pSma, void *pMsg, int32_t inputType) {
     tdFetchSubmitReqSuids(pMsg, &uidStore);
 
     if (uidStore.suid != 0) {
-      tdExecuteRSma(pSma, pMsg, inputType, uidStore.suid);
+      tdExecuteRSmaAsync(pSma, pMsg, inputType, uidStore.suid);
 
       void *pIter = taosHashIterate(uidStore.uidHash, NULL);
       while (pIter) {
         tb_uid_t *pTbSuid = (tb_uid_t *)taosHashGetKey(pIter, NULL);
-        tdExecuteRSma(pSma, pMsg, inputType, *pTbSuid);
+        tdExecuteRSmaAsync(pSma, pMsg, inputType, *pTbSuid);
         pIter = taosHashIterate(uidStore.uidHash, pIter);
       }
 
       tdUidStoreDestory(&uidStore);
+
+      tdRSmaExecCheck(pSma);
     }
   }
   return TSDB_CODE_SUCCESS;
@@ -1282,7 +1397,7 @@ int32_t tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash) {
     }
 
     for (int32_t i = 0; i < TSDB_RETENTION_L2; ++i) {
-      qTaskInfo_t taskInfo = RSMA_INFO_QTASK(pRSmaInfo, i);
+      qTaskInfo_t taskInfo = RSMA_INFO_IQTASK(pRSmaInfo, i);
       if (!taskInfo) {
         smaDebug("vgId:%d, rsma, table %" PRIi64 " level %d qTaskInfo is NULL", vid, pRSmaInfo->suid, i + 1);
         continue;
@@ -1452,7 +1567,7 @@ _end:
  * @param level
  * @return int32_t
  */
-int32_t tdRSmaFetchSend(SSma *pSma, SRSmaInfo *pInfo, int8_t level) {
+static int32_t tdRSmaFetchSend(SSma *pSma, SRSmaInfo *pInfo, int8_t level) {
   SRSmaFetchMsg fetchMsg = {.suid = pInfo->suid, .level = level};
   int32_t       ret = 0;
   int32_t       contLen = 0;
@@ -1479,7 +1594,7 @@ int32_t tdRSmaFetchSend(SSma *pSma, SRSmaInfo *pInfo, int8_t level) {
       .code = 0,
       .msgType = TDMT_VND_FETCH_RSMA,
       .pCont = pBuf,
-      .contLen = contLen,
+      .contLen = contLen + sizeof(SMsgHead),
   };
 
   if ((terrno = tmsgPutToQueue(&pSma->pVnode->msgCb, QUERY_QUEUE, &rpcMsg)) != 0) {
@@ -1541,7 +1656,7 @@ int32_t smaProcessFetch(SSma *pSma, void *pMsg) {
   if ((terrno = qSetMultiStreamInput(taskInfo, &dataBlock, 1, STREAM_INPUT__DATA_BLOCK)) < 0) {
     goto _err;
   }
-  if (tdRSmaFetchAndSubmitResult(pSma, taskInfo, pItem, pInfo->pTSchema, pInfo->suid, STREAM_INPUT__DATA_BLOCK) < 0) {
+  if (tdRSmaFetchAndSubmitResult(pSma, taskInfo, pItem, pInfo->pTSchema, pInfo->suid) < 0) {
     goto _err;
   }
 
@@ -1558,3 +1673,125 @@ _err:
   smaError("vgId:%d, failed to process rsma fetch msg since %s", SMA_VID(pSma), terrstr());
   return TSDB_CODE_FAILED;
 }
+
+static void tdFreeRSmaSubmitItems(SArray *pItems) {
+  for (int32_t i = 0; i < taosArrayGetSize(pItems); ++i) {
+    taosFreeQitem(*(void **)taosArrayGet(pItems, i));
+  }
+}
+
+int32_t tdRSmaProcessExecImpl(SSma *pSma) {
+  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
+  SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
+  SHashObj  *infoHash = NULL;
+  SArray    *pSubmitQArr = NULL;
+  SArray    *pSubmitArr = NULL;
+
+  if (!pRSmaStat || !(infoHash = RSMA_INFO_HASH(pRSmaStat))) {
+    terrno = TSDB_CODE_RSMA_INVALID_STAT;
+    goto _err;
+  }
+
+  taosRLockLatch(SMA_ENV_LOCK(pEnv));
+  if (atomic_load_64(&pRSmaStat->qBufSize) < RSMA_QTASKEXEC_BUFSIZ) {
+    taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
+    return TSDB_CODE_SUCCESS;
+  }
+  taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
+
+  if (!(pSubmitQArr = taosArrayInit(taosHashGetSize(infoHash), sizeof(SRSmaExecQItem)))) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  if (!(pSubmitArr = taosArrayInit(1024, POINTER_BYTES))) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  SRSmaExecQItem qItem = {0};
+  taosWLockLatch(SMA_ENV_LOCK(pEnv));
+  void *pIter = taosHashIterate(infoHash, NULL);
+  while (pIter) {
+    SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
+    if (taosQueueItemSize(pInfo->queue)) {
+      taosReadAllQitems(pInfo->queue, pInfo->qall);
+      qItem.qall = &pInfo->qall;
+      qItem.pRSmaInfo = pIter;
+      taosArrayPush(pSubmitQArr, &qItem);
+    }
+    ASSERT(taosQueueItemSize(pInfo->queue) == 0);
+    pIter = taosHashIterate(infoHash, pIter);
+  }
+
+  atomic_store_64(&pRSmaStat->qBufSize, 0);
+  taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
+  smaError("vgId:%d after exec qBufSize is:%" PRIi64, SMA_VID(pSma), atomic_load_64(&pRSmaStat->qBufSize));
+
+  int32_t qSize = taosArrayGetSize(pSubmitQArr);
+  for (int32_t i = 0; i < qSize; ++i) {
+    SRSmaExecQItem *pItem = taosArrayGet(pSubmitQArr, i);
+    while (1) {
+      void *msg = NULL;
+      taosGetQitem(*(STaosQall **)pItem->qall, (void **)&msg);
+      if (msg) {
+        if (taosArrayPush(pSubmitArr, &msg) < 0) {
+          tdFreeRSmaSubmitItems(pSubmitArr);
+          goto _err;
+        }
+      } else {
+        break;
+      }
+    }
+
+    int32_t size = taosArrayGetSize(pSubmitArr);
+    if (size > 0) {
+      SRSmaInfo *pInfo = *(SRSmaInfo **)pItem->pRSmaInfo;
+      for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
+        if (tdExecuteRSmaImpl(pSma, *(SSubmitReq**)pSubmitArr->pData, size, STREAM_INPUT__DATA_SUBMIT, pInfo, pInfo->suid, i) < 0) {
+          tdFreeRSmaSubmitItems(pSubmitArr);
+          goto _err;
+        }
+      }
+      tdFreeRSmaSubmitItems(pSubmitArr);
+      taosArrayClear(pSubmitArr);
+    }
+  }
+
+  taosArrayDestroy(pSubmitArr);
+  taosArrayDestroy(pSubmitQArr);
+  return TSDB_CODE_SUCCESS;
+_err:
+  taosArrayDestroy(pSubmitArr);
+  taosArrayDestroy(pSubmitQArr);
+  return TSDB_CODE_FAILED;
+}
+
+/**
+ * @brief exec rsma level 1data, fetch result of level 2/3 and submit
+ *
+ * @param pSma
+ * @param pMsg
+ * @return int32_t
+ */
+int32_t smaProcessExec(SSma *pSma, void *pMsg) {
+  SRpcMsg   *pRpcMsg = (SRpcMsg *)pMsg;
+  SRSmaStat *pRsmaStat = SMA_RSMA_STAT(pSma);
+
+  if (!pRpcMsg || pRpcMsg->contLen < sizeof(SMsgHead)) {
+    terrno = TSDB_CODE_RSMA_FETCH_MSG_MSSED_UP;
+    goto _err;
+  }
+
+  if (tdRSmaProcessExecImpl(pSma) < 0) {
+    goto _err;
+  }
+
+  pRsmaStat->execStat = 0;
+  smaWarn("vgId:%d, success to process rsma exec msg", SMA_VID(pSma));
+  return TSDB_CODE_SUCCESS;
+_err:
+  pRsmaStat->execStat = 0;
+  smaError("vgId:%d, failed to process rsma fetch msg since %s", SMA_VID(pSma), terrstr());
+  return TSDB_CODE_FAILED;
+}
diff --git a/source/dnode/vnode/src/sma/smaTimeRange.c b/source/dnode/vnode/src/sma/smaTimeRange.c
index f46d9dc29c..a6302b9235 100644
--- a/source/dnode/vnode/src/sma/smaTimeRange.c
+++ b/source/dnode/vnode/src/sma/smaTimeRange.c
@@ -175,7 +175,7 @@ int32_t tdProcessTSmaInsertImpl(SSma *pSma, int64_t indexUid, const char *msg) {
   }
 
   tdRefSmaStat(pSma, pStat);
-  pTsmaStat = SMA_TSMA_STAT(pStat);
+  pTsmaStat = SMA_STAT_TSMA(pStat);
 
   if (!pTsmaStat->pTSma) {
     STSma *pTSma = metaGetSmaInfoByIndex(SMA_META(pSma), indexUid);
diff --git a/source/dnode/vnode/src/sma/smaUtil.c b/source/dnode/vnode/src/sma/smaUtil.c
index d9f38ffd09..da70222485 100644
--- a/source/dnode/vnode/src/sma/smaUtil.c
+++ b/source/dnode/vnode/src/sma/smaUtil.c
@@ -350,49 +350,45 @@ _err:
 }
 
 /**
- * @brief pTSchema is shared
+ * @brief Clone qTaskInfo of SRSmaInfo
  *
  * @param pSma
- * @param pDest
- * @param pSrc
+ * @param pInfo
  * @return int32_t
  */
-int32_t tdCloneRSmaInfo(SSma *pSma, SRSmaInfo **pDest, SRSmaInfo *pSrc) {
-  SVnode     *pVnode = pSma->pVnode;
+int32_t tdCloneRSmaInfo(SSma *pSma, SRSmaInfo *pInfo) {
   SRSmaParam *param = NULL;
-  if (!pSrc) {
-    *pDest = NULL;
+  if (!pInfo) {
     return TSDB_CODE_SUCCESS;
   }
 
   SMetaReader mr = {0};
   metaReaderInit(&mr, SMA_META(pSma), 0);
-  smaDebug("vgId:%d, rsma clone, suid is %" PRIi64, TD_VID(pVnode), pSrc->suid);
-  if (metaGetTableEntryByUid(&mr, pSrc->suid) < 0) {
-    smaError("vgId:%d, rsma clone, failed to get table meta for %" PRIi64 " since %s", TD_VID(pVnode), pSrc->suid,
+  smaDebug("vgId:%d, rsma clone qTaskInfo for suid:%" PRIi64, SMA_VID(pSma), pInfo->suid);
+  if (metaGetTableEntryByUid(&mr, pInfo->suid) < 0) {
+    smaError("vgId:%d, rsma clone, failed to get table meta for %" PRIi64 " since %s", SMA_VID(pSma), pInfo->suid,
              terrstr());
     goto _err;
   }
   ASSERT(mr.me.type == TSDB_SUPER_TABLE);
-  ASSERT(mr.me.uid == pSrc->suid);
+  ASSERT(mr.me.uid == pInfo->suid);
   if (TABLE_IS_ROLLUP(mr.me.flags)) {
     param = &mr.me.stbEntry.rsmaParam;
     for (int32_t i = 0; i < TSDB_RETENTION_L2; ++i) {
-      if (tdCloneQTaskInfo(pSma, pSrc->iTaskInfo[i], pSrc->taskInfo[i], param, pSrc->suid, i) < 0) {
+      if (tdCloneQTaskInfo(pSma, pInfo->taskInfo[i], pInfo->iTaskInfo[i], param, pInfo->suid, i) < 0) {
         goto _err;
       }
     }
-    smaDebug("vgId:%d, rsma clone env success for %" PRIi64, TD_VID(pVnode), pSrc->suid);
+    smaDebug("vgId:%d, rsma clone env success for %" PRIi64, SMA_VID(pSma), pInfo->suid);
+  } else {
+    terrno = TSDB_CODE_RSMA_INVALID_SCHEMA;
+    goto _err;
   }
 
   metaReaderClear(&mr);
-
-  *pDest = pSrc;  // pointer copy
-
   return TSDB_CODE_SUCCESS;
 _err:
-  *pDest = NULL;
   metaReaderClear(&mr);
-  smaError("vgId:%d, rsma clone env failed for %" PRIi64 " since %s", TD_VID(pVnode), pSrc->suid, terrstr());
+  smaError("vgId:%d, rsma clone env failed for %" PRIi64 " since %s", SMA_VID(pSma), pInfo->suid, terrstr());
   return TSDB_CODE_FAILED;
 }
\ No newline at end of file
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 3a25933ec4..751cb21d08 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -295,6 +295,8 @@ int32_t vnodeProcessQueryMsg(SVnode *pVnode, SRpcMsg *pMsg) {
       return qWorkerProcessCQueryMsg(&handle, pVnode->pQuery, pMsg, 0);
     case TDMT_VND_FETCH_RSMA:
       return smaProcessFetch(pVnode->pSma, pMsg);
+    case TDMT_VND_EXEC_RSMA:
+      return smaProcessExec(pVnode->pSma, pMsg);
     default:
       vError("unknown msg type:%d in query queue", pMsg->msgType);
       return TSDB_CODE_VND_APP_ERROR;
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 7115ad85a5..4c3d5cf7af 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -55,7 +55,7 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, size_t nu
     taosArrayClear(pInfo->pBlockLists);
 
     if (type == STREAM_INPUT__MERGED_SUBMIT) {
-      ASSERT(numOfBlocks > 1);
+      // ASSERT(numOfBlocks > 1);
       for (int32_t i = 0; i < numOfBlocks; i++) {
         SSubmitReq* pReq = *(void**)POINTER_SHIFT(input, i * sizeof(void*));
         taosArrayPush(pInfo->pBlockLists, &pReq);
diff --git a/source/libs/executor/src/tsimplehash.c b/source/libs/executor/src/tsimplehash.c
index dbb50f958d..6b2edf0d5e 100644
--- a/source/libs/executor/src/tsimplehash.c
+++ b/source/libs/executor/src/tsimplehash.c
@@ -15,6 +15,7 @@
 
 #include "tsimplehash.h"
 #include "taoserror.h"
+#include "tlog.h"
 
 #define SHASH_DEFAULT_LOAD_FACTOR 0.75
 #define HASH_MAX_CAPACITY         (1024 * 1024 * 16)
@@ -106,27 +107,27 @@ static SHNode *doCreateHashNode(const void *key, size_t keyLen, const void *data
   return pNewNode;
 }
 
-static void taosHashTableResize(SSHashObj *pHashObj) {
+static void tSimpleHashTableResize(SSHashObj *pHashObj) {
   if (!SHASH_NEED_RESIZE(pHashObj)) {
     return;
   }
 
   int32_t newCapacity = (int32_t)(pHashObj->capacity << 1u);
   if (newCapacity > HASH_MAX_CAPACITY) {
-    //    uDebug("current capacity:%zu, maximum capacity:%d, no resize applied due to limitation is reached",
-    //           pHashObj->capacity, HASH_MAX_CAPACITY);
+    uDebug("current capacity:%zu, maximum capacity:%" PRIu64 ", no resize applied due to limitation is reached",
+           pHashObj->capacity, HASH_MAX_CAPACITY);
     return;
   }
 
   int64_t st = taosGetTimestampUs();
   void   *pNewEntryList = taosMemoryRealloc(pHashObj->hashList, sizeof(void *) * newCapacity);
   if (!pNewEntryList) {
-    //    qWarn("hash resize failed due to out of memory, capacity remain:%zu", pHashObj->capacity);
+    uWarn("hash resize failed due to out of memory, capacity remain:%zu", pHashObj->capacity);
     return;
   }
 
   size_t inc = newCapacity - pHashObj->capacity;
-  memset((char *)pNewEntryList + pHashObj->capacity * sizeof(void *), 0, inc);
+  memset((char *)pNewEntryList + pHashObj->capacity * sizeof(void *), 0, inc * sizeof(void *));
 
   pHashObj->hashList = pNewEntryList;
   pHashObj->capacity = newCapacity;
@@ -179,7 +180,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, cons
 
   // need the resize process, write lock applied
   if (SHASH_NEED_RESIZE(pHashObj)) {
-    taosHashTableResize(pHashObj);
+    tSimpleHashTableResize(pHashObj);
   }
 
   int32_t slot = HASH_INDEX(hashVal, pHashObj->capacity);
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index 6e3067d44e..3f6d3421ec 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -616,6 +616,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_RSMA_FILE_CORRUPTED,            "Rsma file corrupted
 TAOS_DEFINE_ERROR(TSDB_CODE_RSMA_REMOVE_EXISTS,             "Rsma remove exists")
 TAOS_DEFINE_ERROR(TSDB_CODE_RSMA_FETCH_MSG_MSSED_UP,        "Rsma fetch msg is messed up")
 TAOS_DEFINE_ERROR(TSDB_CODE_RSMA_EMPTY_INFO,                "Rsma info is empty")
+TAOS_DEFINE_ERROR(TSDB_CODE_RSMA_INVALID_SCHEMA,            "Rsma invalid schema")
 
 //index
 TAOS_DEFINE_ERROR(TSDB_CODE_INDEX_REBUILDING,               "Index is rebuilding")

From 34e14f770fd4080058ac07b2936d33ea7a2bd5f2 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Mon, 15 Aug 2022 09:39:55 +0800
Subject: [PATCH 14/98] enh: rsma batch process

---
 source/dnode/vnode/src/sma/smaRollup.c        | 17 ++----
 source/libs/executor/inc/executil.h           |  5 +-
 source/libs/executor/inc/executorimpl.h       |  4 +-
 source/libs/executor/src/executil.c           | 11 ++--
 source/libs/executor/src/executorimpl.c       | 24 ++++----
 source/libs/executor/src/scanoperator.c       |  6 +-
 source/libs/executor/src/timewindowoperator.c | 56 +++++++++----------
 7 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index 41393eb52f..4ffd6479f5 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -17,7 +17,7 @@
 
 #define RSMA_QTASKINFO_BUFSIZE  32768
 #define RSMA_QTASKINFO_HEAD_LEN (sizeof(int32_t) + sizeof(int8_t) + sizeof(int64_t))  // len + type + suid
-#define RSMA_QTASKEXEC_BUFSIZ   1  // * 1048576                                           // 8 MB
+#define RSMA_QTASKEXEC_BUFSIZ   10 * 1048576                                           // 8 MB
 
 SSmaMgmt smaMgmt = {
     .inited = 0,
@@ -373,8 +373,6 @@ int32_t tdProcessRSmaCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, con
   if (!(pRSmaInfo->queue = taosOpenQueue())) {
     goto _err;
   }
-  smaError("vgId:%d init bufSize:%" PRIi64 ", qMemSize:%" PRIi64, SMA_VID(pSma), atomic_load_64(&pStat->qBufSize),
-           taosQueueMemorySize(pRSmaInfo->queue));
 
   if (!(pRSmaInfo->qall = taosAllocateQall())) {
     goto _err;
@@ -723,7 +721,7 @@ static int32_t tdExecuteRSmaImplAsync(SSma *pSma, const void *pMsg, int32_t inpu
                                       tb_uid_t suid) {
   const SSubmitReq *pReq = (const SSubmitReq *)pMsg;
 
-  void *qItem = taosAllocateQitem(pReq->length, DEF_QITEM);
+  void *qItem = taosAllocateQitem(pReq->header.contLen, DEF_QITEM);
   if (!qItem) {
     return TSDB_CODE_FAILED;
   }
@@ -733,9 +731,8 @@ static int32_t tdExecuteRSmaImplAsync(SSma *pSma, const void *pMsg, int32_t inpu
   taosWriteQitem(pInfo->queue, qItem);
 
   SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
-  int64_t    size = atomic_fetch_add_64(&pRSmaStat->qBufSize, taosQueueMemorySize(pInfo->queue));
-  smaError("vgId:%d originSize:%" PRIi64 ", after push size is:%" PRIi64, SMA_VID(pSma), size,
-           atomic_load_64(&pRSmaStat->qBufSize));
+  atomic_fetch_add_64(&pRSmaStat->qBufSize, taosQueueMemorySize(pInfo->queue));
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -899,11 +896,8 @@ static int32_t tdRSmaExecCheck(SSma *pSma) {
   int64_t    bufSize = atomic_load_64(&pRsmaStat->qBufSize);
 
   if ((pRsmaStat->execStat == 1) || (bufSize < RSMA_QTASKEXEC_BUFSIZ)) {
-    smaError("vgId:%d, return directly as execStat:%" PRIi8 ", bufSize:%" PRIi64, SMA_VID(pSma), pRsmaStat->execStat,
-             bufSize);
     return TSDB_CODE_SUCCESS;
   }
-  smaError("vgId:%d, go on exec as execStat:%" PRIi8 ", bufSize:%" PRIi64, SMA_VID(pSma), pRsmaStat->execStat, bufSize);
 
   pRsmaStat->execStat = 1;
 
@@ -1726,7 +1720,6 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma) {
 
   atomic_store_64(&pRSmaStat->qBufSize, 0);
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-  smaError("vgId:%d after exec qBufSize is:%" PRIi64, SMA_VID(pSma), atomic_load_64(&pRSmaStat->qBufSize));
 
   int32_t qSize = taosArrayGetSize(pSubmitQArr);
   for (int32_t i = 0; i < qSize; ++i) {
@@ -1748,7 +1741,7 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma) {
     if (size > 0) {
       SRSmaInfo *pInfo = *(SRSmaInfo **)pItem->pRSmaInfo;
       for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
-        if (tdExecuteRSmaImpl(pSma, *(SSubmitReq**)pSubmitArr->pData, size, STREAM_INPUT__DATA_SUBMIT, pInfo, pInfo->suid, i) < 0) {
+        if (tdExecuteRSmaImpl(pSma, pSubmitArr->pData, size, STREAM_INPUT__MERGED_SUBMIT, pInfo, pInfo->suid, i) < 0) {
           tdFreeRSmaSubmitItems(pSubmitArr);
           goto _err;
         }
diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index 58b2c1b095..d5b979c762 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -22,7 +22,6 @@
 #include "tbuffer.h"
 #include "tcommon.h"
 #include "tpagedbuf.h"
-#include "tsimplehash.h"
 
 #define SET_RES_WINDOW_KEY(_k, _ori, _len, _uid)     \
   do {                                               \
@@ -103,7 +102,7 @@ static FORCE_INLINE void setResultBufPageDirty(SDiskbasedBuf* pBuf, SResultRowPo
   setBufPageDirty(pPage, true);
 }
 
-void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, int32_t order);
+void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SHashObj* pHashmap, int32_t order);
 void cleanupGroupResInfo(SGroupResInfo* pGroupResInfo);
 
 void initMultiResInfoFromArrayList(SGroupResInfo* pGroupResInfo, SArray* pArrayList);
@@ -141,4 +140,4 @@ int32_t resultrowComparAsc(const void* p1, const void* p2);
 
 int32_t isQualifiedTable(STableKeyInfo* info, SNode* pTagCond, void* metaHandle, bool* pQualified);
 
-#endif  // TDENGINE_QUERYUTIL_H
+#endif  // TDENGINE_QUERYUTIL_H
\ No newline at end of file
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 585b642d2b..11d371d49b 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -296,7 +296,7 @@ enum {
 };
 
 typedef struct SAggSupporter {
-    SSHashObj*     pResultRowHashTable;  // quick locate the window object for each result
+    SHashObj*      pResultRowHashTable;  // quick locate the window object for each result
     char*          keyBuf;               // window key buffer
     SDiskbasedBuf* pResultBuf;           // query result buffer based on blocked-wised disk file
     int32_t        resultRowSize;        // the result buffer size for each result row, with the meta data size for each row
@@ -1045,4 +1045,4 @@ void* destroySqlFunctionCtx(SqlFunctionCtx* pCtx, int32_t numOfOutput);
 }
 #endif
 
-#endif  // TDENGINE_EXECUTORIMPL_H
+#endif  // TDENGINE_EXECUTORIMPL_H
\ No newline at end of file
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 2e6bd312f3..615d742d40 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -97,7 +97,7 @@ int32_t resultrowComparAsc(const void* p1, const void* p2) {
 
 static int32_t resultrowComparDesc(const void* p1, const void* p2) { return resultrowComparAsc(p2, p1); }
 
-void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, int32_t order) {
+void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SHashObj* pHashmap, int32_t order) {
   if (pGroupResInfo->pRows != NULL) {
     taosArrayDestroy(pGroupResInfo->pRows);
   }
@@ -106,10 +106,9 @@ void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, in
   void* pData = NULL;
   pGroupResInfo->pRows = taosArrayInit(10, POINTER_BYTES);
 
-  size_t  keyLen = 0;
-  int32_t iter = 0;
-  while ((pData = tSimpleHashIterate(pHashmap, pData, &iter)) != NULL) {
-    void* key = tSimpleHashGetKey(pData, &keyLen);
+  size_t keyLen = 0;
+  while ((pData = taosHashIterate(pHashmap, pData)) != NULL) {
+    void* key = taosHashGetKey(pData, &keyLen);
 
     SResKeyPos* p = taosMemoryMalloc(keyLen + sizeof(SResultRowPosition));
 
@@ -987,4 +986,4 @@ void initLimitInfo(const SNode* pLimit, const SNode* pSLimit, SLimitInfo* pLimit
   pLimitInfo->slimit = slimit;
   pLimitInfo->remainOffset = limit.offset;
   pLimitInfo->remainGroupOffset = slimit.offset;
-}
+}
\ No newline at end of file
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 46ca99c8cd..5d07a15b2f 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -250,7 +250,7 @@ SResultRow* doSetResultOutBufByKey(SDiskbasedBuf* pResultBuf, SResultRowInfo* pR
   SET_RES_WINDOW_KEY(pSup->keyBuf, pData, bytes, groupId);
 
   SResultRowPosition* p1 =
-      (SResultRowPosition*)tSimpleHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)taosHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
 
   SResultRow* pResult = NULL;
 
@@ -292,7 +292,7 @@ SResultRow* doSetResultOutBufByKey(SDiskbasedBuf* pResultBuf, SResultRowInfo* pR
 
     // add a new result set for a new group
     SResultRowPosition pos = {.pageId = pResult->pageId, .offset = pResult->offset};
-    tSimpleHashPut(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), &pos,
+    taosHashPut(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), &pos,
                 sizeof(SResultRowPosition));
   }
 
@@ -301,7 +301,7 @@ SResultRow* doSetResultOutBufByKey(SDiskbasedBuf* pResultBuf, SResultRowInfo* pR
 
   // too many time window in query
   if (pTaskInfo->execModel == OPTR_EXEC_MODEL_BATCH &&
-      tSimpleHashGetSize(pSup->pResultRowHashTable) > MAX_INTERVAL_TIME_WINDOW) {
+      taosHashGetSize(pSup->pResultRowHashTable) > MAX_INTERVAL_TIME_WINDOW) {
     longjmp(pTaskInfo->env, TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW);
   }
 
@@ -3017,7 +3017,7 @@ int32_t aggEncodeResultRow(SOperatorInfo* pOperator, char** result, int32_t* len
   }
   SOptrBasicInfo* pInfo = (SOptrBasicInfo*)(pOperator->info);
   SAggSupporter*  pSup = (SAggSupporter*)POINTER_SHIFT(pOperator->info, sizeof(SOptrBasicInfo));
-  int32_t         size = tSimpleHashGetSize(pSup->pResultRowHashTable);
+  int32_t         size = taosHashGetSize(pSup->pResultRowHashTable);
   size_t          keyLen = sizeof(uint64_t) * 2;  // estimate the key length
   int32_t         totalSize =
       sizeof(int32_t) + sizeof(int32_t) + size * (sizeof(int32_t) + keyLen + sizeof(int32_t) + pSup->resultRowSize);
@@ -3045,10 +3045,9 @@ int32_t aggEncodeResultRow(SOperatorInfo* pOperator, char** result, int32_t* len
   setBufPageDirty(pPage, true);
   releaseBufPage(pSup->pResultBuf, pPage);
 
-  int32_t iter = 0;
-  void*   pIter = tSimpleHashIterate(pSup->pResultRowHashTable, NULL, &iter);
+  void* pIter = taosHashIterate(pSup->pResultRowHashTable, NULL);
   while (pIter) {
-    void*               key = tSimpleHashGetKey(pIter, &keyLen);
+    void*               key = taosHashGetKey(pIter, &keyLen);
     SResultRowPosition* p1 = (SResultRowPosition*)pIter;
 
     pPage = (SFilePage*)getBufPage(pSup->pResultBuf, p1->pageId);
@@ -3080,7 +3079,7 @@ int32_t aggEncodeResultRow(SOperatorInfo* pOperator, char** result, int32_t* len
     memcpy(*result + offset, pRow, pSup->resultRowSize);
     offset += pSup->resultRowSize;
 
-    pIter = tSimpleHashIterate(pSup->pResultRowHashTable, pIter, &iter);
+    pIter = taosHashIterate(pSup->pResultRowHashTable, pIter);
   }
 
   *(int32_t*)(*result) = offset;
@@ -3115,7 +3114,7 @@ int32_t aggDecodeResultRow(SOperatorInfo* pOperator, char* result) {
 
     // add a new result set for a new group
     SResultRowPosition pos = {.pageId = resultRow->pageId, .offset = resultRow->offset};
-    tSimpleHashPut(pSup->pResultRowHashTable, result + offset, keyLen, &pos, sizeof(SResultRowPosition));
+    taosHashPut(pSup->pResultRowHashTable, result + offset, keyLen, &pos, sizeof(SResultRowPosition));
 
     offset += keyLen;
     int32_t valueLen = *(int32_t*)(result + offset);
@@ -3454,8 +3453,7 @@ int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t n
 
   pAggSup->resultRowSize = getResultRowSize(pCtx, numOfOutput);
   pAggSup->keyBuf = taosMemoryCalloc(1, keyBufSize + POINTER_BYTES + sizeof(int64_t));
-  // pAggSup->pResultRowHashTable = taosHashInit(10, hashFn, true, HASH_NO_LOCK);
-  pAggSup->pResultRowHashTable = tSimpleHashInit(100000, hashFn);
+  pAggSup->pResultRowHashTable = taosHashInit(10, hashFn, true, HASH_NO_LOCK);
 
   if (pAggSup->keyBuf == NULL || pAggSup->pResultRowHashTable == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
@@ -3481,7 +3479,7 @@ int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t n
 
 void cleanupAggSup(SAggSupporter* pAggSup) {
   taosMemoryFreeClear(pAggSup->keyBuf);
-  tSimpleHashCleanup(pAggSup->pResultRowHashTable);
+  taosHashCleanup(pAggSup->pResultRowHashTable);
   destroyDiskbasedBuf(pAggSup->pResultBuf);
 }
 
@@ -4779,4 +4777,4 @@ int32_t initStreamAggSupporter(SStreamAggSupporter* pSup, const char* pKey, SqlF
     pCtx[i].pBuf = pSup->pResultBuf;
   }
   return code;
-}
+}
\ No newline at end of file
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index c404fca597..c373634c16 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -178,8 +178,8 @@ static SResultRow* getTableGroupOutputBuf(SOperatorInfo* pOperator, uint64_t gro
 
   STableScanInfo* pTableScanInfo = pOperator->info;
 
-  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(pTableScanInfo->pdInfo.pAggSup->pResultRowHashTable, buf,
-                                                               GET_RES_WINDOW_KEY_LEN(sizeof(groupId)));
+  SResultRowPosition* p1 =
+      (SResultRowPosition*)taosHashGet(pTableScanInfo->pdInfo.pAggSup->pResultRowHashTable, buf, GET_RES_WINDOW_KEY_LEN(sizeof(groupId)));
 
   if (p1 == NULL) {
     return NULL;
@@ -3128,4 +3128,4 @@ _error:
   taosMemoryFree(pInfo);
   taosMemoryFree(pOperator);
   return NULL;
-}
+}
\ No newline at end of file
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index ff323bf4ba..b81cb7724f 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1385,7 +1385,7 @@ bool doClearWindow(SAggSupporter* pAggSup, SExprSupp* pSup, char* pData, int16_t
                    int32_t numOfOutput) {
   SET_RES_WINDOW_KEY(pAggSup->keyBuf, pData, bytes, groupId);
   SResultRowPosition* p1 =
-      (SResultRowPosition*)tSimpleHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)taosHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   if (!p1) {
     // window has been closed
     return false;
@@ -1398,14 +1398,14 @@ bool doDeleteIntervalWindow(SAggSupporter* pAggSup, TSKEY ts, uint64_t groupId)
   size_t bytes = sizeof(TSKEY);
   SET_RES_WINDOW_KEY(pAggSup->keyBuf, &ts, bytes, groupId);
   SResultRowPosition* p1 =
-      (SResultRowPosition*)tSimpleHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)taosHashGet(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   if (!p1) {
     // window has been closed
     return false;
   }
   // SFilePage* bufPage = getBufPage(pAggSup->pResultBuf, p1->pageId);
   // dBufSetBufPageRecycled(pAggSup->pResultBuf, bufPage);
-  tSimpleHashRemove(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+  taosHashRemove(pAggSup->pResultRowHashTable, pAggSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   return true;
 }
 
@@ -1455,12 +1455,11 @@ static void doClearWindows(SAggSupporter* pAggSup, SExprSupp* pSup1, SInterval*
   }
 }
 
-static int32_t getAllIntervalWindow(SSHashObj* pHashMap, SHashObj* resWins) {
+static int32_t getAllIntervalWindow(SHashObj* pHashMap, SHashObj* resWins) {
   void*  pIte = NULL;
   size_t keyLen = 0;
-  int32_t iter = 0;
-  while ((pIte = tSimpleHashIterate(pHashMap, pIte, &iter)) != NULL) {
-    void*    key = tSimpleHashGetKey(pIte, &keyLen);
+  while ((pIte = taosHashIterate(pHashMap, pIte)) != NULL) {
+    void*    key = taosHashGetKey(pIte, &keyLen);
     uint64_t groupId = *(uint64_t*)key;
     ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
     TSKEY               ts = *(int64_t*)((char*)key + sizeof(uint64_t));
@@ -1473,18 +1472,16 @@ static int32_t getAllIntervalWindow(SSHashObj* pHashMap, SHashObj* resWins) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t closeIntervalWindow(SSHashObj* pHashMap, STimeWindowAggSupp* pSup, SInterval* pInterval,
+static int32_t closeIntervalWindow(SHashObj* pHashMap, STimeWindowAggSupp* pSup, SInterval* pInterval,
                                    SHashObj* pPullDataMap, SHashObj* closeWins, SArray* pRecyPages,
                                    SDiskbasedBuf* pDiscBuf) {
   qDebug("===stream===close interval window");
   void*  pIte = NULL;
-  void*   key = NULL;
-  size_t  keyLen = GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY));
-  int32_t iter = 0;
-  while ((pIte = tSimpleHashIterateKV(pHashMap, pIte, &key, &iter)) != NULL) {
-    // void*    key = tSimpleHashGetKey(pIte, &keyLen);
+  size_t keyLen = 0;
+  while ((pIte = taosHashIterate(pHashMap, pIte)) != NULL) {
+    void*    key = taosHashGetKey(pIte, &keyLen);
     uint64_t groupId = *(uint64_t*)key;
-    // ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
+    ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
     TSKEY       ts = *(int64_t*)((char*)key + sizeof(uint64_t));
     STimeWindow win;
     win.skey = ts;
@@ -1520,7 +1517,7 @@ static int32_t closeIntervalWindow(SSHashObj* pHashMap, STimeWindowAggSupp* pSup
       }
       char keyBuf[GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY))];
       SET_RES_WINDOW_KEY(keyBuf, &ts, sizeof(TSKEY), groupId);
-      tSimpleHashRemove(pHashMap, keyBuf, keyLen);
+      taosHashRemove(pHashMap, keyBuf, keyLen);
     }
   }
   return TSDB_CODE_SUCCESS;
@@ -2850,7 +2847,7 @@ bool hasIntervalWindow(SAggSupporter* pSup, TSKEY ts, uint64_t groupId) {
   int32_t bytes = sizeof(TSKEY);
   SET_RES_WINDOW_KEY(pSup->keyBuf, &ts, bytes, groupId);
   SResultRowPosition* p1 =
-      (SResultRowPosition*)tSimpleHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
+      (SResultRowPosition*)taosHashGet(pSup->pResultRowHashTable, pSup->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
   return p1 != NULL;
 }
 
@@ -2891,9 +2888,8 @@ static void rebuildIntervalWindow(SStreamFinalIntervalOperatorInfo* pInfo, SExpr
 
 bool isDeletedWindow(STimeWindow* pWin, uint64_t groupId, SAggSupporter* pSup) {
   SET_RES_WINDOW_KEY(pSup->keyBuf, &pWin->skey, sizeof(int64_t), groupId);
-  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(pSup->pResultRowHashTable, pSup->keyBuf,
-                                                               GET_RES_WINDOW_KEY_LEN(sizeof(int64_t)));
-
+  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(pSup->pResultRowHashTable, pSup->keyBuf,
+                                                            GET_RES_WINDOW_KEY_LEN(sizeof(int64_t)));
   return p1 == NULL;
 }
 
@@ -3021,7 +3017,7 @@ static void doHashInterval(SOperatorInfo* pOperatorInfo, SSDataBlock* pSDataBloc
 }
 
 static void clearStreamIntervalOperator(SStreamFinalIntervalOperatorInfo* pInfo) {
-  tSimpleHashClear(pInfo->aggSup.pResultRowHashTable);
+  taosHashClear(pInfo->aggSup.pResultRowHashTable);
   clearDiskbasedBuf(pInfo->aggSup.pResultBuf);
   cleanupResultRowInfo(&pInfo->binfo.resultRowInfo);
   initResultRowInfo(&pInfo->binfo.resultRowInfo);
@@ -4932,14 +4928,14 @@ static int32_t outputMergeAlignedIntervalResult(SOperatorInfo* pOperatorInfo, ui
   SExprSupp*                pSup = &pOperatorInfo->exprSupp;
 
   SET_RES_WINDOW_KEY(iaInfo->aggSup.keyBuf, &wstartTs, TSDB_KEYSIZE, tableGroupId);
-  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(
-      iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
+                                                            GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
   ASSERT(p1 != NULL);
 
   finalizeResultRowIntoResultDataBlock(iaInfo->aggSup.pResultBuf, p1, pSup->pCtx, pSup->pExprInfo, pSup->numOfExprs,
                                        pSup->rowEntryInfoOffset, pResultBlock, pTaskInfo);
-  tSimpleHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
-  ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
+  taosHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -4962,7 +4958,7 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR
 
   // there is an result exists
   if (miaInfo->curTs != INT64_MIN) {
-    ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
+    ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
 
     if (ts != miaInfo->curTs) {
       outputMergeAlignedIntervalResult(pOperatorInfo, tableGroupId, pResultBlock, miaInfo->curTs);
@@ -4970,7 +4966,7 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR
     }
   } else {
     miaInfo->curTs = ts;
-    ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
+    ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 0);
   }
 
   STimeWindow win = {0};
@@ -5046,7 +5042,7 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
     if (pBlock == NULL) {
       // close last unfinalized time window
       if (miaInfo->curTs != INT64_MIN) {
-        ASSERT(tSimpleHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
+        ASSERT(taosHashGetSize(iaInfo->aggSup.pResultRowHashTable) == 1);
         outputMergeAlignedIntervalResult(pOperator, miaInfo->groupId, pRes, miaInfo->curTs);
         miaInfo->curTs = INT64_MIN;
       }
@@ -5223,12 +5219,12 @@ static int32_t finalizeWindowResult(SOperatorInfo* pOperatorInfo, uint64_t table
   SExprSupp*                     pExprSup = &pOperatorInfo->exprSupp;
 
   SET_RES_WINDOW_KEY(iaInfo->aggSup.keyBuf, &win->skey, TSDB_KEYSIZE, tableGroupId);
-  SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
+  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
                                                             GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
   ASSERT(p1 != NULL);
   finalizeResultRowIntoResultDataBlock(iaInfo->aggSup.pResultBuf, p1, pExprSup->pCtx, pExprSup->pExprInfo,
                                        pExprSup->numOfExprs, pExprSup->rowEntryInfoOffset, pResultBlock, pTaskInfo);
-  tSimpleHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  taosHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
   return TSDB_CODE_SUCCESS;
 }
 
@@ -5491,4 +5487,4 @@ _error:
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
-}
+}
\ No newline at end of file

From 4eccd81e9420af0ce6c1812e531f3a518494c43e Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 16 Aug 2022 14:39:03 +0800
Subject: [PATCH 15/98] fix:error in tag filter optimization

---
 source/libs/executor/src/executil.c   | 4 +++-
 tests/system-test/2-query/json_tag.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 2a43751707..2e82ab3d89 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -433,8 +433,10 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
         tagVal.cid = pColInfo->info.colId;
         const char* p = metaGetTableTagVal(tag, pColInfo->info.type, &tagVal);
 
-        if (p == NULL){
+        if (p == NULL || (pColInfo->info.type == TSDB_DATA_TYPE_JSON && ((STag*)p)->nTag == 0)){
           colDataAppend(pColInfo, i, p, true);
+        } else if (pColInfo->info.type == TSDB_DATA_TYPE_JSON) {
+          colDataAppend(pColInfo, i, p, false);
         } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
           char *tmp = taosMemoryMalloc(tagVal.nData + VARSTR_HEADER_SIZE);
           varDataSetLen(tmp, tagVal.nData);
diff --git a/tests/system-test/2-query/json_tag.py b/tests/system-test/2-query/json_tag.py
index d9d7ef2300..30179062f5 100644
--- a/tests/system-test/2-query/json_tag.py
+++ b/tests/system-test/2-query/json_tag.py
@@ -216,7 +216,7 @@ class TDTestCase:
 
         # test where with json tag
         tdSql.query("select * from jsons1_1 where jtag is not null")
-        tdSql.query("select * from jsons1 where jtag='{\"tag1\":11,\"tag2\":\"\"}'")
+        tdSql.error("select * from jsons1 where jtag='{\"tag1\":11,\"tag2\":\"\"}'")
         tdSql.error("select * from jsons1 where jtag->'tag1'={}")
 
         # test json error

From c4d25ccb90874c49e9602189611157eddf99201e Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 16 Aug 2022 14:48:31 +0800
Subject: [PATCH 16/98] fix:remove log for time cost

---
 source/dnode/vnode/src/meta/metaQuery.c | 146 ++++++++++++------------
 source/libs/executor/src/executil.c     |  22 ++--
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index df22913a0d..adf9088cae 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -53,79 +53,79 @@ _err:
   return -1;
 }
 
-int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
-
-  SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
-  SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
-  SMeta  *pMeta = meta;
-  int64_t version;
-  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-
-  int64_t stt1 = taosGetTimestampUs();
-  for(int i = 0; i < taosArrayGetSize(uidList); i++) {
-    void* ppVal = NULL;
-    int vlen = 0;
-    uint64_t *  uid = taosArrayGet(uidList, i);
-    // query uid.idx
-    if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
-      continue;
-    }
-    version = *(int64_t *)ppVal;
-
-    STbDbKey tbDbKey = {.version = version, .uid = *uid};
-    taosArrayPush(uidVersion, &tbDbKey);
-    taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
-  }
-  int64_t stt2 = taosGetTimestampUs();
-  qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
-
-  TBC        *pCur = NULL;
-  tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
-  tdbTbcMoveToFirst(pCur);
-  void *pKey = NULL;
-  int   kLen = 0;
-
-  while(1){
-    SMetaReader pReader = {0};
-    int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
-    if (ret < 0) break;
-    STbDbKey *tmp = (STbDbKey*)pKey;
-    int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
-    if(ver == NULL || *ver != tmp->version) continue;
-    taosArrayPush(readerList, &pReader);
-  }
-  tdbTbcClose(pCur);
-
-  taosArrayClear(readerList);
-  int64_t stt3 = taosGetTimestampUs();
-  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
-  for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
-    SMetaReader pReader = {0};
-
-    STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
-    // query table.db
-    if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
-      continue;
-    }
-    taosArrayPush(readerList, &pReader);
-  }
-  int64_t stt4 = taosGetTimestampUs();
-  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
-
-  for(int i = 0; i < taosArrayGetSize(readerList); i++){
-    SMetaReader* pReader  = taosArrayGet(readerList, i);
-    metaReaderInit(pReader, meta, 0);
-    // decode the entry
-    tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
-
-    if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
-    }
-    metaReaderClear(pReader);
-  }
-  int64_t stt5 = taosGetTimestampUs();
-  qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
-  return 0;
-}
+//int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
+//
+//  SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
+//  SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
+//  SMeta  *pMeta = meta;
+//  int64_t version;
+//  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
+//
+//  int64_t stt1 = taosGetTimestampUs();
+//  for(int i = 0; i < taosArrayGetSize(uidList); i++) {
+//    void* ppVal = NULL;
+//    int vlen = 0;
+//    uint64_t *  uid = taosArrayGet(uidList, i);
+//    // query uid.idx
+//    if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
+//      continue;
+//    }
+//    version = *(int64_t *)ppVal;
+//
+//    STbDbKey tbDbKey = {.version = version, .uid = *uid};
+//    taosArrayPush(uidVersion, &tbDbKey);
+//    taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
+//  }
+//  int64_t stt2 = taosGetTimestampUs();
+//  qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
+//
+//  TBC        *pCur = NULL;
+//  tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
+//  tdbTbcMoveToFirst(pCur);
+//  void *pKey = NULL;
+//  int   kLen = 0;
+//
+//  while(1){
+//    SMetaReader pReader = {0};
+//    int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
+//    if (ret < 0) break;
+//    STbDbKey *tmp = (STbDbKey*)pKey;
+//    int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
+//    if(ver == NULL || *ver != tmp->version) continue;
+//    taosArrayPush(readerList, &pReader);
+//  }
+//  tdbTbcClose(pCur);
+//
+//  taosArrayClear(readerList);
+//  int64_t stt3 = taosGetTimestampUs();
+//  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
+//  for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
+//    SMetaReader pReader = {0};
+//
+//    STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
+//    // query table.db
+//    if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
+//      continue;
+//    }
+//    taosArrayPush(readerList, &pReader);
+//  }
+//  int64_t stt4 = taosGetTimestampUs();
+//  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
+//
+//  for(int i = 0; i < taosArrayGetSize(readerList); i++){
+//    SMetaReader* pReader  = taosArrayGet(readerList, i);
+//    metaReaderInit(pReader, meta, 0);
+//    // decode the entry
+//    tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
+//
+//    if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
+//    }
+//    metaReaderClear(pReader);
+//  }
+//  int64_t stt5 = taosGetTimestampUs();
+//  qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
+//  return 0;
+//}
 
 int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
   SMeta  *pMeta = pReader->pMeta;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 2e82ab3d89..449f357685 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -396,7 +396,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
     blockDataAppendColInfo(pResBlock, &colInfo);
   }
 
-  int64_t stt = taosGetTimestampUs();
+//  int64_t stt = taosGetTimestampUs();
   tags = taosArrayInit(8, POINTER_BYTES);
   code = metaGetTableTags(metaHandle, suid, uidList, tags);
   if (code != TSDB_CODE_SUCCESS) {
@@ -408,8 +408,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
   if(rows == 0){
     goto end;
   }
-  int64_t stt1 = taosGetTimestampUs();
-  qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
+//  int64_t stt1 = taosGetTimestampUs();
+//  qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
 
   code = blockDataEnsureCapacity(pResBlock, rows);
   if (code != TSDB_CODE_SUCCESS) {
@@ -417,7 +417,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
     goto end;
   }
 
-  int64_t st = taosGetTimestampUs();
+//  int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
     void* tag = taosArrayGetP(tags, i);
     int64_t* uid = taosArrayGet(uidList, i);
@@ -451,8 +451,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
   }
   pResBlock->info.rows = rows;
 
-  int64_t st1 = taosGetTimestampUs();
-  qDebug("generate tag block rows:%d, cost:%ld us", rows, st1-st);
+//  int64_t st1 = taosGetTimestampUs();
+//  qDebug("generate tag block rows:%d, cost:%ld us", rows, st1-st);
 
   pBlockList = taosArrayInit(2, POINTER_BYTES);
   taosArrayPush(pBlockList, &pResBlock);
@@ -467,8 +467,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
   if(code != TSDB_CODE_SUCCESS){
     terrno = code;
   }
-  int64_t st2 = taosGetTimestampUs();
-  qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
+//  int64_t st2 = taosGetTimestampUs();
+//  qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
 
 end:
   taosArrayDestroyP(tags, taosMemoryFree);
@@ -497,15 +497,15 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
       SIndexMetaArg metaArg = {
           .metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid};
 
-      int64_t stt = taosGetTimestampUs();
+//      int64_t stt = taosGetTimestampUs();
       SIdxFltStatus status = SFLT_NOT_INDEX;
       code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
       if (code != 0 || status == SFLT_NOT_INDEX) {
         qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
       }
 
-      int64_t stt1 = taosGetTimestampUs();
-      qDebug("generate table list, cost:%ld us", stt1-stt);
+//      int64_t stt1 = taosGetTimestampUs();
+//      qDebug("generate table list, cost:%ld us", stt1-stt);
     }else if(!pTagCond){
       vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
     }

From 7c82b1221f69fdfcc36bf36bac0a2be849400585 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 16 Aug 2022 17:04:35 +0800
Subject: [PATCH 17/98] fix: return error if stable's name duplicate with child
 table

---
 source/dnode/vnode/src/meta/metaTable.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index e56b8ad939..079c89cc36 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -176,6 +176,15 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
   // validate req
   metaReaderInit(&mr, pMeta, 0);
   if (metaGetTableEntryByName(&mr, pReq->name) == 0) {
+    if (mr.me.type == TSDB_SUPER_TABLE) {
+      metaReaderClear(&mr);
+      return 0;
+    } else {
+      terrno = TSDB_CODE_TDB_STB_ALREADY_EXIST;
+      metaReaderClear(&mr);
+      return -1;
+    }
+    /*
 // TODO: just for pass case
 #if 0
     terrno = TSDB_CODE_TDB_STB_ALREADY_EXIST;
@@ -185,6 +194,7 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
     metaReaderClear(&mr);
     return 0;
 #endif
+    */
   }
   metaReaderClear(&mr);
 

From 4c4f5bdf5fbd0cd4eeb0ef783b259a2824199de1 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 16 Aug 2022 19:28:16 +0800
Subject: [PATCH 18/98] fix: the supertable and subtable can have same name

---
 source/dnode/vnode/src/meta/metaTable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 079c89cc36..a1c1215a92 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -180,14 +180,14 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
       metaReaderClear(&mr);
       return 0;
     } else {
-      terrno = TSDB_CODE_TDB_STB_ALREADY_EXIST;
+      terrno = TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
       metaReaderClear(&mr);
       return -1;
     }
     /*
 // TODO: just for pass case
 #if 0
-    terrno = TSDB_CODE_TDB_STB_ALREADY_EXIST;
+    terrno = TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
     metaReaderClear(&mr);
     return -1;
 #else

From e73a311a08be329ea15c35e021695afe32d80ea1 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 16 Aug 2022 19:30:32 +0800
Subject: [PATCH 19/98] test: add case for dupliate supertable name

---
 tests/script/tsim/db/basic2.sim | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/script/tsim/db/basic2.sim b/tests/script/tsim/db/basic2.sim
index 114adf98e6..2ba7d806af 100644
--- a/tests/script/tsim/db/basic2.sim
+++ b/tests/script/tsim/db/basic2.sim
@@ -3,6 +3,21 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
+print =============== conflict stb
+sql create database db vgroups 1;
+sql use db;
+sql create table stb (ts timestamp, i int) tags (j int);
+sql_error create table stb using stb tags (1);
+sql_error create table stb (ts timestamp, i int);
+
+sql create table ctb (ts timestamp, i int);
+sql_error create table ctb (ts timestamp, i int) tags (j int);
+
+sql create table ntb (ts timestamp, i int);
+sql_error create table ntb (ts timestamp, i int) tags (j int);
+
+sql drop database db
+
 print =============== create database d1
 sql create database d1
 sql use d1

From d170adf2140328935fb9fb0b69f5f082de2569d8 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Tue, 16 Aug 2022 20:22:45 +0800
Subject: [PATCH 20/98] enh: rsma batch process

---
 source/dnode/vnode/src/inc/sma.h          |   2 +-
 source/dnode/vnode/src/inc/vnd.h          |   1 +
 source/dnode/vnode/src/sma/smaCommit.c    |  37 +++--
 source/dnode/vnode/src/sma/smaRollup.c    | 174 +++++++++++++++-------
 source/dnode/vnode/src/vnd/vnodeBufPool.c |  12 +-
 source/dnode/vnode/src/vnd/vnodeCommit.c  |   8 +-
 source/libs/executor/src/scanoperator.c   |   3 +-
 7 files changed, 169 insertions(+), 68 deletions(-)

diff --git a/source/dnode/vnode/src/inc/sma.h b/source/dnode/vnode/src/inc/sma.h
index bc204e032d..c36207e495 100644
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
@@ -240,7 +240,7 @@ static int32_t tdDestroySmaState(SSmaStat *pSmaStat, int8_t smaType);
 void          *tdFreeSmaState(SSmaStat *pSmaStat, int8_t smaType);
 void          *tdFreeRSmaInfo(SSma *pSma, SRSmaInfo *pInfo, bool isDeepFree);
 int32_t        tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash);
-int32_t        tdRSmaProcessExecImpl(SSma *pSma);
+int32_t        tdRSmaProcessExecImpl(SSma *pSma, int8_t type);
 
 int32_t tdProcessRSmaCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, const char *tbName);
 int32_t tdProcessRSmaRestoreImpl(SSma *pSma, int8_t type, int64_t qtaskFileVer);
diff --git a/source/dnode/vnode/src/inc/vnd.h b/source/dnode/vnode/src/inc/vnd.h
index 77b18b8c02..900d29b97e 100644
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
@@ -65,6 +65,7 @@ struct SVBufPool {
   SVBufPool*       next;
   SVnode*          pVnode;
   volatile int32_t nRef;
+  TdThreadSpinlock lock;
   int64_t          size;
   uint8_t*         ptr;
   SVBufPoolNode*   pTail;
diff --git a/source/dnode/vnode/src/sma/smaCommit.c b/source/dnode/vnode/src/sma/smaCommit.c
index 807c033489..101fca3346 100644
--- a/source/dnode/vnode/src/sma/smaCommit.c
+++ b/source/dnode/vnode/src/sma/smaCommit.c
@@ -297,10 +297,9 @@ static int32_t tdProcessRSmaSyncPostCommitImpl(SSma *pSma) {
 }
 
 /**
- * @brief Rsma async commit implementation
+ * @brief Rsma async commit implementation(only do some necessary light weighted task)
  *  1) set rsma stat TASK_TRIGGER_STAT_PAUSED
  *  2) Wait all running fetch task finish to fetch and put submitMsg into level 2/3 wQueue(blocking level 1 write)
- *  3)
  *
  * @param pSma
  * @return int32_t
@@ -334,12 +333,7 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma) {
     }
   }
 
-  // step 3: consume the SubmitReq in buffer
-  if (tdRSmaProcessExecImpl(pSma) < 0) {
-    return TSDB_CODE_FAILED;
-  }
-
-  // step 4:  swap rsmaInfoHash and iRsmaInfoHash
+  // step 3:  swap queue/qall and iQueue/iQal
   // lock
   taosWLockLatch(SMA_ENV_LOCK(pEnv));
 
@@ -379,9 +373,32 @@ static int32_t tdProcessRSmaAsyncCommitImpl(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  // perform persist task for qTaskInfo
   SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
-  tdRSmaPersistExecImpl(pRSmaStat, RSMA_INFO_HASH(pRSmaStat));
+
+  // step 1: consume the SubmitReq in buffer
+  int32_t nLoops = 0;
+  smaDebug("vgId:%d start to wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+  while (pRSmaStat->execStat == 1) {
+    taosMsleep(15);
+    if ((++nLoops & 63) == 0) {
+      smaWarn("vgId:%d 1s waited for rsma exec stat = 0, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+      sched_yield();
+    }
+  }
+  pRSmaStat->execStat = 1;
+  smaDebug("vgId:%d end to wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+
+  if (tdRSmaProcessExecImpl(pSma, 1) < 0) {
+    pRSmaStat->execStat = 0;
+    return TSDB_CODE_FAILED;
+  }
+
+  // step 2: perform persist task for qTaskInfo operator
+  if (tdRSmaPersistExecImpl(pRSmaStat, RSMA_INFO_HASH(pRSmaStat)) < 0) {
+    pRSmaStat->execStat = 0;
+    return TSDB_CODE_FAILED;
+  }
+  pRSmaStat->execStat = 0;
 
   return TSDB_CODE_SUCCESS;
 }
diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index 4ffd6479f5..de4b7dd808 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -15,9 +15,9 @@
 
 #include "sma.h"
 
-#define RSMA_QTASKINFO_BUFSIZE  32768
+#define RSMA_QTASKINFO_BUFSIZE  (32768)
 #define RSMA_QTASKINFO_HEAD_LEN (sizeof(int32_t) + sizeof(int8_t) + sizeof(int64_t))  // len + type + suid
-#define RSMA_QTASKEXEC_BUFSIZ   10 * 1048576                                           // 8 MB
+#define RSMA_QTASKEXEC_BUFSIZ   (1048576)
 
 SSmaMgmt smaMgmt = {
     .inited = 0,
@@ -35,7 +35,7 @@ static int32_t    tdUpdateTbUidListImpl(SSma *pSma, tb_uid_t *suid, SArray *tbUi
 static int32_t    tdSetRSmaInfoItemParams(SSma *pSma, SRSmaParam *param, SRSmaStat *pStat, SRSmaInfo *pRSmaInfo,
                                           int8_t idx);
 static int32_t    tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
-                                    tb_uid_t suid, int8_t level);
+                                    int8_t type, int8_t level);
 static SRSmaInfo *tdAcquireRSmaInfoBySuid(SSma *pSma, int64_t suid);
 static void       tdReleaseRSmaInfo(SSma *pSma, SRSmaInfo *pInfo);
 static int32_t    tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSmaInfoItem *pItem, STSchema *pTSchema,
@@ -600,17 +600,6 @@ static int32_t tdFetchSubmitReqSuids(SSubmitReq *pMsg, STbUidStore *pStore) {
   return 0;
 }
 
-static void tdDestroySDataBlockArray(SArray *pArray) {
-  // TODO
-#if 0
-  for (int32_t i = 0; i < taosArrayGetSize(pArray); ++i) {
-    SSDataBlock *pDataBlock = taosArrayGet(pArray, i);
-    blockDestroyInner(pDataBlock);
-  }
-#endif
-  taosArrayDestroy(pArray);
-}
-
 /**
  * @brief retention of rsma1/rsma2
  *
@@ -668,8 +657,7 @@ static int32_t tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSm
     } else {
       smaDebug("vgId:%d, rsma %" PRIi8 " data fetched", SMA_VID(pSma), pItem->level);
     }
-
-#if 1
+#if 0
     char flag[10] = {0};
     snprintf(flag, 10, "level %" PRIi8, pItem->level);
     blockDebugShowDataBlocks(pResList, flag);
@@ -731,11 +719,45 @@ static int32_t tdExecuteRSmaImplAsync(SSma *pSma, const void *pMsg, int32_t inpu
   taosWriteQitem(pInfo->queue, qItem);
 
   SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
-  atomic_fetch_add_64(&pRSmaStat->qBufSize, taosQueueMemorySize(pInfo->queue));
+  int64_t    bufSize = atomic_add_fetch_64(&pRSmaStat->qBufSize, pReq->header.contLen);
+
+  // smoothing consume
+  int32_t n = bufSize / RSMA_QTASKEXEC_BUFSIZ;
+  if (n > 1) {
+    if (n > 10) {
+      n = 10;
+    }
+    taosMsleep(n << 4);
+    if (n > 2) {
+      smaWarn("vgId:%d pInfo->queue itemSize:%d, memSize:%" PRIi64 ", sleep %d ms", SMA_VID(pSma),
+              taosQueueItemSize(pInfo->queue), taosQueueMemorySize(pInfo->queue), n << 4);
+    } else {
+      smaDebug("vgId:%d pInfo->queue itemSize:%d, memSize:%" PRIi64 ", sleep %d ms", SMA_VID(pSma),
+               taosQueueItemSize(pInfo->queue), taosQueueMemorySize(pInfo->queue), n << 4);
+    }
+  }
 
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t tdRsmaPrintSubmitReq(SSma *pSma, SSubmitReq *pReq) {
+  SSubmitMsgIter msgIter = {0};
+  SSubmitBlkIter blkIter = {0};
+  STSRow        *row = NULL;
+  if (tInitSubmitMsgIter(pReq, &msgIter) < 0) return -1;
+  while (true) {
+    SSubmitBlk *pBlock = NULL;
+    if (tGetSubmitMsgNext(&msgIter, &pBlock) < 0) return -1;
+    if (pBlock == NULL) break;
+    tInitSubmitBlkIter(&msgIter, pBlock, &blkIter);
+    while ((row = tGetSubmitBlkNext(&blkIter)) != NULL) {
+      smaDebug("vgId:%d numOfRows:%d, suid:%" PRIi64 ", uid:%" PRIi64 ", version:%" PRIi64 ", ts:%" PRIi64,
+               SMA_VID(pSma), msgIter.numOfRows, msgIter.suid, msgIter.uid, pReq->version, row->ts);
+    }
+  }
+  return 0;
+}
+
 /**
  * @brief sync mode
  *
@@ -744,32 +766,42 @@ static int32_t tdExecuteRSmaImplAsync(SSma *pSma, const void *pMsg, int32_t inpu
  * @param msgSize
  * @param inputType
  * @param pInfo
- * @param suid
+ * @param type
  * @param level
  * @return int32_t
  */
 static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
-                                 tb_uid_t suid, int8_t level) {
+                                 int8_t type, int8_t level) {
   int32_t idx = level - 1;
-  if (!pInfo || !RSMA_INFO_QTASK(pInfo, idx)) {
-    smaDebug("vgId:%d, no qTaskInfo to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level, suid);
+
+  void *qTaskInfo = (type == 0) ? RSMA_INFO_QTASK(pInfo, idx) : RSMA_INFO_IQTASK(pInfo, idx);
+  if (!qTaskInfo) {
+    smaDebug("vgId:%d, no qTaskInfo to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level,
+             pInfo->suid);
     return TSDB_CODE_SUCCESS;
   }
   if (!pInfo->pTSchema) {
-    smaWarn("vgId:%d, no schema to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level, suid);
+    smaWarn("vgId:%d, no schema to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level, pInfo->suid);
     return TSDB_CODE_FAILED;
   }
 
   smaDebug("vgId:%d, execute rsma %" PRIi8 " task for qTaskInfo:%p suid:%" PRIu64, SMA_VID(pSma), level,
-           RSMA_INFO_QTASK(pInfo, idx), suid);
+           RSMA_INFO_QTASK(pInfo, idx), pInfo->suid);
 
-  if (qSetMultiStreamInput(RSMA_INFO_QTASK(pInfo, idx), pMsg, msgSize, inputType) < 0) {  // INPUT__DATA_SUBMIT
+#if 0
+  for (int32_t i = 0; i < msgSize; ++i) {
+    SSubmitReq *pReq = *(SSubmitReq **)((char *)pMsg + i * sizeof(void *));
+    smaDebug("vgId:%d [%d][%d] version %" PRIi64, SMA_VID(pSma), msgSize, i, pReq->version);
+    tdRsmaPrintSubmitReq(pSma, pReq);
+  }
+#endif
+  if (qSetMultiStreamInput(qTaskInfo, pMsg, msgSize, inputType) < 0) {
     smaError("vgId:%d, rsma %" PRIi8 " qSetStreamInput failed since %s", SMA_VID(pSma), level, tstrerror(terrno));
     return TSDB_CODE_FAILED;
   }
 
   SRSmaInfoItem *pItem = RSMA_INFO_ITEM(pInfo, idx);
-  tdRSmaFetchAndSubmitResult(pSma, RSMA_INFO_QTASK(pInfo, idx), pItem, pInfo->pTSchema, suid);
+  tdRSmaFetchAndSubmitResult(pSma, qTaskInfo, pItem, pInfo->pTSchema, pInfo->suid);
   atomic_store_8(&pItem->triggerStat, TASK_TRIGGER_STAT_ACTIVE);
 
   if (smaMgmt.tmrHandle) {
@@ -858,6 +890,8 @@ static int32_t tdExecuteRSmaAsync(SSma *pSma, const void *pMsg, int32_t inputTyp
       tdReleaseRSmaInfo(pSma, pRSmaInfo);
       return TSDB_CODE_FAILED;
     }
+  } else {
+    ASSERT(0);
   }
 
   tdReleaseRSmaInfo(pSma, pRSmaInfo);
@@ -896,9 +930,18 @@ static int32_t tdRSmaExecCheck(SSma *pSma) {
   int64_t    bufSize = atomic_load_64(&pRsmaStat->qBufSize);
 
   if ((pRsmaStat->execStat == 1) || (bufSize < RSMA_QTASKEXEC_BUFSIZ)) {
+    if (bufSize > RSMA_QTASKEXEC_BUFSIZ) {
+      smaDebug("vgId:%d bufSize is %d but has no chance to exec as qTaskInfo occupied by another task", SMA_VID(pSma),
+               bufSize);
+    } else {
+      smaDebug("vgId:%d bufSize is %d but has no chance to exec as less than %d", SMA_VID(pSma), bufSize,
+               RSMA_QTASKEXEC_BUFSIZ);
+    }
     return TSDB_CODE_SUCCESS;
   }
 
+  smaDebug("vgId:%d bufSize is %d and has chance to exec as qTaskInfo is free now", SMA_VID(pSma), bufSize);
+
   pRsmaStat->execStat = 1;
 
   SRSmaExecMsg fetchMsg;
@@ -1633,6 +1676,7 @@ int32_t smaProcessFetch(SSma *pSma, void *pMsg) {
     goto _err;
   }
 
+#if 0
   pInfo = tdAcquireRSmaInfoBySuid(pSma, req.suid);
   if (!pInfo) {
     if (terrno == TSDB_CODE_SUCCESS) {
@@ -1657,12 +1701,13 @@ int32_t smaProcessFetch(SSma *pSma, void *pMsg) {
   tdCleanupStreamInputDataBlock(taskInfo);
 
   tdReleaseRSmaInfo(pSma, pInfo);
+#endif
   tDecoderClear(&decoder);
   smaDebug("vgId:%d, success to process rsma fetch msg for suid:%" PRIi64 " level:%" PRIi8, SMA_VID(pSma), req.suid,
            req.level);
   return TSDB_CODE_SUCCESS;
 _err:
-  tdReleaseRSmaInfo(pSma, pInfo);
+  // tdReleaseRSmaInfo(pSma, pInfo);
   tDecoderClear(&decoder);
   smaError("vgId:%d, failed to process rsma fetch msg since %s", SMA_VID(pSma), terrstr());
   return TSDB_CODE_FAILED;
@@ -1674,7 +1719,14 @@ static void tdFreeRSmaSubmitItems(SArray *pItems) {
   }
 }
 
-int32_t tdRSmaProcessExecImpl(SSma *pSma) {
+/**
+ * @brief
+ *
+ * @param pSma
+ * @param type 0 triggered when buffer overflow, 1 triggered by commit
+ * @return int32_t
+ */
+int32_t tdRSmaProcessExecImpl(SSma *pSma, int8_t type) {
   SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
   SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
   SHashObj  *infoHash = NULL;
@@ -1686,12 +1738,14 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma) {
     goto _err;
   }
 
-  taosRLockLatch(SMA_ENV_LOCK(pEnv));
-  if (atomic_load_64(&pRSmaStat->qBufSize) < RSMA_QTASKEXEC_BUFSIZ) {
+  if (type == 0) {
+    taosRLockLatch(SMA_ENV_LOCK(pEnv));
+    if (atomic_load_64(&pRSmaStat->qBufSize) < RSMA_QTASKEXEC_BUFSIZ) {
+      taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
+      return TSDB_CODE_SUCCESS;
+    }
     taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
-    return TSDB_CODE_SUCCESS;
   }
-  taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
 
   if (!(pSubmitQArr = taosArrayInit(taosHashGetSize(infoHash), sizeof(SRSmaExecQItem)))) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -1706,18 +1760,33 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma) {
   SRSmaExecQItem qItem = {0};
   taosWLockLatch(SMA_ENV_LOCK(pEnv));
   void *pIter = taosHashIterate(infoHash, NULL);
-  while (pIter) {
-    SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
-    if (taosQueueItemSize(pInfo->queue)) {
-      taosReadAllQitems(pInfo->queue, pInfo->qall);
-      qItem.qall = &pInfo->qall;
-      qItem.pRSmaInfo = pIter;
-      taosArrayPush(pSubmitQArr, &qItem);
+  if (type == 0) {
+    while (pIter) {
+      SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
+      if (taosQueueItemSize(pInfo->queue)) {
+        taosReadAllQitems(pInfo->queue, pInfo->qall);
+        qItem.qall = &pInfo->qall;
+        qItem.pRSmaInfo = pIter;
+        taosArrayPush(pSubmitQArr, &qItem);
+      }
+      ASSERT(taosQueueItemSize(pInfo->queue) == 0);
+      pIter = taosHashIterate(infoHash, pIter);
     }
-    ASSERT(taosQueueItemSize(pInfo->queue) == 0);
-    pIter = taosHashIterate(infoHash, pIter);
+  } else if (type == 1) {
+    while (pIter) {
+      SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
+      if (taosQueueItemSize(pInfo->iQueue)) {
+        taosReadAllQitems(pInfo->iQueue, pInfo->iQall);
+        qItem.qall = &pInfo->iQall;
+        qItem.pRSmaInfo = pIter;
+        taosArrayPush(pSubmitQArr, &qItem);
+      }
+      ASSERT(taosQueueItemSize(pInfo->iQueue) == 0);
+      pIter = taosHashIterate(infoHash, pIter);
+    }
+  } else {
+    ASSERT(0);
   }
-
   atomic_store_64(&pRSmaStat->qBufSize, 0);
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
 
@@ -1739,12 +1808,16 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma) {
 
     int32_t size = taosArrayGetSize(pSubmitArr);
     if (size > 0) {
-      SRSmaInfo *pInfo = *(SRSmaInfo **)pItem->pRSmaInfo;
-      for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
-        if (tdExecuteRSmaImpl(pSma, pSubmitArr->pData, size, STREAM_INPUT__MERGED_SUBMIT, pInfo, pInfo->suid, i) < 0) {
-          tdFreeRSmaSubmitItems(pSubmitArr);
-          goto _err;
+      if (type == 0 || type == 1) {
+        SRSmaInfo *pInfo = *(SRSmaInfo **)pItem->pRSmaInfo;
+        for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
+          if (tdExecuteRSmaImpl(pSma, pSubmitArr->pData, size, STREAM_INPUT__MERGED_SUBMIT, pInfo, type, i) < 0) {
+            tdFreeRSmaSubmitItems(pSubmitArr);
+            goto _err;
+          }
         }
+      } else {
+        ASSERT(0);
       }
       tdFreeRSmaSubmitItems(pSubmitArr);
       taosArrayClear(pSubmitArr);
@@ -1775,16 +1848,17 @@ int32_t smaProcessExec(SSma *pSma, void *pMsg) {
     terrno = TSDB_CODE_RSMA_FETCH_MSG_MSSED_UP;
     goto _err;
   }
-
-  if (tdRSmaProcessExecImpl(pSma) < 0) {
+  smaDebug("vgId:%d, begin to process rsma exec msg by thread:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+  if (tdRSmaProcessExecImpl(pSma, 0) < 0) {
     goto _err;
   }
 
   pRsmaStat->execStat = 0;
-  smaWarn("vgId:%d, success to process rsma exec msg", SMA_VID(pSma));
+  smaDebug("vgId:%d, success to process rsma exec msg by thead:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
   return TSDB_CODE_SUCCESS;
 _err:
   pRsmaStat->execStat = 0;
-  smaError("vgId:%d, failed to process rsma fetch msg since %s", SMA_VID(pSma), terrstr());
+  smaError("vgId:%d, failed to process rsma fetch msg by thread:%p since %s", SMA_VID(pSma),
+           (void *)taosGetSelfPthreadId(), terrstr());
   return TSDB_CODE_FAILED;
 }
diff --git a/source/dnode/vnode/src/vnd/vnodeBufPool.c b/source/dnode/vnode/src/vnd/vnodeBufPool.c
index 0623b3bd10..5a22114ab4 100644
--- a/source/dnode/vnode/src/vnd/vnodeBufPool.c
+++ b/source/dnode/vnode/src/vnd/vnodeBufPool.c
@@ -78,7 +78,7 @@ void vnodeBufPoolReset(SVBufPool *pPool) {
 void *vnodeBufPoolMalloc(SVBufPool *pPool, int size) {
   SVBufPoolNode *pNode;
   void          *p;
-
+  taosThreadSpinLock(&pPool->lock);
   if (pPool->node.size >= pPool->ptr - pPool->node.data + size) {
     // allocate from the anchor node
     p = pPool->ptr;
@@ -89,6 +89,7 @@ void *vnodeBufPoolMalloc(SVBufPool *pPool, int size) {
     pNode = taosMemoryMalloc(sizeof(*pNode) + size);
     if (pNode == NULL) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
+      taosThreadSpinUnlock(&pPool->lock);
       return NULL;
     }
 
@@ -101,7 +102,7 @@ void *vnodeBufPoolMalloc(SVBufPool *pPool, int size) {
 
     pPool->size = pPool->size + sizeof(*pNode) + size;
   }
-
+  taosThreadSpinUnlock(&pPool->lock);
   return p;
 }
 
@@ -129,6 +130,12 @@ static int vnodeBufPoolCreate(SVnode *pVnode, int64_t size, SVBufPool **ppPool)
     return -1;
   }
 
+  if (taosThreadSpinInit(&pPool->lock, 0) != 0) {
+    taosMemoryFree(pPool);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
   pPool->next = NULL;
   pPool->pVnode = pVnode;
   pPool->nRef = 0;
@@ -145,6 +152,7 @@ static int vnodeBufPoolCreate(SVnode *pVnode, int64_t size, SVBufPool **ppPool)
 
 static int vnodeBufPoolDestroy(SVBufPool *pPool) {
   vnodeBufPoolReset(pPool);
+  taosThreadSpinDestroy(&pPool->lock);
   taosMemoryFree(pPool);
   return 0;
 }
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index c8dc07af0a..2f5169a0ec 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -220,9 +220,6 @@ int vnodeCommit(SVnode *pVnode) {
   vInfo("vgId:%d, start to commit, commit ID:%" PRId64 " version:%" PRId64, TD_VID(pVnode), pVnode->state.commitID,
         pVnode->state.applied);
 
-  vnodeBufPoolUnRef(pVnode->inUse);
-  pVnode->inUse = NULL;
-
   pVnode->state.commitTerm = pVnode->state.applyTerm;
 
   // save info
@@ -248,7 +245,7 @@ int vnodeCommit(SVnode *pVnode) {
   }
 
   if (VND_IS_RSMA(pVnode)) {
-    smaAsyncCommit(pVnode->pSma);
+    smaAsyncCommit(pVnode->pSma);  // would write L2/L3 data into BufPool
 
     if (tsdbCommit(VND_RSMA0(pVnode)) < 0) {
       ASSERT(0);
@@ -268,6 +265,9 @@ int vnodeCommit(SVnode *pVnode) {
       return -1;
     }
   }
+  
+  vnodeBufPoolUnRef(pVnode->inUse);
+  pVnode->inUse = NULL;
 
   if (tqCommit(pVnode->pTq) < 0) {
     ASSERT(0);
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 32d564d502..adb79fc6ad 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1174,6 +1174,7 @@ static void checkUpdateData(SStreamScanInfo* pInfo, bool invertible, SSDataBlock
   SColumnInfoData* pColDataInfo = taosArrayGet(pBlock->pDataBlock, pInfo->primaryTsIndex);
   ASSERT(pColDataInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP);
   TSKEY* tsCol = (TSKEY*)pColDataInfo->pData;
+  bool   inserted = updateInfoIsTableInserted(pInfo->pUpdateInfo, pBlock->info.uid);
   for (int32_t rowId = 0; rowId < pBlock->info.rows; rowId++) {
     SResultRowInfo dumyInfo;
     dumyInfo.cur.pageId = -1;
@@ -1183,7 +1184,7 @@ static void checkUpdateData(SStreamScanInfo* pInfo, bool invertible, SSDataBlock
       win = getActiveTimeWindow(NULL, &dumyInfo, tsCol[rowId], &pInfo->interval, TSDB_ORDER_ASC);
       isClosed = isCloseWindow(&win, &pInfo->twAggSup);
     }
-    bool inserted = updateInfoIsTableInserted(pInfo->pUpdateInfo, pBlock->info.uid);
+
     // must check update info first.
     bool update = updateInfoIsUpdated(pInfo->pUpdateInfo, pBlock->info.uid, tsCol[rowId]);
     bool closedWin = isClosed && inserted && isSignleIntervalWindow(pInfo) &&

From eee4c0853d6df2bff2a997305f709a104eafdca8 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 17 Aug 2022 10:34:53 +0800
Subject: [PATCH 21/98] refactor(sync): add syncNodeAppendEntriesOnePeer

---
 include/libs/sync/sync.h               |  11 +--
 source/libs/sync/inc/syncReplication.h |   2 +
 source/libs/sync/src/syncReplication.c | 115 +++++++++++++++++++++++++
 3 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index 6d8895eb96..7cd2ebdede 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -26,11 +26,12 @@ extern "C" {
 
 extern bool gRaftDetailLog;
 
-#define SYNC_RESP_TTL_MS       10000000
-#define SYNC_SPEED_UP_HB_TIMER 400
-#define SYNC_SPEED_UP_AFTER_MS (1000 * 20)
-#define SYNC_SLOW_DOWN_RANGE   100
-#define SYNC_MAX_READ_RANGE    10
+#define SYNC_RESP_TTL_MS          10000000
+#define SYNC_SPEED_UP_HB_TIMER    400
+#define SYNC_SPEED_UP_AFTER_MS    (1000 * 20)
+#define SYNC_SLOW_DOWN_RANGE      100
+#define SYNC_MAX_READ_RANGE       10
+#define SYNC_MAX_PROGRESS_WAIT_MS 4000
 
 #define SYNC_MAX_BATCH_SIZE 1
 #define SYNC_INDEX_BEGIN    0
diff --git a/source/libs/sync/inc/syncReplication.h b/source/libs/sync/inc/syncReplication.h
index 21821be6c7..edce124ee5 100644
--- a/source/libs/sync/inc/syncReplication.h
+++ b/source/libs/sync/inc/syncReplication.h
@@ -55,6 +55,8 @@ int32_t syncNodeAppendEntriesPeers(SSyncNode* pSyncNode);
 int32_t syncNodeAppendEntriesPeersSnapshot(SSyncNode* pSyncNode);
 int32_t syncNodeAppendEntriesPeersSnapshot2(SSyncNode* pSyncNode);
 
+int32_t syncNodeAppendEntriesOnePeer(SSyncNode* pSyncNode, SRaftId* pDestId, SyncIndex nextIndex);
+
 int32_t syncNodeReplicate(SSyncNode* pSyncNode, bool isTimer);
 int32_t syncNodeAppendEntries(SSyncNode* pSyncNode, const SRaftId* destRaftId, const SyncAppendEntries* pMsg);
 int32_t syncNodeAppendEntriesBatch(SSyncNode* pSyncNode, const SRaftId* destRaftId, const SyncAppendEntriesBatch* pMsg);
diff --git a/source/libs/sync/src/syncReplication.c b/source/libs/sync/src/syncReplication.c
index 24f75de5d3..886f7ad199 100644
--- a/source/libs/sync/src/syncReplication.c
+++ b/source/libs/sync/src/syncReplication.c
@@ -116,6 +116,120 @@ int32_t syncNodeAppendEntriesPeers(SSyncNode* pSyncNode) {
   return ret;
 }
 
+int32_t syncNodeAppendEntriesOnePeer(SSyncNode* pSyncNode, SRaftId* pDestId, SyncIndex nextIndex) {
+  int32_t ret = 0;
+
+  // pre index, pre term
+  SyncIndex preLogIndex = syncNodeGetPreIndex(pSyncNode, nextIndex);
+  SyncTerm  preLogTerm = syncNodeGetPreTerm(pSyncNode, nextIndex);
+  if (preLogTerm == SYNC_TERM_INVALID) {
+    SyncIndex newNextIndex = syncNodeGetLastIndex(pSyncNode) + 1;
+    // SyncIndex newNextIndex = nextIndex + 1;
+
+    syncIndexMgrSetIndex(pSyncNode->pNextIndex, pDestId, newNextIndex);
+    syncIndexMgrSetIndex(pSyncNode->pMatchIndex, pDestId, SYNC_INDEX_INVALID);
+    sError("vgId:%d, sync get pre term error, nextIndex:%" PRId64 ", update next-index:%" PRId64
+           ", match-index:%d, raftid:%" PRId64,
+           pSyncNode->vgId, nextIndex, newNextIndex, SYNC_INDEX_INVALID, pDestId->addr);
+    return -1;
+  }
+
+  // entry pointer array
+  SSyncRaftEntry* entryPArr[SYNC_MAX_BATCH_SIZE];
+  memset(entryPArr, 0, sizeof(entryPArr));
+
+  // get entry batch
+  int32_t   getCount = 0;
+  SyncIndex getEntryIndex = nextIndex;
+  for (int32_t i = 0; i < pSyncNode->pRaftCfg->batchSize; ++i) {
+    SSyncRaftEntry* pEntry = NULL;
+    int32_t         code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, getEntryIndex, &pEntry);
+    if (code == 0) {
+      ASSERT(pEntry != NULL);
+      entryPArr[i] = pEntry;
+      getCount++;
+      getEntryIndex++;
+
+    } else {
+      break;
+    }
+  }
+
+  // event log
+  do {
+    char     logBuf[128];
+    char     host[64];
+    uint16_t port;
+    syncUtilU642Addr(pDestId->addr, host, sizeof(host), &port);
+    snprintf(logBuf, sizeof(logBuf), "build batch:%d for %s:%d", getCount, host, port);
+    syncNodeEventLog(pSyncNode, logBuf);
+  } while (0);
+
+  // build msg
+  SyncAppendEntriesBatch* pMsg = syncAppendEntriesBatchBuild(entryPArr, getCount, pSyncNode->vgId);
+  ASSERT(pMsg != NULL);
+
+  // free entries
+  for (int32_t i = 0; i < pSyncNode->pRaftCfg->batchSize; ++i) {
+    SSyncRaftEntry* pEntry = entryPArr[i];
+    if (pEntry != NULL) {
+      syncEntryDestory(pEntry);
+      entryPArr[i] = NULL;
+    }
+  }
+
+  // prepare msg
+  pMsg->srcId = pSyncNode->myRaftId;
+  pMsg->destId = *pDestId;
+  pMsg->term = pSyncNode->pRaftStore->currentTerm;
+  pMsg->prevLogIndex = preLogIndex;
+  pMsg->prevLogTerm = preLogTerm;
+  pMsg->commitIndex = pSyncNode->commitIndex;
+  pMsg->privateTerm = 0;
+  pMsg->dataCount = getCount;
+
+  // send msg
+  syncNodeAppendEntriesBatch(pSyncNode, pDestId, pMsg);
+
+  // speed up
+  if (pMsg->dataCount > 0 && pSyncNode->commitIndex - pMsg->prevLogIndex > SYNC_SLOW_DOWN_RANGE) {
+    ret = 1;
+
+#if 0
+      do {
+        char     logBuf[128];
+        char     host[64];
+        uint16_t port;
+        syncUtilU642Addr(pDestId->addr, host, sizeof(host), &port);
+        snprintf(logBuf, sizeof(logBuf), "maybe speed up for %s:%d, pre-index:%ld", host, port, pMsg->prevLogIndex);
+        syncNodeEventLog(pSyncNode, logBuf);
+      } while (0);
+#endif
+  }
+
+  syncAppendEntriesBatchDestroy(pMsg);
+
+  return ret;
+}
+
+int32_t syncNodeAppendEntriesPeersSnapshot2(SSyncNode* pSyncNode) {
+  if (pSyncNode->state != TAOS_SYNC_STATE_LEADER) {
+    return -1;
+  }
+
+  int32_t ret = 0;
+  for (int i = 0; i < pSyncNode->peersNum; ++i) {
+    SRaftId* pDestId = &(pSyncNode->peersId[i]);
+
+    // next index
+    SyncIndex nextIndex = syncIndexMgrGetIndex(pSyncNode->pNextIndex, pDestId);
+    ret = syncNodeAppendEntriesOnePeer(pSyncNode, pDestId, nextIndex);
+  }
+
+  return ret;
+}
+
+#if 0
 int32_t syncNodeAppendEntriesPeersSnapshot2(SSyncNode* pSyncNode) {
   if (pSyncNode->state != TAOS_SYNC_STATE_LEADER) {
     return -1;
@@ -221,6 +335,7 @@ int32_t syncNodeAppendEntriesPeersSnapshot2(SSyncNode* pSyncNode) {
 
   return ret;
 }
+#endif
 
 int32_t syncNodeAppendEntriesPeersSnapshot(SSyncNode* pSyncNode) {
   ASSERT(pSyncNode->state == TAOS_SYNC_STATE_LEADER);

From b888c90054fb5f82479f93c6fafe9b577f8598e1 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 17 Aug 2022 10:38:40 +0800
Subject: [PATCH 22/98] fix: change the interval data load status when scan

---
 source/libs/executor/src/scanoperator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 454a0b0070..12df378a42 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -139,7 +139,7 @@ static bool overlapWithTimeWindow(SInterval* pInterval, SDataBlockInfo* pBlockIn
       }
 
       assert(w.ekey > pBlockInfo->window.ekey);
-      if (w.skey <= pBlockInfo->window.ekey && w.skey > pBlockInfo->window.skey) {
+      if (TMAX(w.skey, pBlockInfo->window.skey) <= pBlockInfo->window.ekey) {
         return true;
       }
     }
@@ -147,7 +147,7 @@ static bool overlapWithTimeWindow(SInterval* pInterval, SDataBlockInfo* pBlockIn
     w = getAlignQueryTimeWindow(pInterval, pInterval->precision, pBlockInfo->window.ekey);
     assert(w.skey <= pBlockInfo->window.ekey);
 
-    if (w.skey > pBlockInfo->window.skey) {
+    if (TMAX(w.skey, pBlockInfo->window.skey) <= TMIN(w.ekey, pBlockInfo->window.ekey)) {
       return true;
     }
 
@@ -158,7 +158,7 @@ static bool overlapWithTimeWindow(SInterval* pInterval, SDataBlockInfo* pBlockIn
       }
 
       assert(w.skey < pBlockInfo->window.skey);
-      if (w.ekey < pBlockInfo->window.ekey && w.ekey >= pBlockInfo->window.skey) {
+      if (pBlockInfo->window.skey <= TMIN(w.ekey, pBlockInfo->window.ekey)) {
         return true;
       }
     }

From 2bf2d5e6e1226252a0aaef69b5d4af1b1e692539 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 17 Aug 2022 11:39:55 +0800
Subject: [PATCH 23/98] fix:error in get table list by tag filter

---
 source/dnode/vnode/src/meta/metaQuery.c |  20 +-
 source/libs/executor/src/executil.c     |  29 ++-
 source/libs/scalar/src/sclvector.c      |   5 +-
 tests/system-test/2-query/json_tag.py   | 295 ++++++++++++++++++++++++
 4 files changed, 336 insertions(+), 13 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index b302897907..9f2cf409be 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -965,10 +965,11 @@ END:
 int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *tags) {
   SMCtbCursor *pCur = metaOpenCtbCursor(pMeta, suid);
 
-  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-  size_t    len = taosArrayGetSize(uidList);
-  if (len > 0) {
-    for (int i = 0; i < len; i++) {
+  SHashObj *uHash = NULL;
+  size_t len = taosArrayGetSize(uidList);   // len > 0 means there already have uids
+  if(len > 0){
+    uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK);
+    for(int i = 0; i < len; i++){
       int64_t *uid = taosArrayGet(uidList, i);
       taosHashPut(uHash, uid, sizeof(int64_t), &i, sizeof(i));
     }
@@ -985,13 +986,22 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *t
 
     void *tag = taosMemoryMalloc(pCur->vLen);
     memcpy(tag, pCur->pVal, pCur->vLen);
-    taosArrayPush(tags, &tag);
 
     if (len == 0) {
       taosArrayPush(uidList, &id);
+      taosArrayPush(tags, &tag);
+    }else{
+      taosHashPut(uHash, &id, sizeof(int64_t), &tag, POINTER_BYTES);
     }
   }
 
+  for(int i = 0; i < len; i++){
+    int64_t *uid = taosArrayGet(uidList, i);
+    void **tag = taosHashGet(uHash, uid, POINTER_BYTES);
+    taosArrayPush(tags, tag);
+  }
+
+
   taosHashCleanup(uHash);
   metaCloseCtbCursor(pCur);
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 449f357685..f8164e0947 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -321,6 +321,8 @@ static EDealRes getColumn(SNode** pNode, void* pContext) {
       pSColumnNode->node.resType.bytes = TSDB_TABLE_FNAME_LEN - 1 + VARSTR_HEADER_SIZE;
       nodesDestroyNode(*pNode);
       *pNode = (SNode*)pSColumnNode;
+    }else{
+      return DEAL_RES_CONTINUE;
     }
   }else{
     return DEAL_RES_CONTINUE;
@@ -423,11 +425,16 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
     int64_t* uid = taosArrayGet(uidList, i);
     for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
       SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
+
+      char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
+      metaGetTableNameByUid(metaHandle, *uid, str);
+      colDataAppend(pColInfo, i, str, false);
+
       if(pColInfo->info.colId == -1){     // tbname
-        char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
-        metaGetTableNameByUid(metaHandle, *uid, str);
-        colDataAppend(pColInfo, i, str, false);
-        qDebug("tbnameget uid:%ld, tbname:%s", *uid, str+2);
+//        char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
+//        metaGetTableNameByUid(metaHandle, *uid, str);
+//        colDataAppend(pColInfo, i, str, false);
+//        qDebug("tagfilter uid:%ld, tbname:%s", *uid, str+2);
       }else{
         STagVal tagVal = {0};
         tagVal.cid = pColInfo->info.colId;
@@ -445,6 +452,16 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
           taosMemoryFree(tmp);
         } else {
           colDataAppend(pColInfo, i, (const char*)&tagVal.i64, false);
+
+          if(pColInfo->info.type == TSDB_DATA_TYPE_TINYINT){
+            int8_t tint = *(int8_t*)(&tagVal.i64);
+            qDebug("tagfilter uid:%ld, tbname:%s, tint:%d", *uid, str+2, tint);
+
+          }else if(pColInfo->info.type == TSDB_DATA_TYPE_INT){
+            int nint = *(int*)(&tagVal.i64);
+            qDebug("tagfilter uid:%ld, tbname:%s nint:+%d", *uid, str+2, nint);
+
+          }
         }
       }
     }
@@ -529,7 +546,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
       void* var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes);
 
       int64_t* uid = taosArrayGet(res, i);
-      qDebug("tbnameget get uid:%ld, res:%d", *uid, *(bool*)var);
+      qDebug("tagfilter get uid:%ld, res:%d", *uid, *(bool*)var);
       if (*(bool*)var == false) {
         taosArrayRemove(res, i);
         j++;
@@ -545,7 +562,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
   for (int i = 0; i < taosArrayGetSize(res); i++) {
     STableKeyInfo info = {.uid = *(uint64_t*)taosArrayGet(res, i), .groupId = 0};
     taosArrayPush(pListInfo->pTableList, &info);
-    qDebug("tbnameget get uid:%ld", info.uid);
+    qDebug("tagfilter get uid:%ld", info.uid);
   }
 
   taosArrayDestroy(res);
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index aaa70ef5ae..4fc0005e4d 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -1672,8 +1672,9 @@ void vectorBitOr(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut,
       colDataAppendInt8(pOut->columnData, i, (int8_t*)&result);\
     }else{\
       bool  res = filterDoCompare(fp, optr, pLeftData, pRightData);\
-      colDataAppendInt8(pOut->columnData, i, (int8_t*)&res);\
-    }\
+      colDataAppendInt8(pOut->columnData, i, (int8_t*)&res);                                      \
+      if(GET_PARAM_TYPE(pLeft) == TSDB_DATA_TYPE_BIGINT){qDebug("tagfilter left:%d, right:%d, res:%d", *(int64_t*)(pLeftData), *(int64_t*)(pRightData), res);}    \
+    }                                          \
     if(freeLeft) taosMemoryFreeClear(pLeftData);\
     if(freeRight) taosMemoryFreeClear(pRightData);\
   }
diff --git a/tests/system-test/2-query/json_tag.py b/tests/system-test/2-query/json_tag.py
index 856d764747..9b4379c011 100644
--- a/tests/system-test/2-query/json_tag.py
+++ b/tests/system-test/2-query/json_tag.py
@@ -698,3 +698,298 @@ class TDTestCase:
 
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())
+
+08/16 17:52:17.220901 00059267 QRY tagfilter uid:4871209028224417813, tbname:t3 nint:+2
+08/16 17:52:17.220973 00059267 QRY tagfilter uid:4871209028224417813, tbname:t3, tint:3
+08/16 17:52:17.220992 00059267 QRY tagfilter uid:4871209028228349987, tbname:t10 nint:+3
+08/16 17:52:17.221014 00059267 QRY tagfilter uid:4871209028228349987, tbname:t10, tint:4
+08/16 17:52:17.221042 00059267 QRY tagfilter uid:4871209028232282161, tbname:t17 nint:+4
+08/16 17:52:17.221057 00059267 QRY tagfilter uid:4871209028232282161, tbname:t17, tint:5
+08/16 17:52:17.221580 00059267 QRY tagfilter uid:4871209028236083263, tbname:t24 nint:+5
+08/16 17:52:17.221627 00059267 QRY tagfilter uid:4871209028236083263, tbname:t24, tint:6
+08/16 17:52:17.221641 00059267 QRY tagfilter uid:4871209028240015437, tbname:t31 nint:+2
+08/16 17:52:17.221654 00059267 QRY tagfilter uid:4871209028240015437, tbname:t31, tint:3
+08/16 17:52:17.221974 00059267 QRY tagfilter uid:4871209028244013147, tbname:t38 nint:+3
+08/16 17:52:17.222022 00059267 QRY tagfilter uid:4871209028244013147, tbname:t38, tint:4
+08/16 17:52:17.222040 00059267 QRY tagfilter uid:4871209028247879785, tbname:t45 nint:+4
+08/16 17:52:17.222054 00059267 QRY tagfilter uid:4871209028247879785, tbname:t45, tint:5
+08/16 17:52:17.222068 00059267 QRY tagfilter uid:4871209028251877495, tbname:t52 nint:+5
+08/16 17:52:17.222081 00059267 QRY tagfilter uid:4871209028251877495, tbname:t52, tint:6
+08/16 17:52:17.222167 00059267 QRY tagfilter uid:4871209028255744133, tbname:t59 nint:+2
+08/16 17:52:17.222192 00059267 QRY tagfilter uid:4871209028255744133, tbname:t59, tint:3
+08/16 17:52:17.222210 00059267 QRY tagfilter uid:4871209028259741843, tbname:t66 nint:+3
+08/16 17:52:17.222490 00059267 QRY tagfilter uid:4871209028259741843, tbname:t66, tint:4
+08/16 17:52:17.222522 00059267 QRY tagfilter uid:4871209028263805089, tbname:t73 nint:+4
+08/16 17:52:17.222551 00059267 QRY tagfilter uid:4871209028263805089, tbname:t73, tint:5
+08/16 17:52:17.222809 00059267 QRY tagfilter uid:4871209028267802799, tbname:t80 nint:+5
+08/16 17:52:17.222855 00059267 QRY tagfilter uid:4871209028267802799, tbname:t80, tint:6
+08/16 17:52:17.222874 00059267 QRY tagfilter uid:4871209028272062653, tbname:t87 nint:+2
+08/16 17:52:17.222934 00059267 QRY tagfilter uid:4871209028272062653, tbname:t87, tint:3
+08/16 17:52:17.222976 00059267 QRY tagfilter uid:4871209028276322508, tbname:t94 nint:+3
+08/16 17:52:17.222995 00059267 QRY tagfilter uid:4871209028276322508, tbname:t94, tint:4
+08/16 17:52:17.223013 00059267 QRY tagfilter uid:4871209028224942103, tbname:t4 nint:+4
+08/16 17:52:17.223029 00059267 QRY tagfilter uid:4871209028224942103, tbname:t4, tint:5
+08/16 17:52:17.223047 00059267 QRY tagfilter uid:4871209028228874277, tbname:t11 nint:+5
+08/16 17:52:17.223064 00059267 QRY tagfilter uid:4871209028228874277, tbname:t11, tint:6
+08/16 17:52:17.223079 00059267 QRY tagfilter uid:4871209028232871987, tbname:t18 nint:+2
+08/16 17:52:17.223093 00059267 QRY tagfilter uid:4871209028232871987, tbname:t18, tint:3
+08/16 17:52:17.223109 00059267 QRY tagfilter uid:4871209028236607553, tbname:t25 nint:+3
+08/16 17:52:17.223125 00059267 QRY tagfilter uid:4871209028236607553, tbname:t25, tint:4
+08/16 17:52:17.223141 00059267 QRY tagfilter uid:4871209028240605263, tbname:t32 nint:+4
+08/16 17:52:17.223156 00059267 QRY tagfilter uid:4871209028240605263, tbname:t32, tint:5
+08/16 17:52:17.223172 00059267 QRY tagfilter uid:4871209028244602973, tbname:t39 nint:+5
+08/16 17:52:17.223188 00059267 QRY tagfilter uid:4871209028244602973, tbname:t39, tint:6
+08/16 17:52:17.223204 00059267 QRY tagfilter uid:4871209028248404075, tbname:t46 nint:+2
+08/16 17:52:17.223219 00059267 QRY tagfilter uid:4871209028248404075, tbname:t46, tint:3
+08/16 17:52:17.223564 00059267 QRY tagfilter uid:4871209028252401785, tbname:t53 nint:+3
+08/16 17:52:17.223598 00059267 QRY tagfilter uid:4871209028252401785, tbname:t53, tint:4
+08/16 17:52:17.223614 00059267 QRY tagfilter uid:4871209028256333959, tbname:t60 nint:+4
+08/16 17:52:17.223638 00059267 QRY tagfilter uid:4871209028256333959, tbname:t60, tint:5
+08/16 17:52:17.223771 00059267 QRY tagfilter uid:4871209028260397205, tbname:t67 nint:+5
+08/16 17:52:17.223813 00059267 QRY tagfilter uid:4871209028260397205, tbname:t67, tint:6
+08/16 17:52:17.223828 00059267 QRY tagfilter uid:4871209028264525987, tbname:t74 nint:+2
+08/16 17:52:17.223858 00059267 QRY tagfilter uid:4871209028264525987, tbname:t74, tint:3
+08/16 17:52:17.223895 00059267 QRY tagfilter uid:4871209028268392625, tbname:t81 nint:+3
+08/16 17:52:17.223917 00059267 QRY tagfilter uid:4871209028268392625, tbname:t81, tint:4
+08/16 17:52:17.223953 00059267 QRY tagfilter uid:4871209028272718015, tbname:t88 nint:+4
+08/16 17:52:17.223977 00059267 QRY tagfilter uid:4871209028272718015, tbname:t88, tint:5
+08/16 17:52:17.223991 00059267 QRY tagfilter uid:4871209028276977870, tbname:t95 nint:+5
+08/16 17:52:17.224003 00059267 QRY tagfilter uid:4871209028276977870, tbname:t95, tint:6
+08/16 17:52:17.224018 00059267 QRY tagfilter uid:4871209028225466393, tbname:t5 nint:+2
+08/16 17:52:17.224030 00059267 QRY tagfilter uid:4871209028225466393, tbname:t5, tint:3
+08/16 17:52:17.224044 00059267 QRY tagfilter uid:4871209028229398567, tbname:t12 nint:+3
+08/16 17:52:17.224056 00059267 QRY tagfilter uid:4871209028229398567, tbname:t12, tint:4
+08/16 17:52:17.224071 00059267 QRY tagfilter uid:4871209028233396277, tbname:t19 nint:+4
+08/16 17:52:17.224084 00059267 QRY tagfilter uid:4871209028233396277, tbname:t19, tint:5
+08/16 17:52:17.224097 00059267 QRY tagfilter uid:4871209028237197379, tbname:t26 nint:+5
+08/16 17:52:17.224110 00059267 QRY tagfilter uid:4871209028237197379, tbname:t26, tint:6
+08/16 17:52:17.224125 00059267 QRY tagfilter uid:4871209028241195089, tbname:t33 nint:+2
+08/16 17:52:17.224139 00059267 QRY tagfilter uid:4871209028241195089, tbname:t33, tint:3
+08/16 17:52:17.224188 00059267 QRY tagfilter uid:4871209028245127263, tbname:t40 nint:+3
+08/16 17:52:17.224209 00059267 QRY tagfilter uid:4871209028245127263, tbname:t40, tint:4
+08/16 17:52:17.224459 00059267 QRY tagfilter uid:4871209028248993901, tbname:t47 nint:+4
+08/16 17:52:17.224479 00059267 QRY tagfilter uid:4871209028248993901, tbname:t47, tint:5
+08/16 17:52:17.224494 00059267 QRY tagfilter uid:4871209028252926075, tbname:t54 nint:+5
+08/16 17:52:17.224507 00059267 QRY tagfilter uid:4871209028252926075, tbname:t54, tint:6
+08/16 17:52:17.224522 00059267 QRY tagfilter uid:4871209028256858249, tbname:t61 nint:+2
+08/16 17:52:17.224535 00059267 QRY tagfilter uid:4871209028256858249, tbname:t61, tint:3
+08/16 17:52:17.224549 00059267 QRY tagfilter uid:4871209028260987031, tbname:t68 nint:+3
+08/16 17:52:17.224564 00059267 QRY tagfilter uid:4871209028260987031, tbname:t68, tint:4
+08/16 17:52:17.224664 00059267 QRY tagfilter uid:4871209028265050277, tbname:t75 nint:+4
+08/16 17:52:17.224717 00059267 QRY tagfilter uid:4871209028265050277, tbname:t75, tint:5
+08/16 17:52:17.224731 00059267 QRY tagfilter uid:4871209028269047987, tbname:t82 nint:+5
+08/16 17:52:17.224769 00059267 QRY tagfilter uid:4871209028269047987, tbname:t82, tint:6
+08/16 17:52:17.224783 00059267 QRY tagfilter uid:4871209028273307841, tbname:t89 nint:+2
+08/16 17:52:17.224923 00059267 QRY tagfilter uid:4871209028273307841, tbname:t89, tint:3
+08/16 17:52:17.224990 00059267 QRY tagfilter uid:4871209028277502160, tbname:t96 nint:+3
+08/16 17:52:17.225006 00059267 QRY tagfilter uid:4871209028277502160, tbname:t96, tint:4
+08/16 17:52:17.225018 00059267 QRY tagfilter uid:4871209028225990683, tbname:t6 nint:+4
+08/16 17:52:17.225029 00059267 QRY tagfilter uid:4871209028225990683, tbname:t6, tint:5
+08/16 17:52:17.225039 00059267 QRY tagfilter uid:4871209028229922857, tbname:t13 nint:+5
+08/16 17:52:17.225053 00059267 QRY tagfilter uid:4871209028229922857, tbname:t13, tint:6
+08/16 17:52:17.225072 00059267 QRY tagfilter uid:4871209028233986103, tbname:t20 nint:+2
+08/16 17:52:17.225082 00059267 QRY tagfilter uid:4871209028233986103, tbname:t20, tint:3
+08/16 17:52:17.225093 00059267 QRY tagfilter uid:4871209028237721669, tbname:t27 nint:+3
+08/16 17:52:17.225103 00059267 QRY tagfilter uid:4871209028237721669, tbname:t27, tint:4
+08/16 17:52:17.225113 00059267 QRY tagfilter uid:4871209028241784915, tbname:t34 nint:+4
+08/16 17:52:17.225368 00059267 QRY tagfilter uid:4871209028241784915, tbname:t34, tint:5
+08/16 17:52:17.225409 00059267 QRY tagfilter uid:4871209028245717089, tbname:t41 nint:+5
+08/16 17:52:17.225437 00059267 QRY tagfilter uid:4871209028245717089, tbname:t41, tint:6
+08/16 17:52:17.225462 00059267 QRY tagfilter uid:4871209028249518191, tbname:t48 nint:+2
+08/16 17:52:17.225475 00059267 QRY tagfilter uid:4871209028249518191, tbname:t48, tint:3
+08/16 17:52:17.225486 00059267 QRY tagfilter uid:4871209028253450365, tbname:t55 nint:+3
+08/16 17:52:17.225496 00059267 QRY tagfilter uid:4871209028253450365, tbname:t55, tint:4
+08/16 17:52:17.225507 00059267 QRY tagfilter uid:4871209028257382539, tbname:t62 nint:+4
+08/16 17:52:17.225532 00059267 QRY tagfilter uid:4871209028257382539, tbname:t62, tint:5
+08/16 17:52:17.225544 00059267 QRY tagfilter uid:4871209028261511321, tbname:t69 nint:+5
+08/16 17:52:17.225554 00059267 QRY tagfilter uid:4871209028261511321, tbname:t69, tint:6
+08/16 17:52:17.225564 00059267 QRY tagfilter uid:4871209028265574567, tbname:t76 nint:+2
+08/16 17:52:17.225575 00059267 QRY tagfilter uid:4871209028265574567, tbname:t76, tint:3
+08/16 17:52:17.225585 00059267 QRY tagfilter uid:4871209028269637813, tbname:t83 nint:+3
+08/16 17:52:17.225615 00059267 QRY tagfilter uid:4871209028269637813, tbname:t83, tint:4
+08/16 17:52:17.225640 00059267 QRY tagfilter uid:4871209028273963203, tbname:t90 nint:+4
+08/16 17:52:17.225670 00059267 QRY tagfilter uid:4871209028273963203, tbname:t90, tint:5
+08/16 17:52:17.225698 00059267 QRY tagfilter uid:4871209028278026450, tbname:t97 nint:+5
+08/16 17:52:17.225709 00059267 QRY tagfilter uid:4871209028278026450, tbname:t97, tint:6
+08/16 17:52:17.226570 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226623 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226642 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226684 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226733 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226765 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226773 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226780 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226787 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226793 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226801 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226808 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226815 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226821 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226828 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226834 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226840 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226847 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226854 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226860 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226867 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226873 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226880 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226886 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226893 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226900 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226907 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226914 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.226920 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.226927 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.226934 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.226940 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227014 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.227036 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.227043 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.227050 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227056 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.227062 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.227069 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.227076 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227082 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.227089 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.227107 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.227129 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227138 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.227144 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.227151 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.227157 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227163 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.227170 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.227176 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.227194 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227202 00059267 QRY tagfilter left:2, right:3, res:1
+08/16 17:52:17.227208 00059267 QRY tagfilter left:3, right:3, res:0
+08/16 17:52:17.227215 00059267 QRY tagfilter left:4, right:3, res:0
+08/16 17:52:17.227221 00059267 QRY tagfilter left:5, right:3, res:0
+08/16 17:52:17.227284 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227298 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227304 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227311 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227317 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227324 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227330 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227359 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227421 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227437 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227444 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227450 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227456 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227463 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227469 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227475 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227493 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227500 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227507 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227513 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227520 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227526 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227541 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227548 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227570 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227578 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227585 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227591 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227598 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227604 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227611 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227617 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227624 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227630 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227636 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227643 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227649 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227656 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227662 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227668 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227675 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227681 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227688 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227696 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227703 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227709 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227716 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227723 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227729 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227738 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227744 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227750 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227757 00059267 QRY tagfilter left:3, right:2, res:1
+08/16 17:52:17.227764 00059267 QRY tagfilter left:4, right:2, res:1
+08/16 17:52:17.227771 00059267 QRY tagfilter left:5, right:2, res:1
+08/16 17:52:17.227779 00059267 QRY tagfilter left:6, right:2, res:1
+08/16 17:52:17.227803 00059267 QRY tagfilter get uid:4871209028224417813, res:1
+08/16 17:52:17.227811 00059267 QRY tagfilter get uid:4871209028228349987, res:0
+08/16 17:52:17.227822 00059267 QRY tagfilter get uid:4871209028232282161, res:0
+08/16 17:52:17.227829 00059267 QRY tagfilter get uid:4871209028236083263, res:0
+08/16 17:52:17.227836 00059267 QRY tagfilter get uid:4871209028240015437, res:1
+08/16 17:52:17.227843 00059267 QRY tagfilter get uid:4871209028244013147, res:0
+08/16 17:52:17.227849 00059267 QRY tagfilter get uid:4871209028247879785, res:0
+08/16 17:52:17.227856 00059267 QRY tagfilter get uid:4871209028251877495, res:0
+08/16 17:52:17.227862 00059267 QRY tagfilter get uid:4871209028255744133, res:1
+08/16 17:52:17.227871 00059267 QRY tagfilter get uid:4871209028259741843, res:0
+08/16 17:52:17.227928 00059267 QRY tagfilter get uid:4871209028263805089, res:0
+08/16 17:52:17.227951 00059267 QRY tagfilter get uid:4871209028267802799, res:0
+08/16 17:52:17.227959 00059267 QRY tagfilter get uid:4871209028272062653, res:1
+08/16 17:52:17.227965 00059267 QRY tagfilter get uid:4871209028276322508, res:0
+08/16 17:52:17.227974 00059267 QRY tagfilter get uid:4871209028224942103, res:0
+08/16 17:52:17.227981 00059267 QRY tagfilter get uid:4871209028228874277, res:0
+08/16 17:52:17.227988 00059267 QRY tagfilter get uid:4871209028232871987, res:1
+08/16 17:52:17.227995 00059267 QRY tagfilter get uid:4871209028236607553, res:0
+08/16 17:52:17.228001 00059267 QRY tagfilter get uid:4871209028240605263, res:0
+08/16 17:52:17.228008 00059267 QRY tagfilter get uid:4871209028244602973, res:0
+08/16 17:52:17.228016 00059267 QRY tagfilter get uid:4871209028248404075, res:1
+08/16 17:52:17.228023 00059267 QRY tagfilter get uid:4871209028252401785, res:0
+08/16 17:52:17.228030 00059267 QRY tagfilter get uid:4871209028256333959, res:0
+08/16 17:52:17.228036 00059267 QRY tagfilter get uid:4871209028260397205, res:0
+08/16 17:52:17.228043 00059267 QRY tagfilter get uid:4871209028264525987, res:1
+08/16 17:52:17.228049 00059267 QRY tagfilter get uid:4871209028268392625, res:0
+08/16 17:52:17.228056 00059267 QRY tagfilter get uid:4871209028272718015, res:0
+08/16 17:52:17.228063 00059267 QRY tagfilter get uid:4871209028276977870, res:0
+08/16 17:52:17.228070 00059267 QRY tagfilter get uid:4871209028225466393, res:1
+08/16 17:52:17.228076 00059267 QRY tagfilter get uid:4871209028229398567, res:0
+08/16 17:52:17.228083 00059267 QRY tagfilter get uid:4871209028233396277, res:0
+08/16 17:52:17.228089 00059267 QRY tagfilter get uid:4871209028237197379, res:0
+08/16 17:52:17.228095 00059267 QRY tagfilter get uid:4871209028241195089, res:1
+08/16 17:52:17.228104 00059267 QRY tagfilter get uid:4871209028245127263, res:0
+08/16 17:52:17.228110 00059267 QRY tagfilter get uid:4871209028248993901, res:0
+08/16 17:52:17.228117 00059267 QRY tagfilter get uid:4871209028252926075, res:0
+08/16 17:52:17.228123 00059267 QRY tagfilter get uid:4871209028256858249, res:1
+08/16 17:52:17.228129 00059267 QRY tagfilter get uid:4871209028260987031, res:0
+08/16 17:52:17.228136 00059267 QRY tagfilter get uid:4871209028265050277, res:0
+08/16 17:52:17.228158 00059267 QRY tagfilter get uid:4871209028269047987, res:0
+08/16 17:52:17.228166 00059267 QRY tagfilter get uid:4871209028273307841, res:1
+08/16 17:52:17.228172 00059267 QRY tagfilter get uid:4871209028277502160, res:0
+08/16 17:52:17.228179 00059267 QRY tagfilter get uid:4871209028225990683, res:0
+08/16 17:52:17.228185 00059267 QRY tagfilter get uid:4871209028229922857, res:0
+08/16 17:52:17.228192 00059267 QRY tagfilter get uid:4871209028233986103, res:1
+08/16 17:52:17.228198 00059267 QRY tagfilter get uid:4871209028237721669, res:0
+08/16 17:52:17.228204 00059267 QRY tagfilter get uid:4871209028241784915, res:0
+08/16 17:52:17.228211 00059267 QRY tagfilter get uid:4871209028245717089, res:0
+08/16 17:52:17.228217 00059267 QRY tagfilter get uid:4871209028249518191, res:1
+08/16 17:52:17.228223 00059267 QRY tagfilter get uid:4871209028253450365, res:0
+08/16 17:52:17.228300 00059267 QRY tagfilter get uid:4871209028257382539, res:0
+08/16 17:52:17.228323 00059267 QRY tagfilter get uid:4871209028261511321, res:0
+08/16 17:52:17.228330 00059267 QRY tagfilter get uid:4871209028265574567, res:1
+08/16 17:52:17.228336 00059267 QRY tagfilter get uid:4871209028269637813, res:0
+08/16 17:52:17.228343 00059267 QRY tagfilter get uid:4871209028273963203, res:0
+08/16 17:52:17.228349 00059267 QRY tagfilter get uid:4871209028278026450, res:0
+08/16 17:52:17.228357 00059267 QRY tagfilter get uid:4871209028224417813
+08/16 17:52:17.228363 00059267 QRY tagfilter get uid:4871209028240015437
+08/16 17:52:17.228383 00059267 QRY tagfilter get uid:4871209028255744133
+08/16 17:52:17.228406 00059267 QRY tagfilter get uid:4871209028272062653
+08/16 17:52:17.228413 00059267 QRY tagfilter get uid:4871209028232871987
+08/16 17:52:17.228442 00059267 QRY tagfilter get uid:4871209028248404075
+08/16 17:52:17.228478 00059267 QRY tagfilter get uid:4871209028264525987
+08/16 17:52:17.228499 00059267 QRY tagfilter get uid:4871209028225466393
+08/16 17:52:17.228507 00059267 QRY tagfilter get uid:4871209028241195089
+08/16 17:52:17.228513 00059267 QRY tagfilter get uid:4871209028256858249
+08/16 17:52:17.228520 00059267 QRY tagfilter get uid:4871209028273307841
+08/16 17:52:17.228526 00059267 QRY tagfilter get uid:4871209028233986103
+08/16 17:52:17.228533 00059267 QRY tagfilter get uid:4871209028249518191
+08/16 17:52:17.228539 00059267 QRY tagfilter get uid:4871209028265574567
\ No newline at end of file

From 171ce325c79d816f314561d05975ba93498ca411 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 17 Aug 2022 11:47:59 +0800
Subject: [PATCH 24/98] fix:error in get table list by tag filter

---
 source/libs/executor/src/executil.c   |  22 +-
 source/libs/scalar/src/sclvector.c    |   1 -
 tests/system-test/2-query/json_tag.py | 295 --------------------------
 3 files changed, 4 insertions(+), 314 deletions(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index f8164e0947..9f8f97c4f5 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -426,15 +426,11 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
     for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
       SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
 
-      char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
-      metaGetTableNameByUid(metaHandle, *uid, str);
-      colDataAppend(pColInfo, i, str, false);
-
       if(pColInfo->info.colId == -1){     // tbname
-//        char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
-//        metaGetTableNameByUid(metaHandle, *uid, str);
-//        colDataAppend(pColInfo, i, str, false);
-//        qDebug("tagfilter uid:%ld, tbname:%s", *uid, str+2);
+        char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
+        metaGetTableNameByUid(metaHandle, *uid, str);
+        colDataAppend(pColInfo, i, str, false);
+        qDebug("tagfilter uid:%ld, tbname:%s", *uid, str+2);
       }else{
         STagVal tagVal = {0};
         tagVal.cid = pColInfo->info.colId;
@@ -452,16 +448,6 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
           taosMemoryFree(tmp);
         } else {
           colDataAppend(pColInfo, i, (const char*)&tagVal.i64, false);
-
-          if(pColInfo->info.type == TSDB_DATA_TYPE_TINYINT){
-            int8_t tint = *(int8_t*)(&tagVal.i64);
-            qDebug("tagfilter uid:%ld, tbname:%s, tint:%d", *uid, str+2, tint);
-
-          }else if(pColInfo->info.type == TSDB_DATA_TYPE_INT){
-            int nint = *(int*)(&tagVal.i64);
-            qDebug("tagfilter uid:%ld, tbname:%s nint:+%d", *uid, str+2, nint);
-
-          }
         }
       }
     }
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 4fc0005e4d..55699d5abd 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -1673,7 +1673,6 @@ void vectorBitOr(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut,
     }else{\
       bool  res = filterDoCompare(fp, optr, pLeftData, pRightData);\
       colDataAppendInt8(pOut->columnData, i, (int8_t*)&res);                                      \
-      if(GET_PARAM_TYPE(pLeft) == TSDB_DATA_TYPE_BIGINT){qDebug("tagfilter left:%d, right:%d, res:%d", *(int64_t*)(pLeftData), *(int64_t*)(pRightData), res);}    \
     }                                          \
     if(freeLeft) taosMemoryFreeClear(pLeftData);\
     if(freeRight) taosMemoryFreeClear(pRightData);\
diff --git a/tests/system-test/2-query/json_tag.py b/tests/system-test/2-query/json_tag.py
index 9b4379c011..856d764747 100644
--- a/tests/system-test/2-query/json_tag.py
+++ b/tests/system-test/2-query/json_tag.py
@@ -698,298 +698,3 @@ class TDTestCase:
 
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())
-
-08/16 17:52:17.220901 00059267 QRY tagfilter uid:4871209028224417813, tbname:t3 nint:+2
-08/16 17:52:17.220973 00059267 QRY tagfilter uid:4871209028224417813, tbname:t3, tint:3
-08/16 17:52:17.220992 00059267 QRY tagfilter uid:4871209028228349987, tbname:t10 nint:+3
-08/16 17:52:17.221014 00059267 QRY tagfilter uid:4871209028228349987, tbname:t10, tint:4
-08/16 17:52:17.221042 00059267 QRY tagfilter uid:4871209028232282161, tbname:t17 nint:+4
-08/16 17:52:17.221057 00059267 QRY tagfilter uid:4871209028232282161, tbname:t17, tint:5
-08/16 17:52:17.221580 00059267 QRY tagfilter uid:4871209028236083263, tbname:t24 nint:+5
-08/16 17:52:17.221627 00059267 QRY tagfilter uid:4871209028236083263, tbname:t24, tint:6
-08/16 17:52:17.221641 00059267 QRY tagfilter uid:4871209028240015437, tbname:t31 nint:+2
-08/16 17:52:17.221654 00059267 QRY tagfilter uid:4871209028240015437, tbname:t31, tint:3
-08/16 17:52:17.221974 00059267 QRY tagfilter uid:4871209028244013147, tbname:t38 nint:+3
-08/16 17:52:17.222022 00059267 QRY tagfilter uid:4871209028244013147, tbname:t38, tint:4
-08/16 17:52:17.222040 00059267 QRY tagfilter uid:4871209028247879785, tbname:t45 nint:+4
-08/16 17:52:17.222054 00059267 QRY tagfilter uid:4871209028247879785, tbname:t45, tint:5
-08/16 17:52:17.222068 00059267 QRY tagfilter uid:4871209028251877495, tbname:t52 nint:+5
-08/16 17:52:17.222081 00059267 QRY tagfilter uid:4871209028251877495, tbname:t52, tint:6
-08/16 17:52:17.222167 00059267 QRY tagfilter uid:4871209028255744133, tbname:t59 nint:+2
-08/16 17:52:17.222192 00059267 QRY tagfilter uid:4871209028255744133, tbname:t59, tint:3
-08/16 17:52:17.222210 00059267 QRY tagfilter uid:4871209028259741843, tbname:t66 nint:+3
-08/16 17:52:17.222490 00059267 QRY tagfilter uid:4871209028259741843, tbname:t66, tint:4
-08/16 17:52:17.222522 00059267 QRY tagfilter uid:4871209028263805089, tbname:t73 nint:+4
-08/16 17:52:17.222551 00059267 QRY tagfilter uid:4871209028263805089, tbname:t73, tint:5
-08/16 17:52:17.222809 00059267 QRY tagfilter uid:4871209028267802799, tbname:t80 nint:+5
-08/16 17:52:17.222855 00059267 QRY tagfilter uid:4871209028267802799, tbname:t80, tint:6
-08/16 17:52:17.222874 00059267 QRY tagfilter uid:4871209028272062653, tbname:t87 nint:+2
-08/16 17:52:17.222934 00059267 QRY tagfilter uid:4871209028272062653, tbname:t87, tint:3
-08/16 17:52:17.222976 00059267 QRY tagfilter uid:4871209028276322508, tbname:t94 nint:+3
-08/16 17:52:17.222995 00059267 QRY tagfilter uid:4871209028276322508, tbname:t94, tint:4
-08/16 17:52:17.223013 00059267 QRY tagfilter uid:4871209028224942103, tbname:t4 nint:+4
-08/16 17:52:17.223029 00059267 QRY tagfilter uid:4871209028224942103, tbname:t4, tint:5
-08/16 17:52:17.223047 00059267 QRY tagfilter uid:4871209028228874277, tbname:t11 nint:+5
-08/16 17:52:17.223064 00059267 QRY tagfilter uid:4871209028228874277, tbname:t11, tint:6
-08/16 17:52:17.223079 00059267 QRY tagfilter uid:4871209028232871987, tbname:t18 nint:+2
-08/16 17:52:17.223093 00059267 QRY tagfilter uid:4871209028232871987, tbname:t18, tint:3
-08/16 17:52:17.223109 00059267 QRY tagfilter uid:4871209028236607553, tbname:t25 nint:+3
-08/16 17:52:17.223125 00059267 QRY tagfilter uid:4871209028236607553, tbname:t25, tint:4
-08/16 17:52:17.223141 00059267 QRY tagfilter uid:4871209028240605263, tbname:t32 nint:+4
-08/16 17:52:17.223156 00059267 QRY tagfilter uid:4871209028240605263, tbname:t32, tint:5
-08/16 17:52:17.223172 00059267 QRY tagfilter uid:4871209028244602973, tbname:t39 nint:+5
-08/16 17:52:17.223188 00059267 QRY tagfilter uid:4871209028244602973, tbname:t39, tint:6
-08/16 17:52:17.223204 00059267 QRY tagfilter uid:4871209028248404075, tbname:t46 nint:+2
-08/16 17:52:17.223219 00059267 QRY tagfilter uid:4871209028248404075, tbname:t46, tint:3
-08/16 17:52:17.223564 00059267 QRY tagfilter uid:4871209028252401785, tbname:t53 nint:+3
-08/16 17:52:17.223598 00059267 QRY tagfilter uid:4871209028252401785, tbname:t53, tint:4
-08/16 17:52:17.223614 00059267 QRY tagfilter uid:4871209028256333959, tbname:t60 nint:+4
-08/16 17:52:17.223638 00059267 QRY tagfilter uid:4871209028256333959, tbname:t60, tint:5
-08/16 17:52:17.223771 00059267 QRY tagfilter uid:4871209028260397205, tbname:t67 nint:+5
-08/16 17:52:17.223813 00059267 QRY tagfilter uid:4871209028260397205, tbname:t67, tint:6
-08/16 17:52:17.223828 00059267 QRY tagfilter uid:4871209028264525987, tbname:t74 nint:+2
-08/16 17:52:17.223858 00059267 QRY tagfilter uid:4871209028264525987, tbname:t74, tint:3
-08/16 17:52:17.223895 00059267 QRY tagfilter uid:4871209028268392625, tbname:t81 nint:+3
-08/16 17:52:17.223917 00059267 QRY tagfilter uid:4871209028268392625, tbname:t81, tint:4
-08/16 17:52:17.223953 00059267 QRY tagfilter uid:4871209028272718015, tbname:t88 nint:+4
-08/16 17:52:17.223977 00059267 QRY tagfilter uid:4871209028272718015, tbname:t88, tint:5
-08/16 17:52:17.223991 00059267 QRY tagfilter uid:4871209028276977870, tbname:t95 nint:+5
-08/16 17:52:17.224003 00059267 QRY tagfilter uid:4871209028276977870, tbname:t95, tint:6
-08/16 17:52:17.224018 00059267 QRY tagfilter uid:4871209028225466393, tbname:t5 nint:+2
-08/16 17:52:17.224030 00059267 QRY tagfilter uid:4871209028225466393, tbname:t5, tint:3
-08/16 17:52:17.224044 00059267 QRY tagfilter uid:4871209028229398567, tbname:t12 nint:+3
-08/16 17:52:17.224056 00059267 QRY tagfilter uid:4871209028229398567, tbname:t12, tint:4
-08/16 17:52:17.224071 00059267 QRY tagfilter uid:4871209028233396277, tbname:t19 nint:+4
-08/16 17:52:17.224084 00059267 QRY tagfilter uid:4871209028233396277, tbname:t19, tint:5
-08/16 17:52:17.224097 00059267 QRY tagfilter uid:4871209028237197379, tbname:t26 nint:+5
-08/16 17:52:17.224110 00059267 QRY tagfilter uid:4871209028237197379, tbname:t26, tint:6
-08/16 17:52:17.224125 00059267 QRY tagfilter uid:4871209028241195089, tbname:t33 nint:+2
-08/16 17:52:17.224139 00059267 QRY tagfilter uid:4871209028241195089, tbname:t33, tint:3
-08/16 17:52:17.224188 00059267 QRY tagfilter uid:4871209028245127263, tbname:t40 nint:+3
-08/16 17:52:17.224209 00059267 QRY tagfilter uid:4871209028245127263, tbname:t40, tint:4
-08/16 17:52:17.224459 00059267 QRY tagfilter uid:4871209028248993901, tbname:t47 nint:+4
-08/16 17:52:17.224479 00059267 QRY tagfilter uid:4871209028248993901, tbname:t47, tint:5
-08/16 17:52:17.224494 00059267 QRY tagfilter uid:4871209028252926075, tbname:t54 nint:+5
-08/16 17:52:17.224507 00059267 QRY tagfilter uid:4871209028252926075, tbname:t54, tint:6
-08/16 17:52:17.224522 00059267 QRY tagfilter uid:4871209028256858249, tbname:t61 nint:+2
-08/16 17:52:17.224535 00059267 QRY tagfilter uid:4871209028256858249, tbname:t61, tint:3
-08/16 17:52:17.224549 00059267 QRY tagfilter uid:4871209028260987031, tbname:t68 nint:+3
-08/16 17:52:17.224564 00059267 QRY tagfilter uid:4871209028260987031, tbname:t68, tint:4
-08/16 17:52:17.224664 00059267 QRY tagfilter uid:4871209028265050277, tbname:t75 nint:+4
-08/16 17:52:17.224717 00059267 QRY tagfilter uid:4871209028265050277, tbname:t75, tint:5
-08/16 17:52:17.224731 00059267 QRY tagfilter uid:4871209028269047987, tbname:t82 nint:+5
-08/16 17:52:17.224769 00059267 QRY tagfilter uid:4871209028269047987, tbname:t82, tint:6
-08/16 17:52:17.224783 00059267 QRY tagfilter uid:4871209028273307841, tbname:t89 nint:+2
-08/16 17:52:17.224923 00059267 QRY tagfilter uid:4871209028273307841, tbname:t89, tint:3
-08/16 17:52:17.224990 00059267 QRY tagfilter uid:4871209028277502160, tbname:t96 nint:+3
-08/16 17:52:17.225006 00059267 QRY tagfilter uid:4871209028277502160, tbname:t96, tint:4
-08/16 17:52:17.225018 00059267 QRY tagfilter uid:4871209028225990683, tbname:t6 nint:+4
-08/16 17:52:17.225029 00059267 QRY tagfilter uid:4871209028225990683, tbname:t6, tint:5
-08/16 17:52:17.225039 00059267 QRY tagfilter uid:4871209028229922857, tbname:t13 nint:+5
-08/16 17:52:17.225053 00059267 QRY tagfilter uid:4871209028229922857, tbname:t13, tint:6
-08/16 17:52:17.225072 00059267 QRY tagfilter uid:4871209028233986103, tbname:t20 nint:+2
-08/16 17:52:17.225082 00059267 QRY tagfilter uid:4871209028233986103, tbname:t20, tint:3
-08/16 17:52:17.225093 00059267 QRY tagfilter uid:4871209028237721669, tbname:t27 nint:+3
-08/16 17:52:17.225103 00059267 QRY tagfilter uid:4871209028237721669, tbname:t27, tint:4
-08/16 17:52:17.225113 00059267 QRY tagfilter uid:4871209028241784915, tbname:t34 nint:+4
-08/16 17:52:17.225368 00059267 QRY tagfilter uid:4871209028241784915, tbname:t34, tint:5
-08/16 17:52:17.225409 00059267 QRY tagfilter uid:4871209028245717089, tbname:t41 nint:+5
-08/16 17:52:17.225437 00059267 QRY tagfilter uid:4871209028245717089, tbname:t41, tint:6
-08/16 17:52:17.225462 00059267 QRY tagfilter uid:4871209028249518191, tbname:t48 nint:+2
-08/16 17:52:17.225475 00059267 QRY tagfilter uid:4871209028249518191, tbname:t48, tint:3
-08/16 17:52:17.225486 00059267 QRY tagfilter uid:4871209028253450365, tbname:t55 nint:+3
-08/16 17:52:17.225496 00059267 QRY tagfilter uid:4871209028253450365, tbname:t55, tint:4
-08/16 17:52:17.225507 00059267 QRY tagfilter uid:4871209028257382539, tbname:t62 nint:+4
-08/16 17:52:17.225532 00059267 QRY tagfilter uid:4871209028257382539, tbname:t62, tint:5
-08/16 17:52:17.225544 00059267 QRY tagfilter uid:4871209028261511321, tbname:t69 nint:+5
-08/16 17:52:17.225554 00059267 QRY tagfilter uid:4871209028261511321, tbname:t69, tint:6
-08/16 17:52:17.225564 00059267 QRY tagfilter uid:4871209028265574567, tbname:t76 nint:+2
-08/16 17:52:17.225575 00059267 QRY tagfilter uid:4871209028265574567, tbname:t76, tint:3
-08/16 17:52:17.225585 00059267 QRY tagfilter uid:4871209028269637813, tbname:t83 nint:+3
-08/16 17:52:17.225615 00059267 QRY tagfilter uid:4871209028269637813, tbname:t83, tint:4
-08/16 17:52:17.225640 00059267 QRY tagfilter uid:4871209028273963203, tbname:t90 nint:+4
-08/16 17:52:17.225670 00059267 QRY tagfilter uid:4871209028273963203, tbname:t90, tint:5
-08/16 17:52:17.225698 00059267 QRY tagfilter uid:4871209028278026450, tbname:t97 nint:+5
-08/16 17:52:17.225709 00059267 QRY tagfilter uid:4871209028278026450, tbname:t97, tint:6
-08/16 17:52:17.226570 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226623 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226642 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226684 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226733 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226765 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226773 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226780 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226787 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226793 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226801 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226808 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226815 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226821 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226828 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226834 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226840 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226847 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226854 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226860 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226867 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226873 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226880 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226886 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226893 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226900 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226907 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226914 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.226920 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.226927 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.226934 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.226940 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227014 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.227036 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.227043 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.227050 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227056 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.227062 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.227069 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.227076 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227082 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.227089 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.227107 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.227129 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227138 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.227144 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.227151 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.227157 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227163 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.227170 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.227176 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.227194 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227202 00059267 QRY tagfilter left:2, right:3, res:1
-08/16 17:52:17.227208 00059267 QRY tagfilter left:3, right:3, res:0
-08/16 17:52:17.227215 00059267 QRY tagfilter left:4, right:3, res:0
-08/16 17:52:17.227221 00059267 QRY tagfilter left:5, right:3, res:0
-08/16 17:52:17.227284 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227298 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227304 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227311 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227317 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227324 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227330 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227359 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227421 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227437 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227444 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227450 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227456 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227463 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227469 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227475 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227493 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227500 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227507 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227513 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227520 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227526 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227541 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227548 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227570 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227578 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227585 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227591 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227598 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227604 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227611 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227617 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227624 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227630 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227636 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227643 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227649 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227656 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227662 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227668 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227675 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227681 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227688 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227696 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227703 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227709 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227716 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227723 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227729 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227738 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227744 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227750 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227757 00059267 QRY tagfilter left:3, right:2, res:1
-08/16 17:52:17.227764 00059267 QRY tagfilter left:4, right:2, res:1
-08/16 17:52:17.227771 00059267 QRY tagfilter left:5, right:2, res:1
-08/16 17:52:17.227779 00059267 QRY tagfilter left:6, right:2, res:1
-08/16 17:52:17.227803 00059267 QRY tagfilter get uid:4871209028224417813, res:1
-08/16 17:52:17.227811 00059267 QRY tagfilter get uid:4871209028228349987, res:0
-08/16 17:52:17.227822 00059267 QRY tagfilter get uid:4871209028232282161, res:0
-08/16 17:52:17.227829 00059267 QRY tagfilter get uid:4871209028236083263, res:0
-08/16 17:52:17.227836 00059267 QRY tagfilter get uid:4871209028240015437, res:1
-08/16 17:52:17.227843 00059267 QRY tagfilter get uid:4871209028244013147, res:0
-08/16 17:52:17.227849 00059267 QRY tagfilter get uid:4871209028247879785, res:0
-08/16 17:52:17.227856 00059267 QRY tagfilter get uid:4871209028251877495, res:0
-08/16 17:52:17.227862 00059267 QRY tagfilter get uid:4871209028255744133, res:1
-08/16 17:52:17.227871 00059267 QRY tagfilter get uid:4871209028259741843, res:0
-08/16 17:52:17.227928 00059267 QRY tagfilter get uid:4871209028263805089, res:0
-08/16 17:52:17.227951 00059267 QRY tagfilter get uid:4871209028267802799, res:0
-08/16 17:52:17.227959 00059267 QRY tagfilter get uid:4871209028272062653, res:1
-08/16 17:52:17.227965 00059267 QRY tagfilter get uid:4871209028276322508, res:0
-08/16 17:52:17.227974 00059267 QRY tagfilter get uid:4871209028224942103, res:0
-08/16 17:52:17.227981 00059267 QRY tagfilter get uid:4871209028228874277, res:0
-08/16 17:52:17.227988 00059267 QRY tagfilter get uid:4871209028232871987, res:1
-08/16 17:52:17.227995 00059267 QRY tagfilter get uid:4871209028236607553, res:0
-08/16 17:52:17.228001 00059267 QRY tagfilter get uid:4871209028240605263, res:0
-08/16 17:52:17.228008 00059267 QRY tagfilter get uid:4871209028244602973, res:0
-08/16 17:52:17.228016 00059267 QRY tagfilter get uid:4871209028248404075, res:1
-08/16 17:52:17.228023 00059267 QRY tagfilter get uid:4871209028252401785, res:0
-08/16 17:52:17.228030 00059267 QRY tagfilter get uid:4871209028256333959, res:0
-08/16 17:52:17.228036 00059267 QRY tagfilter get uid:4871209028260397205, res:0
-08/16 17:52:17.228043 00059267 QRY tagfilter get uid:4871209028264525987, res:1
-08/16 17:52:17.228049 00059267 QRY tagfilter get uid:4871209028268392625, res:0
-08/16 17:52:17.228056 00059267 QRY tagfilter get uid:4871209028272718015, res:0
-08/16 17:52:17.228063 00059267 QRY tagfilter get uid:4871209028276977870, res:0
-08/16 17:52:17.228070 00059267 QRY tagfilter get uid:4871209028225466393, res:1
-08/16 17:52:17.228076 00059267 QRY tagfilter get uid:4871209028229398567, res:0
-08/16 17:52:17.228083 00059267 QRY tagfilter get uid:4871209028233396277, res:0
-08/16 17:52:17.228089 00059267 QRY tagfilter get uid:4871209028237197379, res:0
-08/16 17:52:17.228095 00059267 QRY tagfilter get uid:4871209028241195089, res:1
-08/16 17:52:17.228104 00059267 QRY tagfilter get uid:4871209028245127263, res:0
-08/16 17:52:17.228110 00059267 QRY tagfilter get uid:4871209028248993901, res:0
-08/16 17:52:17.228117 00059267 QRY tagfilter get uid:4871209028252926075, res:0
-08/16 17:52:17.228123 00059267 QRY tagfilter get uid:4871209028256858249, res:1
-08/16 17:52:17.228129 00059267 QRY tagfilter get uid:4871209028260987031, res:0
-08/16 17:52:17.228136 00059267 QRY tagfilter get uid:4871209028265050277, res:0
-08/16 17:52:17.228158 00059267 QRY tagfilter get uid:4871209028269047987, res:0
-08/16 17:52:17.228166 00059267 QRY tagfilter get uid:4871209028273307841, res:1
-08/16 17:52:17.228172 00059267 QRY tagfilter get uid:4871209028277502160, res:0
-08/16 17:52:17.228179 00059267 QRY tagfilter get uid:4871209028225990683, res:0
-08/16 17:52:17.228185 00059267 QRY tagfilter get uid:4871209028229922857, res:0
-08/16 17:52:17.228192 00059267 QRY tagfilter get uid:4871209028233986103, res:1
-08/16 17:52:17.228198 00059267 QRY tagfilter get uid:4871209028237721669, res:0
-08/16 17:52:17.228204 00059267 QRY tagfilter get uid:4871209028241784915, res:0
-08/16 17:52:17.228211 00059267 QRY tagfilter get uid:4871209028245717089, res:0
-08/16 17:52:17.228217 00059267 QRY tagfilter get uid:4871209028249518191, res:1
-08/16 17:52:17.228223 00059267 QRY tagfilter get uid:4871209028253450365, res:0
-08/16 17:52:17.228300 00059267 QRY tagfilter get uid:4871209028257382539, res:0
-08/16 17:52:17.228323 00059267 QRY tagfilter get uid:4871209028261511321, res:0
-08/16 17:52:17.228330 00059267 QRY tagfilter get uid:4871209028265574567, res:1
-08/16 17:52:17.228336 00059267 QRY tagfilter get uid:4871209028269637813, res:0
-08/16 17:52:17.228343 00059267 QRY tagfilter get uid:4871209028273963203, res:0
-08/16 17:52:17.228349 00059267 QRY tagfilter get uid:4871209028278026450, res:0
-08/16 17:52:17.228357 00059267 QRY tagfilter get uid:4871209028224417813
-08/16 17:52:17.228363 00059267 QRY tagfilter get uid:4871209028240015437
-08/16 17:52:17.228383 00059267 QRY tagfilter get uid:4871209028255744133
-08/16 17:52:17.228406 00059267 QRY tagfilter get uid:4871209028272062653
-08/16 17:52:17.228413 00059267 QRY tagfilter get uid:4871209028232871987
-08/16 17:52:17.228442 00059267 QRY tagfilter get uid:4871209028248404075
-08/16 17:52:17.228478 00059267 QRY tagfilter get uid:4871209028264525987
-08/16 17:52:17.228499 00059267 QRY tagfilter get uid:4871209028225466393
-08/16 17:52:17.228507 00059267 QRY tagfilter get uid:4871209028241195089
-08/16 17:52:17.228513 00059267 QRY tagfilter get uid:4871209028256858249
-08/16 17:52:17.228520 00059267 QRY tagfilter get uid:4871209028273307841
-08/16 17:52:17.228526 00059267 QRY tagfilter get uid:4871209028233986103
-08/16 17:52:17.228533 00059267 QRY tagfilter get uid:4871209028249518191
-08/16 17:52:17.228539 00059267 QRY tagfilter get uid:4871209028265574567
\ No newline at end of file

From c7e778f9a842e7ce5d7066aa129eda71d789b249 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 13:30:37 +0800
Subject: [PATCH 25/98] refactor code

---
 source/libs/transport/src/thttp.c | 164 +++++++++++++-----------------
 1 file changed, 70 insertions(+), 94 deletions(-)

diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 62277a7569..52c692d22a 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -14,14 +14,21 @@
  */
 
 #define _DEFAULT_SOURCE
-#ifdef USE_UV
-#include <uv.h>
-#endif
 // clang-format off
-#include "zlib.h"
+#include <uv.h>
 #include "thttp.h"
 #include "taoserror.h"
 #include "tlog.h"
+#include "zlib.h"
+
+typedef struct SHttpClient {
+  uv_connect_t conn;
+  uv_tcp_t     tcp;
+  uv_write_t   req;
+  uv_buf_t*    buf;
+  char*        addr;
+  uint16_t     port;
+} SHttpClient;
 
 static int32_t taosBuildHttpHeader(const char* server, int32_t contLen, char* pHead, int32_t headLen,
                                    EHttpCompFlag flag) {
@@ -45,7 +52,7 @@ static int32_t taosBuildHttpHeader(const char* server, int32_t contLen, char* pH
   }
 }
 
-int32_t taosCompressHttpRport(char* pSrc, int32_t srcLen) {
+static int32_t taosCompressHttpRport(char* pSrc, int32_t srcLen) {
   int32_t code = -1;
   int32_t destLen = srcLen;
   void*   pDest = taosMemoryMalloc(destLen);
@@ -114,40 +121,53 @@ _OVER:
   return code;
 }
 
-#ifdef USE_UV
-static void clientConnCb(uv_connect_t* req, int32_t status) {
-  if (status < 0) {
+static void destroyHttpClient(SHttpClient* cli) {
+  taosMemoryFree(cli->buf);
+  taosMemoryFree(cli->addr);
+  taosMemoryFree(cli);
+}
+static void clientCloseCb(uv_handle_t* handle) {
+  SHttpClient* cli = handle->data;
+  destroyHttpClient(cli);
+}
+static void clientSentCb(uv_write_t* req, int32_t status) {
+  SHttpClient* cli = req->data;
+  if (status != 0) {
     terrno = TAOS_SYSTEM_ERROR(status);
-    uError("connection error %s", uv_strerror(status));
-    uv_close((uv_handle_t*)req->handle, NULL);
+    uError("http-report failed to send data %s", uv_strerror(status));
+  } else {
+    uInfo("http-report succ to send data");
+  }
+  uv_close((uv_handle_t*)&cli->tcp, clientCloseCb);
+}
+static void clientConnCb(uv_connect_t* req, int32_t status) {
+  SHttpClient* cli = req->data;
+  if (status != 0) {
+    terrno = TAOS_SYSTEM_ERROR(status);
+    uError("http-report failed to conn to server, reason:%s, dst:%s:%d", uv_strerror(status), cli->addr, cli->port);
+    uv_close((uv_handle_t*)&cli->tcp, clientCloseCb);
     return;
   }
-  uv_buf_t* wb = req->data;
-  assert(wb != NULL);
-  uv_write_t write_req;
-  uv_write(&write_req, req->handle, wb, 2, NULL);
-  uv_close((uv_handle_t*)req->handle, NULL);
+  uv_write(&cli->req, (uv_stream_t*)&cli->tcp, cli->buf, 2, clientSentCb);
 }
 
-int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag) {
+static int32_t taosBuildDstAddr(const char* server, uint16_t port, struct sockaddr_in* dest) {
   uint32_t ipv4 = taosGetIpv4FromFqdn(server);
   if (ipv4 == 0xffffffff) {
     terrno = TAOS_SYSTEM_ERROR(errno);
-    uError("failed to get http server:%s ip since %s", server, terrstr());
+    uError("http-report failed to get http server:%s ip since %s", server, terrstr());
     return -1;
   }
-
   char ipv4Buf[128] = {0};
   tinet_ntoa(ipv4Buf, ipv4);
-
+  uv_ip4_addr(ipv4Buf, port, dest);
+  return 0;
+}
+int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag) {
   struct sockaddr_in dest = {0};
-  uv_ip4_addr(ipv4Buf, port, &dest);
-
-  uv_tcp_t   socket_tcp = {0};
-  uv_loop_t* loop = uv_default_loop();
-  uv_tcp_init(loop, &socket_tcp);
-  uv_connect_t* connect = (uv_connect_t*)taosMemoryMalloc(sizeof(uv_connect_t));
-
+  if (taosBuildDstAddr(server, port, &dest) < 0) {
+    return -1;
+  }
   if (flag == HTTP_GZIP) {
     int32_t dstLen = taosCompressHttpRport(pCont, contLen);
     if (dstLen > 0) {
@@ -156,81 +176,37 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
       flag = HTTP_FLAT;
     }
   }
+  terrno = 0;
 
   char    header[1024] = {0};
   int32_t headLen = taosBuildHttpHeader(server, contLen, header, sizeof(header), flag);
 
-  uv_buf_t wb[2];
-  wb[0] = uv_buf_init((char*)header, headLen);
-  wb[1] = uv_buf_init((char*)pCont, contLen);
+  uv_buf_t* wb = taosMemoryCalloc(2, sizeof(uv_buf_t));
+  wb[0] = uv_buf_init((char*)header, headLen);  // stack var
+  wb[1] = uv_buf_init((char*)pCont, contLen);   //  heap var
+
+  SHttpClient* cli = taosMemoryCalloc(1, sizeof(SHttpClient));
+  cli->conn.data = cli;
+  cli->tcp.data = cli;
+  cli->req.data = cli;
+  cli->buf = wb;
+  cli->addr = tstrdup(server);
+  cli->port = port;
+
+  uv_loop_t* loop = uv_default_loop();
+  uv_tcp_init(loop, &cli->tcp);
+  // set up timeout to avoid stuck;
+  int32_t fd = taosCreateSocketWithTimeout(5);
+  uv_tcp_open((uv_tcp_t*)&cli->tcp, fd);
+
+  int32_t ret = uv_tcp_connect(&cli->conn, &cli->tcp, (const struct sockaddr*)&dest, clientConnCb);
+  if (ret != 0) {
+    uError("http-report failed to connect to server, reason:%s, dst:%s:%d", uv_strerror(ret), cli->addr, cli->port);
+    destroyHttpClient(cli);
+  }
 
-  connect->data = wb;
-  terrno = 0;
-  uv_tcp_connect(connect, &socket_tcp, (const struct sockaddr*)&dest, clientConnCb);
   uv_run(loop, UV_RUN_DEFAULT);
   uv_loop_close(loop);
-  taosMemoryFree(connect);
   return terrno;
 }
-
-#else
-int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag) {
-  int32_t     code = -1;
-  TdSocketPtr pSocket = NULL;
-
-  uint32_t ip = taosGetIpv4FromFqdn(server);
-  if (ip == 0xffffffff) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    uError("failed to get http server:%s ip since %s", server, terrstr());
-    goto SEND_OVER;
-  }
-
-  pSocket = taosOpenTcpClientSocket(ip, port, 0);
-  if (pSocket == NULL) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    uError("failed to create http socket to %s:%u since %s", server, port, terrstr());
-    goto SEND_OVER;
-  }
-
-  if (flag == HTTP_GZIP) {
-    int32_t dstLen = taosCompressHttpRport(pCont, contLen);
-    if (dstLen > 0) {
-      contLen = dstLen;
-    } else {
-      flag = HTTP_FLAT;
-    }
-  }
-
-  char    header[1024] = {0};
-  int32_t headLen = taosBuildHttpHeader(server, contLen, header, sizeof(header), flag);
-  if (taosWriteMsg(pSocket, header, headLen) < 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    uError("failed to send http header to %s:%u since %s", server, port, terrstr());
-    goto SEND_OVER;
-  }
-
-  if (taosWriteMsg(pSocket, (void*)pCont, contLen) < 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    uError("failed to send http content to %s:%u since %s", server, port, terrstr());
-    goto SEND_OVER;
-  }
-
-  // read something to avoid nginx error 499
-  if (taosWriteMsg(pSocket, header, 10) < 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    uError("failed to receive response from %s:%u since %s", server, port, terrstr());
-    goto SEND_OVER;
-  }
-
-  code = 0;
-
-SEND_OVER:
-  if (pSocket != NULL) {
-    taosCloseSocket(&pSocket);
-  }
-
-  return code;
-}
-
 // clang-format on
-#endif

From 96ab366beca54c8873cd08ad4a7898333d4613e2 Mon Sep 17 00:00:00 2001
From: Huo Linhe <linhehuo@gmail.com>
Date: Wed, 17 Aug 2022 13:55:04 +0800
Subject: [PATCH 26/98] fix: remove rust-bindings, use official connector
 instead

Closes [TD-18455](https://jira.taosdata.com:18080/browse/TD-18455)
---
 cmake/rust-bindings_CMakeLists.txt.in |  12 ---
 contrib/CMakeLists.txt                |   5 --
 examples/rust/.gitignore              |   2 +
 examples/rust/Cargo.toml              |  18 +++++
 examples/rust/examples/bind-tags.rs   |  80 +++++++++++++++++++
 examples/rust/examples/bind.rs        |  74 ++++++++++++++++++
 examples/rust/examples/query.rs       | 106 ++++++++++++++++++++++++++
 examples/rust/examples/subscribe.rs   | 103 +++++++++++++++++++++++++
 examples/rust/src/main.rs             |   3 +
 9 files changed, 386 insertions(+), 17 deletions(-)
 delete mode 100644 cmake/rust-bindings_CMakeLists.txt.in
 create mode 100644 examples/rust/.gitignore
 create mode 100644 examples/rust/Cargo.toml
 create mode 100644 examples/rust/examples/bind-tags.rs
 create mode 100644 examples/rust/examples/bind.rs
 create mode 100644 examples/rust/examples/query.rs
 create mode 100644 examples/rust/examples/subscribe.rs
 create mode 100644 examples/rust/src/main.rs

diff --git a/cmake/rust-bindings_CMakeLists.txt.in b/cmake/rust-bindings_CMakeLists.txt.in
deleted file mode 100644
index d16e86139b..0000000000
--- a/cmake/rust-bindings_CMakeLists.txt.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# rust-bindings
-ExternalProject_Add(rust-bindings
-        GIT_REPOSITORY https://github.com/songtianyi/tdengine-rust-bindings.git
-        GIT_TAG 7ed7a97
-        SOURCE_DIR "${TD_SOURCE_DIR}/examples/rust"
-        BINARY_DIR "${TD_SOURCE_DIR}/examples/rust"
-        CONFIGURE_COMMAND "" 
-        BUILD_COMMAND ""  
-        INSTALL_COMMAND ""
-        TEST_COMMAND ""
-        )
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 294b59fe95..a1eec81ee0 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -105,11 +105,6 @@ if(${BUILD_WITH_SQLITE})
     cat("${TD_SUPPORT_DIR}/sqlite_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif(${BUILD_WITH_SQLITE})
 
-# rust-bindings
-if(${RUST_BINDINGS})
-    cat("${TD_SUPPORT_DIR}/rust-bindings_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif(${RUST_BINDINGS})
-
 # lucene
 if(${BUILD_WITH_LUCENE})
     cat("${TD_SUPPORT_DIR}/lucene_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
diff --git a/examples/rust/.gitignore b/examples/rust/.gitignore
new file mode 100644
index 0000000000..96ef6c0b94
--- /dev/null
+++ b/examples/rust/.gitignore
@@ -0,0 +1,2 @@
+/target
+Cargo.lock
diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml
new file mode 100644
index 0000000000..1ed73e2fde
--- /dev/null
+++ b/examples/rust/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+taos = "*"
+
+[dev-dependencies]
+chrono = "0.4"
+itertools = "0.10.3"
+pretty_env_logger = "0.4.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+tokio = { version = "1", features = ["full"] }
+anyhow = "1"
diff --git a/examples/rust/examples/bind-tags.rs b/examples/rust/examples/bind-tags.rs
new file mode 100644
index 0000000000..a1f7286625
--- /dev/null
+++ b/examples/rust/examples/bind-tags.rs
@@ -0,0 +1,80 @@
+use anyhow::Result;
+use serde::Deserialize;
+use taos::*;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let taos = TaosBuilder::from_dsn("taos://")?.build()?;
+    taos.exec_many([
+        "drop database if exists test",
+        "create database test keep 36500",
+        "use test",
+        "create table tb1 (ts timestamp, c1 bool, c2 tinyint, c3 smallint, c4 int, c5 bigint,
+            c6 tinyint unsigned, c7 smallint unsigned, c8 int unsigned, c9 bigint unsigned,
+            c10 float, c11 double, c12 varchar(100), c13 nchar(100)) tags(t1 varchar(100))",
+    ])
+    .await?;
+    let mut stmt = Stmt::init(&taos)?;
+    stmt.prepare(
+        "insert into ? using tb1 tags(?) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+    )?;
+    stmt.set_tbname("d0")?;
+    stmt.set_tags(&[Value::VarChar("涛思".to_string())])?;
+
+    let params = vec![
+        ColumnView::from_millis_timestamp(vec![164000000000]),
+        ColumnView::from_bools(vec![true]),
+        ColumnView::from_tiny_ints(vec![i8::MAX]),
+        ColumnView::from_small_ints(vec![i16::MAX]),
+        ColumnView::from_ints(vec![i32::MAX]),
+        ColumnView::from_big_ints(vec![i64::MAX]),
+        ColumnView::from_unsigned_tiny_ints(vec![u8::MAX]),
+        ColumnView::from_unsigned_small_ints(vec![u16::MAX]),
+        ColumnView::from_unsigned_ints(vec![u32::MAX]),
+        ColumnView::from_unsigned_big_ints(vec![u64::MAX]),
+        ColumnView::from_floats(vec![f32::MAX]),
+        ColumnView::from_doubles(vec![f64::MAX]),
+        ColumnView::from_varchar(vec!["ABC"]),
+        ColumnView::from_nchar(vec!["涛思数据"]),
+    ];
+    let rows = stmt.bind(&params)?.add_batch()?.execute()?;
+    assert_eq!(rows, 1);
+
+    #[derive(Debug, Deserialize)]
+    #[allow(dead_code)]
+    struct Row {
+        ts: String,
+        c1: bool,
+        c2: i8,
+        c3: i16,
+        c4: i32,
+        c5: i64,
+        c6: u8,
+        c7: u16,
+        c8: u32,
+        c9: u64,
+        c10: Option<f32>,
+        c11: f64,
+        c12: String,
+        c13: String,
+        t1: serde_json::Value,
+    }
+
+    let rows: Vec<Row> = taos
+        .query("select * from tb1")
+        .await?
+        .deserialize()
+        .try_collect()
+        .await?;
+    let row = &rows[0];
+    dbg!(&row);
+    assert_eq!(row.c5, i64::MAX);
+    assert_eq!(row.c8, u32::MAX);
+    assert_eq!(row.c9, u64::MAX);
+    assert_eq!(row.c10.unwrap(), f32::MAX);
+    // assert_eq!(row.c11, f64::MAX);
+    assert_eq!(row.c12, "ABC");
+    assert_eq!(row.c13, "涛思数据");
+
+    Ok(())
+}
diff --git a/examples/rust/examples/bind.rs b/examples/rust/examples/bind.rs
new file mode 100644
index 0000000000..194938a319
--- /dev/null
+++ b/examples/rust/examples/bind.rs
@@ -0,0 +1,74 @@
+use anyhow::Result;
+use serde::Deserialize;
+use taos::*;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let taos = TaosBuilder::from_dsn("taos://")?.build()?;
+    taos.exec_many([
+        "drop database if exists test_bindable",
+        "create database test_bindable keep 36500",
+        "use test_bindable",
+        "create table tb1 (ts timestamp, c1 bool, c2 tinyint, c3 smallint, c4 int, c5 bigint,
+            c6 tinyint unsigned, c7 smallint unsigned, c8 int unsigned, c9 bigint unsigned,
+            c10 float, c11 double, c12 varchar(100), c13 nchar(100))",
+    ])
+    .await?;
+    let mut stmt = Stmt::init(&taos)?;
+    stmt.prepare("insert into tb1 values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")?;
+    let params = vec![
+        ColumnView::from_millis_timestamp(vec![0]),
+        ColumnView::from_bools(vec![true]),
+        ColumnView::from_tiny_ints(vec![i8::MAX]),
+        ColumnView::from_small_ints(vec![i16::MAX]),
+        ColumnView::from_ints(vec![i32::MAX]),
+        ColumnView::from_big_ints(vec![i64::MAX]),
+        ColumnView::from_unsigned_tiny_ints(vec![u8::MAX]),
+        ColumnView::from_unsigned_small_ints(vec![u16::MAX]),
+        ColumnView::from_unsigned_ints(vec![u32::MAX]),
+        ColumnView::from_unsigned_big_ints(vec![u64::MAX]),
+        ColumnView::from_floats(vec![f32::MAX]),
+        ColumnView::from_doubles(vec![f64::MAX]),
+        ColumnView::from_varchar(vec!["ABC"]),
+        ColumnView::from_nchar(vec!["涛思数据"]),
+    ];
+    let rows = stmt.bind(&params)?.add_batch()?.execute()?;
+    assert_eq!(rows, 1);
+
+    #[derive(Debug, Deserialize)]
+    #[allow(dead_code)]
+    struct Row {
+        ts: String,
+        c1: bool,
+        c2: i8,
+        c3: i16,
+        c4: i32,
+        c5: i64,
+        c6: u8,
+        c7: u16,
+        c8: u32,
+        c9: u64,
+        c10: Option<f32>,
+        c11: f64,
+        c12: String,
+        c13: String,
+    }
+
+    let rows: Vec<Row> = taos
+        .query("select * from tb1")
+        .await?
+        .deserialize()
+        .try_collect()
+        .await?;
+    let row = &rows[0];
+    dbg!(&row);
+    assert_eq!(row.c5, i64::MAX);
+    assert_eq!(row.c8, u32::MAX);
+    assert_eq!(row.c9, u64::MAX);
+    assert_eq!(row.c10.unwrap(), f32::MAX);
+    // assert_eq!(row.c11, f64::MAX);
+    assert_eq!(row.c12, "ABC");
+    assert_eq!(row.c13, "涛思数据");
+
+    Ok(())
+}
diff --git a/examples/rust/examples/query.rs b/examples/rust/examples/query.rs
new file mode 100644
index 0000000000..016b291abc
--- /dev/null
+++ b/examples/rust/examples/query.rs
@@ -0,0 +1,106 @@
+use std::time::Duration;
+
+use chrono::{DateTime, Local};
+use taos::*;
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    let dsn = "taos://";
+
+    let opts = PoolBuilder::new()
+        .max_size(5000) // max connections
+        .max_lifetime(Some(Duration::from_secs(60 * 60))) // lifetime of each connection
+        .min_idle(Some(1000)) // minimal idle connections
+        .connection_timeout(Duration::from_secs(2));
+
+    let pool = TaosBuilder::from_dsn(dsn)?.with_pool_builder(opts)?;
+
+    let taos = pool.get()?;
+
+    let db = "query";
+
+    // prepare database
+    taos.exec_many([
+        format!("DROP DATABASE IF EXISTS `{db}`"),
+        format!("CREATE DATABASE `{db}`"),
+        format!("USE `{db}`"),
+    ])
+    .await?;
+
+    let inserted = taos.exec_many([
+        // create super table
+        "CREATE TABLE `meters` (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT, `phase` FLOAT) TAGS (`groupid` INT, `location` BINARY(16))",
+        // create child table
+        "CREATE TABLE `d0` USING `meters` TAGS(0, 'Los Angles')",
+        // insert into child table
+        "INSERT INTO `d0` values(now - 10s, 10, 116, 0.32)",
+        // insert with NULL values
+        "INSERT INTO `d0` values(now - 8s, NULL, NULL, NULL)",
+        // insert and automatically create table with tags if not exists
+        "INSERT INTO `d1` USING `meters` TAGS(1, 'San Francisco') values(now - 9s, 10.1, 119, 0.33)",
+        // insert many records in a single sql
+        "INSERT INTO `d1` values (now-8s, 10, 120, 0.33) (now - 6s, 10, 119, 0.34) (now - 4s, 11.2, 118, 0.322)",
+    ]).await?;
+
+    assert_eq!(inserted, 6);
+    loop {
+        let count: usize = taos
+            .query_one("select count(*) from `meters`")
+            .await?
+            .unwrap_or_default();
+
+        if count >= 6 {
+            break;
+        } else {
+            println!("waiting for data");
+        }
+    }
+
+    let mut result = taos.query("select tbname, * from `meters`").await?;
+
+    for field in result.fields() {
+        println!("got field: {}", field.name());
+    }
+
+    // Query option 1, use rows stream.
+    let mut rows = result.rows();
+    let mut nrows = 0;
+    while let Some(row) = rows.try_next().await? {
+        for (col, (name, value)) in row.enumerate() {
+            println!(
+                "[{}] got value in col {} (named `{:>8}`): {}",
+                nrows, col, name, value
+            );
+        }
+        nrows += 1;
+    }
+
+    // Query options 2, use deserialization with serde.
+    #[derive(Debug, serde::Deserialize)]
+    #[allow(dead_code)]
+    struct Record {
+        tbname: String,
+        // deserialize timestamp to chrono::DateTime<Local>
+        ts: DateTime<Local>,
+        // float to f32
+        current: Option<f32>,
+        // int to i32
+        voltage: Option<i32>,
+        phase: Option<f32>,
+        groupid: i32,
+        // binary/varchar to String
+        location: String,
+    }
+
+    let records: Vec<Record> = taos
+        .query("select tbname, * from `meters`")
+        .await?
+        .deserialize()
+        .try_collect()
+        .await?;
+
+    dbg!(result.summary());
+    assert_eq!(records.len(), 6);
+    dbg!(records);
+    Ok(())
+}
diff --git a/examples/rust/examples/subscribe.rs b/examples/rust/examples/subscribe.rs
new file mode 100644
index 0000000000..9e2e890405
--- /dev/null
+++ b/examples/rust/examples/subscribe.rs
@@ -0,0 +1,103 @@
+use std::time::Duration;
+
+use chrono::{DateTime, Local};
+use taos::*;
+
+// Query options 2, use deserialization with serde.
+#[derive(Debug, serde::Deserialize)]
+#[allow(dead_code)]
+struct Record {
+    // deserialize timestamp to chrono::DateTime<Local>
+    ts: DateTime<Local>,
+    // float to f32
+    current: Option<f32>,
+    // int to i32
+    voltage: Option<i32>,
+    phase: Option<f32>,
+}
+
+async fn prepare(taos: Taos) -> anyhow::Result<()> {
+    let inserted = taos.exec_many([
+        // create child table
+        "CREATE TABLE `d0` USING `meters` TAGS(0, 'Los Angles')",
+        // insert into child table
+        "INSERT INTO `d0` values(now - 10s, 10, 116, 0.32)",
+        // insert with NULL values
+        "INSERT INTO `d0` values(now - 8s, NULL, NULL, NULL)",
+        // insert and automatically create table with tags if not exists
+        "INSERT INTO `d1` USING `meters` TAGS(1, 'San Francisco') values(now - 9s, 10.1, 119, 0.33)",
+        // insert many records in a single sql
+        "INSERT INTO `d1` values (now-8s, 10, 120, 0.33) (now - 6s, 10, 119, 0.34) (now - 4s, 11.2, 118, 0.322)",
+    ]).await?;
+    assert_eq!(inserted, 6);
+    Ok(())
+}
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    // std::env::set_var("RUST_LOG", "debug");
+    pretty_env_logger::init();
+    let dsn = "taos://localhost:6030";
+    let builder = TaosBuilder::from_dsn(dsn)?;
+
+    let taos = builder.build()?;
+    let db = "tmq";
+
+    // prepare database
+    taos.exec_many([
+        "DROP TOPIC IF EXISTS tmq_meters".to_string(),
+        format!("DROP DATABASE IF EXISTS `{db}`"),
+        format!("CREATE DATABASE `{db}`"),
+        format!("USE `{db}`"),
+        // create super table
+        "CREATE TABLE `meters` (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT, `phase` FLOAT) TAGS (`groupid` INT, `location` BINARY(16))".to_string(),
+        // create topic for subscription
+        format!("CREATE TOPIC tmq_meters with META AS DATABASE {db}")
+    ])
+    .await?;
+
+    let task = tokio::spawn(prepare(taos));
+
+    tokio::time::sleep(Duration::from_secs(1)).await;
+
+    // subscribe
+    let tmq = TmqBuilder::from_dsn("taos://localhost:6030/?group.id=test")?;
+
+    let mut consumer = tmq.build()?;
+    consumer.subscribe(["tmq_meters"]).await?;
+
+    {
+        let mut stream = consumer.stream();
+
+        while let Some((offset, message)) = stream.try_next().await? {
+            // get information from offset
+
+            // the topic
+            let topic = offset.topic();
+            // the vgroup id, like partition id in kafka.
+            let vgroup_id = offset.vgroup_id();
+            println!("* in vgroup id {vgroup_id} of topic {topic}\n");
+
+            if let Some(data) = message.into_data() {
+                while let Some(block) = data.fetch_raw_block().await? {
+                    // one block for one table, get table name if needed
+                    let name = block.table_name();
+                    let records: Vec<Record> = block.deserialize().try_collect()?;
+                    println!(
+                        "** table: {}, got {} records: {:#?}\n",
+                        name.unwrap(),
+                        records.len(),
+                        records
+                    );
+                }
+            }
+            consumer.commit(offset).await?;
+        }
+    }
+
+    consumer.unsubscribe().await;
+
+    task.await??;
+
+    Ok(())
+}
diff --git a/examples/rust/src/main.rs b/examples/rust/src/main.rs
new file mode 100644
index 0000000000..e7a11a969c
--- /dev/null
+++ b/examples/rust/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

From 4f16771de4067d9cecbeef1baafd7b530409e411 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 17 Aug 2022 14:45:31 +0800
Subject: [PATCH 27/98] fix:error in get table list by tag filter

---
 source/dnode/vnode/inc/vnode.h          |  2 +-
 source/dnode/vnode/src/meta/metaQuery.c | 21 ++++-----------------
 source/libs/executor/src/executil.c     |  9 +++++----
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 9d92a9c1e4..c224f6ce7f 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -91,7 +91,7 @@ typedef struct SMetaEntry  SMetaEntry;
 void        metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
 void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
-int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *tags);
+int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags);
 int32_t     metaReadNext(SMetaReader *pReader);
 const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
 int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 9f2cf409be..29a4dd3e34 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -962,13 +962,13 @@ END:
   return ret;
 }
 
-int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *tags) {
+int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags) {
   SMCtbCursor *pCur = metaOpenCtbCursor(pMeta, suid);
 
   SHashObj *uHash = NULL;
   size_t len = taosArrayGetSize(uidList);   // len > 0 means there already have uids
   if(len > 0){
-    uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK);
+    uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
     for(int i = 0; i < len; i++){
       int64_t *uid = taosArrayGet(uidList, i);
       taosHashPut(uHash, uid, sizeof(int64_t), &i, sizeof(i));
@@ -982,26 +982,13 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SArray *t
 
     if (len > 0 && taosHashGet(uHash, &id, sizeof(int64_t)) == NULL) {
       continue;
-    }
-
-    void *tag = taosMemoryMalloc(pCur->vLen);
-    memcpy(tag, pCur->pVal, pCur->vLen);
-
-    if (len == 0) {
+    }else if (len == 0) {
       taosArrayPush(uidList, &id);
-      taosArrayPush(tags, &tag);
-    }else{
-      taosHashPut(uHash, &id, sizeof(int64_t), &tag, POINTER_BYTES);
     }
-  }
 
-  for(int i = 0; i < len; i++){
-    int64_t *uid = taosArrayGet(uidList, i);
-    void **tag = taosHashGet(uHash, uid, POINTER_BYTES);
-    taosArrayPush(tags, tag);
+    taosHashPut(tags, &id, sizeof(int64_t), pCur->pVal, pCur->vLen);
   }
 
-
   taosHashCleanup(uHash);
   metaCloseCtbCursor(pCur);
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 9f8f97c4f5..2547b5e228 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -368,7 +368,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
   int32_t code = TSDB_CODE_SUCCESS;
   SArray* pBlockList = NULL;
   SSDataBlock* pResBlock = NULL;
-  SArray* tags = NULL;
+  SHashObj * tags = NULL;
   SScalarParam output = {0};
 
   tagFilterAssist ctx = {0};
@@ -399,7 +399,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
   }
 
 //  int64_t stt = taosGetTimestampUs();
-  tags = taosArrayInit(8, POINTER_BYTES);
+  tags = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
   code = metaGetTableTags(metaHandle, suid, uidList, tags);
   if (code != TSDB_CODE_SUCCESS) {
     terrno = code;
@@ -421,8 +421,9 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
 
 //  int64_t st = taosGetTimestampUs();
   for (int32_t i = 0; i < rows; i++) {
-    void* tag = taosArrayGetP(tags, i);
     int64_t* uid = taosArrayGet(uidList, i);
+    void* tag = taosHashGet(tags, uid, sizeof(int64_t));
+    ASSERT(tag);
     for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
       SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
 
@@ -474,7 +475,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
 //  qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
 
 end:
-  taosArrayDestroyP(tags, taosMemoryFree);
+  taosHashCleanup(tags);
   taosHashCleanup(ctx.colHash);
   taosArrayDestroy(ctx.cInfoList);
   blockDataDestroy(pResBlock);

From e7377e410caa4a55a37ccc7efd985cfc43c8be16 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 17 Aug 2022 15:10:15 +0800
Subject: [PATCH 28/98] refactor(mnode): check drop and alter stb for stream
 and topic

---
 source/dnode/mnode/impl/src/mndStb.c | 167 +++++++++++++++++++++++++--
 1 file changed, 160 insertions(+), 7 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 3e747b66c8..dd2b595c29 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -1145,7 +1145,7 @@ static int32_t mndAddSuperTableTag(const SStbObj *pOld, SStbObj *pNew, SArray *p
   return 0;
 }
 
-int32_t mndCheckColAndTagModifiable(SMnode *pMnode, const char *stbname, int64_t suid, col_id_t colId) {
+static int32_t mndCheckAlterColForTopic(SMnode *pMnode, const char *stbFullName, int64_t suid, col_id_t colId) {
   SSdb *pSdb = pMnode->pSdb;
   void *pIter = NULL;
   while (1) {
@@ -1154,7 +1154,7 @@ int32_t mndCheckColAndTagModifiable(SMnode *pMnode, const char *stbname, int64_t
     if (pIter == NULL) break;
 
     mDebug("topic:%s, check tag and column modifiable, stb:%s suid:%" PRId64 " colId:%d, subType:%d sql:%s",
-           pTopic->name, stbname, suid, colId, pTopic->subType, pTopic->sql);
+           pTopic->name, stbFullName, suid, colId, pTopic->subType, pTopic->sql);
     if (pTopic->subType != TOPIC_SUB_TYPE__COLUMN) {
       sdbRelease(pSdb, pTopic);
       continue;
@@ -1192,20 +1192,66 @@ int32_t mndCheckColAndTagModifiable(SMnode *pMnode, const char *stbname, int64_t
     sdbRelease(pSdb, pTopic);
     nodesDestroyNode(pAst);
   }
+  return 0;
+}
 
+static int32_t mndCheckAlterColForStream(SMnode *pMnode, const char *stbFullName, int64_t suid, col_id_t colId) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+  while (1) {
+    SStreamObj *pStream = NULL;
+    pIter = sdbFetch(pSdb, SDB_STREAM, pIter, (void **)&pStream);
+    if (pIter == NULL) break;
+
+    SNode *pAst = NULL;
+    if (nodesStringToNode(pStream->ast, &pAst) != 0) {
+      ASSERT(0);
+      return -1;
+    }
+
+    SNodeList *pNodeList = NULL;
+    nodesCollectColumns((SSelectStmt *)pAst, SQL_CLAUSE_FROM, NULL, COLLECT_COL_TYPE_ALL, &pNodeList);
+    SNode *pNode = NULL;
+    FOREACH(pNode, pNodeList) {
+      SColumnNode *pCol = (SColumnNode *)pNode;
+
+      if (pCol->tableId != suid) {
+        mDebug("stream:%s, check colId:%d passed", pStream->name, pCol->colId);
+        goto NEXT;
+      }
+      if (pCol->colId > 0 && pCol->colId == colId) {
+        sdbRelease(pSdb, pStream);
+        nodesDestroyNode(pAst);
+        terrno = TSDB_CODE_MND_STREAM_MUST_BE_DELETED;
+        mError("stream:%s, check colId:%d conflicted", pStream->name, pCol->colId);
+        return -1;
+      }
+      mDebug("stream:%s, check colId:%d passed", pStream->name, pCol->colId);
+    }
+
+  NEXT:
+    sdbRelease(pSdb, pStream);
+    nodesDestroyNode(pAst);
+  }
+  return 0;
+}
+
+static int32_t mndCheckAlterColForTSma(SMnode *pMnode, const char *stbFullName, int64_t suid, col_id_t colId) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
   while (1) {
     SSmaObj *pSma = NULL;
     pIter = sdbFetch(pSdb, SDB_SMA, pIter, (void **)&pSma);
     if (pIter == NULL) break;
 
-    mDebug("tsma:%s, check tag and column modifiable, stb:%s suid:%" PRId64 " colId:%d, sql:%s", pSma->name, stbname,
-           suid, colId, pSma->sql);
+    mDebug("tsma:%s, check tag and column modifiable, stb:%s suid:%" PRId64 " colId:%d, sql:%s", pSma->name,
+           stbFullName, suid, colId, pSma->sql);
 
     SNode *pAst = NULL;
     if (nodesStringToNode(pSma->ast, &pAst) != 0) {
       terrno = TSDB_CODE_SDB_INVALID_DATA_CONTENT;
       mError("tsma:%s, check tag and column modifiable, stb:%s suid:%" PRId64 " colId:%d failed since parse AST err",
-             pSma->name, stbname, suid, colId);
+             pSma->name, stbFullName, suid, colId);
       return -1;
     }
 
@@ -1218,7 +1264,7 @@ int32_t mndCheckColAndTagModifiable(SMnode *pMnode, const char *stbname, int64_t
 
       if ((pCol->tableId != suid) && (pSma->stbUid != suid)) {
         mDebug("tsma:%s, check colId:%d passed", pSma->name, pCol->colId);
-        goto NEXT2;
+        goto NEXT;
       }
       if ((pCol->colId) > 0 && (pCol->colId == colId)) {
         sdbRelease(pSdb, pSma);
@@ -1230,11 +1276,24 @@ int32_t mndCheckColAndTagModifiable(SMnode *pMnode, const char *stbname, int64_t
       mDebug("tsma:%s, check colId:%d passed", pSma->name, pCol->colId);
     }
 
-  NEXT2:
+  NEXT:
     sdbRelease(pSdb, pSma);
     nodesDestroyNode(pAst);
   }
+  return 0;
+}
 
+int32_t mndCheckColAndTagModifiable(SMnode *pMnode, const char *stbFullName, int64_t suid, col_id_t colId) {
+  if (mndCheckAlterColForTopic(pMnode, stbFullName, suid, colId) < 0) {
+    return -1;
+  }
+  if (mndCheckAlterColForStream(pMnode, stbFullName, suid, colId) < 0) {
+    return -1;
+  }
+
+  if (mndCheckAlterColForTSma(pMnode, stbFullName, suid, colId) < 0) {
+    return -1;
+  }
   return 0;
 }
 
@@ -1930,6 +1989,90 @@ _OVER:
   return code;
 }
 
+static int32_t mndCheckDropStbForTopic(SMnode *pMnode, const char *stbFullName, int64_t suid) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+  while (1) {
+    SMqTopicObj *pTopic = NULL;
+    pIter = sdbFetch(pSdb, SDB_TOPIC, pIter, (void **)&pTopic);
+    if (pIter == NULL) break;
+
+    if (pTopic->subType == TOPIC_SUB_TYPE__TABLE) {
+      if (pTopic->stbUid == suid) {
+        sdbRelease(pSdb, pTopic);
+        return -1;
+      }
+    }
+
+    if (pTopic->subType != TOPIC_SUB_TYPE__COLUMN) {
+      sdbRelease(pSdb, pTopic);
+      continue;
+    }
+
+    SNode *pAst = NULL;
+    if (nodesStringToNode(pTopic->ast, &pAst) != 0) {
+      ASSERT(0);
+      return -1;
+    }
+
+    SNodeList *pNodeList = NULL;
+    nodesCollectColumns((SSelectStmt *)pAst, SQL_CLAUSE_FROM, NULL, COLLECT_COL_TYPE_ALL, &pNodeList);
+    SNode *pNode = NULL;
+    FOREACH(pNode, pNodeList) {
+      SColumnNode *pCol = (SColumnNode *)pNode;
+
+      if (pCol->tableId != suid) {
+        mDebug("topic:%s, check colId:%d passed", pTopic->name, pCol->colId);
+        sdbRelease(pSdb, pTopic);
+        nodesDestroyNode(pAst);
+        return -1;
+      } else {
+        goto NEXT;
+      }
+    }
+  NEXT:
+    sdbRelease(pSdb, pTopic);
+    nodesDestroyNode(pAst);
+  }
+  return 0;
+}
+
+static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName, int64_t suid) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+  while (1) {
+    SStreamObj *pStream = NULL;
+    pIter = sdbFetch(pSdb, SDB_STREAM, pIter, (void **)&pStream);
+    if (pIter == NULL) break;
+
+    SNode *pAst = NULL;
+    if (nodesStringToNode(pStream->ast, &pAst) != 0) {
+      ASSERT(0);
+      return -1;
+    }
+
+    SNodeList *pNodeList = NULL;
+    nodesCollectColumns((SSelectStmt *)pAst, SQL_CLAUSE_FROM, NULL, COLLECT_COL_TYPE_ALL, &pNodeList);
+    SNode *pNode = NULL;
+    FOREACH(pNode, pNodeList) {
+      SColumnNode *pCol = (SColumnNode *)pNode;
+
+      if (pCol->tableId != suid) {
+        mDebug("stream:%s, check colId:%d passed", pStream->name, pCol->colId);
+        sdbRelease(pSdb, pStream);
+        nodesDestroyNode(pAst);
+        return -1;
+      } else {
+        goto NEXT;
+      }
+    }
+  NEXT:
+    sdbRelease(pSdb, pStream);
+    nodesDestroyNode(pAst);
+  }
+  return 0;
+}
+
 static int32_t mndProcessDropStbReq(SRpcMsg *pReq) {
   SMnode      *pMnode = pReq->info.node;
   int32_t      code = -1;
@@ -1971,6 +2114,16 @@ static int32_t mndProcessDropStbReq(SRpcMsg *pReq) {
     goto _OVER;
   }
 
+  if (mndCheckDropStbForTopic(pMnode, dropReq.name, pStb->uid) < 0) {
+    terrno = TSDB_CODE_MND_TOPIC_MUST_BE_DELETED;
+    goto _OVER;
+  }
+
+  if (mndCheckDropStbForStream(pMnode, dropReq.name, pStb->uid) < 0) {
+    terrno = TSDB_CODE_MND_STREAM_MUST_BE_DELETED;
+    goto _OVER;
+  }
+
   code = mndDropStb(pMnode, pReq, pDb, pStb);
   if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS;
 

From a036d64ae0dc7d50cf5c4bf21df6ef9949396baa Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 15:28:49 +0800
Subject: [PATCH 29/98] avoid filter invalid table

---
 source/dnode/vnode/src/meta/metaQuery.c | 141 ++++++++++++------------
 1 file changed, 72 insertions(+), 69 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 29a4dd3e34..4e85cde7ca 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -53,79 +53,79 @@ _err:
   return -1;
 }
 
-//int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
+// int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
 //
-//  SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
-//  SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
-//  SMeta  *pMeta = meta;
-//  int64_t version;
-//  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
+//   SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
+//   SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
+//   SMeta  *pMeta = meta;
+//   int64_t version;
+//   SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
 //
-//  int64_t stt1 = taosGetTimestampUs();
-//  for(int i = 0; i < taosArrayGetSize(uidList); i++) {
-//    void* ppVal = NULL;
-//    int vlen = 0;
-//    uint64_t *  uid = taosArrayGet(uidList, i);
-//    // query uid.idx
-//    if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
-//      continue;
-//    }
-//    version = *(int64_t *)ppVal;
+//   int64_t stt1 = taosGetTimestampUs();
+//   for(int i = 0; i < taosArrayGetSize(uidList); i++) {
+//     void* ppVal = NULL;
+//     int vlen = 0;
+//     uint64_t *  uid = taosArrayGet(uidList, i);
+//     // query uid.idx
+//     if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
+//       continue;
+//     }
+//     version = *(int64_t *)ppVal;
 //
-//    STbDbKey tbDbKey = {.version = version, .uid = *uid};
-//    taosArrayPush(uidVersion, &tbDbKey);
-//    taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
-//  }
-//  int64_t stt2 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
+//     STbDbKey tbDbKey = {.version = version, .uid = *uid};
+//     taosArrayPush(uidVersion, &tbDbKey);
+//     taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
+//   }
+//   int64_t stt2 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
 //
-//  TBC        *pCur = NULL;
-//  tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
-//  tdbTbcMoveToFirst(pCur);
-//  void *pKey = NULL;
-//  int   kLen = 0;
+//   TBC        *pCur = NULL;
+//   tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
+//   tdbTbcMoveToFirst(pCur);
+//   void *pKey = NULL;
+//   int   kLen = 0;
 //
-//  while(1){
-//    SMetaReader pReader = {0};
-//    int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
-//    if (ret < 0) break;
-//    STbDbKey *tmp = (STbDbKey*)pKey;
-//    int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
-//    if(ver == NULL || *ver != tmp->version) continue;
-//    taosArrayPush(readerList, &pReader);
-//  }
-//  tdbTbcClose(pCur);
+//   while(1){
+//     SMetaReader pReader = {0};
+//     int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
+//     if (ret < 0) break;
+//     STbDbKey *tmp = (STbDbKey*)pKey;
+//     int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
+//     if(ver == NULL || *ver != tmp->version) continue;
+//     taosArrayPush(readerList, &pReader);
+//   }
+//   tdbTbcClose(pCur);
 //
-//  taosArrayClear(readerList);
-//  int64_t stt3 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
-//  for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
-//    SMetaReader pReader = {0};
+//   taosArrayClear(readerList);
+//   int64_t stt3 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
+//   for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
+//     SMetaReader pReader = {0};
 //
-//    STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
-//    // query table.db
-//    if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
-//      continue;
-//    }
-//    taosArrayPush(readerList, &pReader);
-//  }
-//  int64_t stt4 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
+//     STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
+//     // query table.db
+//     if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
+//       continue;
+//     }
+//     taosArrayPush(readerList, &pReader);
+//   }
+//   int64_t stt4 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
 //
-//  for(int i = 0; i < taosArrayGetSize(readerList); i++){
-//    SMetaReader* pReader  = taosArrayGet(readerList, i);
-//    metaReaderInit(pReader, meta, 0);
-//    // decode the entry
-//    tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
+//   for(int i = 0; i < taosArrayGetSize(readerList); i++){
+//     SMetaReader* pReader  = taosArrayGet(readerList, i);
+//     metaReaderInit(pReader, meta, 0);
+//     // decode the entry
+//     tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
 //
-//    if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
-//    }
-//    metaReaderClear(pReader);
-//  }
-//  int64_t stt5 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
-//  return 0;
-//}
+//     if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
+//     }
+//     metaReaderClear(pReader);
+//   }
+//   int64_t stt5 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
+//   return 0;
+// }
 
 int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
   SMeta  *pMeta = pReader->pMeta;
@@ -824,7 +824,7 @@ SArray *metaGetSmaTbUids(SMeta *pMeta) {
 #endif
 
 const void *metaGetTableTagVal(void *pTag, int16_t type, STagVal *val) {
-  STag *tag = (STag*) pTag;
+  STag *tag = (STag *)pTag;
   if (type == TSDB_DATA_TYPE_JSON) {
     return tag;
   }
@@ -926,6 +926,9 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
         break;
       }
     }
+    if (p->suid != pKey->suid) {
+      break;
+    }
     first = false;
     if (p != NULL) {
       int32_t cmp = (*param->filterFunc)(p->data, pKey->data, pKey->type);
@@ -966,10 +969,10 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj
   SMCtbCursor *pCur = metaOpenCtbCursor(pMeta, suid);
 
   SHashObj *uHash = NULL;
-  size_t len = taosArrayGetSize(uidList);   // len > 0 means there already have uids
-  if(len > 0){
+  size_t    len = taosArrayGetSize(uidList);  // len > 0 means there already have uids
+  if (len > 0) {
     uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-    for(int i = 0; i < len; i++){
+    for (int i = 0; i < len; i++) {
       int64_t *uid = taosArrayGet(uidList, i);
       taosHashPut(uHash, uid, sizeof(int64_t), &i, sizeof(i));
     }
@@ -982,7 +985,7 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj
 
     if (len > 0 && taosHashGet(uHash, &id, sizeof(int64_t)) == NULL) {
       continue;
-    }else if (len == 0) {
+    } else if (len == 0) {
       taosArrayPush(uidList, &id);
     }
 

From 2ca5bdc708ccbeb497912b01dd4b05b09f69d4dc Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 17 Aug 2022 15:39:38 +0800
Subject: [PATCH 30/98] refactor(sync): add syncNodeDynamicQuorum

---
 include/libs/sync/sync.h                      | 14 ++--
 include/libs/sync/syncTools.h                 |  1 +
 source/libs/sync/inc/syncIndexMgr.h           | 17 +++--
 source/libs/sync/inc/syncInt.h                |  2 +
 source/libs/sync/src/syncAppendEntries.c      |  9 +++
 source/libs/sync/src/syncAppendEntriesReply.c | 12 ++++
 source/libs/sync/src/syncCommit.c             | 58 ++++++++++++++++
 source/libs/sync/src/syncIndexMgr.c           | 66 ++++++++++++++++++-
 source/libs/sync/src/syncMain.c               | 11 ++--
 source/libs/sync/src/syncMessage.c            |  2 +
 .../sync/test/syncAppendEntriesReplyTest.cpp  |  3 +
 11 files changed, 178 insertions(+), 17 deletions(-)

diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index 7cd2ebdede..952066df46 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -26,12 +26,14 @@ extern "C" {
 
 extern bool gRaftDetailLog;
 
-#define SYNC_RESP_TTL_MS          10000000
-#define SYNC_SPEED_UP_HB_TIMER    400
-#define SYNC_SPEED_UP_AFTER_MS    (1000 * 20)
-#define SYNC_SLOW_DOWN_RANGE      100
-#define SYNC_MAX_READ_RANGE       10
-#define SYNC_MAX_PROGRESS_WAIT_MS 4000
+#define SYNC_RESP_TTL_MS             10000000
+#define SYNC_SPEED_UP_HB_TIMER       400
+#define SYNC_SPEED_UP_AFTER_MS       (1000 * 20)
+#define SYNC_SLOW_DOWN_RANGE         100
+#define SYNC_MAX_READ_RANGE          2
+#define SYNC_MAX_PROGRESS_WAIT_MS    4000
+#define SYNC_MAX_START_TIME_RANGE_MS (1000 * 20)
+#define SYNC_MAX_RECV_TIME_RANGE_MS  1000
 
 #define SYNC_MAX_BATCH_SIZE 1
 #define SYNC_INDEX_BEGIN    0
diff --git a/include/libs/sync/syncTools.h b/include/libs/sync/syncTools.h
index cd2c2d4a4f..6c95c3c6d7 100644
--- a/include/libs/sync/syncTools.h
+++ b/include/libs/sync/syncTools.h
@@ -423,6 +423,7 @@ typedef struct SyncAppendEntriesReply {
   SyncTerm  privateTerm;
   bool      success;
   SyncIndex matchIndex;
+  int64_t   startTime;
 } SyncAppendEntriesReply;
 
 SyncAppendEntriesReply* syncAppendEntriesReplyBuild(int32_t vgId);
diff --git a/source/libs/sync/inc/syncIndexMgr.h b/source/libs/sync/inc/syncIndexMgr.h
index 1f60a9d57e..fb85b89419 100644
--- a/source/libs/sync/inc/syncIndexMgr.h
+++ b/source/libs/sync/inc/syncIndexMgr.h
@@ -29,8 +29,12 @@ extern "C" {
 // SIndexMgr -----------------------------
 typedef struct SSyncIndexMgr {
   SRaftId (*replicas)[TSDB_MAX_REPLICA];
-  SyncIndex  index[TSDB_MAX_REPLICA];
-  SyncTerm   privateTerm[TSDB_MAX_REPLICA];  // for advanced function
+  SyncIndex index[TSDB_MAX_REPLICA];
+  SyncTerm  privateTerm[TSDB_MAX_REPLICA];  // for advanced function
+
+  int64_t startTimeArr[TSDB_MAX_REPLICA];
+  int64_t recvTimeArr[TSDB_MAX_REPLICA];
+
   int32_t    replicaNum;
   SSyncNode *pSyncNode;
 } SSyncIndexMgr;
@@ -41,8 +45,13 @@ void           syncIndexMgrDestroy(SSyncIndexMgr *pSyncIndexMgr);
 void           syncIndexMgrClear(SSyncIndexMgr *pSyncIndexMgr);
 void           syncIndexMgrSetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, SyncIndex index);
 SyncIndex      syncIndexMgrGetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId);
-cJSON *        syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr);
-char *         syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr);
+cJSON         *syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr);
+char          *syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr);
+
+void    syncIndexMgrSetStartTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, int64_t startTime);
+int64_t syncIndexMgrGetStartTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId);
+void    syncIndexMgrSetRecvTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, int64_t recvTime);
+int64_t syncIndexMgrGetRecvTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId);
 
 // void     syncIndexMgrSetTerm(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, SyncTerm term);
 // SyncTerm syncIndexMgrGetTerm(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId);
diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index 3e247e5d79..de43c81654 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -269,6 +269,8 @@ int32_t syncNodeLeaderTransfer(SSyncNode* pSyncNode);
 int32_t syncNodeLeaderTransferTo(SSyncNode* pSyncNode, SNodeInfo newLeader);
 int32_t syncDoLeaderTransfer(SSyncNode* ths, SRpcMsg* pRpcMsg, SSyncRaftEntry* pEntry);
 
+int32_t syncNodeDynamicQuorum(const SSyncNode* pSyncNode);
+
 // trace log
 void syncLogSendRequestVote(SSyncNode* pSyncNode, const SyncRequestVote* pMsg, const char* s);
 void syncLogRecvRequestVote(SSyncNode* pSyncNode, const SyncRequestVote* pMsg, const char* s);
diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c
index 4f93d8197d..e000ba8bf8 100644
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
@@ -148,6 +148,7 @@ int32_t syncNodeOnAppendEntriesCb(SSyncNode* ths, SyncAppendEntries* pMsg) {
     pReply->term = ths->pRaftStore->currentTerm;
     pReply->success = false;
     pReply->matchIndex = SYNC_INDEX_INVALID;
+    pReply->startTime = ths->startTime;
 
     // msg event log
     syncLogSendAppendEntriesReply(ths, pReply, "");
@@ -290,6 +291,8 @@ int32_t syncNodeOnAppendEntriesCb(SSyncNode* ths, SyncAppendEntries* pMsg) {
       pReply->matchIndex = pMsg->prevLogIndex;
     }
 
+    pReply->startTime = ths->startTime;
+
     // msg event log
     syncLogSendAppendEntriesReply(ths, pReply, "");
 
@@ -603,6 +606,7 @@ int32_t syncNodeOnAppendEntriesSnapshot2Cb(SSyncNode* ths, SyncAppendEntriesBatc
       pReply->privateTerm = ths->pNewNodeReceiver->privateTerm;
       pReply->success = true;
       pReply->matchIndex = matchIndex;
+      pReply->startTime = ths->startTime;
 
       // msg event log
       syncLogSendAppendEntriesReply(ths, pReply, "");
@@ -651,6 +655,7 @@ int32_t syncNodeOnAppendEntriesSnapshot2Cb(SSyncNode* ths, SyncAppendEntriesBatc
       pReply->privateTerm = ths->pNewNodeReceiver->privateTerm;
       pReply->success = false;
       pReply->matchIndex = ths->commitIndex;
+      pReply->startTime = ths->startTime;
 
       // msg event log
       syncLogSendAppendEntriesReply(ths, pReply, "");
@@ -729,6 +734,7 @@ int32_t syncNodeOnAppendEntriesSnapshot2Cb(SSyncNode* ths, SyncAppendEntriesBatc
       pReply->privateTerm = ths->pNewNodeReceiver->privateTerm;
       pReply->success = true;
       pReply->matchIndex = hasAppendEntries ? pMsg->prevLogIndex + pMsg->dataCount : pMsg->prevLogIndex;
+      pReply->startTime = ths->startTime;
 
       // msg event log
       syncLogSendAppendEntriesReply(ths, pReply, "");
@@ -874,6 +880,7 @@ int32_t syncNodeOnAppendEntriesSnapshotCb(SSyncNode* ths, SyncAppendEntries* pMs
       pReply->privateTerm = ths->pNewNodeReceiver->privateTerm;
       pReply->success = true;
       pReply->matchIndex = matchIndex;
+      pReply->startTime = ths->startTime;
 
       // msg event log
       syncLogSendAppendEntriesReply(ths, pReply, "");
@@ -919,6 +926,7 @@ int32_t syncNodeOnAppendEntriesSnapshotCb(SSyncNode* ths, SyncAppendEntries* pMs
       pReply->privateTerm = ths->pNewNodeReceiver->privateTerm;
       pReply->success = false;
       pReply->matchIndex = SYNC_INDEX_INVALID;
+      pReply->startTime = ths->startTime;
 
       // msg event log
       syncLogSendAppendEntriesReply(ths, pReply, "");
@@ -984,6 +992,7 @@ int32_t syncNodeOnAppendEntriesSnapshotCb(SSyncNode* ths, SyncAppendEntries* pMs
       pReply->privateTerm = ths->pNewNodeReceiver->privateTerm;
       pReply->success = true;
       pReply->matchIndex = hasAppendEntries ? pMsg->prevLogIndex + 1 : pMsg->prevLogIndex;
+      pReply->startTime = ths->startTime;
 
       // msg event log
       syncLogSendAppendEntriesReply(ths, pReply, "");
diff --git a/source/libs/sync/src/syncAppendEntriesReply.c b/source/libs/sync/src/syncAppendEntriesReply.c
index 4928c54bd7..9253ed0129 100644
--- a/source/libs/sync/src/syncAppendEntriesReply.c
+++ b/source/libs/sync/src/syncAppendEntriesReply.c
@@ -64,6 +64,10 @@ int32_t syncNodeOnAppendEntriesReplyCb(SSyncNode* ths, SyncAppendEntriesReply* p
 
   ASSERT(pMsg->term == ths->pRaftStore->currentTerm);
 
+  // update time
+  syncIndexMgrSetStartTime(ths->pNextIndex, &(pMsg->srcId), pMsg->startTime);
+  syncIndexMgrSetRecvTime(ths->pNextIndex, &(pMsg->srcId), taosGetTimestampMs());
+
   SyncIndex beforeNextIndex = syncIndexMgrGetIndex(ths->pNextIndex, &(pMsg->srcId));
   SyncIndex beforeMatchIndex = syncIndexMgrGetIndex(ths->pMatchIndex, &(pMsg->srcId));
 
@@ -170,6 +174,10 @@ int32_t syncNodeOnAppendEntriesReplySnapshot2Cb(SSyncNode* ths, SyncAppendEntrie
 
   ASSERT(pMsg->term == ths->pRaftStore->currentTerm);
 
+  // update time
+  syncIndexMgrSetStartTime(ths->pNextIndex, &(pMsg->srcId), pMsg->startTime);
+  syncIndexMgrSetRecvTime(ths->pNextIndex, &(pMsg->srcId), taosGetTimestampMs());
+
   SyncIndex beforeNextIndex = syncIndexMgrGetIndex(ths->pNextIndex, &(pMsg->srcId));
   SyncIndex beforeMatchIndex = syncIndexMgrGetIndex(ths->pMatchIndex, &(pMsg->srcId));
 
@@ -330,6 +338,10 @@ int32_t syncNodeOnAppendEntriesReplySnapshotCb(SSyncNode* ths, SyncAppendEntries
 
   ASSERT(pMsg->term == ths->pRaftStore->currentTerm);
 
+  // update time
+  syncIndexMgrSetStartTime(ths->pNextIndex, &(pMsg->srcId), pMsg->startTime);
+  syncIndexMgrSetRecvTime(ths->pNextIndex, &(pMsg->srcId), taosGetTimestampMs());
+
   SyncIndex beforeNextIndex = syncIndexMgrGetIndex(ths->pNextIndex, &(pMsg->srcId));
   SyncIndex beforeMatchIndex = syncIndexMgrGetIndex(ths->pMatchIndex, &(pMsg->srcId));
 
diff --git a/source/libs/sync/src/syncCommit.c b/source/libs/sync/src/syncCommit.c
index 3a94ed9713..3829ea0730 100644
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
@@ -133,6 +133,63 @@ bool syncAgreeIndex(SSyncNode* pSyncNode, SRaftId* pRaftId, SyncIndex index) {
   return false;
 }
 
+static inline int64_t syncNodeAbs64(int64_t a, int64_t b) {
+  ASSERT(a >= 0);
+  ASSERT(b >= 0);
+
+  int64_t c = a > b ? a - b : b - a;
+  return c;
+}
+
+int32_t syncNodeDynamicQuorum(const SSyncNode* pSyncNode) {
+  int32_t quorum = 1;  // self
+
+  int64_t timeNow = taosGetTimestampMs();
+  for (int i = 0; i < pSyncNode->peersNum; ++i) {
+    int64_t peerStartTime = syncIndexMgrGetStartTime(pSyncNode->pNextIndex, &(pSyncNode->peersId)[i]);
+    int64_t peerRecvTime = syncIndexMgrGetRecvTime(pSyncNode->pNextIndex, &(pSyncNode->peersId)[i]);
+
+    int64_t recvTimeDiff = syncNodeAbs64(peerRecvTime, timeNow);
+    int64_t startTimeDiff = syncNodeAbs64(peerStartTime, pSyncNode->startTime);
+
+    int32_t addQuorum = 0;
+
+    if (recvTimeDiff < SYNC_MAX_RECV_TIME_RANGE_MS) {
+      addQuorum = 1;
+    } else {
+      addQuorum = 0;
+    }
+
+    if (startTimeDiff > SYNC_MAX_START_TIME_RANGE_MS) {
+      addQuorum = 0;
+    }
+
+    quorum += addQuorum;
+  }
+
+  ASSERT(quorum <= pSyncNode->replicaNum);
+
+  if (quorum < pSyncNode->quorum) {
+    quorum = pSyncNode->quorum;
+  }
+
+  return quorum;
+}
+
+bool syncAgree(SSyncNode* pSyncNode, SyncIndex index) {
+  int agreeCount = 0;
+  for (int i = 0; i < pSyncNode->replicaNum; ++i) {
+    if (syncAgreeIndex(pSyncNode, &(pSyncNode->replicasId[i]), index)) {
+      ++agreeCount;
+    }
+    if (agreeCount >= syncNodeDynamicQuorum(pSyncNode)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/*
 bool syncAgree(SSyncNode* pSyncNode, SyncIndex index) {
   int agreeCount = 0;
   for (int i = 0; i < pSyncNode->replicaNum; ++i) {
@@ -145,3 +202,4 @@ bool syncAgree(SSyncNode* pSyncNode, SyncIndex index) {
   }
   return false;
 }
+*/
diff --git a/source/libs/sync/src/syncIndexMgr.c b/source/libs/sync/src/syncIndexMgr.c
index 8c820fcd9c..07c4fa8429 100644
--- a/source/libs/sync/src/syncIndexMgr.c
+++ b/source/libs/sync/src/syncIndexMgr.c
@@ -47,6 +47,13 @@ void syncIndexMgrDestroy(SSyncIndexMgr *pSyncIndexMgr) {
 void syncIndexMgrClear(SSyncIndexMgr *pSyncIndexMgr) {
   memset(pSyncIndexMgr->index, 0, sizeof(pSyncIndexMgr->index));
   memset(pSyncIndexMgr->privateTerm, 0, sizeof(pSyncIndexMgr->privateTerm));
+
+  // int64_t timeNow = taosGetMonotonicMs();
+  for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
+    pSyncIndexMgr->startTimeArr[i] = 0;
+    pSyncIndexMgr->recvTimeArr[i] = 0;
+  }
+
   /*
   for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
     pSyncIndexMgr->index[i] = 0;
@@ -68,7 +75,8 @@ void syncIndexMgrSetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId,
   char     host[128];
   uint16_t port;
   syncUtilU642Addr(pRaftId->addr, host, sizeof(host), &port);
-  sError("vgId:%d, index mgr set for %s:%d, index:%" PRId64 " error", pSyncIndexMgr->pSyncNode->vgId, host, port, index);
+  sError("vgId:%d, index mgr set for %s:%d, index:%" PRId64 " error", pSyncIndexMgr->pSyncNode->vgId, host, port,
+         index);
 }
 
 SyncIndex syncIndexMgrGetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId) {
@@ -125,11 +133,65 @@ cJSON *syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr) {
 
 char *syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr) {
   cJSON *pJson = syncIndexMgr2Json(pSyncIndexMgr);
-  char * serialized = cJSON_Print(pJson);
+  char  *serialized = cJSON_Print(pJson);
   cJSON_Delete(pJson);
   return serialized;
 }
 
+void syncIndexMgrSetStartTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, int64_t startTime) {
+  for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
+    if (syncUtilSameId(&((*(pSyncIndexMgr->replicas))[i]), pRaftId)) {
+      (pSyncIndexMgr->startTimeArr)[i] = startTime;
+      return;
+    }
+  }
+
+  // maybe config change
+  // ASSERT(0);
+  char     host[128];
+  uint16_t port;
+  syncUtilU642Addr(pRaftId->addr, host, sizeof(host), &port);
+  sError("vgId:%d, index mgr set for %s:%d, start-time:%" PRId64 " error", pSyncIndexMgr->pSyncNode->vgId, host, port,
+         startTime);
+}
+
+int64_t syncIndexMgrGetStartTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId) {
+  for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
+    if (syncUtilSameId(&((*(pSyncIndexMgr->replicas))[i]), pRaftId)) {
+      int64_t startTime = (pSyncIndexMgr->startTimeArr)[i];
+      return startTime;
+    }
+  }
+  ASSERT(0);
+}
+
+void syncIndexMgrSetRecvTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, int64_t recvTime) {
+  for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
+    if (syncUtilSameId(&((*(pSyncIndexMgr->replicas))[i]), pRaftId)) {
+      (pSyncIndexMgr->recvTimeArr)[i] = recvTime;
+      return;
+    }
+  }
+
+  // maybe config change
+  // ASSERT(0);
+  char     host[128];
+  uint16_t port;
+  syncUtilU642Addr(pRaftId->addr, host, sizeof(host), &port);
+  sError("vgId:%d, index mgr set for %s:%d, recv-time:%" PRId64 " error", pSyncIndexMgr->pSyncNode->vgId, host, port,
+         recvTime);
+}
+
+int64_t syncIndexMgrGetRecvTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId) {
+  for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
+    if (syncUtilSameId(&((*(pSyncIndexMgr->replicas))[i]), pRaftId)) {
+      int64_t recvTime = (pSyncIndexMgr->recvTimeArr)[i];
+      return recvTime;
+    }
+  }
+  ASSERT(0);
+}
+
 // for debug -------------------
 void syncIndexMgrPrint(SSyncIndexMgr *pObj) {
   char *serialized = syncIndexMgr2Str(pObj);
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 1991560d42..a00b59d292 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1682,13 +1682,13 @@ inline void syncNodeEventLog(const SSyncNode* pSyncNode, char* str) {
                ", sby:%d, "
                "stgy:%d, bch:%d, "
                "r-num:%d, "
-               "lcfg:%" PRId64 ", chging:%d, rsto:%d, elt:%" PRId64 ", hb:%" PRId64 ", %s",
+               "lcfg:%" PRId64 ", chging:%d, rsto:%d, dquorum:%d, elt:%" PRId64 ", hb:%" PRId64 ", %s",
                pSyncNode->vgId, syncUtilState2String(pSyncNode->state), str, pSyncNode->pRaftStore->currentTerm,
                pSyncNode->commitIndex, logBeginIndex, logLastIndex, snapshot.lastApplyIndex, snapshot.lastApplyTerm,
                pSyncNode->pRaftCfg->isStandBy, pSyncNode->pRaftCfg->snapshotStrategy, pSyncNode->pRaftCfg->batchSize,
                pSyncNode->replicaNum, pSyncNode->pRaftCfg->lastConfigIndex, pSyncNode->changing,
-               pSyncNode->restoreFinish, pSyncNode->electTimerLogicClockUser, pSyncNode->heartbeatTimerLogicClockUser,
-               printStr);
+               pSyncNode->restoreFinish, syncNodeDynamicQuorum(pSyncNode), pSyncNode->electTimerLogicClockUser,
+               pSyncNode->heartbeatTimerLogicClockUser, printStr);
     } else {
       snprintf(logBuf, sizeof(logBuf), "%s", str);
     }
@@ -1706,12 +1706,13 @@ inline void syncNodeEventLog(const SSyncNode* pSyncNode, char* str) {
                ", sby:%d, "
                "stgy:%d, bch:%d, "
                "r-num:%d, "
-               "lcfg:%" PRId64 ", chging:%d, rsto:%d, %s",
+               "lcfg:%" PRId64 ", chging:%d, rsto:%d, dquorum:%d, elt:%" PRId64 ", hb:%" PRId64 ", %s",
                pSyncNode->vgId, syncUtilState2String(pSyncNode->state), str, pSyncNode->pRaftStore->currentTerm,
                pSyncNode->commitIndex, logBeginIndex, logLastIndex, snapshot.lastApplyIndex, snapshot.lastApplyTerm,
                pSyncNode->pRaftCfg->isStandBy, pSyncNode->pRaftCfg->snapshotStrategy, pSyncNode->pRaftCfg->batchSize,
                pSyncNode->replicaNum, pSyncNode->pRaftCfg->lastConfigIndex, pSyncNode->changing,
-               pSyncNode->restoreFinish, printStr);
+               pSyncNode->restoreFinish, syncNodeDynamicQuorum(pSyncNode), pSyncNode->electTimerLogicClockUser,
+               pSyncNode->heartbeatTimerLogicClockUser, printStr);
     } else {
       snprintf(s, len, "%s", str);
     }
diff --git a/source/libs/sync/src/syncMessage.c b/source/libs/sync/src/syncMessage.c
index 13adaf055c..b42aba560f 100644
--- a/source/libs/sync/src/syncMessage.c
+++ b/source/libs/sync/src/syncMessage.c
@@ -1947,6 +1947,8 @@ cJSON* syncAppendEntriesReply2Json(const SyncAppendEntriesReply* pMsg) {
     cJSON_AddNumberToObject(pRoot, "success", pMsg->success);
     snprintf(u64buf, sizeof(u64buf), "%" PRId64, pMsg->matchIndex);
     cJSON_AddStringToObject(pRoot, "matchIndex", u64buf);
+    snprintf(u64buf, sizeof(u64buf), "%" PRId64, pMsg->startTime);
+    cJSON_AddStringToObject(pRoot, "startTime", u64buf);
   }
 
   cJSON* pJson = cJSON_CreateObject();
diff --git a/source/libs/sync/test/syncAppendEntriesReplyTest.cpp b/source/libs/sync/test/syncAppendEntriesReplyTest.cpp
index d41e99a3cd..72d3fd5ef3 100644
--- a/source/libs/sync/test/syncAppendEntriesReplyTest.cpp
+++ b/source/libs/sync/test/syncAppendEntriesReplyTest.cpp
@@ -24,6 +24,7 @@ SyncAppendEntriesReply *createMsg() {
   pMsg->matchIndex = 77;
   pMsg->term = 33;
   pMsg->privateTerm = 44;
+  pMsg->startTime = taosGetTimestampMs();
   return pMsg;
 }
 
@@ -89,6 +90,8 @@ void test5() {
 }
 
 int main() {
+  gRaftDetailLog = true;
+
   tsAsyncLog = 0;
   sDebugFlag = DEBUG_TRACE + DEBUG_SCREEN + DEBUG_FILE;
   logTest();

From 359fa4bc56ea43fe90bf39aec8ec048deaee4040 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 17 Aug 2022 15:50:33 +0800
Subject: [PATCH 31/98] fix:error in get table list by tag filter

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

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 2547b5e228..fc10551618 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -506,6 +506,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
       code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
       if (code != 0 || status == SFLT_NOT_INDEX) {
         qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
+        code = TDB_CODE_SUCCESS;
       }
 
 //      int64_t stt1 = taosGetTimestampUs();

From 4e9ead32aaf3693fc46cf4d2a40d7102951a8046 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 15:56:14 +0800
Subject: [PATCH 32/98] refactor code

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

diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 52c692d22a..806a786b00 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -196,8 +196,8 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
   uv_loop_t* loop = uv_default_loop();
   uv_tcp_init(loop, &cli->tcp);
   // set up timeout to avoid stuck;
-  int32_t fd = taosCreateSocketWithTimeout(5);
-  uv_tcp_open((uv_tcp_t*)&cli->tcp, fd);
+  //int32_t fd = taosCreateSocketWithTimeout(5);
+  //uv_tcp_open((uv_tcp_t*)&cli->tcp, fd);
 
   int32_t ret = uv_tcp_connect(&cli->conn, &cli->tcp, (const struct sockaddr*)&dest, clientConnCb);
   if (ret != 0) {

From 13f5acd4b910f3c13c277d28e0b299bb55736069 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 17 Aug 2022 16:04:58 +0800
Subject: [PATCH 33/98] fix(query): fix interp pResBlock->rows > capacity cause
 assert failure

TD-18445
---
 source/libs/executor/src/timewindowoperator.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 6418f5305c..3e931a489d 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2154,7 +2154,9 @@ static void doKeepLinearInfo(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlo
 
 static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup, SSDataBlock* pResBlock) {
   int32_t rows = pResBlock->info.rows;
-
+  if (rows >= pResBlock->info.capacity) {
+    return;
+  }
   // todo set the correct primary timestamp column
 
   // output the result

From 6453e24c846dd5da55660fb54b19e6455d22a48c Mon Sep 17 00:00:00 2001
From: Huo Linhe <linhehuo@gmail.com>
Date: Wed, 17 Aug 2022 17:20:54 +0800
Subject: [PATCH 34/98] chore: add lost source code for tmq example of C

---
 docs/examples/c/tmq_example.c | 275 ++++++++++++++++++++++++++++++++++
 1 file changed, 275 insertions(+)
 create mode 100644 docs/examples/c/tmq_example.c

diff --git a/docs/examples/c/tmq_example.c b/docs/examples/c/tmq_example.c
new file mode 100644
index 0000000000..19adaad116
--- /dev/null
+++ b/docs/examples/c/tmq_example.c
@@ -0,0 +1,275 @@
+/*
+ * 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/>.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "taos.h"
+
+static int  running = 1;
+static char dbName[64] = "tmqdb";
+static char stbName[64] = "stb";
+static char topicName[64] = "topicname";
+
+static int32_t msg_process(TAOS_RES* msg) {
+  char    buf[1024];
+  int32_t rows = 0;
+
+  const char* topicName = tmq_get_topic_name(msg);
+  const char* dbName = tmq_get_db_name(msg);
+  int32_t     vgroupId = tmq_get_vgroup_id(msg);
+
+  printf("topic: %s\n", topicName);
+  printf("db: %s\n", dbName);
+  printf("vgroup id: %d\n", vgroupId);
+
+  while (1) {
+    TAOS_ROW row = taos_fetch_row(msg);
+    if (row == NULL) break;
+
+    TAOS_FIELD* fields = taos_fetch_fields(msg);
+    int32_t     numOfFields = taos_field_count(msg);
+    int32_t*    length = taos_fetch_lengths(msg);
+    int32_t     precision = taos_result_precision(msg);
+    rows++;
+    taos_print_row(buf, row, fields, numOfFields);
+    printf("row content: %s\n", buf);
+  }
+
+  return rows;
+}
+
+static int32_t init_env() {
+  TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
+  if (pConn == NULL) {
+    return -1;
+  }
+
+  TAOS_RES* pRes;
+  // drop database if exists
+  printf("create database\n");
+  pRes = taos_query(pConn, "drop database if exists tmqdb");
+  if (taos_errno(pRes) != 0) {
+    printf("error in drop tmqdb, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  // create database
+  pRes = taos_query(pConn, "create database tmqdb");
+  if (taos_errno(pRes) != 0) {
+    printf("error in create tmqdb, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  // create super table
+  printf("create super table\n");
+  pRes = taos_query(
+      pConn, "create table tmqdb.stb (ts timestamp, c1 int, c2 float, c3 varchar(16)) tags(t1 int, t3 varchar(16))");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table stb, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  // create sub tables
+  printf("create sub tables\n");
+  pRes = taos_query(pConn, "create table tmqdb.ctb0 using tmqdb.stb tags(0, 'subtable0')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table ctb0, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create table tmqdb.ctb1 using tmqdb.stb tags(1, 'subtable1')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table ctb1, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create table tmqdb.ctb2 using tmqdb.stb tags(2, 'subtable2')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table ctb2, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create table tmqdb.ctb3 using tmqdb.stb tags(3, 'subtable3')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table ctb3, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  // insert data
+  printf("insert data into sub tables\n");
+  pRes = taos_query(pConn, "insert into tmqdb.ctb0 values(now, 0, 0, 'a0')(now+1s, 0, 0, 'a00')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to insert into ctb0, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "insert into tmqdb.ctb1 values(now, 1, 1, 'a1')(now+1s, 11, 11, 'a11')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to insert into ctb0, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "insert into tmqdb.ctb2 values(now, 2, 2, 'a1')(now+1s, 22, 22, 'a22')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to insert into ctb0, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "insert into tmqdb.ctb3 values(now, 3, 3, 'a1')(now+1s, 33, 33, 'a33')");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to insert into ctb0, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  taos_close(pConn);
+  return 0;
+}
+
+int32_t create_topic() {
+  printf("create topic\n");
+  TAOS_RES* pRes;
+  TAOS*     pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
+  if (pConn == NULL) {
+    return -1;
+  }
+
+  pRes = taos_query(pConn, "use tmqdb");
+  if (taos_errno(pRes) != 0) {
+    printf("error in use tmqdb, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create topic topicname as select ts, c1, c2, c3, tbname from tmqdb.stb where c1 > 1");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create topic topicname, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  taos_close(pConn);
+  return 0;
+}
+
+void tmq_commit_cb_print(tmq_t* tmq, int32_t code, void* param) {
+  printf("tmq_commit_cb_print() code: %d, tmq: %p, param: %p\n", code, tmq, param);
+}
+
+tmq_t* build_consumer() {
+  tmq_conf_res_t code;
+  tmq_conf_t*    conf = tmq_conf_new();
+  code = tmq_conf_set(conf, "enable.auto.commit", "true");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "auto.commit.interval.ms", "1000");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "group.id", "cgrpName");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "client.id", "user defined name");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "td.connect.user", "root");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "td.connect.pass", "taosdata");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "auto.offset.reset", "earliest");
+  if (TMQ_CONF_OK != code) return NULL;
+  code = tmq_conf_set(conf, "experimental.snapshot.enable", "false");
+  if (TMQ_CONF_OK != code) return NULL;
+
+  tmq_conf_set_auto_commit_cb(conf, tmq_commit_cb_print, NULL);
+
+  tmq_t* tmq = tmq_consumer_new(conf, NULL, 0);
+  tmq_conf_destroy(conf);
+  return tmq;
+}
+
+tmq_list_t* build_topic_list() {
+  tmq_list_t* topicList = tmq_list_new();
+  int32_t     code = tmq_list_append(topicList, "topicname");
+  if (code) {
+    return NULL;
+  }
+  return topicList;
+}
+
+void basic_consume_loop(tmq_t* tmq) {
+  int32_t totalRows = 0;
+  int32_t msgCnt = 0;
+  int32_t timeout = 5000;
+  while (running) {
+    TAOS_RES* tmqmsg = tmq_consumer_poll(tmq, timeout);
+    if (tmqmsg) {
+      msgCnt++;
+      totalRows += msg_process(tmqmsg);
+      taos_free_result(tmqmsg);
+    } else {
+      break;
+    }
+  }
+
+  fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
+}
+
+int main(int argc, char* argv[]) {
+  int32_t code;
+
+  if (init_env() < 0) {
+    return -1;
+  }
+
+  if (create_topic() < 0) {
+    return -1;
+  }
+
+  tmq_t* tmq = build_consumer();
+  if (NULL == tmq) {
+    fprintf(stderr, "%% build_consumer() fail!\n");
+    return -1;
+  }
+
+  tmq_list_t* topic_list = build_topic_list();
+  if (NULL == topic_list) {
+    return -1;
+  }
+
+  if ((code = tmq_subscribe(tmq, topic_list))) {
+    fprintf(stderr, "%% Failed to tmq_subscribe(): %s\n", tmq_err2str(code));
+  }
+  tmq_list_destroy(topic_list);
+
+  basic_consume_loop(tmq);
+
+  code = tmq_consumer_close(tmq);
+  if (code) {
+    fprintf(stderr, "%% Failed to close consumer: %s\n", tmq_err2str(code));
+  } else {
+    fprintf(stderr, "%% Consumer closed\n");
+  }
+
+  return 0;
+}

From 0bc12a8320157fe71872b61e468b31719d9a4f50 Mon Sep 17 00:00:00 2001
From: Huo Linhe <linhehuo@gmail.com>
Date: Wed, 17 Aug 2022 17:27:45 +0800
Subject: [PATCH 35/98] chore: fix source code file name typo

---
 docs/zh/07-develop/_sub_c.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/07-develop/_sub_c.mdx b/docs/zh/07-develop/_sub_c.mdx
index b8f73a8ff1..b0667268e9 100644
--- a/docs/zh/07-develop/_sub_c.mdx
+++ b/docs/zh/07-develop/_sub_c.mdx
@@ -1,3 +1,3 @@
 ```c
-{{#include docs/examples/c/tmq-example.c}}
+{{#include docs/examples/c/tmq_example.c}}
 ```

From ebc79f906e182dd3a4b798dbc48153d648017c8b Mon Sep 17 00:00:00 2001
From: ShuaiQChang <changshuaiqiang@163.com>
Date: Wed, 17 Aug 2022 17:39:40 +0800
Subject: [PATCH 36/98] fix: docs error

---
 docs/zh/07-develop/07-tmq.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/07-develop/07-tmq.mdx b/docs/zh/07-develop/07-tmq.mdx
index 25f37121e8..da8bf5e20e 100644
--- a/docs/zh/07-develop/07-tmq.mdx
+++ b/docs/zh/07-develop/07-tmq.mdx
@@ -724,7 +724,6 @@ consumer.close();
 
 </TabItem>
 
-
 <TabItem value="Go" label="Go">
 
 ```go
@@ -769,6 +768,7 @@ consumer.Unsubscribe();
 // 关闭消费
 consumer.Close();
 ```
+
 </TabItem>
 
 </Tabs>
@@ -809,7 +809,7 @@ SHOW SUBSCRIPTIONS;
 <Tabs defaultValue="java" groupId="lang">
 
 <TabItem label="C" value="c">
-  <CDemo>
+  <CDemo />
 </TabItem>
 
 <TabItem label="Java" value="java">

From 5e38aab3d7bb0dc389351e93897fdcde763d300e Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 17 Aug 2022 17:51:49 +0800
Subject: [PATCH 37/98] fix: plus 1 with tdb strlen

---
 source/dnode/vnode/src/meta/metaTable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index e8755e0035..0e0b354cef 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -192,7 +192,7 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
   // validate req
   void *pData = NULL;
   int   nData = 0;
-  if (tdbTbGet(pMeta->pNameIdx, pReq->name, strlen(pReq->name), &pData, &nData) == 0) {
+  if (tdbTbGet(pMeta->pNameIdx, pReq->name, strlen(pReq->name) + 1, &pData, &nData) == 0) {
     tb_uid_t uid = *(tb_uid_t *)pData;
     tdbFree(pData);
     SMetaInfo info;

From 9eb99615fe58b552ba0ad0222d9e8249b05eb99c Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 17:58:46 +0800
Subject: [PATCH 38/98] fix invalid packet

---
 source/libs/transport/inc/transComm.h |  1 +
 source/libs/transport/src/transComm.c | 13 +++++++++----
 source/libs/transport/src/transSvr.c  | 26 ++++++++++++++++++--------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h
index 6b52c74271..1efb0bb316 100644
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@@ -98,6 +98,7 @@ typedef void* queue[2];
 #define TRANS_RETRY_INTERVAL    15    // retry interval (ms)
 #define TRANS_CONN_TIMEOUT      3     // connect timeout (s)
 #define TRANS_READ_TIMEOUT      3000  // read timeout  (ms)
+#define TRANS_PACKET_LIMIT      1024 * 1024 * 512
 
 typedef SRpcMsg      STransMsg;
 typedef SRpcCtx      STransCtx;
diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c
index 4272ec0b1c..af49e5845b 100644
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@@ -112,15 +112,20 @@ int transClearBuffer(SConnBuffer* buf) {
 }
 
 int transDumpFromBuffer(SConnBuffer* connBuf, char** buf) {
+  static const int HEADSIZE = sizeof(STransMsgHead);
+
   SConnBuffer* p = connBuf;
   if (p->left != 0) {
     return -1;
   }
   int total = connBuf->total;
-  *buf = taosMemoryCalloc(1, total);
-  memcpy(*buf, p->buf, total);
-
-  transResetBuffer(connBuf);
+  if (total >= HEADSIZE) {
+    *buf = taosMemoryCalloc(1, total);
+    memcpy(*buf, p->buf, total);
+    transResetBuffer(connBuf);
+  } else {
+    total = -1;
+  }
   return total;
 }
 
diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index 3512b27bf8..a94eb01beb 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -184,10 +184,15 @@ static void uvHandleActivityTimeout(uv_timer_t* handle) {
 }
 
 static void uvHandleReq(SSvrConn* pConn) {
-  STransMsgHead* msg = NULL;
-  int            msgLen = 0;
+  STrans* pTransInst = pConn->pTransInst;
 
-  msgLen = transDumpFromBuffer(&pConn->readBuf, (char**)&msg);
+  STransMsgHead* msg = NULL;
+  int            msgLen = transDumpFromBuffer(&pConn->readBuf, (char**)&msg);
+  if (msgLen <= 0) {
+    tError("%s conn %p alread read complete packet", transLabel(pTransInst), pConn);
+    transUnrefSrvHandle(pConn);
+    return;
+  }
 
   STransMsgHead* pHead = (STransMsgHead*)msg;
   pHead->code = htonl(pHead->code);
@@ -220,7 +225,6 @@ static void uvHandleReq(SSvrConn* pConn) {
       tDebug("conn %p acquired by server app", pConn);
     }
   }
-  STrans*   pTransInst = pConn->pTransInst;
   STraceId* trace = &pHead->traceId;
   if (pConn->status == ConnNormal && pHead->noResp == 0) {
     transRefSrvHandle(pConn);
@@ -268,11 +272,17 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
   if (nread > 0) {
     pBuf->len += nread;
     tTrace("%s conn %p total read:%d, current read:%d", transLabel(pTransInst), conn, pBuf->len, (int)nread);
-    while (transReadComplete(pBuf)) {
-      tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
-      uvHandleReq(conn);
+    if (pBuf->len <= TRANS_PACKET_LIMIT) {
+      while (transReadComplete(pBuf)) {
+        tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
+        uvHandleReq(conn);
+      }
+      return;
+    } else {
+      tError("%s conn %p read unexpected packet, exceed limit", transLabel(pTransInst), conn);
+      destroyConn(conn, true);
+      return;
     }
-    return;
   }
   if (nread == 0) {
     return;

From e3c11172ec7ccacefc2f643e249f7500726e691d Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 17 Aug 2022 19:01:22 +0800
Subject: [PATCH 39/98] fix:error in get table list by tag filter

---
 source/libs/executor/src/executil.c | 20 +++++++++++++++++++-
 source/libs/scalar/src/scalar.c     |  3 +++
 source/libs/scalar/src/sclvector.c  |  4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index fc10551618..1dabea0d6b 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -334,7 +334,13 @@ static EDealRes getColumn(SNode** pNode, void* pContext) {
     taosHashPut(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId), pNode, sizeof((*pNode)));
     pSColumnNode->slotId = pData->index++;
     SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes};
+#if TAG_FILTER_DEBUG
+    qDebug("tagfilter build column info, slotId:%d, colId:%d, type:%d", pSColumnNode->slotId, cInfo.colId, cInfo.type);
+#endif
     taosArrayPush(pData->cInfoList, &cInfo);
+  }else{
+    SColumnNode* col = *(SColumnNode**)data;
+    pSColumnNode->slotId = col->slotId;
   }
 
   return DEAL_RES_CONTINUE;
@@ -431,7 +437,9 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
         char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
         metaGetTableNameByUid(metaHandle, *uid, str);
         colDataAppend(pColInfo, i, str, false);
+#if TAG_FILTER_DEBUG
         qDebug("tagfilter uid:%ld, tbname:%s", *uid, str+2);
+#endif
       }else{
         STagVal tagVal = {0};
         tagVal.cid = pColInfo->info.colId;
@@ -442,13 +450,23 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
         } else if (pColInfo->info.type == TSDB_DATA_TYPE_JSON) {
           colDataAppend(pColInfo, i, p, false);
         } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
-          char *tmp = taosMemoryMalloc(tagVal.nData + VARSTR_HEADER_SIZE);
+          char *tmp = taosMemoryCalloc(tagVal.nData + VARSTR_HEADER_SIZE + 1, 1);
           varDataSetLen(tmp, tagVal.nData);
           memcpy(tmp + VARSTR_HEADER_SIZE, tagVal.pData, tagVal.nData);
           colDataAppend(pColInfo, i, tmp, false);
+#if TAG_FILTER_DEBUG
+          qDebug("tagfilter varch:%s", tmp+2);
+#endif
           taosMemoryFree(tmp);
         } else {
           colDataAppend(pColInfo, i, (const char*)&tagVal.i64, false);
+#if TAG_FILTER_DEBUG
+          if(pColInfo->info.type == TSDB_DATA_TYPE_INT){
+            qDebug("tagfilter int:%d", *(int*)(&tagVal.i64));
+          }else if(pColInfo->info.type == TSDB_DATA_TYPE_DOUBLE){
+            qDebug("tagfilter double:%f", *(double *)(&tagVal.i64));
+          }
+#endif
         }
       }
     }
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index d0c5a76f4b..54376561de 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -292,6 +292,9 @@ int32_t sclInitParam(SNode* node, SScalarParam *param, SScalarCtx *ctx, int32_t
       }
 
       SColumnInfoData *columnData = (SColumnInfoData *)taosArrayGet(block->pDataBlock, ref->slotId);
+#if TAG_FILTER_DEBUG
+      qDebug("tagfilter column info, slotId:%d, colId:%d, type:%d", ref->slotId, columnData->info.colId, columnData->info.type);
+#endif
       param->numOfRows = block->info.rows;
       param->columnData = columnData;
       break;
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 55699d5abd..aaa70ef5ae 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -1672,8 +1672,8 @@ void vectorBitOr(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut,
       colDataAppendInt8(pOut->columnData, i, (int8_t*)&result);\
     }else{\
       bool  res = filterDoCompare(fp, optr, pLeftData, pRightData);\
-      colDataAppendInt8(pOut->columnData, i, (int8_t*)&res);                                      \
-    }                                          \
+      colDataAppendInt8(pOut->columnData, i, (int8_t*)&res);\
+    }\
     if(freeLeft) taosMemoryFreeClear(pLeftData);\
     if(freeRight) taosMemoryFreeClear(pRightData);\
   }

From 853e6e29888afcf14ce4a743c9b82f1c19850bb9 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 17 Aug 2022 19:19:58 +0800
Subject: [PATCH 40/98] refactor(mnode): drop stream task

---
 examples/c/stream_demo.c                   |  7 +++---
 include/common/tcommon.h                   |  1 +
 include/libs/stream/tstream.h              |  5 +++++
 include/util/taoserror.h                   |  1 +
 source/dnode/mnode/impl/src/mndScheduler.c |  2 ++
 source/dnode/mnode/impl/src/mndStb.c       | 11 ++++++----
 source/dnode/vnode/src/tq/tq.c             | 14 +++---------
 source/libs/stream/inc/streamInc.h         |  1 -
 source/libs/stream/src/stream.c            |  8 +++++--
 source/libs/stream/src/streamMeta.c        | 25 ++++++++++++++++------
 source/libs/stream/src/streamQueue.c       |  4 +++-
 source/libs/stream/src/streamTask.c        |  4 ++--
 source/util/src/terror.c                   |  1 +
 13 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/examples/c/stream_demo.c b/examples/c/stream_demo.c
index dd4fbc8d2d..2fcf4dd62c 100644
--- a/examples/c/stream_demo.c
+++ b/examples/c/stream_demo.c
@@ -98,10 +98,9 @@ int32_t create_stream() {
   /*const char* sql = "select min(k), max(k), sum(k) as sum_of_k from st1";*/
   /*const char* sql = "select sum(k) from tu1 interval(10m)";*/
   /*pRes = tmq_create_stream(pConn, "stream1", "out1", sql);*/
-  pRes =
-      taos_query(pConn,
-                 "create stream stream1 trigger max_delay 10s into outstb as select _wstart, sum(k) from st1 partition "
-                 "by tbname session(ts, 10s) ");
+  pRes = taos_query(pConn,
+                    "create stream stream1 trigger max_delay 10s watermark 10s into outstb as select _wstart start, "
+                    "count(k) from st1 partition by tbname interval(20s) ");
   if (taos_errno(pRes) != 0) {
     printf("failed to create stream stream1, reason:%s\n", taos_errstr(pRes));
     return -1;
diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index e04d9d5e86..dbe020f7ec 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -60,6 +60,7 @@ enum {
   STREAM_INPUT__DATA_RETRIEVE,
   STREAM_INPUT__GET_RES,
   STREAM_INPUT__CHECKPOINT,
+  STREAM_INPUT__DESTROY,
 };
 
 typedef enum EStreamType {
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index e6fcb021d5..484d0991f2 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -53,6 +53,7 @@ enum {
   TASK_SCHED_STATUS__WAITING,
   TASK_SCHED_STATUS__ACTIVE,
   TASK_SCHED_STATUS__FAILED,
+  TASK_SCHED_STATUS__DROPPING,
 };
 
 enum {
@@ -127,6 +128,10 @@ typedef struct {
   int8_t type;
 } SStreamCheckpoint;
 
+typedef struct {
+  int8_t type;
+} SStreamTaskDestroy;
+
 typedef struct {
   int8_t       type;
   SSDataBlock* pBlock;
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index d7ec3697af..c3796fbadd 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -291,6 +291,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_STREAM_NOT_EXIST          TAOS_DEF_ERROR_CODE(0, 0x03F1)
 #define TSDB_CODE_MND_INVALID_STREAM_OPTION     TAOS_DEF_ERROR_CODE(0, 0x03F2)
 #define TSDB_CODE_MND_STREAM_MUST_BE_DELETED    TAOS_DEF_ERROR_CODE(0, 0x03F3)
+#define TSDB_CODE_MND_STREAM_TASK_DROPPED       TAOS_DEF_ERROR_CODE(0, 0x03F4)
 
 // mnode-sma
 #define TSDB_CODE_MND_SMA_ALREADY_EXIST         TAOS_DEF_ERROR_CODE(0, 0x0480)
diff --git a/source/dnode/mnode/impl/src/mndScheduler.c b/source/dnode/mnode/impl/src/mndScheduler.c
index a24b7ef459..3bfd7eb596 100644
--- a/source/dnode/mnode/impl/src/mndScheduler.c
+++ b/source/dnode/mnode/impl/src/mndScheduler.c
@@ -424,6 +424,8 @@ int32_t mndScheduleStream(SMnode* pMnode, SStreamObj* pStream) {
       }
       mndAddTaskToTaskSet(taskSourceLevel, pTask);
 
+      pTask->triggerParam = 0;
+
       // source
       pTask->taskLevel = TASK_LEVEL__SOURCE;
 
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index dd2b595c29..59c6d65953 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -2021,8 +2021,7 @@ static int32_t mndCheckDropStbForTopic(SMnode *pMnode, const char *stbFullName,
     FOREACH(pNode, pNodeList) {
       SColumnNode *pCol = (SColumnNode *)pNode;
 
-      if (pCol->tableId != suid) {
-        mDebug("topic:%s, check colId:%d passed", pTopic->name, pCol->colId);
+      if (pCol->tableId == suid) {
         sdbRelease(pSdb, pTopic);
         nodesDestroyNode(pAst);
         return -1;
@@ -2045,6 +2044,11 @@ static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName,
     pIter = sdbFetch(pSdb, SDB_STREAM, pIter, (void **)&pStream);
     if (pIter == NULL) break;
 
+    if (pStream->smaId == 0 && pStream->targetStbUid == suid) {
+      sdbRelease(pSdb, pStream);
+      return -1;
+    }
+
     SNode *pAst = NULL;
     if (nodesStringToNode(pStream->ast, &pAst) != 0) {
       ASSERT(0);
@@ -2057,8 +2061,7 @@ static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName,
     FOREACH(pNode, pNodeList) {
       SColumnNode *pCol = (SColumnNode *)pNode;
 
-      if (pCol->tableId != suid) {
-        mDebug("stream:%s, check colId:%d passed", pStream->name, pCol->colId);
+      if (pCol->tableId == suid) {
         sdbRelease(pSdb, pStream);
         nodesDestroyNode(pAst);
         return -1;
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index a98fea1988..c6bc8e6e59 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -628,8 +628,6 @@ int32_t tqProcessVgChangeReq(STQ* pTq, int64_t version, char* msg, int32_t msgLe
 }
 
 int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask) {
-  int32_t code = 0;
-
   if (pTask->taskLevel == TASK_LEVEL__AGG) {
     ASSERT(taosArrayGetSize(pTask->childEpInfo) != 0);
   }
@@ -640,8 +638,7 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask) {
   pTask->outputQueue = streamQueueOpen();
 
   if (pTask->inputQueue == NULL || pTask->outputQueue == NULL) {
-    code = -1;
-    goto FAIL;
+    return -1;
   }
 
   pTask->inputStatus = TASK_INPUT_STATUS__NORMAL;
@@ -686,14 +683,9 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask) {
 
   streamSetupTrigger(pTask);
 
-  tqInfo("deploy stream task on vg %d, task id %d, child id %d", TD_VID(pTq->pVnode), pTask->taskId,
+  tqInfo("expand stream task on vg %d, task id %d, child id %d", TD_VID(pTq->pVnode), pTask->taskId,
          pTask->selfChildId);
-
-FAIL:
-  if (pTask->inputQueue) streamQueueClose(pTask->inputQueue);
-  if (pTask->outputQueue) streamQueueClose(pTask->outputQueue);
-  // TODO free executor
-  return code;
+  return 0;
 }
 
 int32_t tqProcessTaskDeployReq(STQ* pTq, int64_t version, char* msg, int32_t msgLen) {
diff --git a/source/libs/stream/inc/streamInc.h b/source/libs/stream/inc/streamInc.h
index 3776cb261f..6e30eeaa86 100644
--- a/source/libs/stream/inc/streamInc.h
+++ b/source/libs/stream/inc/streamInc.h
@@ -32,7 +32,6 @@ typedef struct {
 
 static SStreamGlobalEnv streamEnv;
 
-int32_t streamExec(SStreamTask* pTask);
 int32_t streamPipelineExec(SStreamTask* pTask, int32_t batchNum, bool dispatch);
 
 int32_t streamDispatch(SStreamTask* pTask);
diff --git a/source/libs/stream/src/stream.c b/source/libs/stream/src/stream.c
index 6da7d4fd59..d6e87c2736 100644
--- a/source/libs/stream/src/stream.c
+++ b/source/libs/stream/src/stream.c
@@ -185,7 +185,9 @@ int32_t streamProcessDispatchReq(SStreamTask* pTask, SStreamDispatchReq* pReq, S
   tFreeStreamDispatchReq(pReq);
 
   if (exec) {
-    streamTryExec(pTask);
+    if (streamTryExec(pTask) < 0) {
+      return -1;
+    }
 
     if (pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) {
       streamDispatch(pTask);
@@ -221,7 +223,9 @@ int32_t streamProcessDispatchRsp(SStreamTask* pTask, SStreamDispatchRsp* pRsp) {
 }
 
 int32_t streamProcessRunReq(SStreamTask* pTask) {
-  streamTryExec(pTask);
+  if (streamTryExec(pTask) < 0) {
+    return -1;
+  }
 
   if (pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) {
     streamDispatch(pTask);
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index 64a9537e6c..f34f68ffc6 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -99,16 +99,19 @@ int32_t streamMetaAddSerializedTask(SStreamMeta* pMeta, int64_t startVer, char*
     goto FAIL;
   }
 
-  taosHashPut(pMeta->pTasks, &pTask->taskId, sizeof(int32_t), &pTask, sizeof(void*));
+  if (taosHashPut(pMeta->pTasks, &pTask->taskId, sizeof(int32_t), &pTask, sizeof(void*)) < 0) {
+    goto FAIL;
+  }
 
   if (tdbTbUpsert(pMeta->pTaskDb, &pTask->taskId, sizeof(int32_t), msg, msgLen, &pMeta->txn) < 0) {
+    taosHashRemove(pMeta->pTasks, &pTask->taskId, sizeof(int32_t));
     ASSERT(0);
-    return -1;
+    goto FAIL;
   }
   return 0;
 
 FAIL:
-  if (pTask) taosMemoryFree(pTask);
+  if (pTask) tFreeSStreamTask(pTask);
   return -1;
 }
 
@@ -158,11 +161,21 @@ int32_t streamMetaRemoveTask(SStreamMeta* pMeta, int32_t taskId) {
     SStreamTask* pTask = *ppTask;
     taosHashRemove(pMeta->pTasks, &taskId, sizeof(int32_t));
     atomic_store_8(&pTask->taskStatus, TASK_STATUS__DROPPING);
+
+    if (tdbTbDelete(pMeta->pTaskDb, &taskId, sizeof(int32_t), &pMeta->txn) < 0) {
+      /*return -1;*/
+    }
+
+    while (1) {
+      int8_t schedStatus =
+          atomic_val_compare_exchange_8(&pTask->schedStatus, TASK_SCHED_STATUS__INACTIVE, TASK_SCHED_STATUS__DROPPING);
+      if (schedStatus == TASK_SCHED_STATUS__INACTIVE) {
+        tFreeSStreamTask(pTask);
+        break;
+      }
+    }
   }
 
-  if (tdbTbDelete(pMeta->pTaskDb, &taskId, sizeof(int32_t), &pMeta->txn) < 0) {
-    /*return -1;*/
-  }
   return 0;
 }
 
diff --git a/source/libs/stream/src/streamQueue.c b/source/libs/stream/src/streamQueue.c
index 6819e5329f..45b78a8c6e 100644
--- a/source/libs/stream/src/streamQueue.c
+++ b/source/libs/stream/src/streamQueue.c
@@ -38,7 +38,9 @@ void streamQueueClose(SStreamQueue* queue) {
     if (qItem) {
       taosFreeQitem(qItem);
     } else {
-      return;
+      break;
     }
   }
+  taosFreeQall(queue->qall);
+  taosCloseQueue(queue->queue);
 }
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index 638d39e5cc..0c35c1408e 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -152,8 +152,8 @@ int32_t tDecodeSStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
 }
 
 void tFreeSStreamTask(SStreamTask* pTask) {
-  streamQueueClose(pTask->inputQueue);
-  streamQueueClose(pTask->outputQueue);
+  if (pTask->inputQueue) streamQueueClose(pTask->inputQueue);
+  if (pTask->outputQueue) streamQueueClose(pTask->outputQueue);
   if (pTask->exec.qmsg) taosMemoryFree(pTask->exec.qmsg);
   if (pTask->exec.executor) qDestroyTask(pTask->exec.executor);
   taosMemoryFree(pTask);
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index 7b06967940..f6b62b5ea8 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -293,6 +293,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_CGROUP_USED,              "Consumer group being
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_STREAM_ALREADY_EXIST,     "Stream already exists")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_STREAM_NOT_EXIST,         "Stream not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_STREAM_OPTION,    "Invalid stream option")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_STREAM_MUST_BE_DELETED,   "Stream must be dropped first")
 
 // mnode-sma
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_SMA_ALREADY_EXIST,        "SMA already exists")

From e016c8f729c7d3677c66616257e2a15c856118d6 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 20:04:04 +0800
Subject: [PATCH 41/98] fix invalid packet

---
 source/libs/transport/inc/transComm.h |  6 ++++++
 source/libs/transport/src/transCli.c  |  1 +
 source/libs/transport/src/transComm.c |  8 ++++++--
 source/libs/transport/src/transSvr.c  | 16 ++++++++++------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h
index 1efb0bb316..bc1c6386f6 100644
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@@ -100,6 +100,10 @@ typedef void* queue[2];
 #define TRANS_READ_TIMEOUT      3000  // read timeout  (ms)
 #define TRANS_PACKET_LIMIT      1024 * 1024 * 512
 
+#define TRANS_MAGIC_NUM 0x5f375a86
+
+#define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
+
 typedef SRpcMsg      STransMsg;
 typedef SRpcCtx      STransCtx;
 typedef SRpcCtxVal   STransCtxVal;
@@ -152,6 +156,7 @@ typedef struct {
   char hasEpSet : 2;  // contain epset or not, 0(default): no epset, 1: contain epset
 
   char     user[TSDB_UNI_LEN];
+  uint32_t magicNum;
   STraceId traceId;
   uint64_t ahandle;  // ahandle assigned by client
   uint32_t code;     // del later
@@ -204,6 +209,7 @@ typedef struct SConnBuffer {
   int   cap;
   int   left;
   int   total;
+  int   invalid;
 } SConnBuffer;
 
 typedef void (*AsyncCB)(uv_async_t* handle);
diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index add007e14d..8fdfcd5309 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -759,6 +759,7 @@ void cliSend(SCliConn* pConn) {
   pHead->release = REQUEST_RELEASE_HANDLE(pCliMsg) ? 1 : 0;
   memcpy(pHead->user, pTransInst->user, strlen(pTransInst->user));
   pHead->traceId = pMsg->info.traceId;
+  pHead->magicNum = htonl(TRANS_MAGIC_NUM);
 
   uv_buf_t wb = uv_buf_init((char*)pHead, msgLen);
 
diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c
index af49e5845b..3ba8186e9d 100644
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@@ -91,6 +91,7 @@ int transInitBuffer(SConnBuffer* buf) {
   buf->left = -1;
   buf->len = 0;
   buf->total = 0;
+  buf->invalid = 0;
   return 0;
 }
 int transDestroyBuffer(SConnBuffer* p) {
@@ -108,6 +109,7 @@ int transClearBuffer(SConnBuffer* buf) {
   p->left = -1;
   p->len = 0;
   p->total = 0;
+  p->invalid = 0;
   return 0;
 }
 
@@ -119,7 +121,7 @@ int transDumpFromBuffer(SConnBuffer* connBuf, char** buf) {
     return -1;
   }
   int total = connBuf->total;
-  if (total >= HEADSIZE) {
+  if (total >= HEADSIZE && !p->invalid) {
     *buf = taosMemoryCalloc(1, total);
     memcpy(*buf, p->buf, total);
     transResetBuffer(connBuf);
@@ -178,6 +180,7 @@ bool transReadComplete(SConnBuffer* connBuf) {
       memcpy((char*)&head, connBuf->buf, sizeof(head));
       int32_t msgLen = (int32_t)htonl(head.msgLen);
       p->total = msgLen;
+      p->invalid = TRANS_NOVALID_PACKET(htonl(head.magicNum));
     }
     if (p->total >= p->len) {
       p->left = p->total - p->len;
@@ -185,7 +188,8 @@ bool transReadComplete(SConnBuffer* connBuf) {
       p->left = 0;
     }
   }
-  return p->left == 0 ? true : false;
+
+  return (p->left == 0 || p->invalid) ? true : false;
 }
 
 int transSetConnOption(uv_tcp_t* stream) {
diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index a94eb01beb..be6eafba97 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -183,15 +183,14 @@ static void uvHandleActivityTimeout(uv_timer_t* handle) {
   tDebug("%p timeout since no activity", conn);
 }
 
-static void uvHandleReq(SSvrConn* pConn) {
+static bool uvHandleReq(SSvrConn* pConn) {
   STrans* pTransInst = pConn->pTransInst;
 
   STransMsgHead* msg = NULL;
   int            msgLen = transDumpFromBuffer(&pConn->readBuf, (char**)&msg);
   if (msgLen <= 0) {
-    tError("%s conn %p alread read complete packet", transLabel(pTransInst), pConn);
-    transUnrefSrvHandle(pConn);
-    return;
+    tError("%s conn %p read invalid packet", transLabel(pTransInst), pConn);
+    return false;
   }
 
   STransMsgHead* pHead = (STransMsgHead*)msg;
@@ -207,7 +206,7 @@ static void uvHandleReq(SSvrConn* pConn) {
   //  uv_queue_work(((SWorkThrd*)pConn->hostThrd)->loop, wreq, uvWorkDoTask, uvWorkAfterTask);
 
   if (uvRecvReleaseReq(pConn, pHead)) {
-    return;
+    return true;
   }
 
   STransMsg transMsg;
@@ -262,6 +261,7 @@ static void uvHandleReq(SSvrConn* pConn) {
   transReleaseExHandle(transGetRefMgt(), pConn->refId);
 
   (*pTransInst->cfp)(pTransInst->parent, &transMsg, NULL);
+  return true;
 }
 
 void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
@@ -275,7 +275,10 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
     if (pBuf->len <= TRANS_PACKET_LIMIT) {
       while (transReadComplete(pBuf)) {
         tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
-        uvHandleReq(conn);
+        if (uvHandleReq(conn) == false) {
+          destroyConn(conn, true);
+          break;
+        }
       }
       return;
     } else {
@@ -374,6 +377,7 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
   pHead->ahandle = (uint64_t)pMsg->info.ahandle;
   pHead->traceId = pMsg->info.traceId;
   pHead->hasEpSet = pMsg->info.hasEpSet;
+  pHead->magicNum = htonl(TRANS_MAGIC_NUM);
 
   if (pConn->status == ConnNormal) {
     pHead->msgType = (0 == pMsg->msgType ? pConn->inType + 1 : pMsg->msgType);

From 32be8a71ee0c61f6fd52545fdc747c85ef23cf68 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 17 Aug 2022 20:14:06 +0800
Subject: [PATCH 42/98] enh: rsma batch process

---
 source/dnode/vnode/src/inc/sma.h       |  29 ++-
 source/dnode/vnode/src/sma/smaCommit.c |  91 ++++----
 source/dnode/vnode/src/sma/smaEnv.c    |  18 +-
 source/dnode/vnode/src/sma/smaRollup.c | 302 +++++++++++++++----------
 4 files changed, 259 insertions(+), 181 deletions(-)

diff --git a/source/dnode/vnode/src/inc/sma.h b/source/dnode/vnode/src/inc/sma.h
index c36207e495..26adc8d5e5 100644
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
@@ -96,10 +96,10 @@ struct SRSmaStat {
   int8_t           commitStat;        // 0 not in committing, 1 in committing
   int8_t           execStat;          // 0 not in exec , 1 in exec
   SArray          *aTaskFile;         // qTaskFiles committed recently(for recovery/snapshot r/w)
-  SHashObj        *rsmaInfoHash;      // key: stbUid, value: SRSmaInfo;
+  SHashObj        *infoHash;          // key: suid, value: SRSmaInfo
+  SHashObj        *fetchHash;         // key: suid, value: L1 or L2 or L1|L2
 };
 
-
 struct SSmaStat {
   union {
     STSmaStat tsmaStat;  // time-range-wise sma
@@ -108,13 +108,14 @@ struct SSmaStat {
   T_REF_DECLARE()
 };
 
-#define SMA_STAT_TSMA(s)      (&(s)->tsmaStat)
-#define SMA_STAT_RSMA(s)      (&(s)->rsmaStat)
-#define RSMA_INFO_HASH(r)     ((r)->rsmaInfoHash)
-#define RSMA_TRIGGER_STAT(r)  (&(r)->triggerStat)
-#define RSMA_COMMIT_STAT(r)   (&(r)->commitStat)
-#define RSMA_REF_ID(r)        ((r)->refId)
-#define RSMA_FS_LOCK(r)       (&(r)->lock)
+#define SMA_STAT_TSMA(s)     (&(s)->tsmaStat)
+#define SMA_STAT_RSMA(s)     (&(s)->rsmaStat)
+#define RSMA_INFO_HASH(r)    ((r)->infoHash)
+#define RSMA_FETCH_HASH(r)   ((r)->fetchHash)
+#define RSMA_TRIGGER_STAT(r) (&(r)->triggerStat)
+#define RSMA_COMMIT_STAT(r)  (&(r)->commitStat)
+#define RSMA_REF_ID(r)       ((r)->refId)
+#define RSMA_FS_LOCK(r)      (&(r)->lock)
 
 struct SRSmaInfoItem {
   int8_t  level;
@@ -142,7 +143,7 @@ struct SRSmaInfo {
 #define RSMA_INFO_IS_DEL(r)    ((r)->delFlag == 1)
 #define RSMA_INFO_SET_DEL(r)   ((r)->delFlag = 1)
 #define RSMA_INFO_QTASK(r, i)  ((r)->taskInfo[i])
-#define RSMA_INFO_IQTASK(r, i)  ((r)->iTaskInfo[i])
+#define RSMA_INFO_IQTASK(r, i) ((r)->iTaskInfo[i])
 #define RSMA_INFO_ITEM(r, i)   (&(r)->items[i])
 
 enum {
@@ -167,6 +168,12 @@ enum {
   RSMA_RESTORE_SYNC = 2,
 };
 
+typedef enum {
+  RSMA_EXEC_OVERFLOW = 1,  // triggered by queue buf overflow
+  RSMA_EXEC_TIMEOUT = 2,   // triggered by timer
+  RSMA_EXEC_COMMIT = 3,    // triggered by commit
+} ERsmaExecType;
+
 void  tdDestroySmaEnv(SSmaEnv *pSmaEnv);
 void *tdFreeSmaEnv(SSmaEnv *pSmaEnv);
 
@@ -240,7 +247,7 @@ static int32_t tdDestroySmaState(SSmaStat *pSmaStat, int8_t smaType);
 void          *tdFreeSmaState(SSmaStat *pSmaStat, int8_t smaType);
 void          *tdFreeRSmaInfo(SSma *pSma, SRSmaInfo *pInfo, bool isDeepFree);
 int32_t        tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash);
-int32_t        tdRSmaProcessExecImpl(SSma *pSma, int8_t type);
+int32_t        tdRSmaProcessExecImpl(SSma *pSma, ERsmaExecType type);
 
 int32_t tdProcessRSmaCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, const char *tbName);
 int32_t tdProcessRSmaRestoreImpl(SSma *pSma, int8_t type, int64_t qtaskFileVer);
diff --git a/source/dnode/vnode/src/sma/smaCommit.c b/source/dnode/vnode/src/sma/smaCommit.c
index 101fca3346..25777f90ab 100644
--- a/source/dnode/vnode/src/sma/smaCommit.c
+++ b/source/dnode/vnode/src/sma/smaCommit.c
@@ -121,7 +121,7 @@ static int32_t tdProcessRSmaSyncPreCommitImpl(SSma *pSma) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SSmaStat *pStat = SMA_ENV_STAT(pSmaEnv);
+  SSmaStat  *pStat = SMA_ENV_STAT(pSmaEnv);
   SRSmaStat *pRSmaStat = SMA_STAT_RSMA(pStat);
 
   // step 1: set rsma stat paused
@@ -333,7 +333,34 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma) {
     }
   }
 
-  // step 3:  swap queue/qall and iQueue/iQal
+  /**
+   * @brief step 3: consume the SubmitReq in buffer
+   *  1) This is high cost task and should not put in asyncPreCommit originally.
+   *  2) But, if put in asyncCommit, would trigger taskInfo cloning frequently.
+   */
+  nLoops = 0;
+  smaInfo("vgId:%d, start to wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+
+  int8_t old;
+  while (1) {
+    old = atomic_val_compare_exchange_8(&pRSmaStat->execStat, 0, 1);
+    if (old == 0) break;
+    if (++nLoops > 1000) {
+      sched_yield();
+      nLoops = 0;
+      smaDebug("vgId:%d, wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+    }
+  }
+
+  smaInfo("vgId:%d, end to wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+
+  if (tdRSmaProcessExecImpl(pSma, RSMA_EXEC_COMMIT) < 0) {
+    atomic_store_8(&pRSmaStat->execStat, 0);
+    return TSDB_CODE_FAILED;
+  }
+
+
+  // step 4:  swap queue/qall and iQueue/iQall
   // lock
   taosWLockLatch(SMA_ENV_LOCK(pEnv));
 
@@ -351,11 +378,12 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma) {
   }
 
   atomic_store_64(&pRSmaStat->qBufSize, 0);
-
+  atomic_store_8(&pRSmaStat->execStat, 0);
   // unlock
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
 
-  // step 4: others
+
+  // step 5: others
   pRSmaStat->commitAppliedVer = pSma->pVnode->state.applied;
 
   return TSDB_CODE_SUCCESS;
@@ -375,36 +403,17 @@ static int32_t tdProcessRSmaAsyncCommitImpl(SSma *pSma) {
 
   SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
 
-  // step 1: consume the SubmitReq in buffer
-  int32_t nLoops = 0;
-  smaDebug("vgId:%d start to wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
-  while (pRSmaStat->execStat == 1) {
-    taosMsleep(15);
-    if ((++nLoops & 63) == 0) {
-      smaWarn("vgId:%d 1s waited for rsma exec stat = 0, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
-      sched_yield();
-    }
-  }
-  pRSmaStat->execStat = 1;
-  smaDebug("vgId:%d end to wait for rsma qtask free, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
 
-  if (tdRSmaProcessExecImpl(pSma, 1) < 0) {
-    pRSmaStat->execStat = 0;
-    return TSDB_CODE_FAILED;
-  }
-
-  // step 2: perform persist task for qTaskInfo operator
+  // perform persist task for qTaskInfo operator
   if (tdRSmaPersistExecImpl(pRSmaStat, RSMA_INFO_HASH(pRSmaStat)) < 0) {
-    pRSmaStat->execStat = 0;
     return TSDB_CODE_FAILED;
   }
-  pRSmaStat->execStat = 0;
 
   return TSDB_CODE_SUCCESS;
 }
 
 /**
- * @brief Migrate rsmaInfo from iRsmaInfo to rsmaInfo if rsmaInfoHash not empty.
+ * @brief Migrate rsmaInfo from iRsmaInfo to rsmaInfo if rsma infoHash not empty.
  *
  * @param pSma
  * @return int32_t
@@ -424,13 +433,13 @@ static int32_t tdProcessRSmaAsyncPostCommitImpl(SSma *pSma) {
 
   void *pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), NULL);
   while (pIter) {
-    tb_uid_t *pSuid = (tb_uid_t *)taosHashGetKey(pIter, NULL);
+    tb_uid_t  *pSuid = (tb_uid_t *)taosHashGetKey(pIter, NULL);
     SRSmaInfo *pRSmaInfo = *(SRSmaInfo **)pIter;
     if (RSMA_INFO_IS_DEL(pRSmaInfo)) {
       int32_t refVal = T_REF_VAL_GET(pRSmaInfo);
       if (refVal == 0) {
-        if(!rsmaDeleted) {
-          if((rsmaDeleted = taosArrayInit(1, sizeof(tb_uid_t)))){
+        if (!rsmaDeleted) {
+          if ((rsmaDeleted = taosArrayInit(1, sizeof(tb_uid_t)))) {
             taosArrayPush(rsmaDeleted, pSuid);
           }
         }
@@ -461,22 +470,20 @@ static int32_t tdProcessRSmaAsyncPostCommitImpl(SSma *pSma) {
     pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), pIter);
   }
 
-  if (taosArrayGetSize(rsmaDeleted) > 0) {
-    for (int32_t i = 0; i < taosArrayGetSize(rsmaDeleted); ++i) {
-      tb_uid_t *pSuid = taosArrayGet(rsmaDeleted, i);
-      void     *pRSmaInfo = taosHashGet(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t));
-      if ((pRSmaInfo = *(SRSmaInfo **)pRSmaInfo)) {
-        tdFreeRSmaInfo(pSma, pRSmaInfo, true);
-        smaDebug(
-            "vgId:%d, rsma async post commit, free rsma info since already deleted and ref is 0 for "
-            "table:%" PRIi64,
-            SMA_VID(pSma), *pSuid);
-      }
-      taosHashRemove(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t));
+  for (int32_t i = 0; i < taosArrayGetSize(rsmaDeleted); ++i) {
+    tb_uid_t *pSuid = taosArrayGet(rsmaDeleted, i);
+    void     *pRSmaInfo = taosHashGet(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t));
+    if ((pRSmaInfo = *(SRSmaInfo **)pRSmaInfo)) {
+      tdFreeRSmaInfo(pSma, pRSmaInfo, true);
+      smaDebug(
+          "vgId:%d, rsma async post commit, free rsma info since already deleted and ref is 0 for "
+          "table:%" PRIi64,
+          SMA_VID(pSma), *pSuid);
     }
-    // remove suid in files
-    taosArrayDestroy(rsmaDeleted);
+    taosHashRemove(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t));
   }
+  taosArrayDestroy(rsmaDeleted);
+  // TODO: remove suid in files?
 
   // unlock
   taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
diff --git a/source/dnode/vnode/src/sma/smaEnv.c b/source/dnode/vnode/src/sma/smaEnv.c
index 73f8060559..f51aad22bd 100644
--- a/source/dnode/vnode/src/sma/smaEnv.c
+++ b/source/dnode/vnode/src/sma/smaEnv.c
@@ -171,7 +171,7 @@ int32_t tdUnRefSmaStat(SSma *pSma, SSmaStat *pStat) {
 
 int32_t tdRefRSmaInfo(SSma *pSma, SRSmaInfo *pRSmaInfo) {
   if (!pRSmaInfo) return 0;
-  
+
   int ref = T_REF_INC(pRSmaInfo);
   smaDebug("vgId:%d, ref rsma info:%p, val:%d", SMA_VID(pSma), pRSmaInfo, ref);
   return 0;
@@ -228,7 +228,12 @@ static int32_t tdInitSmaStat(SSmaStat **pSmaStat, int8_t smaType, const SSma *pS
       RSMA_INFO_HASH(pRSmaStat) = taosHashInit(
           RSMA_TASK_INFO_HASH_SLOT, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_ENTRY_LOCK);
       if (!RSMA_INFO_HASH(pRSmaStat)) {
-        taosMemoryFreeClear(*pSmaStat);
+        return TSDB_CODE_FAILED;
+      }
+
+      RSMA_FETCH_HASH(pRSmaStat) = taosHashInit(
+          RSMA_TASK_INFO_HASH_SLOT, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_ENTRY_LOCK);
+      if (!RSMA_FETCH_HASH(pRSmaStat)) {
         return TSDB_CODE_FAILED;
       }
     } else if (smaType == TSDB_SMA_TYPE_TIME_RANGE) {
@@ -274,7 +279,10 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
     }
     taosHashCleanup(RSMA_INFO_HASH(pStat));
 
-    // step 3: wait all triggered fetch tasks finished
+    // step 3: destroy the rsma fetch hash
+    taosHashCleanup(RSMA_FETCH_HASH(pStat));
+
+    // step 4: wait all triggered fetch tasks finished
     int32_t nLoops = 0;
     while (1) {
       if (T_REF_VAL_GET((SSmaStat *)pStat) == 0) {
@@ -289,8 +297,8 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
         nLoops = 0;
       }
     }
-    
-    // step 4: free pStat
+
+    // step 5: free pStat
     taosMemoryFreeClear(pStat);
   }
 }
diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index de4b7dd808..1e2a8b35a4 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -17,7 +17,8 @@
 
 #define RSMA_QTASKINFO_BUFSIZE  (32768)
 #define RSMA_QTASKINFO_HEAD_LEN (sizeof(int32_t) + sizeof(int8_t) + sizeof(int64_t))  // len + type + suid
-#define RSMA_QTASKEXEC_BUFSIZ   (1048576)
+#define RSMA_QTASKEXEC_BUFSIZE  (1048576)
+#define RSMA_SUBMIT_BATCH_SIZE  (1024)
 
 SSmaMgmt smaMgmt = {
     .inited = 0,
@@ -35,9 +36,11 @@ static int32_t    tdUpdateTbUidListImpl(SSma *pSma, tb_uid_t *suid, SArray *tbUi
 static int32_t    tdSetRSmaInfoItemParams(SSma *pSma, SRSmaParam *param, SRSmaStat *pStat, SRSmaInfo *pRSmaInfo,
                                           int8_t idx);
 static int32_t    tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
-                                    int8_t type, int8_t level);
+                                    ERsmaExecType type, int8_t level);
 static SRSmaInfo *tdAcquireRSmaInfoBySuid(SSma *pSma, int64_t suid);
 static void       tdReleaseRSmaInfo(SSma *pSma, SRSmaInfo *pInfo);
+static void       tdFreeRSmaSubmitItems(SArray *pItems);
+static int32_t    tdRSmaConsumeAndFetch(SSma *pSma, int64_t suid, int8_t level, SArray *pSubmitArr);
 static int32_t    tdRSmaFetchAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSmaInfoItem *pItem, STSchema *pTSchema,
                                              int64_t suid);
 static void       tdRSmaFetchTrigger(void *param, void *tmrId);
@@ -559,6 +562,14 @@ void *tdUidStoreFree(STbUidStore *pStore) {
   return NULL;
 }
 
+/**
+ * @brief The SubmitReq for rsma L2/L3 is inserted by tsdbInsertData method directly while not by WriteQ, as the queue
+ * would be freed when close Vnode, thus lock should be used if with race condition.
+ * @param pTsdb
+ * @param version
+ * @param pReq
+ * @return int32_t
+ */
 static int32_t tdProcessSubmitReq(STsdb *pTsdb, int64_t version, void *pReq) {
   if (!pReq) {
     terrno = TSDB_CODE_INVALID_PTR;
@@ -566,7 +577,7 @@ static int32_t tdProcessSubmitReq(STsdb *pTsdb, int64_t version, void *pReq) {
   }
 
   SSubmitReq *pSubmitReq = (SSubmitReq *)pReq;
-
+  // TODO: spin lock for race conditiond
   if (tsdbInsertData(pTsdb, version, pSubmitReq, NULL) < 0) {
     return TSDB_CODE_FAILED;
   }
@@ -696,7 +707,7 @@ _err:
 }
 
 /**
- * @brief Copy msg to rsmaQueueBuffer
+ * @brief Copy msg to rsmaQueueBuffer for batch process
  *
  * @param pSma
  * @param pMsg
@@ -722,17 +733,17 @@ static int32_t tdExecuteRSmaImplAsync(SSma *pSma, const void *pMsg, int32_t inpu
   int64_t    bufSize = atomic_add_fetch_64(&pRSmaStat->qBufSize, pReq->header.contLen);
 
   // smoothing consume
-  int32_t n = bufSize / RSMA_QTASKEXEC_BUFSIZ;
+  int32_t n = bufSize / RSMA_QTASKEXEC_BUFSIZE;
   if (n > 1) {
     if (n > 10) {
       n = 10;
     }
     taosMsleep(n << 4);
     if (n > 2) {
-      smaWarn("vgId:%d pInfo->queue itemSize:%d, memSize:%" PRIi64 ", sleep %d ms", SMA_VID(pSma),
+      smaWarn("vgId:%d, pInfo->queue itemSize:%d, memSize:%" PRIi64 ", sleep %d ms", SMA_VID(pSma),
               taosQueueItemSize(pInfo->queue), taosQueueMemorySize(pInfo->queue), n << 4);
     } else {
-      smaDebug("vgId:%d pInfo->queue itemSize:%d, memSize:%" PRIi64 ", sleep %d ms", SMA_VID(pSma),
+      smaDebug("vgId:%d, pInfo->queue itemSize:%d, memSize:%" PRIi64 ", sleep %d ms", SMA_VID(pSma),
                taosQueueItemSize(pInfo->queue), taosQueueMemorySize(pInfo->queue), n << 4);
     }
   }
@@ -751,7 +762,7 @@ static int32_t tdRsmaPrintSubmitReq(SSma *pSma, SSubmitReq *pReq) {
     if (pBlock == NULL) break;
     tInitSubmitBlkIter(&msgIter, pBlock, &blkIter);
     while ((row = tGetSubmitBlkNext(&blkIter)) != NULL) {
-      smaDebug("vgId:%d numOfRows:%d, suid:%" PRIi64 ", uid:%" PRIi64 ", version:%" PRIi64 ", ts:%" PRIi64,
+      smaDebug("vgId:%d, numOfRows:%d, suid:%" PRIi64 ", uid:%" PRIi64 ", version:%" PRIi64 ", ts:%" PRIi64,
                SMA_VID(pSma), msgIter.numOfRows, msgIter.suid, msgIter.uid, pReq->version, row->ts);
     }
   }
@@ -771,10 +782,10 @@ static int32_t tdRsmaPrintSubmitReq(SSma *pSma, SSubmitReq *pReq) {
  * @return int32_t
  */
 static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
-                                 int8_t type, int8_t level) {
+                                 ERsmaExecType type, int8_t level) {
   int32_t idx = level - 1;
 
-  void *qTaskInfo = (type == 0) ? RSMA_INFO_QTASK(pInfo, idx) : RSMA_INFO_IQTASK(pInfo, idx);
+  void *qTaskInfo = (type == RSMA_EXEC_COMMIT) ? RSMA_INFO_IQTASK(pInfo, idx) : RSMA_INFO_QTASK(pInfo, idx);
   if (!qTaskInfo) {
     smaDebug("vgId:%d, no qTaskInfo to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level,
              pInfo->suid);
@@ -791,7 +802,7 @@ static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize,
 #if 0
   for (int32_t i = 0; i < msgSize; ++i) {
     SSubmitReq *pReq = *(SSubmitReq **)((char *)pMsg + i * sizeof(void *));
-    smaDebug("vgId:%d [%d][%d] version %" PRIi64, SMA_VID(pSma), msgSize, i, pReq->version);
+    smaDebug("vgId:%d, [%d][%d] version %" PRIi64, SMA_VID(pSma), msgSize, i, pReq->version);
     tdRsmaPrintSubmitReq(pSma, pReq);
   }
 #endif
@@ -802,11 +813,6 @@ static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize,
 
   SRSmaInfoItem *pItem = RSMA_INFO_ITEM(pInfo, idx);
   tdRSmaFetchAndSubmitResult(pSma, qTaskInfo, pItem, pInfo->pTSchema, pInfo->suid);
-  atomic_store_8(&pItem->triggerStat, TASK_TRIGGER_STAT_ACTIVE);
-
-  if (smaMgmt.tmrHandle) {
-    taosTmrReset(tdRSmaFetchTrigger, pItem->maxDelay, pItem, smaMgmt.tmrHandle, &pItem->tmrId);
-  }
 
   return TSDB_CODE_SUCCESS;
 }
@@ -854,13 +860,7 @@ static SRSmaInfo *tdAcquireRSmaInfoBySuid(SSma *pSma, int64_t suid) {
   }
   taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
 
-  if (RSMA_COMMIT_STAT(pStat) == 0) {  // return NULL if not in committing stat
-    return NULL;
-  }
-
-  // unlock
-  taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-  return pRSmaInfo;
+  return NULL;
 }
 
 static FORCE_INLINE void tdReleaseRSmaInfo(SSma *pSma, SRSmaInfo *pInfo) {
@@ -890,6 +890,16 @@ static int32_t tdExecuteRSmaAsync(SSma *pSma, const void *pMsg, int32_t inputTyp
       tdReleaseRSmaInfo(pSma, pRSmaInfo);
       return TSDB_CODE_FAILED;
     }
+    if (smaMgmt.tmrHandle) {
+      SRSmaInfoItem *pItem = RSMA_INFO_ITEM(pRSmaInfo, 0);
+      if (pItem->level > 0) {
+        atomic_store_8(&pItem->triggerStat, TASK_TRIGGER_STAT_ACTIVE);
+      }
+      pItem = RSMA_INFO_ITEM(pRSmaInfo, 1);
+      if (pItem->level > 0) {
+        atomic_store_8(&pItem->triggerStat, TASK_TRIGGER_STAT_ACTIVE);
+      }
+    }
   } else {
     ASSERT(0);
   }
@@ -898,51 +908,23 @@ static int32_t tdExecuteRSmaAsync(SSma *pSma, const void *pMsg, int32_t inputTyp
   return TSDB_CODE_SUCCESS;
 }
 
-#if 0
-/**
- * @brief sync mode
- * 
- * @param pSma 
- * @param pMsg 
- * @param inputType 
- * @param suid 
- * @return int32_t 
- */
-static int32_t tdExecuteRSma(SSma *pSma, const void *pMsg, int32_t inputType, tb_uid_t suid) {
-  SRSmaInfo *pRSmaInfo = tdAcquireRSmaInfoBySuid(pSma, suid);
-  if (!pRSmaInfo) {
-    smaDebug("vgId:%d, execute rsma, no rsma info for suid:%" PRIu64, SMA_VID(pSma), suid);
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (inputType == STREAM_INPUT__DATA_SUBMIT) {
-    tdExecuteRSmaImpl(pSma, pMsg, inputType, pRSmaInfo, suid, TSDB_RETENTION_L1);
-    tdExecuteRSmaImpl(pSma, pMsg, inputType, pRSmaInfo, suid, TSDB_RETENTION_L2);
-  }
-
-  tdReleaseRSmaInfo(pSma, pRSmaInfo);
-  return TSDB_CODE_SUCCESS;
-}
-#endif
-
 static int32_t tdRSmaExecCheck(SSma *pSma) {
-  SRSmaStat *pRsmaStat = SMA_RSMA_STAT(pSma);
-  int64_t    bufSize = atomic_load_64(&pRsmaStat->qBufSize);
+  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
+  int64_t    bufSize = atomic_load_64(&pRSmaStat->qBufSize);
 
-  if ((pRsmaStat->execStat == 1) || (bufSize < RSMA_QTASKEXEC_BUFSIZ)) {
-    if (bufSize > RSMA_QTASKEXEC_BUFSIZ) {
-      smaDebug("vgId:%d bufSize is %d but has no chance to exec as qTaskInfo occupied by another task", SMA_VID(pSma),
-               bufSize);
-    } else {
-      smaDebug("vgId:%d bufSize is %d but has no chance to exec as less than %d", SMA_VID(pSma), bufSize,
-               RSMA_QTASKEXEC_BUFSIZ);
-    }
+  if (bufSize < RSMA_QTASKEXEC_BUFSIZE) {
+    smaDebug("vgId:%d, bufSize is %d but has no chance to exec as less than %d", SMA_VID(pSma), bufSize,
+             RSMA_QTASKEXEC_BUFSIZE);
     return TSDB_CODE_SUCCESS;
   }
 
-  smaDebug("vgId:%d bufSize is %d and has chance to exec as qTaskInfo is free now", SMA_VID(pSma), bufSize);
+  if (atomic_val_compare_exchange_8(&pRSmaStat->execStat, 0, 1) == 1) {
+    smaDebug("vgId:%d, bufSize is %d but has no chance to exec as qTaskInfo occupied by another task", SMA_VID(pSma),
+             bufSize);
+    return TSDB_CODE_SUCCESS;
+  }
 
-  pRsmaStat->execStat = 1;
+  smaDebug("vgId:%d, bufSize is %d and has chance to exec as qTaskInfo is free now", SMA_VID(pSma), bufSize);
 
   SRSmaExecMsg fetchMsg;
   int32_t      contLen = sizeof(SMsgHead);
@@ -967,7 +949,7 @@ static int32_t tdRSmaExecCheck(SSma *pSma) {
 
   return TSDB_CODE_SUCCESS;
 _err:
-  pRsmaStat->execStat = 0;
+  atomic_store_8(&pRSmaStat->execStat, 0);
   return TSDB_CODE_FAILED;
 }
 
@@ -1592,7 +1574,7 @@ static void tdRSmaFetchTrigger(void *param, void *tmrId) {
   }
 
 _end:
-  // taosTmrReset(tdRSmaFetchTrigger, pItem->maxDelay, pItem, smaMgmt.tmrHandle, &pItem->tmrId);
+  taosTmrReset(tdRSmaFetchTrigger, pItem->maxDelay, pItem, smaMgmt.tmrHandle, &pItem->tmrId);
   tdReleaseSmaRef(smaMgmt.rsetId, pRSmaInfo->refId);
 }
 
@@ -1656,13 +1638,11 @@ _err:
  * @return int32_t
  */
 int32_t smaProcessFetch(SSma *pSma, void *pMsg) {
-  SRpcMsg       *pRpcMsg = (SRpcMsg *)pMsg;
-  SRSmaFetchMsg  req = {0};
-  SDecoder       decoder = {0};
-  void          *pBuf = NULL;
-  SRSmaInfo     *pInfo = NULL;
-  SRSmaInfoItem *pItem = NULL;
-
+  SRpcMsg      *pRpcMsg = (SRpcMsg *)pMsg;
+  SRSmaFetchMsg req = {0};
+  SDecoder      decoder = {0};
+  void         *pBuf = NULL;
+  SRSmaStat    *pRSmaStat = NULL;
   if (!pRpcMsg || pRpcMsg->contLen < sizeof(SMsgHead)) {
     terrno = TSDB_CODE_RSMA_FETCH_MSG_MSSED_UP;
     goto _err;
@@ -1676,38 +1656,33 @@ int32_t smaProcessFetch(SSma *pSma, void *pMsg) {
     goto _err;
   }
 
-#if 0
-  pInfo = tdAcquireRSmaInfoBySuid(pSma, req.suid);
-  if (!pInfo) {
-    if (terrno == TSDB_CODE_SUCCESS) {
-      terrno = TSDB_CODE_RSMA_EMPTY_INFO;
+  pRSmaStat = SMA_RSMA_STAT(pSma);
+
+  if (atomic_val_compare_exchange_8(&pRSmaStat->execStat, 0, 1) == 0) {
+    SArray *pSubmitArr = NULL;
+    if (!(pSubmitArr = taosArrayInit(RSMA_SUBMIT_BATCH_SIZE, POINTER_BYTES))) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      atomic_store_8(&pRSmaStat->execStat, 0);
+      goto _err;
     }
-    smaWarn("vgId:%d, failed to process rsma fetch msg for suid:%" PRIi64 " level:%" PRIi8 " since %s", SMA_VID(pSma),
-            req.suid, req.level, terrstr());
-    goto _err;
+    tdRSmaConsumeAndFetch(pSma, req.suid, req.level, pSubmitArr);
+    atomic_store_8(&pRSmaStat->execStat, 0);
+    taosArrayDestroy(pSubmitArr);
+  } else {
+    int8_t  level = req.level;
+    int8_t *val = taosHashGet(RSMA_FETCH_HASH(pRSmaStat), &req.suid, sizeof(req.suid));
+    if (val) {
+      level |= (*val);
+    }
+    ASSERT(level >= 1 && level <= 3);
+    taosHashPut(RSMA_FETCH_HASH(pRSmaStat), &req.suid, sizeof(req.suid), &level, sizeof(level));
   }
 
-  pItem = RSMA_INFO_ITEM(pInfo, req.level - 1);
-
-  SSDataBlock dataBlock = {.info.type = STREAM_GET_ALL};
-  qTaskInfo_t taskInfo = RSMA_INFO_QTASK(pInfo, req.level - 1);
-  if ((terrno = qSetMultiStreamInput(taskInfo, &dataBlock, 1, STREAM_INPUT__DATA_BLOCK)) < 0) {
-    goto _err;
-  }
-  if (tdRSmaFetchAndSubmitResult(pSma, taskInfo, pItem, pInfo->pTSchema, pInfo->suid) < 0) {
-    goto _err;
-  }
-
-  tdCleanupStreamInputDataBlock(taskInfo);
-
-  tdReleaseRSmaInfo(pSma, pInfo);
-#endif
   tDecoderClear(&decoder);
   smaDebug("vgId:%d, success to process rsma fetch msg for suid:%" PRIi64 " level:%" PRIi8, SMA_VID(pSma), req.suid,
            req.level);
   return TSDB_CODE_SUCCESS;
 _err:
-  // tdReleaseRSmaInfo(pSma, pInfo);
   tDecoderClear(&decoder);
   smaError("vgId:%d, failed to process rsma fetch msg since %s", SMA_VID(pSma), terrstr());
   return TSDB_CODE_FAILED;
@@ -1719,28 +1694,101 @@ static void tdFreeRSmaSubmitItems(SArray *pItems) {
   }
 }
 
+static int32_t tdRSmaConsumeAndFetch(SSma *pSma, int64_t suid, int8_t level, SArray *pSubmitArr) {
+  SRSmaInfo *pInfo = tdAcquireRSmaInfoBySuid(pSma, suid);
+  if (!pInfo) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  // step 1: consume submit req
+  int64_t qMemSize = 0;
+  if ((qMemSize = taosQueueMemorySize(pInfo->queue) > 0)) {
+    taosReadAllQitems(pInfo->queue, pInfo->qall);  // queue has mutex lock
+
+    SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
+    atomic_fetch_sub_64(&pRSmaStat->qBufSize, qMemSize);
+
+    taosArrayClear(pSubmitArr);
+    
+    while (1) {
+      void *msg = NULL;
+      taosGetQitem(pInfo->qall, (void **)&msg);
+      if (msg) {
+        if (taosArrayPush(pSubmitArr, &msg) < 0) {
+          tdFreeRSmaSubmitItems(pSubmitArr);
+          goto _err;
+        }
+      } else {
+        break;
+      }
+    }
+
+    int32_t size = taosArrayGetSize(pSubmitArr);
+    if (size > 0) {
+      for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
+        if (tdExecuteRSmaImpl(pSma, pSubmitArr->pData, size, STREAM_INPUT__MERGED_SUBMIT, pInfo, RSMA_EXEC_TIMEOUT, i) <
+            0) {
+          tdFreeRSmaSubmitItems(pSubmitArr);
+          goto _err;
+        }
+      }
+
+      tdFreeRSmaSubmitItems(pSubmitArr);
+    }
+  }
+
+  // step 2: fetch rsma result
+  SSDataBlock dataBlock = {.info.type = STREAM_GET_ALL};
+  for (int8_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
+    if (level & i) {
+      qTaskInfo_t taskInfo = RSMA_INFO_QTASK(pInfo, i - 1);
+      if (!taskInfo) {
+        continue;
+      }
+      if ((terrno = qSetMultiStreamInput(taskInfo, &dataBlock, 1, STREAM_INPUT__DATA_BLOCK)) < 0) {
+        goto _err;
+      }
+      SRSmaInfoItem *pItem = RSMA_INFO_ITEM(pInfo, i - 1);
+      if (tdRSmaFetchAndSubmitResult(pSma, taskInfo, pItem, pInfo->pTSchema, suid) < 0) {
+        tdCleanupStreamInputDataBlock(taskInfo);
+        goto _err;
+      }
+
+      tdCleanupStreamInputDataBlock(taskInfo);
+    }
+  }
+
+_end:
+  tdReleaseRSmaInfo(pSma, pInfo);
+  return TSDB_CODE_SUCCESS;
+_err:
+  tdReleaseRSmaInfo(pSma, pInfo);
+  return TSDB_CODE_FAILED;
+}
+
 /**
  * @brief
  *
  * @param pSma
- * @param type 0 triggered when buffer overflow, 1 triggered by commit
+ * @param type
  * @return int32_t
  */
-int32_t tdRSmaProcessExecImpl(SSma *pSma, int8_t type) {
+int32_t tdRSmaProcessExecImpl(SSma *pSma, ERsmaExecType type) {
   SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
   SRSmaStat *pRSmaStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
   SHashObj  *infoHash = NULL;
   SArray    *pSubmitQArr = NULL;
   SArray    *pSubmitArr = NULL;
+  bool       isFetchAll = false;
 
   if (!pRSmaStat || !(infoHash = RSMA_INFO_HASH(pRSmaStat))) {
     terrno = TSDB_CODE_RSMA_INVALID_STAT;
     goto _err;
   }
 
-  if (type == 0) {
+  if (type == RSMA_EXEC_OVERFLOW) {
     taosRLockLatch(SMA_ENV_LOCK(pEnv));
-    if (atomic_load_64(&pRSmaStat->qBufSize) < RSMA_QTASKEXEC_BUFSIZ) {
+    if (atomic_load_64(&pRSmaStat->qBufSize) < RSMA_QTASKEXEC_BUFSIZE) {
       taosRUnLockLatch(SMA_ENV_LOCK(pEnv));
       return TSDB_CODE_SUCCESS;
     }
@@ -1752,19 +1800,19 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma, int8_t type) {
     goto _err;
   }
 
-  if (!(pSubmitArr = taosArrayInit(1024, POINTER_BYTES))) {
+  if (!(pSubmitArr = taosArrayInit(RSMA_SUBMIT_BATCH_SIZE, POINTER_BYTES))) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
   }
 
+  // step 1: rsma exec - consume data in buffer queue for all suids
   SRSmaExecQItem qItem = {0};
-  taosWLockLatch(SMA_ENV_LOCK(pEnv));
-  void *pIter = taosHashIterate(infoHash, NULL);
-  if (type == 0) {
+  void          *pIter = taosHashIterate(infoHash, NULL);  // infoHash has r/w lock
+  if (type == RSMA_EXEC_OVERFLOW) {
     while (pIter) {
       SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
       if (taosQueueItemSize(pInfo->queue)) {
-        taosReadAllQitems(pInfo->queue, pInfo->qall);
+        taosReadAllQitems(pInfo->queue, pInfo->qall);  // queue has mutex lock
         qItem.qall = &pInfo->qall;
         qItem.pRSmaInfo = pIter;
         taosArrayPush(pSubmitQArr, &qItem);
@@ -1772,7 +1820,7 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma, int8_t type) {
       ASSERT(taosQueueItemSize(pInfo->queue) == 0);
       pIter = taosHashIterate(infoHash, pIter);
     }
-  } else if (type == 1) {
+  } else if (type == RSMA_EXEC_COMMIT) {
     while (pIter) {
       SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
       if (taosQueueItemSize(pInfo->iQueue)) {
@@ -1788,7 +1836,6 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma, int8_t type) {
     ASSERT(0);
   }
   atomic_store_64(&pRSmaStat->qBufSize, 0);
-  taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
 
   int32_t qSize = taosArrayGetSize(pSubmitQArr);
   for (int32_t i = 0; i < qSize; ++i) {
@@ -1808,22 +1855,31 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma, int8_t type) {
 
     int32_t size = taosArrayGetSize(pSubmitArr);
     if (size > 0) {
-      if (type == 0 || type == 1) {
-        SRSmaInfo *pInfo = *(SRSmaInfo **)pItem->pRSmaInfo;
-        for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
-          if (tdExecuteRSmaImpl(pSma, pSubmitArr->pData, size, STREAM_INPUT__MERGED_SUBMIT, pInfo, type, i) < 0) {
-            tdFreeRSmaSubmitItems(pSubmitArr);
-            goto _err;
-          }
+      SRSmaInfo *pInfo = *(SRSmaInfo **)pItem->pRSmaInfo;
+      for (int32_t i = 1; i <= TSDB_RETENTION_L2; ++i) {
+        if (tdExecuteRSmaImpl(pSma, pSubmitArr->pData, size, STREAM_INPUT__MERGED_SUBMIT, pInfo, type, i) < 0) {
+          tdFreeRSmaSubmitItems(pSubmitArr);
+          goto _err;
         }
-      } else {
-        ASSERT(0);
       }
       tdFreeRSmaSubmitItems(pSubmitArr);
       taosArrayClear(pSubmitArr);
     }
   }
 
+  // step 2: rsma fetch - consume data in buffer queue for suids triggered by timer
+  if (taosHashGetSize(RSMA_FETCH_HASH(pRSmaStat)) <= 0) {
+    goto _end;
+  }
+  pIter = taosHashIterate(RSMA_FETCH_HASH(pRSmaStat), NULL);
+  if (pIter) {
+    tdRSmaConsumeAndFetch(pSma, *(int64_t *)taosHashGetKey(pIter, NULL), *(int8_t *)pIter, pSubmitArr);
+    while ((pIter = taosHashIterate(RSMA_FETCH_HASH(pRSmaStat), pIter))) {
+      tdRSmaConsumeAndFetch(pSma, *(int64_t *)taosHashGetKey(pIter, NULL), *(int8_t *)pIter, pSubmitArr);
+    }
+  }
+
+_end:
   taosArrayDestroy(pSubmitArr);
   taosArrayDestroy(pSubmitQArr);
   return TSDB_CODE_SUCCESS;
@@ -1842,23 +1898,23 @@ _err:
  */
 int32_t smaProcessExec(SSma *pSma, void *pMsg) {
   SRpcMsg   *pRpcMsg = (SRpcMsg *)pMsg;
-  SRSmaStat *pRsmaStat = SMA_RSMA_STAT(pSma);
+  SRSmaStat *pRSmaStat = SMA_RSMA_STAT(pSma);
 
   if (!pRpcMsg || pRpcMsg->contLen < sizeof(SMsgHead)) {
     terrno = TSDB_CODE_RSMA_FETCH_MSG_MSSED_UP;
     goto _err;
   }
-  smaDebug("vgId:%d, begin to process rsma exec msg by thread:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
-  if (tdRSmaProcessExecImpl(pSma, 0) < 0) {
+  smaDebug("vgId:%d, begin to process rsma exec msg by TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+  if (tdRSmaProcessExecImpl(pSma, RSMA_EXEC_OVERFLOW) < 0) {
     goto _err;
   }
 
-  pRsmaStat->execStat = 0;
-  smaDebug("vgId:%d, success to process rsma exec msg by thead:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
+  atomic_store_8(&pRSmaStat->execStat, 0);
+  smaDebug("vgId:%d, success to process rsma exec msg by TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
   return TSDB_CODE_SUCCESS;
 _err:
-  pRsmaStat->execStat = 0;
-  smaError("vgId:%d, failed to process rsma fetch msg by thread:%p since %s", SMA_VID(pSma),
-           (void *)taosGetSelfPthreadId(), terrstr());
+  atomic_store_8(&pRSmaStat->execStat, 0);
+  smaError("vgId:%d, failed to process rsma exec msg by TID:%p since %s", SMA_VID(pSma), (void *)taosGetSelfPthreadId(),
+           terrstr());
   return TSDB_CODE_FAILED;
 }

From ea891dc79353ee862509bf26ae0182e7d879b69b Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 17 Aug 2022 20:30:42 +0800
Subject: [PATCH 43/98] other: code optimization

---
 source/dnode/vnode/src/vnd/vnodeCommit.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 2f5169a0ec..ab618fe430 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -222,6 +222,13 @@ int vnodeCommit(SVnode *pVnode) {
 
   pVnode->state.commitTerm = pVnode->state.applyTerm;
 
+  // preCommit
+  // smaSyncPreCommit(pVnode->pSma);
+  smaAsyncPreCommit(pVnode->pSma);
+
+  vnodeBufPoolUnRef(pVnode->inUse);
+  pVnode->inUse = NULL;
+
   // save info
   info.config = pVnode->config;
   info.state.committed = pVnode->state.applied;
@@ -234,10 +241,6 @@ int vnodeCommit(SVnode *pVnode) {
   }
   walBeginSnapshot(pVnode->pWal, pVnode->state.applied);
 
-  // preCommit
-  // smaSyncPreCommit(pVnode->pSma);
-  smaAsyncPreCommit(pVnode->pSma);
-
   // commit each sub-system
   if (metaCommit(pVnode->pMeta) < 0) {
     ASSERT(0);
@@ -245,7 +248,7 @@ int vnodeCommit(SVnode *pVnode) {
   }
 
   if (VND_IS_RSMA(pVnode)) {
-    smaAsyncCommit(pVnode->pSma);  // would write L2/L3 data into BufPool
+    smaAsyncCommit(pVnode->pSma);
 
     if (tsdbCommit(VND_RSMA0(pVnode)) < 0) {
       ASSERT(0);

From d65b75514a130983f0cb035f91516e72cc167a88 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 17 Aug 2022 20:38:34 +0800
Subject: [PATCH 44/98] fix: remove obsoleted codes

---
 source/dnode/vnode/src/vnd/vnodeCommit.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index ab618fe430..fc09eaac44 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -268,9 +268,6 @@ int vnodeCommit(SVnode *pVnode) {
       return -1;
     }
   }
-  
-  vnodeBufPoolUnRef(pVnode->inUse);
-  pVnode->inUse = NULL;
 
   if (tqCommit(pVnode->pTq) < 0) {
     ASSERT(0);

From c6f60ba3d78e92ef494c5d1129e998a40f3f4d2d Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 20:49:59 +0800
Subject: [PATCH 45/98] fix invalid packet

---
 source/libs/transport/inc/transComm.h |  8 +++
 source/libs/transport/src/transCli.c  | 66 +++++++++++-------
 source/libs/transport/src/transComm.c | 19 +++--
 source/libs/transport/src/transSvr.c  | 99 +++++++++++++++------------
 4 files changed, 119 insertions(+), 73 deletions(-)

diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h
index 04b58da570..117455f722 100644
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@@ -99,6 +99,12 @@ typedef void* queue[2];
 #define TRANS_CONN_TIMEOUT      3     // connect timeout (s)
 #define TRANS_READ_TIMEOUT      3000  // read timeout  (ms)
 
+#define TRANS_PACKET_LIMIT 1024 * 1024 * 512
+
+#define TRANS_MAGIC_NUM 0x5f375a86
+
+#define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
+
 typedef SRpcMsg      STransMsg;
 typedef SRpcCtx      STransCtx;
 typedef SRpcCtxVal   STransCtxVal;
@@ -151,6 +157,7 @@ typedef struct {
   char hasEpSet : 2;  // contain epset or not, 0(default): no epset, 1: contain epset
 
   char     user[TSDB_UNI_LEN];
+  uint32_t magicNum;
   STraceId traceId;
   uint64_t ahandle;  // ahandle assigned by client
   uint32_t code;     // del later
@@ -203,6 +210,7 @@ typedef struct SConnBuffer {
   int   cap;
   int   left;
   int   total;
+  int   invalid;
 } SConnBuffer;
 
 typedef void (*AsyncCB)(uv_async_t* handle);
diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 9eea43be23..5428b8acf6 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -127,6 +127,8 @@ static void cliAsyncCb(uv_async_t* handle);
 static void cliIdleCb(uv_idle_t* handle);
 static void cliPrepareCb(uv_prepare_t* handle);
 
+static bool cliRecvReleaseReq(SCliConn* conn, STransMsgHead* pHead);
+
 static int32_t allocConnRef(SCliConn* conn, bool update);
 
 static int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg);
@@ -211,28 +213,6 @@ static void cliReleaseUnfinishedMsg(SCliConn* conn) {
 #define CONN_PERSIST_TIME(para)    ((para) <= 90000 ? 90000 : (para))
 #define CONN_GET_HOST_THREAD(conn) (conn ? ((SCliConn*)conn)->hostThrd : NULL)
 #define CONN_GET_INST_LABEL(conn)  (((STrans*)(((SCliThrd*)(conn)->hostThrd)->pTransInst))->label)
-#define CONN_SHOULD_RELEASE(conn, head)                                                                              \
-  do {                                                                                                               \
-    if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) {                                                   \
-      uint64_t ahandle = head->ahandle;                                                                              \
-      CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle);                                                                     \
-      transClearBuffer(&conn->readBuf);                                                                              \
-      transFreeMsg(transContFromHead((char*)head));                                                                  \
-      if (transQueueSize(&conn->cliMsgs) > 0 && ahandle == 0) {                                                      \
-        SCliMsg* cliMsg = transQueueGet(&conn->cliMsgs, 0);                                                          \
-        if (cliMsg->type == Release) return;                                                                         \
-      }                                                                                                              \
-      tDebug("%s conn %p receive release request, refId:%" PRId64 "", CONN_GET_INST_LABEL(conn), conn, conn->refId); \
-      if (T_REF_VAL_GET(conn) > 1) {                                                                                 \
-        transUnrefCliHandle(conn);                                                                                   \
-      }                                                                                                              \
-      destroyCmsg(pMsg);                                                                                             \
-      cliReleaseUnfinishedMsg(conn);                                                                                 \
-      transQueueClear(&conn->cliMsgs);                                                                               \
-      addConnToPool(((SCliThrd*)conn->hostThrd)->pool, conn);                                                        \
-      return;                                                                                                        \
-    }                                                                                                                \
-  } while (0)
 
 #define CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle)                                         \
   do {                                                                                    \
@@ -346,10 +326,17 @@ void cliHandleResp(SCliConn* conn) {
   }
 
   STransMsgHead* pHead = NULL;
-  transDumpFromBuffer(&conn->readBuf, (char**)&pHead);
+  if (transDumpFromBuffer(&conn->readBuf, (char**)&pHead) <= 0) {
+    tDebug("%s conn %p recv invalid packet ", CONN_GET_INST_LABEL(conn), conn);
+    return;
+  }
   pHead->code = htonl(pHead->code);
   pHead->msgLen = htonl(pHead->msgLen);
 
+  if (cliRecvReleaseReq(conn, pHead)) {
+    return;
+  }
+
   STransMsg transMsg = {0};
   transMsg.contLen = transContLenFromMsg(pHead->msgLen);
   transMsg.pCont = transContFromHead((char*)pHead);
@@ -361,7 +348,6 @@ void cliHandleResp(SCliConn* conn) {
 
   SCliMsg*       pMsg = NULL;
   STransConnCtx* pCtx = NULL;
-  CONN_SHOULD_RELEASE(conn, pHead);
 
   if (CONN_NO_PERSIST_BY_APP(conn)) {
     pMsg = transQueuePop(&conn->cliMsgs);
@@ -625,7 +611,12 @@ static void cliRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) {
     pBuf->len += nread;
     while (transReadComplete(pBuf)) {
       tTrace("%s conn %p read complete", CONN_GET_INST_LABEL(conn), conn);
-      cliHandleResp(conn);
+      if (pBuf->invalid) {
+        cliHandleExcept(conn);
+        break;
+      } else {
+        cliHandleResp(conn);
+      }
     }
     return;
   }
@@ -786,6 +777,7 @@ void cliSend(SCliConn* pConn) {
   pHead->release = REQUEST_RELEASE_HANDLE(pCliMsg) ? 1 : 0;
   memcpy(pHead->user, pTransInst->user, strlen(pTransInst->user));
   pHead->traceId = pMsg->info.traceId;
+  pHead->magicNum = htonl(TRANS_MAGIC_NUM);
 
   uv_buf_t wb = uv_buf_init((char*)pHead, msgLen);
 
@@ -1053,6 +1045,30 @@ static void cliPrepareCb(uv_prepare_t* handle) {
   if (thrd->stopMsg != NULL) cliHandleQuit(thrd->stopMsg, thrd);
 }
 
+bool cliRecvReleaseReq(SCliConn* conn, STransMsgHead* pHead) {
+  if (pHead->release == 1 && (pHead->msgLen) == sizeof(*pHead)) {
+    uint64_t ahandle = pHead->ahandle;
+    SCliMsg* pMsg = NULL;
+    CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle);
+    transClearBuffer(&conn->readBuf);
+    transFreeMsg(transContFromHead((char*)pHead));
+    if (transQueueSize(&conn->cliMsgs) > 0 && ahandle == 0) {
+      SCliMsg* cliMsg = transQueueGet(&conn->cliMsgs, 0);
+      if (cliMsg->type == Release) return true;
+    }
+    tDebug("%s conn %p receive release request, refId:%" PRId64 "", CONN_GET_INST_LABEL(conn), conn, conn->refId);
+    if (T_REF_VAL_GET(conn) > 1) {
+      transUnrefCliHandle(conn);
+    }
+    destroyCmsg(pMsg);
+    cliReleaseUnfinishedMsg(conn);
+    transQueueClear(&conn->cliMsgs);
+    addConnToPool(((SCliThrd*)conn->hostThrd)->pool, conn);
+    return true;
+  }
+  return false;
+}
+
 static void* cliWorkThread(void* arg) {
   SCliThrd* pThrd = (SCliThrd*)arg;
   pThrd->pid = taosGetSelfPthreadId();
diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c
index b568163e23..c50d0d3e5c 100644
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@@ -91,6 +91,7 @@ int transInitBuffer(SConnBuffer* buf) {
   buf->left = -1;
   buf->len = 0;
   buf->total = 0;
+  buf->invalid = 0;
   return 0;
 }
 int transDestroyBuffer(SConnBuffer* p) {
@@ -108,19 +109,24 @@ int transClearBuffer(SConnBuffer* buf) {
   p->left = -1;
   p->len = 0;
   p->total = 0;
+  p->invalid = 0;
   return 0;
 }
 
 int transDumpFromBuffer(SConnBuffer* connBuf, char** buf) {
-  SConnBuffer* p = connBuf;
+  static const int HEADSIZE = sizeof(STransMsgHead);
+  SConnBuffer*     p = connBuf;
   if (p->left != 0) {
     return -1;
   }
   int total = connBuf->total;
-  *buf = taosMemoryCalloc(1, total);
-  memcpy(*buf, p->buf, total);
-
-  transResetBuffer(connBuf);
+  if (total >= HEADSIZE && !p->invalid) {
+    *buf = taosMemoryCalloc(1, total);
+    memcpy(*buf, p->buf, total);
+    transResetBuffer(connBuf);
+  } else {
+    total = -1;
+  }
   return total;
 }
 
@@ -173,6 +179,7 @@ bool transReadComplete(SConnBuffer* connBuf) {
       memcpy((char*)&head, connBuf->buf, sizeof(head));
       int32_t msgLen = (int32_t)htonl(head.msgLen);
       p->total = msgLen;
+      p->invalid = TRANS_NOVALID_PACKET(htonl(head.magicNum));
     }
     if (p->total >= p->len) {
       p->left = p->total - p->len;
@@ -180,7 +187,7 @@ bool transReadComplete(SConnBuffer* connBuf) {
       p->left = 0;
     }
   }
-  return p->left == 0 ? true : false;
+  return (p->left == 0 || p->invalid) ? true : false;
 }
 
 int transSetConnOption(uv_tcp_t* stream) {
diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index 4d35e346b1..f8f55ab1d8 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -114,6 +114,8 @@ static void uvAcceptAsyncCb(uv_async_t* handle);
 static void uvShutDownCb(uv_shutdown_t* req, int status);
 static void uvPrepareCb(uv_prepare_t* handle);
 
+static bool uvRecvReleaseReq(SSvrConn* conn, STransMsgHead* pHead);
+
 /*
  * time-consuming task throwed into BG work thread
  */
@@ -154,37 +156,6 @@ static void* transAcceptThread(void* arg);
 static bool addHandleToWorkloop(SWorkThrd* pThrd, char* pipeName);
 static bool addHandleToAcceptloop(void* arg);
 
-#define CONN_SHOULD_RELEASE(conn, head)                                                                   \
-  do {                                                                                                    \
-    if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) {                                        \
-      reallocConnRef(conn);                                                                               \
-      tTrace("conn %p received release request", conn);                                                   \
-                                                                                                          \
-      STraceId traceId = head->traceId;                                                                   \
-      conn->status = ConnRelease;                                                                         \
-      transClearBuffer(&conn->readBuf);                                                                   \
-      transFreeMsg(transContFromHead((char*)head));                                                       \
-                                                                                                          \
-      STransMsg tmsg = {                                                                                  \
-          .code = 0, .info.handle = (void*)conn, .info.traceId = traceId, .info.ahandle = (void*)0x9527}; \
-      SSvrMsg* srvMsg = taosMemoryCalloc(1, sizeof(SSvrMsg));                                             \
-      srvMsg->msg = tmsg;                                                                                 \
-      srvMsg->type = Release;                                                                             \
-      srvMsg->pConn = conn;                                                                               \
-      if (!transQueuePush(&conn->srvMsgs, srvMsg)) {                                                      \
-        return;                                                                                           \
-      }                                                                                                   \
-      if (conn->regArg.init) {                                                                            \
-        tTrace("conn %p release, notify server app", conn);                                               \
-        STrans* pTransInst = conn->pTransInst;                                                            \
-        (*pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);                                \
-        memset(&conn->regArg, 0, sizeof(conn->regArg));                                                   \
-      }                                                                                                   \
-      uvStartSendRespInternal(srvMsg);                                                                    \
-      return;                                                                                             \
-    }                                                                                                     \
-  } while (0)
-
 #define SRV_RELEASE_UV(loop)       \
   do {                             \
     uv_walk(loop, uvWalkCb, NULL); \
@@ -212,17 +183,25 @@ static void uvHandleActivityTimeout(uv_timer_t* handle) {
   tDebug("%p timeout since no activity", conn);
 }
 
-static void uvHandleReq(SSvrConn* pConn) {
-  STransMsgHead* msg = NULL;
-  int            msgLen = 0;
+static bool uvHandleReq(SSvrConn* pConn) {
+  STrans* pTransInst = pConn->pTransInst;
 
-  msgLen = transDumpFromBuffer(&pConn->readBuf, (char**)&msg);
+  STransMsgHead* msg = NULL;
+  int            msgLen = transDumpFromBuffer(&pConn->readBuf, (char**)&msg);
+  if (msgLen <= 0) {
+    tError("%s conn %p read invalid packet", transLabel(pTransInst), pConn);
+    return false;
+  }
 
   STransMsgHead* pHead = (STransMsgHead*)msg;
   pHead->code = htonl(pHead->code);
   pHead->msgLen = htonl(pHead->msgLen);
   memcpy(pConn->user, pHead->user, strlen(pHead->user));
 
+  if (uvRecvReleaseReq(pConn, pHead)) {
+    return true;
+  }
+
   // TODO(dengyihao): time-consuming task throwed into BG Thread
   //  uv_work_t* wreq = taosMemoryMalloc(sizeof(uv_work_t));
   //  wreq->data = pConn;
@@ -230,8 +209,6 @@ static void uvHandleReq(SSvrConn* pConn) {
   //  transRefSrvHandle(pConn);
   //  uv_queue_work(((SWorkThrd*)pConn->hostThrd)->loop, wreq, uvWorkDoTask, uvWorkAfterTask);
 
-  CONN_SHOULD_RELEASE(pConn, pHead);
-
   STransMsg transMsg;
   memset(&transMsg, 0, sizeof(transMsg));
   transMsg.contLen = transContLenFromMsg(pHead->msgLen);
@@ -247,7 +224,6 @@ static void uvHandleReq(SSvrConn* pConn) {
       tDebug("conn %p acquired by server app", pConn);
     }
   }
-  STrans*   pTransInst = pConn->pTransInst;
   STraceId* trace = &pHead->traceId;
   if (pConn->status == ConnNormal && pHead->noResp == 0) {
     transRefSrvHandle(pConn);
@@ -285,6 +261,7 @@ static void uvHandleReq(SSvrConn* pConn) {
   transReleaseExHandle(transGetRefMgt(), pConn->refId);
 
   (*pTransInst->cfp)(pTransInst->parent, &transMsg, NULL);
+  return true;
 }
 
 void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
@@ -295,11 +272,18 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
   if (nread > 0) {
     pBuf->len += nread;
     tTrace("%s conn %p total read:%d, current read:%d", transLabel(pTransInst), conn, pBuf->len, (int)nread);
-    while (transReadComplete(pBuf)) {
-      tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
-      uvHandleReq(conn);
+    if (pBuf->len <= TRANS_PACKET_LIMIT) {
+      while (transReadComplete(pBuf)) {
+        tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
+        if (pBuf->invalid) {
+          destroyConn(conn, true);
+          break;
+        } else {
+          if (false == uvHandleReq(conn)) break;
+        }
+      }
+      return;
     }
-    return;
   }
   if (nread == 0) {
     return;
@@ -391,6 +375,7 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
   pHead->ahandle = (uint64_t)pMsg->info.ahandle;
   pHead->traceId = pMsg->info.traceId;
   pHead->hasEpSet = pMsg->info.hasEpSet;
+  pHead->magicNum = htonl(TRANS_MAGIC_NUM);
 
   if (pConn->status == ConnNormal) {
     pHead->msgType = (0 == pMsg->msgType ? pConn->inType + 1 : pMsg->msgType);
@@ -591,6 +576,36 @@ static void uvPrepareCb(uv_prepare_t* handle) {
   }
 }
 
+static bool uvRecvReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) {
+  if ((pHead)->release == 1 && (pHead->msgLen) == sizeof(*pHead)) {
+    reallocConnRef(pConn);
+    tTrace("conn %p received release request", pConn);
+
+    STraceId traceId = pHead->traceId;
+    pConn->status = ConnRelease;
+    transClearBuffer(&pConn->readBuf);
+    transFreeMsg(transContFromHead((char*)pHead));
+
+    STransMsg tmsg = {.code = 0, .info.handle = (void*)pConn, .info.traceId = traceId, .info.ahandle = (void*)0x9527};
+    SSvrMsg*  srvMsg = taosMemoryCalloc(1, sizeof(SSvrMsg));
+    srvMsg->msg = tmsg;
+    srvMsg->type = Release;
+    srvMsg->pConn = pConn;
+    if (!transQueuePush(&pConn->srvMsgs, srvMsg)) {
+      return true;
+    }
+    if (pConn->regArg.init) {
+      tTrace("conn %p release, notify server app", pConn);
+      STrans* pTransInst = pConn->pTransInst;
+      (*pTransInst->cfp)(pTransInst->parent, &(pConn->regArg.msg), NULL);
+      memset(&pConn->regArg, 0, sizeof(pConn->regArg));
+    }
+    uvStartSendResp(srvMsg);
+    return true;
+  }
+  return false;
+}
+
 static void uvWorkDoTask(uv_work_t* req) {
   // doing time-consumeing task
   // only auth conn currently, add more func later

From b604131eee73aa02f7db086c537d312cba63ae44 Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Wed, 17 Aug 2022 22:30:02 +0800
Subject: [PATCH 46/98] docs: grafana plugin document (#16181)

* docs: grafana for TDengine 3.0

* docs: add colon

* docs: remove taosKeeper
---
 .../{15-taosKeeper.md => 14-taosKeeper.md}       |   4 ++--
 docs/zh/14-reference/14-taosx.md                 |   4 ----
 docs/zh/20-third-party/01-grafana.mdx            |   8 ++++++--
 docs/zh/20-third-party/import_dashboard.webp     | Bin 0 -> 6484 bytes
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename docs/zh/14-reference/{15-taosKeeper.md => 14-taosKeeper.md} (95%)
 delete mode 100644 docs/zh/14-reference/14-taosx.md
 create mode 100644 docs/zh/20-third-party/import_dashboard.webp

diff --git a/docs/zh/14-reference/15-taosKeeper.md b/docs/zh/14-reference/14-taosKeeper.md
similarity index 95%
rename from docs/zh/14-reference/15-taosKeeper.md
rename to docs/zh/14-reference/14-taosKeeper.md
index d3f96bc5a9..f1165c9d0f 100644
--- a/docs/zh/14-reference/15-taosKeeper.md
+++ b/docs/zh/14-reference/14-taosKeeper.md
@@ -25,7 +25,7 @@ taosKeeper 安装方式：
 <!-- taosKeeper 需要在操作系统终端执行，该工具支持两种配置方式：[命令行参数](#命令行参数启动) 和 [配置文件](#配置文件启动)。命令行参数优先级高于配置文件参数。-->
 taosKeeper 需要在操作系统终端执行，该工具支持 [配置文件启动](#配置文件启动)。
 
-**在运行 taosKeeper 之前要确保 TDengine 集群与 taosAdapter 已经在正确运行。**
+**在运行 taosKeeper 之前要确保 TDengine 集群与 taosAdapter 已经在正确运行。** 并且 TDengine 已经开启监控服务，具体请参考：[TDengine 监控配置](../config/#监控相关)。
 
 <!--
 ### 命令行参数启动
@@ -93,7 +93,7 @@ taosKeeper 作为 TDengine 监控指标的导出工具，可以将 TDengine 产
 
 ```shell
 $ taos
-# 
+# 如上示例，使用 log 库作为监控日志存储位置
 > use log;
 > select * from cluster_info limit 1;
 ```
diff --git a/docs/zh/14-reference/14-taosx.md b/docs/zh/14-reference/14-taosx.md
deleted file mode 100644
index ed3f8d488f..0000000000
--- a/docs/zh/14-reference/14-taosx.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-sidebar_label: taosX
-title: 使用 taosX 在集群间复制数据
----
\ No newline at end of file
diff --git a/docs/zh/20-third-party/01-grafana.mdx b/docs/zh/20-third-party/01-grafana.mdx
index 93090ffd38..becb1a70a9 100644
--- a/docs/zh/20-third-party/01-grafana.mdx
+++ b/docs/zh/20-third-party/01-grafana.mdx
@@ -193,7 +193,7 @@ docker run -d \
 
 如上图所示，在 Query 中选中 `TDengine` 数据源，在下方查询框可输入相应 SQL 进行查询，具体说明如下：
 
-- INPUT SQL：输入要查询的语句（该 SQL 语句的结果集应为两列多行），例如：`select avg(mem_system) from log.dn where ts >= $from and ts < $to interval($interval)` ，其中，from、to 和 interval 为 TDengine 插件的内置变量，表示从 Grafana 插件面板获取的查询范围和时间间隔。除了内置变量外，`也支持可以使用自定义模板变量`。
+- INPUT SQL：输入要查询的语句（该 SQL 语句的结果集应为两列多行），例如：`select _wstart, avg(mem_system) from log.dnodes_info where ts >= $from and ts < $to interval($interval)` ，其中，from、to 和 interval 为 TDengine 插件的内置变量，表示从 Grafana 插件面板获取的查询范围和时间间隔。除了内置变量外，`也支持可以使用自定义模板变量`。
 - ALIAS BY：可设置当前查询别名。
 - GENERATE SQL： 点击该按钮会自动替换相应变量，并生成最终执行的语句。
 
@@ -205,7 +205,11 @@ docker run -d \
 
 ### 导入 Dashboard
 
-在数据源配置页面，您可以为该数据源导入 TDinsight 面板，作为 TDengine 集群的监控可视化工具。该 Dashboard 已发布在 Grafana：[Dashboard 15167 - TDinsight](https://grafana.com/grafana/dashboards/15167)) 。其他安装方式和相关使用说明请见 [TDinsight 用户手册](/reference/tdinsight/)。
+在数据源配置页面，您可以为该数据源导入 TDinsight 面板，作为 TDengine 集群的监控可视化工具。如果 TDengine 服务端为 3.0 版本请选择 `TDinsight for 3.x` 导入。
+
+![TDengine Database Grafana plugine import dashboard](./import_dashboard.webp)
+
+其中适配 TDengine 2.* 的 Dashboard 已发布在 Grafana：[Dashboard 15167 - TDinsight](https://grafana.com/grafana/dashboards/15167)) 。其他安装方式和相关使用说明请见 [TDinsight 用户手册](/reference/tdinsight/)。
 
 使用 TDengine 作为数据源的其他面板，可以[在此搜索](https://grafana.com/grafana/dashboards/?dataSource=tdengine-datasource)。以下是一份不完全列表：
 
diff --git a/docs/zh/20-third-party/import_dashboard.webp b/docs/zh/20-third-party/import_dashboard.webp
new file mode 100644
index 0000000000000000000000000000000000000000..164e3f4690a5a55f937a3c29e1e8ca026648e6b1
GIT binary patch
literal 6484
zcmZ{lWl$X6lJ;ki!QF!dcXwwXxD8GS9tiFvxJz&g?hZjiaM$3$-F=WCLvWq_zjwFl
z-rcJAd^#UaS3mvy`gCh4$;+#f0RZ}PG8%ds!qnh@?ukW!Tp;TaA{9_FNik2gw1l>(
zkVv?-4j;|d>6zD{ZcG((^mO49tMuFAu6imn@js8$qPY?%el7mr;BJ45pZk^*?wrp8
z8#dkU^{y{kOgAM)FAom`$GtP3^G}DNQY`@&j|W@MgIt$g;2zdj*Vn-A>}D||xbds+
zJl)b(Nnksi@<HGz^F{xTOY^leaQ+VPYWSk^s!(fu_L_W({6hXT{E~l7b(+5sF!2a_
z9EMxBnqK3a!*8A#!jnZowyjRof@fx*1hjX<vpwo~vnnoSCOY1esp;Go^b!8~yW-}k
zwn`Y8f4z(Q|9Mtuwbsw9uAZ~Xf%t6EZ%vr1Xs>wEQ_9M@WzTzl&@Y6JrtAUTX)PGR
zeKaA6t`O;diqY<4chtErwA!e~EUWa>XmDBt8GMXRU0sOVi52(=FE{7e2Lar)z{e3t
z-!23UnPc!+2o(eHFMeY0`RpswQjAEB`RDV(n2j>C{QV?=Jde{Wl1Pu3Q6MVh<1x*I
za=z%1a&RqDv`SCkf?2s^_^UY&bHsy*1%iJveXE>6z*Yq_AO&yr@`Ch7)88yTt;XDa
zzt@>w{KO<8C4XEo6nvTWYZ@j>#F$D-U+8!v1gfno$!ySKkH}J)PsqN4JY#5z%RKU=
zXBMkQ=smBdY&iZ_a5uzrEne9vQcAdzlM<m`4pmp1^G?iUT~D9%L2B*pXv_Y(C7ZG*
zkMs-tT2~C0gGHgDEYjkCJDw#cBBJ0u=ZApT(cL$5tVIdIy+*2*(B;|BN%3kxAu>Oy
zU!O?Wc};M7x0GX>vY;dJZv+2FB1mUXg(x{lI<NbGjQvmPWC?B7Te5?R4A!hNw8vn%
z*`SzGAc<J#&p+U`rr?wXNHnqIYVVj`c|Qe^)DD#+*E#>InafhO1VOfV%Yj;&RSuc^
zN0{s?b*RDQVt>`vBQ*Pt^2PuAbjyyapYp{ow@T1INOMz~d05~6!}LE>bKtDlN8~!y
zIT$nw^v0}w6KbG$=Co4S5B-;=|IVH;Hhb>pw6ZRQr@iAi{BbRQu!S<lNsQyar79zE
zrXU$Jqqb|{ea1?@;h=GVtU9KpweVBrKvZ~a$3D+1&fIv&7W})o|BT4bHKm!^o35^Y
zKJ#D@Ye%P(4lX@2s+%BL8ndOT=!}X}Se4i?Cm<<!%eMCBFiawR#8#wI0HLBwn}qN?
z`Ts^$aGIr+bcbMzMV=i*PWGEI_O#fAG?KYPAFtzhp8u}gz#22DE0fNbSN_&A?sSy=
z|5c2mb>I+}^KKaF0TbcdTyyzFgv${S;JHn2!f>2%%*a55ylHTh(<-_VC%%*}z{iA(
z0Gz3hO<#{mPQIN+r##0RvKKrZQ~vJ{^KWzWB5W;NkYFs!U3!(k!H|70yUCvY?uGYP
zNYS0<`_yy~6bNDKDlw`q{h$Rx@gPWAAn|lHa!y*8^8a*C^OFWj|C_W4x#)zWU&4RE
zs%u!EKK7(^=q5xdDs>@i+m#Pu{CfyA+8xPwC^XsZrXv0y*6jbnslfpNyu#C@&TlST
zH#pjQfz&ZvVfWmrn_0{QgFpDmkh!q)L0=pg3~_68Za9lI&!T)QTzR%Tiu_m(Uj33}
zrBg3&9`Dn{sf2P1w({fh4e3w13lboXF)Q0cG)^}zaNB~~;UV5m=BJXA`>Th=Cg%?m
zCsiR&_^W~CK`>7<+xcf_K@7RQHWchWsQ!&)mzDJf<eh<9eei)&_y;Oqaz+5I6s95o
zz0kF`kAE7rJ(d<ue!qh-4f}pa3wtA?QG{_8{}mlUiL^t&yf>v^jjA`AvC-W9<S>qW
z4kk58K8(|l`K<n2VZQOpqk}0NaRZ*cc8*eEy(<}wBJED<nalH|)@wXrFfn2YlSAiX
z<-}*I>4*%lmZs|A3JEFh-iyt5tvgL8bMC2!H6mst<{w{l=^j{CHaKTq^}{>^<|6>n
zD(7Ry7uMIYnWVUYg#&kOi3-&D6lDJS6KYXW=?(uBL46nozcPX|^m7oVjYgn*vV>Ur
zMn*+uoT=f7uXe7(x}a1cj-ixP3t&VYIq%%kM45q#MyT}K)WfEtd2uH6=I1wpI@AbQ
z<gKF5NLw&UZusk>o&$r#_Gcz~2iD7=t!SU>k4*p%&jim8#CwMIZnOix7L^UX+)|yX
z{BLa8F=uBQ<u>pHG?AWzrf~uS>rxBX8d_n7eGYo#Cdpdi9cSz4g)-XgUqF@?rp%eq
zRHnxcIV*w`4_mBtc((&1MIK>rdPWm`0S9%h_vdPyJtRO)O7V)Ww3ZTBlIC|~GUErM
zMgd(g@rCvL@@G>FQDlq4O$8-1FO*}FwqyI+VZoo$n(y^aliS%zt=A511FX|0WUE7!
zW!8^O2O^$_IbhD6M*;cTvms;8f29@r79v1SCiNTS{)ykUB(=_pR|U1k{vbTZqSA-a
z6>{@^`qA?iipl%(eMA8rHU3&4j6UU(<2K~Zw%l6wAW9}w1srp;^XUr>Ir1R+%*`|5
z1tQL!ZWKu@R58kTK|rt(*W8?@*TvJ&m|>CLt+$RwtFXHy{30q0+65`tUz7}c_q_4Q
zox*hNfi!epACJ)>@b%r8_oVNvH`kAL4>r`!EUJvOdNLD>6B*)rlNSR*ixyp};{dw_
z=eSyHp%$@tI@abXzvQ9YK_<!sXtkhJtCi_n|60rBd68vbGhD|PN3A=|knSY|;^j}v
z^T)gsi(%%!#iQ##)BP5aH_mI(PQmLe80_`YsFk@y`?hD1ZJ+y6uks*c=xBe$2htEU
zGnbLa<0Eld_ABzCX7**}N5-jt$dq%|jjYK>vU;H_3mv1Xl1P*({Js0h{qhMtQ*|d8
z9k=Z_H&gq#j(AxVqbxq9A%!M2e_j2G4jJp8ajP$rcVC1Y=F%^p*mVL{W8cKBvipox
zzH1IyoSJcrtCX(Eom^0CN205v2ZI>)kmZNCHW85mC%C<SK*z3=%7n~Nm#X|{tZCdZ
zekvx;@|0W|^fPZF{+ta~yxdk%Gl`7o!daUVt@qvRkSoZSl99d`_5Bdc5EYV;K9Wu%
z9ql``{P4x@^2dF*3)ER?O6fc8@zl;fDJC(+YtHq=U{O4_QF@OFjjY>&=v0jo1XVj-
zko*VbB?;}L_w6IzBQ}Nz-082#?2wM@aN2@2Z~YE(hO)>nVyk?$Nh1yzZRp^g+51fW
zy4P3I1fA@}#V$Dp@KVWNFMwS&%VB2dn@r~>J8=JYQnTl0%fRPR+BR|0dKt#g<j(XQ
z7v093Q$%a;RJT}YNb#h!qVoJkxsF5DH<TXsikwkJ?sFc*W7_InK9wgjnNZ7ih*y0t
zM`Z8J<$+?fYaOS_qFu~zXT80hpN5DZ6tsi_C}V6%y7CthxSk_BYHzW>kq+<uj=Z<r
z8!j?5FFX(h(+GQV&DJ&aP+oGJV~rD3!!X>;D2INQKI=k95L%`Vyy6V~ZBKA~-D3;Q
zbx2A?-SV@Vd~)rfN&RW4@%nFzXQkDCg4OI3S*hZ?*K(uJ`MZhxNRs@d$xGJ=2?h#9
zn*3#6sQv&pu%1>pLbnrw1-9NstU+9vvyg|Xh#}0@l3zwJ3K8#`ZxP)sj9#P_xuo<r
z_T5<u;FOi-ztv%byK`VvzTR`VOn;^Q7tH95qX(b0+k4rVieTu`9s&rPV#;8T!fvOl
zy{XMMCc^?P;pYW3#;6P94Egc9koybNBCJ#0YU)-Xm#qhqYf-jLNtP8VKC%+1us5jV
zjYCu#siTqKfH(6}-_Ha8_-1PXvgkea`uk_$VDe2(SLH#*HP53I=GZ&7X1H*ly~A6W
z?9ZG+G!s)j`5Y2cqNSOx%?TNR<X&A8v7}z!oyK*7Zz($W>5*7%pdt1V88NLvbjmpP
zFM=j5wCN~xf}R8XE$d+X$oHljnO&n1ikLMY7iVjr`JGM<h$_atwN=iYPcCp4Gk3VI
z{z9Nq<0yekhf2o)8ZOpIPtzuDDc5paIELu>aEQJ1g42{~f3n>VI$*&^*GVAGf*$s3
zXT_}`j^kKZ^6tUrcCjBNluh&<g=STl5r9XnrjBOI&abWDgTCZ+$vg59UDBVq?ZdIY
zW}k)$JP=peE%K2P?Jl{<Bgah$?&89I`eRbuPz0EX^|GID-=Uv@ppa{O1vIYmu`_!5
zSySO1|0#$dDzTmZr5dR_LoLaJzn!4UEMrd}ds?v?W`$>1-%AN1s(6;!G+&clZR5%(
z$$oX{1EHy~HP;@mcCLcE>U(xBB1*s??9#D=ha<56jcio-MBoCk5F{>Sk((ZR8+4-S
za0{?~`kLl>@c|#_<;ukWS$<sit!x2~qrA4aC|>pGV5~VmE>M_t82s2#6&hetpr-M>
zutFW(fE#f5Mx}ju+cmWQE2H{(BMS_VDhq)Oa@3VoDY};J%!_JKzwu^RGzxd>i&W-&
zah(GvlOY0Y<US);&UXx;ALzO_7s(vxsG=RF#2*)?@g`E_OR%!+B-R^kLtf)5UO2HG
zJkuma&89cBAD%IEzxE*Ed|3MZnk@_L3F^<Yf28~9ja9w`$Ig0)AqXfbq#GfrswCa9
zms1bzuBja8XY;^k(IC9twjkh4e2S;Y;R@;YxhHQ*LH+Pue-bhZ%j_&WD&^3!OEgf@
zbYh|@2%M~3h;dN?+F}*-S*8&V-Tf;2AmVZ7v>H9Ue&0ZT>|O4e3qqn<{ax4Z&G;ZD
zIv>6$cv1MHWj1K5)`xYzyImm4)Qwvn*#Kzz2Cacj5H%yh+_hAaIfi5GC=9@rw}f&I
z&jHKm$nl~rI*wiJ0g_J)*E3P)|FURcp8jo{))i!nDJc*V;BHwt29*Zkz^dvEw-fez
zR(XQCNGiqOYs~Zck{4D}(}=9%Kf)0V)uTXkTi&YvP}ncKgrg%ip$xawvPz}cNBRhV
z`m0<~Yq%u`t6ws0j9uW@CDJgDNdKGhU@A>nVv<VtkcdIxY_ON39^PJ{<2sWr+=fC+
z!UXgQjvzh$jD~K3R+!9*mFT?{AdWVjYK4JO%;CxFn-#=C7k*7O6X<C0V{<q#FSuhf
zjtdQi=*BY-8XIP7TaEWNuSe&{udd$p0a8z1p9RLL9LI?3lPwx_OXa~1BJ%kmx?WV`
z0-HXEB_j;Pnp%Vj<;HqOFV6w4izZ>_xl@?ok*#OWo0^z>9E<p;x=D`i&#6)SItP{H
zQ3%QTkGMD&pKllX1gP0(>Cmon2JIlR*x+5%>IO<nYT<lC59M{%`U0{{)|`+6s%Ax(
z0ssKee2WxD?C$B7#;x8Hk2ASxOqATp=Pjj8f|cU<tyd1Yn#z;1l|t^ZbaC!oB&utg
zv!z8z%GURA!tv%-%{PTTm97E!;l036^3XSu?RaJM=sfij6B1=r3d1;Q4`XqwiI%c@
zJb$!looe90NH(i35bNgs;rBVqjx&EiPiQvhm~i|2CJt)Jx>}vTk!>P4TUSLUsz|Du
z0Ss|I<Bzyvt9NLD`nr5xY)AHDg_yR^C||FJ)uhE`cGu$?+HbteChMN!vl~IeQA-{U
z<;pBqzt#pB20s+mj(7tb_{IsP;oQ8OcaG^v@uTTD20hiJNYZaAQi-<#7+)v*7#a<s
z^e?k24C7CiipD~4NJ1P#Y>TqZ=W<8~^X(~~)~-#VjEjr*xvmRi0D?EF&m-3eyftn2
z!(C7CLi(ygjP2S3<u;yECg@m)iO`Q7rLTOSD_=9%j3(oq&Zx%lU%WPh77D_C*|O_L
z3gw1?$vah*9!vzbd%g(eaT}uVui~6RgBDg~n!aqwk0=QI`n-O`abXB<^Ho)$xcY|Q
z9)I2kr;@|nHDZDHNq?RS?bl+CKG)rY)@vp@LM1L#M&HZRFkoD2ply|7ZJ=D2_@B}h
z+lc#AsVdG(T=CJ3326C%Y?l*5=bop={J+a#S30>u=w-dlBLy}~$#hY^rmkCJCaC;+
z`9lUIK-B>%|B`+u*$!$eI!URt$K?B=Y8L0HLJ4PNev<_<HvhR4<7)Uc2w-WdZRs$y
zjQ;`{P!cv9LL54RF7aI6UC}{KOM!g=FAIxt>9WQaAetN=OMxHjl4zYIk$tZ21gI4N
z>8qjWb28h;vKG@x9Lt`w@%XxZXDT}v_Knr43vn8Fm>I2~UQ6^R^7ekPz4@Q!M2t;B
z0;Mqw2ep@EVqEbkP?xQi^HbH_?(XJdqH|LIj(%F{tWmR8TKQxr^vA23fac>Y{Y4Q!
zrZW8Rbn)y$>2v%CbOJw@R|i}x(wWfUH)4L{T1Z;yp!W;>NVbTX){tT-RIMbE=SFeo
zR!XA?c*N4*{X`fR0#kIO5(aWBhsmSisaV=!eJz3vN?j3VUU`cTm!#LA_V;wZ#R(cv
z3mt`RamBUPc#yL-c@)RZUW%)ers7XFxQ-uFi{G8@ph@MG3?YqB&nSD2UyaOBN2_Ha
z+hbhf*A)+KCxKNB-cHp-PjD9IF<{`gSy7Z!f0XY*YHw1t-KsvixpmxEw`s^*dKsrj
z5JRTjqedoorIhmyHD@E=O5*B68GKrSvUxB+jbfu&)d*0%%**}g>?5T4qW%YaECZRk
z6;iGKB#skS-i*g;ZqIYTrRp0Yo-Lzw(@o=HZv}g>NcLq>`KIz&u(H#we-=MMG9%gE
z5X||L<*2@@QE!bZu^>{?k-YmgD(Ix>v>JHL#AQSkaWEs2+nG%JzAVO+9uE`g**ivz
zVbj9l)AtgRaBk2BpJaq!WCSK7kam!Z86zS5?EDXkwT1lMs6f!ca6gm~%hXHR_aw5H
zA50OxHoCpS*(abNpcbb#qr}2J!ykah>x11$^H^6^rgPx&QH&S+z;tAxEIglP-}{P5
z?fk1DChmTXI)eF`)7?u~C5Jme;1K6CfGL{ntt-zY=cFqB0`vZmTSk>a!RaR8GgMql
zOhxF6(Z{Ur#a*z8;!Ps@rKGokHyRyb>z~ZO<?ixHn=IgY(=eFGTzxWa2?`m8ya~{1
z3$dOJYP~fw@WNysHGh_s$}QEOHxgb_6X8r8Xp@eT?&YMUR3d)9@zW#=m)(rI)rl%1
z4E&7^#t1&9*3p*u@<53}y{i*6->hS-Z|=_xK30ren!QQOZ=Jkq1&ArjFX7O2g|MN#
zih~y0ilcgj9h~}VguMHTzXQ8MpC1?1SymfuS06KWR#2_PRq7Tlw1eGN)d`-7YOF{;
z7`^I0%C@SAvfoRW3Q9!Jt=8-%eB7=(OKW%u%~DAXfsu=6!Hx0UIlB}FYhSpzwe<GM
zeqSVf@i$JWR9%G)A)t&Or$91BETj$<R9!l*rtY0afg&n^e(t?~4d(54Gp4phoot9Z
zVyj&(L$Go<dEjoTDBXlJ#a71*a}kv-D|v}P9z_K=ZN76OdIt90iZGNmZAD1np7<$y
zZ2aMbA&zq64ac?FCSGmkT6Ti5X3<sTm*sf+e3Dno0rL!($~-CV(JQ9E1XMdOZ7qd{
z$t7Xd1OgYMZOwEb@}^TSOg=oD)bt69?1V$Wqq%<{l6QOCB2`>qmr7^s_2@cAi-VE-
zzTV-Oxj8DnTqn;!gMuvd;u=ii{K3|4?^%N3zA8p1tTT<!N@8_-{#j9cJC(Xbz2D#K
zaX>1rQB{A!c*PqNM>J=77ei#g+iBYm>y|7uoOQ@C<9@mbAIRW(nI*KG|Dhs@keUjW
z#8lPO3Jcc6PN816lCPd1fzRLe*ZybJ!koZyN?O%mzs*5YuKend(dhMW+<9HDhBM%4
z6}=;EW2`WUzv6L03W{vxV%d+U5wbz#>~b~rNsfcJ|3PVol8J9J_0V%H7VEN*bdqx?
zAVUc`pLJRf_ske3J7sg6+z3WGHV5;wWz{)yS%spUzmJD2Q}Q7Ts4*BvMS8xK7Xj%Y
znRkg?x@s{vw|Ofa?)~b!S0^zH@<3ii9+PkR$hLa$bZ%0EdSqvAMBl@Hyh5?@Ato^%
zsxsbAlKY#f!*(reC$_0E_8!F{VXw~=0={lO3=7YJqbI9vU#sXN4PKxS4V(#wq?~R9
z?$MUgB;=tEqeqIUnjl7!X#07FR#IDAJ+O-{V;3f^(`G)G$jA-|*p+5!UJfBc<t?4B
zxdzwS1CSSD!BjKfU@?c7GG(~0xh~Us;daAR6zc3=_9)&wK;o%RNS1b63B)j1o89Dx
z<1|IX{4A<5^|B8yu%sKI_jc|>=oqG{*UEKv+o^KZ{5i&*`@ti+ifZp+C`lQr49xf8
z&!@(6OrXmgaypTk1{ecPO}pkW26ry!9iu`@Wj6sr4W7sTB=bBQ9hRq&X}3!RZaA0%
z%!=*^qYSvP(S7zsN{pPi3ZORQf7>_?hA_mrGgiDWUnBsfsW=YYSO2qp{&oHf>@R#&

literal 0
HcmV?d00001


From 66f6dcddb85206630df1b1d339ee7915ec7269e3 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 17 Aug 2022 23:02:22 +0800
Subject: [PATCH 47/98] fix invalid packet

---
 source/libs/transport/src/transSvr.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index f8f55ab1d8..f84b87a43d 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -276,6 +276,7 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
       while (transReadComplete(pBuf)) {
         tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
         if (pBuf->invalid) {
+          tTrace("%s conn %p alread read invalid packet", transLabel(pTransInst), conn);
           destroyConn(conn, true);
           break;
         } else {
@@ -600,7 +601,7 @@ static bool uvRecvReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) {
       (*pTransInst->cfp)(pTransInst->parent, &(pConn->regArg.msg), NULL);
       memset(&pConn->regArg, 0, sizeof(pConn->regArg));
     }
-    uvStartSendResp(srvMsg);
+    uvStartSendRespInternal(srvMsg);
     return true;
   }
   return false;
@@ -872,6 +873,7 @@ static int reallocConnRef(SSvrConn* conn) {
 }
 static void uvDestroyConn(uv_handle_t* handle) {
   SSvrConn* conn = handle->data;
+
   if (conn == NULL) {
     return;
   }
@@ -887,9 +889,8 @@ static void uvDestroyConn(uv_handle_t* handle) {
     SSvrMsg* msg = transQueueGet(&conn->srvMsgs, i);
     destroySmsg(msg);
   }
-
-  transReqQueueClear(&conn->wreqQueue);
   transQueueDestroy(&conn->srvMsgs);
+  transReqQueueClear(&conn->wreqQueue);
 
   QUEUE_REMOVE(&conn->queue);
   taosMemoryFree(conn->pTcp);

From 963287798dcacd32ef03b70f83f3813c006e0c67 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 17 Aug 2022 19:44:53 +0800
Subject: [PATCH 48/98] refactor(mnode): drop stream task

---
 include/libs/stream/tstream.h        |  1 -
 source/dnode/mnode/impl/src/mndStb.c |  7 ++++-
 source/dnode/vnode/src/tq/tqSink.c   | 44 +++++++++++++++-------------
 source/libs/stream/src/streamMeta.c  |  8 +++++
 source/libs/stream/src/streamQueue.c |  5 ++--
 source/libs/stream/src/streamTask.c  |  8 +++++
 6 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index 484d0991f2..384c6a289f 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -216,7 +216,6 @@ typedef struct {
   void*     vnode;
   FTbSink*  tbSinkFunc;
   STSchema* pTSchema;
-  SHashObj* pHash;  // groupId to tbuid
 } STaskSinkTb;
 
 typedef void FSmaSink(void* vnode, int64_t smaId, const SArray* data);
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 59c6d65953..6083a76981 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -2044,7 +2044,12 @@ static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName,
     pIter = sdbFetch(pSdb, SDB_STREAM, pIter, (void **)&pStream);
     if (pIter == NULL) break;
 
-    if (pStream->smaId == 0 && pStream->targetStbUid == suid) {
+    if (pStream->smaId != 0) {
+      sdbRelease(pSdb, pStream);
+      continue;
+    }
+
+    if (pStream->targetStbUid == suid) {
       sdbRelease(pSdb, pStream);
       return -1;
     }
diff --git a/source/dnode/vnode/src/tq/tqSink.c b/source/dnode/vnode/src/tq/tqSink.c
index 55630511bf..522bf46aa1 100644
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@@ -231,34 +231,35 @@ void tqTableSink(SStreamTask* pTask, void* vnode, int64_t ver, void* data) {
 
   ASSERT(pTask->tbSink.pTSchema);
   deleteReq.deleteReqs = taosArrayInit(0, sizeof(SSingleDeleteReq));
-  SSubmitReq* pReq = tqBlockToSubmit(pVnode, pRes, pTask->tbSink.pTSchema, true, pTask->tbSink.stbUid,
-                                     pTask->tbSink.stbFullName, &deleteReq);
+  SSubmitReq* submitReq = tqBlockToSubmit(pVnode, pRes, pTask->tbSink.pTSchema, true, pTask->tbSink.stbUid,
+                                          pTask->tbSink.stbFullName, &deleteReq);
 
   tqDebug("vgId:%d, task %d convert blocks over, put into write-queue", TD_VID(pVnode), pTask->taskId);
 
-  int32_t code;
-  int32_t len;
-  tEncodeSize(tEncodeSBatchDeleteReq, &deleteReq, len, code);
-  if (code < 0) {
-    //
-    ASSERT(0);
-  }
-  SEncoder encoder;
-  void*    buf = rpcMallocCont(len + sizeof(SMsgHead));
-  void*    abuf = POINTER_SHIFT(buf, sizeof(SMsgHead));
-  tEncoderInit(&encoder, abuf, len);
-  tEncodeSBatchDeleteReq(&encoder, &deleteReq);
-  tEncoderClear(&encoder);
-
-  ((SMsgHead*)buf)->vgId = pVnode->config.vgId;
-
   if (taosArrayGetSize(deleteReq.deleteReqs) != 0) {
+    int32_t code;
+    int32_t len;
+    tEncodeSize(tEncodeSBatchDeleteReq, &deleteReq, len, code);
+    if (code < 0) {
+      //
+      ASSERT(0);
+    }
+    SEncoder encoder;
+    void*    serializedDeleteReq = rpcMallocCont(len + sizeof(SMsgHead));
+    void*    abuf = POINTER_SHIFT(serializedDeleteReq, sizeof(SMsgHead));
+    tEncoderInit(&encoder, abuf, len);
+    tEncodeSBatchDeleteReq(&encoder, &deleteReq);
+    tEncoderClear(&encoder);
+
+    ((SMsgHead*)serializedDeleteReq)->vgId = pVnode->config.vgId;
+
     SRpcMsg msg = {
         .msgType = TDMT_VND_BATCH_DEL,
-        .pCont = buf,
+        .pCont = serializedDeleteReq,
         .contLen = len + sizeof(SMsgHead),
     };
     if (tmsgPutToQueue(&pVnode->msgCb, WRITE_QUEUE, &msg) != 0) {
+      rpcFreeCont(serializedDeleteReq);
       tqDebug("failed to put into write-queue since %s", terrstr());
     }
   }
@@ -268,11 +269,12 @@ void tqTableSink(SStreamTask* pTask, void* vnode, int64_t ver, void* data) {
   // build write msg
   SRpcMsg msg = {
       .msgType = TDMT_VND_SUBMIT,
-      .pCont = pReq,
-      .contLen = ntohl(pReq->length),
+      .pCont = submitReq,
+      .contLen = ntohl(submitReq->length),
   };
 
   if (tmsgPutToQueue(&pVnode->msgCb, WRITE_QUEUE, &msg) != 0) {
+    rpcFreeCont(submitReq);
     tqDebug("failed to put into write-queue since %s", terrstr());
   }
 }
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index f34f68ffc6..5ff700546c 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -15,6 +15,7 @@
 
 #include "executor.h"
 #include "tstream.h"
+#include "ttimer.h"
 
 SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandFunc) {
   SStreamMeta* pMeta = taosMemoryCalloc(1, sizeof(SStreamMeta));
@@ -166,13 +167,20 @@ int32_t streamMetaRemoveTask(SStreamMeta* pMeta, int32_t taskId) {
       /*return -1;*/
     }
 
+    if (pTask->triggerParam != 0) {
+      taosTmrStop(pTask->timer);
+    }
+
     while (1) {
       int8_t schedStatus =
           atomic_val_compare_exchange_8(&pTask->schedStatus, TASK_SCHED_STATUS__INACTIVE, TASK_SCHED_STATUS__DROPPING);
       if (schedStatus == TASK_SCHED_STATUS__INACTIVE) {
         tFreeSStreamTask(pTask);
         break;
+      } else if (schedStatus == TASK_SCHED_STATUS__DROPPING) {
+        break;
       }
+      taosMsleep(10);
     }
   }
 
diff --git a/source/libs/stream/src/streamQueue.c b/source/libs/stream/src/streamQueue.c
index 45b78a8c6e..ac10c82587 100644
--- a/source/libs/stream/src/streamQueue.c
+++ b/source/libs/stream/src/streamQueue.c
@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tstream.h"
+#include "streamInc.h"
 
 SStreamQueue* streamQueueOpen() {
   SStreamQueue* pQueue = taosMemoryCalloc(1, sizeof(SStreamQueue));
@@ -36,11 +36,12 @@ void streamQueueClose(SStreamQueue* queue) {
   while (1) {
     void* qItem = streamQueueNextItem(queue);
     if (qItem) {
-      taosFreeQitem(qItem);
+      streamFreeQitem(qItem);
     } else {
       break;
     }
   }
   taosFreeQall(queue->qall);
   taosCloseQueue(queue->queue);
+  taosMemoryFree(queue);
 }
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index 0c35c1408e..d588d90543 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -156,5 +156,13 @@ void tFreeSStreamTask(SStreamTask* pTask) {
   if (pTask->outputQueue) streamQueueClose(pTask->outputQueue);
   if (pTask->exec.qmsg) taosMemoryFree(pTask->exec.qmsg);
   if (pTask->exec.executor) qDestroyTask(pTask->exec.executor);
+  taosArrayDestroy(pTask->childEpInfo);
+  if (pTask->outputType == TASK_OUTPUT__TABLE) {
+    tDeleteSSchemaWrapper(pTask->tbSink.pSchemaWrapper);
+    taosMemoryFree(pTask->tbSink.pTSchema);
+  }
+  if (pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) {
+    taosArrayDestroy(pTask->shuffleDispatcher.dbInfo.pVgroupInfos);
+  }
   taosMemoryFree(pTask);
 }

From e7e6a4c7e4669f45ae2eca690c7bda57d115a398 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 09:22:00 +0800
Subject: [PATCH 49/98] fix invalid packet

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

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index f84b87a43d..f50711c59c 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -284,6 +284,9 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
         }
       }
       return;
+    } else {
+      destroyConn(conn, true);
+      return;
     }
   }
   if (nread == 0) {

From 5f54f90416dbf31021a75c30cc7f11e0c2fc2c93 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Thu, 18 Aug 2022 09:30:24 +0800
Subject: [PATCH 50/98] fix: empty struct

---
 include/common/tmsg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index cedbdb6087..8948d9f670 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2664,7 +2664,7 @@ typedef struct {
 } SVgEpSet;
 
 typedef struct {
-  // padding
+  int64_t padding;
 } SRSmaExecMsg;
 
 typedef struct {

From 4bc57e96ba4b2c4b8d0861543e84a9a0d86af8e6 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 09:40:58 +0800
Subject: [PATCH 51/98] fix invalid packet

---
 source/libs/transport/src/thttp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 806a786b00..76a7611c2e 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -16,10 +16,10 @@
 #define _DEFAULT_SOURCE
 // clang-format off
 #include <uv.h>
+#include "zlib.h"
 #include "thttp.h"
 #include "taoserror.h"
 #include "tlog.h"
-#include "zlib.h"
 
 typedef struct SHttpClient {
   uv_connect_t conn;
@@ -196,8 +196,8 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
   uv_loop_t* loop = uv_default_loop();
   uv_tcp_init(loop, &cli->tcp);
   // set up timeout to avoid stuck;
-  //int32_t fd = taosCreateSocketWithTimeout(5);
-  //uv_tcp_open((uv_tcp_t*)&cli->tcp, fd);
+  int32_t fd = taosCreateSocketWithTimeout(5);
+  uv_tcp_open((uv_tcp_t*)&cli->tcp, fd);
 
   int32_t ret = uv_tcp_connect(&cli->conn, &cli->tcp, (const struct sockaddr*)&dest, clientConnCb);
   if (ret != 0) {

From c5d3440b8419abc8b34964a0777acd5e06d9bb56 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Thu, 18 Aug 2022 09:58:24 +0800
Subject: [PATCH 52/98] other: code optimization

---
 include/common/tmsg.h                    |  2 +-
 source/dnode/vnode/src/inc/sma.h         | 12 +++++++-----
 source/dnode/vnode/src/vnd/vnodeCommit.c |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index cedbdb6087..f870bd161f 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2664,7 +2664,7 @@ typedef struct {
 } SVgEpSet;
 
 typedef struct {
-  // padding
+  int32_t padding;
 } SRSmaExecMsg;
 
 typedef struct {
diff --git a/source/dnode/vnode/src/inc/sma.h b/source/dnode/vnode/src/inc/sma.h
index 26adc8d5e5..c43772062e 100644
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
@@ -118,17 +118,19 @@ struct SSmaStat {
 #define RSMA_FS_LOCK(r)      (&(r)->lock)
 
 struct SRSmaInfoItem {
-  int8_t  level;
-  int8_t  triggerStat;
-  int32_t maxDelay;
-  tmr_h   tmrId;
+  int8_t   level;
+  int8_t   triggerStat;
+  uint16_t interval;  // second
+  int32_t  maxDelay;
+  tmr_h    tmrId;
 };
 
 struct SRSmaInfo {
   STSchema *pTSchema;
   int64_t   suid;
   int64_t   refId;  // refId of SRSmaStat
-  int8_t    delFlag;
+  uint64_t  delFlag : 1;
+  uint64_t  lastReceived : 63;  // second
   T_REF_DECLARE()
   SRSmaInfoItem items[TSDB_RETENTION_L2];
   void         *taskInfo[TSDB_RETENTION_L2];   // qTaskInfo_t
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index fc09eaac44..89542baa25 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -220,8 +220,6 @@ int vnodeCommit(SVnode *pVnode) {
   vInfo("vgId:%d, start to commit, commit ID:%" PRId64 " version:%" PRId64, TD_VID(pVnode), pVnode->state.commitID,
         pVnode->state.applied);
 
-  pVnode->state.commitTerm = pVnode->state.applyTerm;
-
   // preCommit
   // smaSyncPreCommit(pVnode->pSma);
   smaAsyncPreCommit(pVnode->pSma);
@@ -229,6 +227,8 @@ int vnodeCommit(SVnode *pVnode) {
   vnodeBufPoolUnRef(pVnode->inUse);
   pVnode->inUse = NULL;
 
+  pVnode->state.commitTerm = pVnode->state.applyTerm;
+  
   // save info
   info.config = pVnode->config;
   info.state.committed = pVnode->state.applied;

From 64747cb029bbecd31d414c7eab8fe992ec8701b2 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Thu, 18 Aug 2022 10:02:27 +0800
Subject: [PATCH 53/98] other: code optimization

---
 source/dnode/vnode/src/vnd/vnodeCommit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 89542baa25..64f223b974 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -228,7 +228,7 @@ int vnodeCommit(SVnode *pVnode) {
   pVnode->inUse = NULL;
 
   pVnode->state.commitTerm = pVnode->state.applyTerm;
-  
+
   // save info
   info.config = pVnode->config;
   info.state.committed = pVnode->state.applied;

From 7e73f3617303e37f7d2d5123c90eb51ac1f821be Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Thu, 18 Aug 2022 10:08:22 +0800
Subject: [PATCH 54/98] other: code format revert

---
 source/libs/executor/inc/executil.h           | 2 +-
 source/libs/executor/inc/executorimpl.h       | 2 +-
 source/libs/executor/src/executil.c           | 2 +-
 source/libs/executor/src/executorimpl.c       | 2 +-
 source/libs/executor/src/scanoperator.c       | 2 +-
 source/libs/executor/src/timewindowoperator.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index d5b979c762..52c73f85f5 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -140,4 +140,4 @@ int32_t resultrowComparAsc(const void* p1, const void* p2);
 
 int32_t isQualifiedTable(STableKeyInfo* info, SNode* pTagCond, void* metaHandle, bool* pQualified);
 
-#endif  // TDENGINE_QUERYUTIL_H
\ No newline at end of file
+#endif  // TDENGINE_QUERYUTIL_H
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 11d371d49b..311d82c8a2 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -1045,4 +1045,4 @@ void* destroySqlFunctionCtx(SqlFunctionCtx* pCtx, int32_t numOfOutput);
 }
 #endif
 
-#endif  // TDENGINE_EXECUTORIMPL_H
\ No newline at end of file
+#endif  // TDENGINE_EXECUTORIMPL_H
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 615d742d40..34247d3b47 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -986,4 +986,4 @@ void initLimitInfo(const SNode* pLimit, const SNode* pSLimit, SLimitInfo* pLimit
   pLimitInfo->slimit = slimit;
   pLimitInfo->remainOffset = limit.offset;
   pLimitInfo->remainGroupOffset = slimit.offset;
-}
\ No newline at end of file
+}
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 4380a662fe..d15dc99122 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4777,4 +4777,4 @@ int32_t initStreamAggSupporter(SStreamAggSupporter* pSup, const char* pKey, SqlF
     pCtx[i].pBuf = pSup->pResultBuf;
   }
   return code;
-}
\ No newline at end of file
+}
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index c26f468238..8c4fbe7971 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -3134,4 +3134,4 @@ _error:
   taosMemoryFree(pInfo);
   taosMemoryFree(pOperator);
   return NULL;
-}
\ No newline at end of file
+}
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index b81cb7724f..6418f5305c 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -5487,4 +5487,4 @@ _error:
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
-}
\ No newline at end of file
+}

From 4dc5df8453da96264097d857e88211212aa68197 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 10:34:55 +0800
Subject: [PATCH 55/98] fix invalid packet

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

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index be6eafba97..10063df329 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -277,7 +277,7 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
         tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
         if (uvHandleReq(conn) == false) {
           destroyConn(conn, true);
-          break;
+          return;
         }
       }
       return;

From 1a449a51a1215c428e818d54e506487e194de966 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 12:05:56 +0800
Subject: [PATCH 56/98] fix invalid packet

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

diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 76a7611c2e..b902fbd13a 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -178,7 +178,7 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
   }
   terrno = 0;
 
-  char    header[1024] = {0};
+  char    header[2048] = {0};
   int32_t headLen = taosBuildHttpHeader(server, contLen, header, sizeof(header), flag);
 
   uv_buf_t* wb = taosMemoryCalloc(2, sizeof(uv_buf_t));

From fb2bb0481ec9bb66f2e7b3f9213ff44b883aa709 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 18 Aug 2022 13:22:59 +0800
Subject: [PATCH 57/98] fix(query): fix interp pResBlock->rows > capacity cause
 assert failure

---
 source/libs/executor/src/timewindowoperator.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 3e931a489d..757ab09d1a 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2154,9 +2154,7 @@ static void doKeepLinearInfo(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlo
 
 static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup, SSDataBlock* pResBlock) {
   int32_t rows = pResBlock->info.rows;
-  if (rows >= pResBlock->info.capacity) {
-    return;
-  }
+  blockDataEnsureCapacity(pResBlock, rows + 1);
   // todo set the correct primary timestamp column
 
   // output the result

From f3ec1593bcd85eadff34d141e4825e58314c3b86 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 13:55:56 +0800
Subject: [PATCH 58/98] fix invalid packet

---
 source/libs/transport/src/transSvr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index 10063df329..753ea00a45 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -265,10 +265,10 @@ static bool uvHandleReq(SSvrConn* pConn) {
 }
 
 void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
-  // opt
-  SSvrConn*    conn = cli->data;
+  SSvrConn* conn = cli->data;
+  STrans*   pTransInst = conn->pTransInst;
+
   SConnBuffer* pBuf = &conn->readBuf;
-  STrans*      pTransInst = conn->pTransInst;
   if (nread > 0) {
     pBuf->len += nread;
     tTrace("%s conn %p total read:%d, current read:%d", transLabel(pTransInst), conn, pBuf->len, (int)nread);

From e1ae5bc7f8884898e96c0a661614facf6cd5f350 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 13:59:23 +0800
Subject: [PATCH 59/98] fix invalid packet

---
 source/common/src/tglobal.c       |  6 +++---
 source/libs/transport/src/thttp.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index c763bbed9c..adc5af1a17 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -75,7 +75,7 @@ int32_t  tsMonitorMaxLogs = 100;
 bool     tsMonitorComp = false;
 
 // telem
-bool     tsEnableTelem = false;
+bool     tsEnableTelem = true;
 int32_t  tsTelemInterval = 86400;
 char     tsTelemServer[TSDB_FQDN_LEN] = "telemetry.taosdata.com";
 uint16_t tsTelemPort = 80;
@@ -166,7 +166,7 @@ int32_t tsTtlPushInterval = 86400;
 int32_t tsGrantHBInterval = 60;
 
 #ifndef _STORAGE
-int32_t taosSetTfsCfg(SConfig *pCfg) { 
+int32_t taosSetTfsCfg(SConfig *pCfg) {
   SConfigItem *pItem = cfgGetItem(pCfg, "dataDir");
   memset(tsDataDir, 0, PATH_MAX);
 
@@ -180,7 +180,7 @@ int32_t taosSetTfsCfg(SConfig *pCfg) {
     uError("failed to create dataDir:%s", tsDataDir);
     return -1;
   }
-  return 0; 
+  return 0;
 }
 #else
 int32_t taosSetTfsCfg(SConfig *pCfg);
diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index b902fbd13a..2b5c56965f 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -152,15 +152,15 @@ static void clientConnCb(uv_connect_t* req, int32_t status) {
 }
 
 static int32_t taosBuildDstAddr(const char* server, uint16_t port, struct sockaddr_in* dest) {
-  uint32_t ipv4 = taosGetIpv4FromFqdn(server);
-  if (ipv4 == 0xffffffff) {
+  uint32_t ip = taosGetIpv4FromFqdn(server);
+  if (ip == 0xffffffff) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     uError("http-report failed to get http server:%s ip since %s", server, terrstr());
     return -1;
   }
-  char ipv4Buf[128] = {0};
-  tinet_ntoa(ipv4Buf, ipv4);
-  uv_ip4_addr(ipv4Buf, port, dest);
+  char buf[128] = {0};
+  tinet_ntoa(buf, ip);
+  uv_ip4_addr(buf, port, dest);
   return 0;
 }
 int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag) {

From 15110480bc3839889c851b45353f678b2b0ad3bf Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 14:22:07 +0800
Subject: [PATCH 60/98] fix invalid packet

---
 source/libs/transport/src/transSvr.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index 753ea00a45..c980b70abd 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -204,7 +204,6 @@ static bool uvHandleReq(SSvrConn* pConn) {
   //  uv_read_stop((uv_stream_t*)pConn->pTcp);
   //  transRefSrvHandle(pConn);
   //  uv_queue_work(((SWorkThrd*)pConn->hostThrd)->loop, wreq, uvWorkDoTask, uvWorkAfterTask);
-
   if (uvRecvReleaseReq(pConn, pHead)) {
     return true;
   }

From a2757eb4f381ff4dc7b561fa1ca90caa572aa90a Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Thu, 18 Aug 2022 14:26:11 +0800
Subject: [PATCH 61/98] fix(mnode): memory leak

---
 source/dnode/mnode/impl/inc/mndDef.h    |  1 +
 source/dnode/mnode/impl/inc/mndStb.h    |  1 +
 source/dnode/mnode/impl/src/mndDef.c    | 19 +++++++++++++++++++
 source/dnode/mnode/impl/src/mndStb.c    | 16 ++++++++++------
 source/dnode/mnode/impl/src/mndStream.c | 13 ++++++++++++-
 5 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h
index 455da6a40e..8cff7fe48e 100644
--- a/source/dnode/mnode/impl/inc/mndDef.h
+++ b/source/dnode/mnode/impl/inc/mndDef.h
@@ -636,6 +636,7 @@ typedef struct {
 
 int32_t tEncodeSStreamObj(SEncoder* pEncoder, const SStreamObj* pObj);
 int32_t tDecodeSStreamObj(SDecoder* pDecoder, SStreamObj* pObj);
+void    tFreeStreamObj(SStreamObj* pObj);
 
 typedef struct {
   char    streamName[TSDB_STREAM_FNAME_LEN];
diff --git a/source/dnode/mnode/impl/inc/mndStb.h b/source/dnode/mnode/impl/inc/mndStb.h
index 44a7fdadde..010199a89f 100644
--- a/source/dnode/mnode/impl/inc/mndStb.h
+++ b/source/dnode/mnode/impl/inc/mndStb.h
@@ -34,6 +34,7 @@ int32_t mndCheckCreateStbReq(SMCreateStbReq *pCreate);
 SDbObj *mndAcquireDbByStb(SMnode *pMnode, const char *stbName);
 int32_t mndBuildStbFromReq(SMnode *pMnode, SStbObj *pDst, SMCreateStbReq *pCreate, SDbObj *pDb);
 int32_t mndAddStbToTrans(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SStbObj *pStb);
+void    mndFreeStb(SStbObj *pStb);
 
 void mndExtractDbNameFromStbFullName(const char *stbFullName, char *dst);
 void mndExtractTbNameFromStbFullName(const char *stbFullName, char *dst, int32_t dstSize);
diff --git a/source/dnode/mnode/impl/src/mndDef.c b/source/dnode/mnode/impl/src/mndDef.c
index 08ce161409..e6f1a40993 100644
--- a/source/dnode/mnode/impl/src/mndDef.c
+++ b/source/dnode/mnode/impl/src/mndDef.c
@@ -116,6 +116,25 @@ int32_t tDecodeSStreamObj(SDecoder *pDecoder, SStreamObj *pObj) {
   return 0;
 }
 
+void tFreeStreamObj(SStreamObj *pStream) {
+  taosMemoryFree(pStream->sql);
+  taosMemoryFree(pStream->ast);
+  taosMemoryFree(pStream->physicalPlan);
+  if (pStream->outputSchema.nCols) taosMemoryFree(pStream->outputSchema.pSchema);
+
+  int32_t sz = taosArrayGetSize(pStream->tasks);
+  for (int32_t i = 0; i < sz; i++) {
+    SArray *pLevel = taosArrayGetP(pStream->tasks, i);
+    int32_t taskSz = taosArrayGetSize(pLevel);
+    for (int32_t j = 0; j < taskSz; j++) {
+      SStreamTask *pTask = taosArrayGetP(pLevel, j);
+      tFreeSStreamTask(pTask);
+    }
+    taosArrayDestroy(pLevel);
+  }
+  taosArrayDestroy(pStream->tasks);
+}
+
 SMqVgEp *tCloneSMqVgEp(const SMqVgEp *pVgEp) {
   SMqVgEp *pVgEpNew = taosMemoryMalloc(sizeof(SMqVgEp));
   if (pVgEpNew == NULL) return NULL;
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 6083a76981..e0f2b83160 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -266,6 +266,15 @@ _OVER:
   return pRow;
 }
 
+void mndFreeStb(SStbObj *pStb) {
+  taosArrayDestroy(pStb->pFuncs);
+  taosMemoryFreeClear(pStb->pColumns);
+  taosMemoryFreeClear(pStb->pTags);
+  taosMemoryFreeClear(pStb->comment);
+  taosMemoryFreeClear(pStb->pAst1);
+  taosMemoryFreeClear(pStb->pAst2);
+}
+
 static int32_t mndStbActionInsert(SSdb *pSdb, SStbObj *pStb) {
   mTrace("stb:%s, perform insert action, row:%p", pStb->name, pStb);
   return 0;
@@ -273,12 +282,7 @@ static int32_t mndStbActionInsert(SSdb *pSdb, SStbObj *pStb) {
 
 static int32_t mndStbActionDelete(SSdb *pSdb, SStbObj *pStb) {
   mTrace("stb:%s, perform delete action, row:%p", pStb->name, pStb);
-  taosArrayDestroy(pStb->pFuncs);
-  taosMemoryFreeClear(pStb->pColumns);
-  taosMemoryFreeClear(pStb->pTags);
-  taosMemoryFreeClear(pStb->comment);
-  taosMemoryFreeClear(pStb->pAst1);
-  taosMemoryFreeClear(pStb->pAst2);
+  mndFreeStb(pStb);
   return 0;
 }
 
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 8c453e0c88..6dc8e2072b 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -167,6 +167,9 @@ static int32_t mndStreamActionInsert(SSdb *pSdb, SStreamObj *pStream) {
 
 static int32_t mndStreamActionDelete(SSdb *pSdb, SStreamObj *pStream) {
   mTrace("stream:%s, perform delete action", pStream->name);
+  taosWLockLatch(&pStream->lock);
+  tFreeStreamObj(pStream);
+  taosWUnLockLatch(&pStream->lock);
   return 0;
 }
 
@@ -493,10 +496,17 @@ static int32_t mndCreateStbForStream(SMnode *pMnode, STrans *pTrans, const SStre
 
   stbObj.uid = pStream->targetStbUid;
 
-  if (mndAddStbToTrans(pMnode, pTrans, pDb, &stbObj) < 0) goto _OVER;
+  if (mndAddStbToTrans(pMnode, pTrans, pDb, &stbObj) < 0) {
+    mndFreeStb(&stbObj);
+    goto _OVER;
+  }
+
+  tFreeSMCreateStbReq(&createReq);
+  mndFreeStb(&stbObj);
 
   return 0;
 _OVER:
+  tFreeSMCreateStbReq(&createReq);
   mndReleaseStb(pMnode, pStb);
   mndReleaseDb(pMnode, pDb);
   return -1;
@@ -715,6 +725,7 @@ _OVER:
   mndReleaseDb(pMnode, pDb);
 
   tFreeSCMCreateStreamReq(&createStreamReq);
+  tFreeStreamObj(&streamObj);
   return code;
 }
 

From 45dc2ec1f20f9e1df21b6f044bfb4cc116b6bdb0 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 18 Aug 2022 14:32:11 +0800
Subject: [PATCH 62/98] fix(tsdb/cache): add DCLP to tsdbCache

---
 source/dnode/vnode/src/inc/tsdb.h       |  3 +-
 source/dnode/vnode/src/tsdb/tsdbCache.c | 53 ++++++++++++++++---------
 source/dnode/vnode/src/tsdb/tsdbOpen.c  |  2 +-
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index f1e980c026..a30f308ecd 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -260,7 +260,7 @@ void    tsdbUntakeReadSnap(STsdb *pTsdb, STsdbReadSnap *pSnap);
 
 // tsdbCache
 int32_t tsdbOpenCache(STsdb *pTsdb);
-void    tsdbCloseCache(SLRUCache *pCache);
+void    tsdbCloseCache(STsdb *pTsdb);
 int32_t tsdbCacheInsertLast(SLRUCache *pCache, tb_uid_t uid, STSRow *row, STsdb *pTsdb);
 int32_t tsdbCacheInsertLastrow(SLRUCache *pCache, STsdb *pTsdb, tb_uid_t uid, STSRow *row, bool dup);
 int32_t tsdbCacheGetLastH(SLRUCache *pCache, tb_uid_t uid, STsdb *pTsdb, LRUHandle **h);
@@ -298,6 +298,7 @@ struct STsdb {
   SMemTable     *imem;
   STsdbFS        fs;
   SLRUCache     *lruCache;
+  TdThreadMutex  lruMutex;
 };
 
 struct TSDBKEY {
diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index f03b02af27..1d2c5c3b32 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -33,16 +33,21 @@ int32_t tsdbOpenCache(STsdb *pTsdb) {
 
   taosLRUCacheSetStrictCapacity(pCache, true);
 
+  taosThreadMutexInit(&pTsdb->lruMutex, NULL);
+
 _err:
   pTsdb->lruCache = pCache;
   return code;
 }
 
-void tsdbCloseCache(SLRUCache *pCache) {
+void tsdbCloseCache(STsdb *pTsdb) {
+  SLRUCache *pCache = pTsdb->lruCache;
   if (pCache) {
     taosLRUCacheEraseUnrefEntries(pCache);
 
     taosLRUCacheCleanup(pCache);
+
+    taosThreadMutexDestroy(&pTsdb->lruMutex);
   }
 }
 
@@ -1100,26 +1105,38 @@ int32_t tsdbCacheGetLastrowH(SLRUCache *pCache, tb_uid_t uid, STsdb *pTsdb, LRUH
   //  getTableCacheKeyS(uid, "lr", key, &keyLen);
   getTableCacheKey(uid, 0, key, &keyLen);
   LRUHandle *h = taosLRUCacheLookup(pCache, key, keyLen);
-  if (h) {
-  } else {
-    STSRow *pRow = NULL;
-    bool    dup = false;  // which is always false for now
-    code = mergeLastRow(uid, pTsdb, &dup, &pRow);
-    // if table's empty or error, return code of -1
-    if (code < 0 || pRow == NULL) {
-      if (!dup && pRow) {
-        taosMemoryFree(pRow);
+  if (!h) {
+    taosThreadMutexLock(&pTsdb->lruMutex);
+
+    h = taosLRUCacheLookup(pCache, key, keyLen);
+    if (!h) {
+      STSRow *pRow = NULL;
+      bool    dup = false;  // which is always false for now
+      code = mergeLastRow(uid, pTsdb, &dup, &pRow);
+      // if table's empty or error, return code of -1
+      if (code < 0 || pRow == NULL) {
+        if (!dup && pRow) {
+          taosMemoryFree(pRow);
+        }
+
+        *handle = NULL;
+        return 0;
       }
 
-      *handle = NULL;
-      return 0;
-    }
+      _taos_lru_deleter_t deleter = deleteTableCacheLastrow;
+      LRUStatus           status =
+          taosLRUCacheInsert(pCache, key, keyLen, pRow, TD_ROW_LEN(pRow), deleter, NULL, TAOS_LRU_PRIORITY_LOW);
+      if (status != TAOS_LRU_STATUS_OK) {
+        code = -1;
+      }
 
-    _taos_lru_deleter_t deleter = deleteTableCacheLastrow;
-    LRUStatus           status =
-        taosLRUCacheInsert(pCache, key, keyLen, pRow, TD_ROW_LEN(pRow), deleter, NULL, TAOS_LRU_PRIORITY_LOW);
-    if (status != TAOS_LRU_STATUS_OK) {
-      code = -1;
+      taosThreadMutexUnlock(&pTsdb->lruMutex);
+    } else {
+      taosThreadMutexUnlock(&pTsdb->lruMutex);
+
+      *handle = h;
+
+      return code;
     }
 
     h = taosLRUCacheLookup(pCache, key, keyLen);
diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c
index be2828d187..ec760e3c57 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@@ -86,7 +86,7 @@ int tsdbClose(STsdb **pTsdb) {
   if (*pTsdb) {
     taosThreadRwlockDestroy(&(*pTsdb)->rwLock);
     tsdbFSClose(*pTsdb);
-    tsdbCloseCache((*pTsdb)->lruCache);
+    tsdbCloseCache(*pTsdb);
     taosMemoryFreeClear(*pTsdb);
   }
   return 0;

From 8a32c0c1898bc6a90d6bbe73592eb44f15f0c70f Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Thu, 18 Aug 2022 14:55:57 +0800
Subject: [PATCH 63/98] refactor(sync): adjust strategy for dynamic quorum

---
 include/libs/sync/sync.h          |  1 +
 source/libs/sync/inc/syncInt.h    |  2 +-
 source/libs/sync/src/syncCommit.c | 40 ++++++++++++++++++++++++-------
 source/libs/sync/src/syncMain.c   | 22 ++++++++++++++---
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index 952066df46..790cbf906d 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -34,6 +34,7 @@ extern bool gRaftDetailLog;
 #define SYNC_MAX_PROGRESS_WAIT_MS    4000
 #define SYNC_MAX_START_TIME_RANGE_MS (1000 * 20)
 #define SYNC_MAX_RECV_TIME_RANGE_MS  1000
+#define SYNC_ADD_QUORUM_COUNT        3
 
 #define SYNC_MAX_BATCH_SIZE 1
 #define SYNC_INDEX_BEGIN    0
diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index de43c81654..0afc373f2d 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -237,7 +237,7 @@ void syncNodeVoteForSelf(SSyncNode* pSyncNode);
 bool syncNodeHasSnapshot(SSyncNode* pSyncNode);
 void syncNodeMaybeUpdateCommitBySnapshot(SSyncNode* pSyncNode);
 
-SyncIndex syncNodeGetLastIndex(SSyncNode* pSyncNode);
+SyncIndex syncNodeGetLastIndex(const SSyncNode* pSyncNode);
 SyncTerm  syncNodeGetLastTerm(SSyncNode* pSyncNode);
 int32_t   syncNodeGetLastIndexTerm(SSyncNode* pSyncNode, SyncIndex* pLastIndex, SyncTerm* pLastTerm);
 
diff --git a/source/libs/sync/src/syncCommit.c b/source/libs/sync/src/syncCommit.c
index 3829ea0730..1e68fe346c 100644
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
@@ -146,23 +146,47 @@ int32_t syncNodeDynamicQuorum(const SSyncNode* pSyncNode) {
 
   int64_t timeNow = taosGetTimestampMs();
   for (int i = 0; i < pSyncNode->peersNum; ++i) {
-    int64_t peerStartTime = syncIndexMgrGetStartTime(pSyncNode->pNextIndex, &(pSyncNode->peersId)[i]);
-    int64_t peerRecvTime = syncIndexMgrGetRecvTime(pSyncNode->pNextIndex, &(pSyncNode->peersId)[i]);
+    int64_t   peerStartTime = syncIndexMgrGetStartTime(pSyncNode->pNextIndex, &(pSyncNode->peersId)[i]);
+    int64_t   peerRecvTime = syncIndexMgrGetRecvTime(pSyncNode->pNextIndex, &(pSyncNode->peersId)[i]);
+    SyncIndex peerMatchIndex = syncIndexMgrGetIndex(pSyncNode->pMatchIndex, &(pSyncNode->peersId)[i]);
 
-    int64_t recvTimeDiff = syncNodeAbs64(peerRecvTime, timeNow);
-    int64_t startTimeDiff = syncNodeAbs64(peerStartTime, pSyncNode->startTime);
+    int64_t recvTimeDiff = TABS(peerRecvTime - timeNow);
+    int64_t startTimeDiff = TABS(peerStartTime - pSyncNode->startTime);
+    int64_t logDiff = TABS(peerMatchIndex - syncNodeGetLastIndex(pSyncNode));
+
+    /*
+        int64_t recvTimeDiff = syncNodeAbs64(peerRecvTime, timeNow);
+        int64_t startTimeDiff = syncNodeAbs64(peerStartTime, pSyncNode->startTime);
+        int64_t logDiff = syncNodeAbs64(peerMatchIndex, syncNodeGetLastIndex(pSyncNode));
+    */
 
     int32_t addQuorum = 0;
 
     if (recvTimeDiff < SYNC_MAX_RECV_TIME_RANGE_MS) {
-      addQuorum = 1;
+      if (startTimeDiff < SYNC_MAX_START_TIME_RANGE_MS) {
+        addQuorum = 1;
+      } else {
+        if (logDiff < SYNC_ADD_QUORUM_COUNT) {
+          addQuorum = 1;
+        } else {
+          addQuorum = 0;
+        }
+      }
     } else {
       addQuorum = 0;
     }
 
-    if (startTimeDiff > SYNC_MAX_START_TIME_RANGE_MS) {
-      addQuorum = 0;
-    }
+    /*
+        if (recvTimeDiff < SYNC_MAX_RECV_TIME_RANGE_MS) {
+          addQuorum = 1;
+        } else {
+          addQuorum = 0;
+        }
+
+        if (startTimeDiff > SYNC_MAX_START_TIME_RANGE_MS) {
+          addQuorum = 0;
+        }
+    */
 
     quorum += addQuorum;
   }
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index a00b59d292..3fe600ecbb 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -2284,7 +2284,7 @@ bool syncNodeHasSnapshot(SSyncNode* pSyncNode) {
 
 // return max(logLastIndex, snapshotLastIndex)
 // if no snapshot and log, return -1
-SyncIndex syncNodeGetLastIndex(SSyncNode* pSyncNode) {
+SyncIndex syncNodeGetLastIndex(const SSyncNode* pSyncNode) {
   SSnapshot snapshot = {.data = NULL, .lastApplyIndex = -1, .lastApplyTerm = 0, .lastConfigIndex = -1};
   if (pSyncNode->pFsm->FpGetSnapshotInfo != NULL) {
     pSyncNode->pFsm->FpGetSnapshotInfo(pSyncNode->pFsm, &snapshot);
@@ -2773,11 +2773,27 @@ int32_t syncDoLeaderTransfer(SSyncNode* ths, SRpcMsg* pRpcMsg, SSyncRaftEntry* p
     return 0;
   }
 
-  if (ths->vgId > 1) {
-    syncNodeEventLog(ths, "I am vnode, can not do leader transfer");
+  if (pEntry->term < ths->pRaftStore->currentTerm) {
+    char logBuf[128];
+    snprintf(logBuf, sizeof(logBuf), "little term:%lu, can not do leader transfer", pEntry->term);
+    syncNodeEventLog(ths, logBuf);
     return 0;
   }
 
+  if (pEntry->index < syncNodeGetLastIndex(ths)) {
+    char logBuf[128];
+    snprintf(logBuf, sizeof(logBuf), "little index:%ld, can not do leader transfer", pEntry->index);
+    syncNodeEventLog(ths, logBuf);
+    return 0;
+  }
+
+  /*
+    if (ths->vgId > 1) {
+      syncNodeEventLog(ths, "I am vnode, can not do leader transfer");
+      return 0;
+    }
+  */
+
   do {
     char logBuf[128];
     snprintf(logBuf, sizeof(logBuf), "do leader transfer, index:%ld", pEntry->index);

From d9e978814ad66b87478a88e53a506afe57a02a88 Mon Sep 17 00:00:00 2001
From: Hui Li <52318143+plum-lihui@users.noreply.github.com>
Date: Thu, 18 Aug 2022 15:33:12 +0800
Subject: [PATCH 64/98] ci: rust dir

The 2.x and 3.x  have the same file name but different contents.
---
 Jenkinsfile2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 754617f99f..12e806c87a 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -43,6 +43,7 @@ def pre_test(){
         cd ${WKC}
         git reset --hard
         git clean -fxd
+        rm -rf examples/rust/
         git remote prune origin
         git fetch
     '''

From 03bb9e7f016f3004a34f5ce56e97de5729b7f480 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 18 Aug 2022 15:44:28 +0800
Subject: [PATCH 65/98] fix: get meta null if table does not exists

---
 source/dnode/vnode/inc/vnode.h          | 1 +
 source/dnode/vnode/src/meta/metaQuery.c | 9 +++++++++
 source/libs/executor/src/executil.c     | 9 +++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index c224f6ce7f..e39863721e 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -95,6 +95,7 @@ int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHash
 int32_t     metaReadNext(SMetaReader *pReader);
 const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
 int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
+bool        metaIsTableExist(SMeta  *pMeta, tb_uid_t uid);
 
 typedef struct SMetaFltParam {
   tb_uid_t suid;
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 4e85cde7ca..7cf365d372 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -127,6 +127,15 @@ _err:
 //   return 0;
 // }
 
+bool metaIsTableExist(SMeta  *pMeta, tb_uid_t uid) {
+  // query uid.idx
+  if (tdbTbGet(pMeta->pUidIdx, &uid, sizeof(uid), NULL, NULL) < 0) {
+    return false;
+  }
+
+  return true;
+}
+
 int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
   SMeta  *pMeta = pReader->pMeta;
   int64_t version;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 1dabea0d6b..baeb972e05 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -533,7 +533,9 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
       vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
     }
   } else {  // Create one table group.
-    taosArrayPush(res, &tableUid);
+    if(metaIsTableExist(metaHandle, tableUid)){
+      taosArrayPush(res, &tableUid);
+    }
   }
 
   if (pTagCond) {
@@ -599,7 +601,10 @@ size_t getTableTagsBufLen(const SNodeList* pGroups) {
 int32_t getGroupIdFromTagsVal(void* pMeta, uint64_t uid, SNodeList* pGroupNode, char* keyBuf, uint64_t* pGroupId) {
   SMetaReader mr = {0};
   metaReaderInit(&mr, pMeta, 0);
-  metaGetTableEntryByUid(&mr, uid);
+  if(metaGetTableEntryByUid(&mr, uid) != 0){    // table not exist
+    metaReaderClear(&mr);
+    return TSDB_CODE_PAR_TABLE_NOT_EXIST;
+  }
 
   SNodeList* groupNew = nodesCloneList(pGroupNode);
 

From 9ef2d736897bb0c0feb81980cb259a31a43ef957 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 18 Aug 2022 16:06:49 +0800
Subject: [PATCH 66/98] fix(query): fix elapsed order by ts desc result
 inconsist after flush to disk

TD-18453
---
 source/libs/function/src/builtinsimpl.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 5aeaecd598..bf4a07f8e2 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -3970,16 +3970,16 @@ int32_t elapsedFunction(SqlFunctionCtx* pCtx) {
     TSKEY*  ptsList = (int64_t*)colDataGetData(pCol, 0);
     if (pCtx->order == TSDB_ORDER_DESC) {
       if (pCtx->start.key == INT64_MIN) {
-        pInfo->max =
-            (pInfo->max < ptsList[start + pInput->numOfRows - 1]) ? ptsList[start + pInput->numOfRows - 1] : pInfo->max;
+        pInfo->max = (pInfo->max < ptsList[start]) ? ptsList[start] : pInfo->max;
       } else {
         pInfo->max = pCtx->start.key + 1;
       }
 
-      if (pCtx->end.key != INT64_MIN) {
-        pInfo->min = pCtx->end.key;
+      if (pCtx->end.key == INT64_MIN) {
+        pInfo->min = (pInfo->min > ptsList[start + pInput->numOfRows - 1]) ?
+                     ptsList[start + pInput->numOfRows - 1] : pInfo->min;
       } else {
-        pInfo->min = ptsList[start];
+        pInfo->min = pCtx->end.key;
       }
     } else {
       if (pCtx->start.key == INT64_MIN) {
@@ -3988,10 +3988,11 @@ int32_t elapsedFunction(SqlFunctionCtx* pCtx) {
         pInfo->min = pCtx->start.key;
       }
 
-      if (pCtx->end.key != INT64_MIN) {
-        pInfo->max = pCtx->end.key + 1;
+      if (pCtx->end.key == INT64_MIN) {
+        pInfo->max = (pInfo->max < ptsList[start + pInput->numOfRows - 1]) ?
+                     ptsList[start + pInput->numOfRows - 1] : pInfo->max;
       } else {
-        pInfo->max = ptsList[start + pInput->numOfRows - 1];
+        pInfo->max = pCtx->end.key + 1;
       }
     }
   }

From 13a93d68ebdddc3d27ce39fa1962586f044b70aa Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 16:09:46 +0800
Subject: [PATCH 67/98] fix invalid packet

---
 source/libs/transport/src/thttp.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 62277a7569..dc0f9128b0 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -221,7 +221,6 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
     uError("failed to receive response from %s:%u since %s", server, port, terrstr());
     goto SEND_OVER;
   }
-
   code = 0;
 
 SEND_OVER:

From 7c2d6571f043680ad32bea7d477a741c27e7f716 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Thu, 18 Aug 2022 16:30:54 +0800
Subject: [PATCH 68/98] refactor(sync): adjust SYNC_MAX_RECV_TIME_RANGE_MS

---
 include/libs/sync/sync.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index 790cbf906d..e6a4dd1d49 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -33,7 +33,7 @@ extern bool gRaftDetailLog;
 #define SYNC_MAX_READ_RANGE          2
 #define SYNC_MAX_PROGRESS_WAIT_MS    4000
 #define SYNC_MAX_START_TIME_RANGE_MS (1000 * 20)
-#define SYNC_MAX_RECV_TIME_RANGE_MS  1000
+#define SYNC_MAX_RECV_TIME_RANGE_MS  1200
 #define SYNC_ADD_QUORUM_COUNT        3
 
 #define SYNC_MAX_BATCH_SIZE 1

From df2224988f486fa5672fa4a44146a05bc41be3cc Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 18 Aug 2022 17:02:52 +0800
Subject: [PATCH 69/98] fix(query): restrict interp input type to numerical
 type only

TD-18487
---
 source/libs/function/src/builtins.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index c19b459cdb..ed82e4cb50 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -1503,11 +1503,17 @@ static int32_t translateInterp(SFunctionNode* pFunc, char* pErrBuf, int32_t len)
     return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
   }
 
+  uint8_t nodeType = nodeType(nodesListGetNode(pFunc->pParameterList, 0));
+  uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
+  if (!IS_NUMERIC_TYPE(paraType) || QUERY_NODE_VALUE == nodeType) {
+    return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+
   if (3 <= numOfParams) {
     int64_t timeVal[2] = {0};
     for (int32_t i = 1; i < 3; ++i) {
-      uint8_t nodeType = nodeType(nodesListGetNode(pFunc->pParameterList, i));
-      uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, i))->resType.type;
+      nodeType = nodeType(nodesListGetNode(pFunc->pParameterList, i));
+      paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, i))->resType.type;
       if (!IS_VAR_DATA_TYPE(paraType) || QUERY_NODE_VALUE != nodeType) {
         return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
       }
@@ -1525,8 +1531,8 @@ static int32_t translateInterp(SFunctionNode* pFunc, char* pErrBuf, int32_t len)
   }
 
   if (4 == numOfParams) {
-    uint8_t nodeType = nodeType(nodesListGetNode(pFunc->pParameterList, 3));
-    uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 3))->resType.type;
+    nodeType = nodeType(nodesListGetNode(pFunc->pParameterList, 3));
+    paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 3))->resType.type;
     if (!IS_INTEGER_TYPE(paraType) || QUERY_NODE_VALUE != nodeType) {
       return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
     }

From 48bf21d321b923e3f1331b2f984189f1a1785c39 Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Thu, 18 Aug 2022 17:32:08 +0800
Subject: [PATCH 70/98] build: move check into shell file

---
 cmake/cmake.install              | 32 +-----------------------
 contrib/CMakeLists.txt           | 18 --------------
 packaging/tools/make_install.bat | 42 +++++++++++++++++++++++++++++++-
 packaging/tools/make_install.sh  |  4 ++-
 4 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/cmake/cmake.install b/cmake/cmake.install
index 4e3d0b166a..6dc6864975 100644
--- a/cmake/cmake.install
+++ b/cmake/cmake.install
@@ -1,38 +1,8 @@
-IF (EXISTS /var/lib/taos/dnode/dnodeCfg.json)
-  INSTALL(CODE "MESSAGE(\"The default data directory /var/lib/taos contains old data of tdengine 2.x, please clear it before installing!\")")
-ELSEIF (EXISTS C:/TDengine/data/dnode/dnodeCfg.json)
-  INSTALL(CODE "MESSAGE(\"The default data directory C:/TDengine/data contains old data of tdengine 2.x, please clear it before installing!\")")
-ELSEIF (TD_LINUX)
+IF (TD_LINUX)
   SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/tools/make_install.sh")
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
   INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_SOURCE_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})")
 ELSEIF (TD_WINDOWS)
-  SET(CMAKE_INSTALL_PREFIX C:/TDengine)
-
-  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/go     DESTINATION connector)
-  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/nodejs DESTINATION connector)
-  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/python DESTINATION connector)
-  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/C\# DESTINATION connector)
-  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/examples DESTINATION .)
-  INSTALL(CODE "IF (NOT EXISTS ${CMAKE_INSTALL_PREFIX}/cfg/taos.cfg)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${TD_SOURCE_DIR}/packaging/cfg/taos.cfg ${CMAKE_INSTALL_PREFIX}/cfg/taos.cfg)
-  ENDIF ()")
-  INSTALL(FILES ${TD_SOURCE_DIR}/include/client/taos.h DESTINATION include)
-  INSTALL(FILES ${TD_SOURCE_DIR}/include/util/taoserror.h DESTINATION include)
-  INSTALL(FILES ${TD_SOURCE_DIR}/include/libs/function/taosudf.h DESTINATION include)
-  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
-  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos_static.lib DESTINATION driver)
-  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
-  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
-  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosd.exe DESTINATION .)
-  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/udfd.exe DESTINATION .)
-  IF (BUILD_TOOLS)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosBenchmark.exe DESTINATION .)
-  ENDIF ()
-
-  IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.38-dist.jar DESTINATION connector/jdbc)
-  ENDIF ()
   SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/tools/make_install.bat")
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
   INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} :needAdmin ${TD_SOURCE_DIR} ${PROJECT_BINARY_DIR} Windows ${TD_VER_NUMBER})")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index a1eec81ee0..494d1577fc 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -135,24 +135,6 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-     
-# clear submodule
-execute_process(COMMAND git submodule deinit -f tools/taos-tools
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git rm --cached tools/taos-tools
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git submodule deinit -f tools/taosadapter
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git rm --cached tools/taosadapter
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git submodule deinit -f tools/taosws-rs
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git rm --cached tools/taosws-rs
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git submodule deinit -f examples/rust
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
-execute_process(COMMAND git rm --cached examples/rust
-        WORKING_DIRECTORY "${TD_SOURCE_DIR}")
 
 # ================================================================================================
 # Build
diff --git a/packaging/tools/make_install.bat b/packaging/tools/make_install.bat
index 0f9e836ae2..3c27c1beca 100644
--- a/packaging/tools/make_install.bat
+++ b/packaging/tools/make_install.bat
@@ -1,7 +1,47 @@
 @echo off
 goto %1
 :needAdmin
+
+if exist C:\\TDengine\\data\\dnode\\dnodeCfg.json (
+  echo The default data directory C:/TDengine/data contains old data of tdengine 2.x, please clear it before installing!
+)
+set source_dir=%2
+set source_dir=%source_dir:/=\\%
+set binary_dir=%3
+set binary_dir=%binary_dir:/=\\%
+set osType=%4
+set verNumber=%5
+set tagert_dir=C:\\TDengine
+
+if not exist %tagert_dir% (
+    mkdir %tagert_dir%
+)
+if not exist %tagert_dir%\\cfg (
+    mkdir %tagert_dir%\\cfg
+)
+if not exist %tagert_dir%\\include (
+    mkdir %tagert_dir%\\include
+)
+if not exist %tagert_dir%\\driver (
+    mkdir %tagert_dir%\\driver
+)
+if not exist C:\\TDengine\\cfg\\taos.cfg (
+    copy %source_dir%\\packaging\\cfg\\taos.cfg %tagert_dir%\\cfg\\taos.cfg > nul
+)
+copy %source_dir%\\include\\client\\taos.h %tagert_dir%\\include > nul
+copy %source_dir%\\include\\util\\taoserror.h %tagert_dir%\\include > nul
+copy %source_dir%\\include\\libs\\function\\taosudf.h %tagert_dir%\\include > nul
+copy %binary_dir%\\build\\lib\\taos.lib %tagert_dir%\\driver > nul
+copy %binary_dir%\\build\\lib\\taos_static.lib %tagert_dir%\\driver > nul
+copy %binary_dir%\\build\\lib\\taos.dll %tagert_dir%\\driver > nul
+copy %binary_dir%\\build\\bin\\taos.exe %tagert_dir% > nul
+copy %binary_dir%\\build\\bin\\taosd.exe %tagert_dir% > nul
+copy %binary_dir%\\build\\bin\\udfd.exe %tagert_dir% > nul
+if exist %binary_dir%\\build\\bin\\taosBenchmark.exe (
+    copy %binary_dir%\\build\\bin\\taosBenchmark.exe %tagert_dir% > nul
+)
+
 mshta vbscript:createobject("shell.application").shellexecute("%~s0",":hasAdmin","","runas",1)(window.close)&& echo To start/stop TDengine with administrator privileges: sc start/stop taosd &goto :eof
 :hasAdmin
-cp -f C:\\TDengine\\driver\\taos.dll C:\\Windows\\System32
+copy /y C:\\TDengine\\driver\\taos.dll C:\\Windows\\System32 > nul
 sc query "taosd" >nul || sc create "taosd" binPath= "C:\\TDengine\\taosd.exe --win_service" start= DEMAND
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index d8d4c5bf2a..6a95ace99e 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -664,7 +664,9 @@ function install_TDengine() {
 ## ==============================Main program starts from here============================
 echo source directory: $1
 echo binary directory: $2
-if [ "$osType" != "Darwin" ]; then
+if [ -x ${data_dir}/dnode/dnodeCfg.json ]; then
+  echo -e "\033[44;31;5mThe default data directory ${data_dir} contains old data of tdengine 2.x, please clear it before installing!\033[0m"
+elif [ "$osType" != "Darwin" ]; then
   if [ -x ${bin_dir}/${clientName} ]; then
     update_TDengine
   else

From 452395bc46b1d15e5f24f7eb31a3351387365f1b Mon Sep 17 00:00:00 2001
From: xleili <xlli@taosdata.com>
Date: Thu, 18 Aug 2022 17:33:28 +0800
Subject: [PATCH 71/98] fix(docs):uncomment nodejs tmq  example's commit

---
 docs/examples/node/nativeexample/subscribe_demo.js | 3 +--
 docs/examples/node/package.json                    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/examples/node/nativeexample/subscribe_demo.js b/docs/examples/node/nativeexample/subscribe_demo.js
index 5b65e1c907..53cbe55d26 100644
--- a/docs/examples/node/nativeexample/subscribe_demo.js
+++ b/docs/examples/node/nativeexample/subscribe_demo.js
@@ -28,8 +28,7 @@ function runConsumer() {
         console.log(msg.topicPartition);
         console.log(msg.block);
         console.log(msg.fields)
-        // fixme(@xiaolei): commented temp, should be fixed.
-        //consumer.commit(msg);
+        consumer.commit(msg);
         console.log(`=======consumer ${i} done`)
     }
 
diff --git a/docs/examples/node/package.json b/docs/examples/node/package.json
index 36d3f016b5..d00d71d99f 100644
--- a/docs/examples/node/package.json
+++ b/docs/examples/node/package.json
@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@tdengine/client": "^3.0.0",
+    "@tdengine/client": "^3.0.1",
     "@tdengine/rest": "^3.0.0"
   }
 }

From 3e6ccb83570052d781d85e491dcf9695e3be5478 Mon Sep 17 00:00:00 2001
From: shenglian zhou <slzhou@taosdata.com>
Date: Thu, 18 Aug 2022 18:00:03 +0800
Subject: [PATCH 72/98] fix: filter producing zero rows will not be treated as
 sys table scan operator completion

---
 source/libs/executor/src/scanoperator.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 367fae66a6..7da290240f 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2213,9 +2213,18 @@ static SSDataBlock* sysTableScanUserTables(SOperatorInfo* pOperator) {
       colDataAppend(pColInfoData, numOfRows, n, false);
 
       if (++numOfRows >= pOperator->resultInfo.capacity) {
-        break;
+        p->info.rows = numOfRows;
+        pInfo->pRes->info.rows = numOfRows;
+
+        relocateColumnData(pInfo->pRes, pInfo->scanCols, p->pDataBlock, false);
+        doFilterResult(pInfo);
+
+        blockDataCleanup(p);
+        if (pInfo->pRes->info.rows > 0)
+          break;
       }
     }
+    blockDataDestroy(p);
 
     // todo temporarily free the cursor here, the true reason why the free is not valid needs to be found
     if (ret != 0) {
@@ -2224,14 +2233,6 @@ static SSDataBlock* sysTableScanUserTables(SOperatorInfo* pOperator) {
       doSetOperatorCompleted(pOperator);
     }
 
-    p->info.rows = numOfRows;
-    pInfo->pRes->info.rows = numOfRows;
-
-    relocateColumnData(pInfo->pRes, pInfo->scanCols, p->pDataBlock, false);
-    doFilterResult(pInfo);
-
-    blockDataDestroy(p);
-
     pInfo->loadInfo.totalRows += pInfo->pRes->info.rows;
     return (pInfo->pRes->info.rows == 0) ? NULL : pInfo->pRes;
   }

From 0bfadd871931dc18f90deb6b843e8ad35feb9a14 Mon Sep 17 00:00:00 2001
From: BoDing <dingbo8128@163.com>
Date: Thu, 18 Aug 2022 18:22:17 +0800
Subject: [PATCH 73/98] fix broken link to taosx

---
 docs/zh/17-operation/03-tolerance.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/17-operation/03-tolerance.md b/docs/zh/17-operation/03-tolerance.md
index 2cfd4b6484..6ee6aa6373 100644
--- a/docs/zh/17-operation/03-tolerance.md
+++ b/docs/zh/17-operation/03-tolerance.md
@@ -27,4 +27,4 @@ TDengine 集群的节点数必须大于等于副本数，否则创建表时将
 
 当 TDengine 集群中的节点部署在不同的物理机上，并设置多个副本数时，就实现了系统的高可靠性，无需再使用其他软件或工具。TDengine 企业版还可以将副本部署在不同机房，从而实现异地容灾。
 
-另外一种灾备方式是通过 `taosX` 将一个 TDengine 集群的数据同步复制到物理上位于不同数据中心的另一个 TDengine 集群。其详细使用方法请参考 [taosX 参考手册](../../reference/taosX)
+另外一种灾备方式是通过 `taosX` 将一个 TDengine 集群的数据同步复制到物理上位于不同数据中心的另一个 TDengine 集群。其详细使用方法请参考 [taosX 参考手册](../../reference/taosx)

From 98fd9aca109e9d791e87dd05f9a72d6b0c22bbf6 Mon Sep 17 00:00:00 2001
From: BoDing <dingbo8128@163.com>
Date: Thu, 18 Aug 2022 18:25:01 +0800
Subject: [PATCH 74/98] remove link to taosx

---
 docs/zh/17-operation/03-tolerance.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/zh/17-operation/03-tolerance.md b/docs/zh/17-operation/03-tolerance.md
index 6ee6aa6373..1ce485b042 100644
--- a/docs/zh/17-operation/03-tolerance.md
+++ b/docs/zh/17-operation/03-tolerance.md
@@ -26,5 +26,3 @@ TDengine 集群中的时序数据的副本数是与数据库关联的，一个
 TDengine 集群的节点数必须大于等于副本数，否则创建表时将报错。
 
 当 TDengine 集群中的节点部署在不同的物理机上，并设置多个副本数时，就实现了系统的高可靠性，无需再使用其他软件或工具。TDengine 企业版还可以将副本部署在不同机房，从而实现异地容灾。
-
-另外一种灾备方式是通过 `taosX` 将一个 TDengine 集群的数据同步复制到物理上位于不同数据中心的另一个 TDengine 集群。其详细使用方法请参考 [taosX 参考手册](../../reference/taosx)

From 1a8fb961823be1ed14f05852155700fe2f002040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Thu, 18 Aug 2022 18:30:03 +0800
Subject: [PATCH 75/98] fix: reset row number when filter produces zero row

---
 source/libs/executor/src/scanoperator.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index f2c4a8e3b6..e578e34b82 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2220,8 +2220,12 @@ static SSDataBlock* sysTableScanUserTables(SOperatorInfo* pOperator) {
         doFilterResult(pInfo);
 
         blockDataCleanup(p);
-        if (pInfo->pRes->info.rows > 0)
+        if (pInfo->pRes->info.rows > 0) {
           break;
+        } else {
+          numOfRows = 0;
+          continue;
+        }
       }
     }
     blockDataDestroy(p);

From 2b092f6551988aebd4aaf6938363593b999979ed Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Thu, 18 Aug 2022 18:39:21 +0800
Subject: [PATCH 76/98] fix(query): memory leak

---
 source/dnode/mnode/impl/src/mndSma.c          |  2 +-
 source/dnode/vnode/src/tq/tqRead.c            |  2 +-
 source/libs/executor/src/executorimpl.c       | 36 +++++++++----------
 source/libs/executor/src/scanoperator.c       |  2 ++
 source/libs/executor/src/timewindowoperator.c |  6 +++-
 source/libs/stream/src/streamTask.c           |  3 +-
 6 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndSma.c b/source/dnode/mnode/impl/src/mndSma.c
index 006d9e749c..6db9b59c69 100644
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
@@ -489,7 +489,7 @@ static int32_t mndCreateSma(SMnode *pMnode, SRpcMsg *pReq, SMCreateSmaReq *pCrea
   smaObj.uid = mndGenerateUid(pCreate->name, TSDB_TABLE_FNAME_LEN);
   ASSERT(smaObj.uid != 0);
   char resultTbName[TSDB_TABLE_FNAME_LEN + 16] = {0};
-  snprintf(resultTbName, TSDB_TABLE_FNAME_LEN + 16, "%s_td_tsma_rst_tb",pCreate->name);
+  snprintf(resultTbName, TSDB_TABLE_FNAME_LEN + 16, "%s_td_tsma_rst_tb", pCreate->name);
   memcpy(smaObj.dstTbName, resultTbName, TSDB_TABLE_FNAME_LEN);
   smaObj.dstTbUid = mndGenerateUid(smaObj.dstTbName, TSDB_TABLE_FNAME_LEN);
   smaObj.stbUid = pStb->uid;
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index b8803b20fc..e6a331f20e 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -341,7 +341,7 @@ FAIL:
   return -1;
 }
 
-void tqReaderSetColIdList(STqReader* pReadHandle, SArray* pColIdList) { pReadHandle->pColIdList = pColIdList; }
+void tqReaderSetColIdList(STqReader* pReader, SArray* pColIdList) { pReader->pColIdList = pColIdList; }
 
 int tqReaderSetTbUidList(STqReader* pReader, const SArray* tbUidList) {
   if (pReader->tbIdHash) {
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index d15dc99122..9ff5b5d759 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3217,8 +3217,8 @@ int32_t handleLimitOffset(SOperatorInfo* pOperator, SLimitInfo* pLimitInfo, SSDa
 }
 
 static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32_t order, int32_t scanFlag);
-static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo *pOperator, SFillOperatorInfo* pInfo, SResultInfo* pResultInfo,
-                                               SExecTaskInfo* pTaskInfo) {
+static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo* pOperator, SFillOperatorInfo* pInfo,
+                                               SResultInfo* pResultInfo, SExecTaskInfo* pTaskInfo) {
   pInfo->totalInputRows = pInfo->existNewGroupBlock->info.rows;
   SSDataBlock* pResBlock = pInfo->pFinalRes;
 
@@ -3242,8 +3242,8 @@ static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo *pOperator, SFillOp
   pInfo->existNewGroupBlock = NULL;
 }
 
-static void doHandleRemainBlockFromNewGroup(SOperatorInfo* pOperator, SFillOperatorInfo* pInfo, SResultInfo* pResultInfo,
-                                            SExecTaskInfo* pTaskInfo) {
+static void doHandleRemainBlockFromNewGroup(SOperatorInfo* pOperator, SFillOperatorInfo* pInfo,
+                                            SResultInfo* pResultInfo, SExecTaskInfo* pTaskInfo) {
   if (taosFillHasMoreResults(pInfo->pFillInfo)) {
     int32_t numOfResultRows = pResultInfo->capacity - pInfo->pFinalRes->info.rows;
     taosFillResultDataBlock(pInfo->pFillInfo, pInfo->pFinalRes, numOfResultRows);
@@ -3259,8 +3259,8 @@ static void doHandleRemainBlockFromNewGroup(SOperatorInfo* pOperator, SFillOpera
 
 static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32_t order, int32_t scanFlag) {
   SFillOperatorInfo* pInfo = pOperator->info;
-  SExprSupp* pSup = &pOperator->exprSupp;
-  SSDataBlock* pResBlock = pInfo->pFinalRes;
+  SExprSupp*         pSup = &pOperator->exprSupp;
+  SSDataBlock*       pResBlock = pInfo->pFinalRes;
 
   setInputDataBlock(pOperator, pSup->pCtx, pBlock, order, scanFlag, false);
   projectApplyFunctions(pSup->pExprInfo, pInfo->pRes, pBlock, pSup->pCtx, pSup->numOfExprs, NULL);
@@ -3270,13 +3270,13 @@ static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlo
   SColumnInfoData* pSrc = taosArrayGet(pBlock->pDataBlock, pInfo->primarySrcSlotId);
   colDataAssign(pDst, pSrc, pInfo->pRes->info.rows, &pResBlock->info);
 
-  for(int32_t i = 0; i < pInfo->numOfNotFillExpr; ++i) {
+  for (int32_t i = 0; i < pInfo->numOfNotFillExpr; ++i) {
     SFillColInfo* pCol = &pInfo->pFillInfo->pFillCol[i + pInfo->numOfExpr];
     ASSERT(pCol->notFillCol);
 
     SExprInfo* pExpr = pCol->pExpr;
-    int32_t srcSlotId = pExpr->base.pParam[0].pCol->slotId;
-    int32_t dstSlotId = pExpr->base.resSchema.slotId;
+    int32_t    srcSlotId = pExpr->base.pParam[0].pCol->slotId;
+    int32_t    dstSlotId = pExpr->base.resSchema.slotId;
 
     SColumnInfoData* pDst1 = taosArrayGet(pInfo->pRes->pDataBlock, dstSlotId);
     SColumnInfoData* pSrc1 = taosArrayGet(pBlock->pDataBlock, srcSlotId);
@@ -3664,7 +3664,7 @@ void destroyExchangeOperatorInfo(void* param, int32_t numOfOutput) {
   taosRemoveRef(exchangeObjRefPool, pExInfo->self);
 }
 
-void freeSourceDataInfo(void *p) {
+void freeSourceDataInfo(void* p) {
   SSourceDataInfo* pInfo = (SSourceDataInfo*)p;
   taosMemoryFreeClear(pInfo->pRsp);
 }
@@ -3694,8 +3694,8 @@ static int32_t initFillInfo(SFillOperatorInfo* pInfo, SExprInfo* pExpr, int32_t
   STimeWindow w = getAlignQueryTimeWindow(pInterval, pInterval->precision, win.skey);
   w = getFirstQualifiedTimeWindow(win.skey, &w, pInterval, TSDB_ORDER_ASC);
 
-  pInfo->pFillInfo =
-      taosCreateFillInfo(w.skey, numOfCols, numOfNotFillCols, capacity, pInterval, fillType, pColInfo, pInfo->primaryTsCol, order, id);
+  pInfo->pFillInfo = taosCreateFillInfo(w.skey, numOfCols, numOfNotFillCols, capacity, pInterval, fillType, pColInfo,
+                                        pInfo->primaryTsCol, order, id);
 
   pInfo->win = win;
   pInfo->p = taosMemoryCalloc(numOfCols, POINTER_BYTES);
@@ -3721,10 +3721,10 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode*
   SExprInfo*   pExprInfo = createExprInfo(pPhyFillNode->pFillExprs, NULL, &pInfo->numOfExpr);
   pInfo->pNotFillExprInfo = createExprInfo(pPhyFillNode->pNotFillExprs, NULL, &pInfo->numOfNotFillExpr);
 
-  SInterval*   pInterval =
+  SInterval* pInterval =
       QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL == downstream->operatorType
-            ? &((SMergeAlignedIntervalAggOperatorInfo*)downstream->info)->intervalAggOperatorInfo->interval
-            : &((SIntervalAggOperatorInfo*)downstream->info)->interval;
+          ? &((SMergeAlignedIntervalAggOperatorInfo*)downstream->info)->intervalAggOperatorInfo->interval
+          : &((SIntervalAggOperatorInfo*)downstream->info)->interval;
 
   int32_t order = (pPhyFillNode->inputTsOrder == ORDER_ASC) ? TSDB_ORDER_ASC : TSDB_ORDER_DESC;
   int32_t type = convertFillType(pPhyFillNode->mode);
@@ -3741,9 +3741,9 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode*
   SArray* pColMatchColInfo = extractColMatchInfo(pPhyFillNode->pFillExprs, pPhyFillNode->node.pOutputDataBlockDesc,
                                                  &numOfOutputCols, COL_MATCH_FROM_SLOT_ID);
 
-  int32_t code =
-      initFillInfo(pInfo, pExprInfo, pInfo->numOfExpr, pInfo->pNotFillExprInfo, pInfo->numOfNotFillExpr, (SNodeListNode*)pPhyFillNode->pValues,
-                   pPhyFillNode->timeRange, pResultInfo->capacity, pTaskInfo->id.str, pInterval, type, order);
+  int32_t code = initFillInfo(pInfo, pExprInfo, pInfo->numOfExpr, pInfo->pNotFillExprInfo, pInfo->numOfNotFillExpr,
+                              (SNodeListNode*)pPhyFillNode->pValues, pPhyFillNode->timeRange, pResultInfo->capacity,
+                              pTaskInfo->id.str, pInterval, type, order);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
   }
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index aca0078592..d116533fe5 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1649,6 +1649,8 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys
     }
     taosArrayDestroy(tableIdList);
     memcpy(&pTaskInfo->streamInfo.tableCond, &pTSInfo->cond, sizeof(SQueryTableDataCond));
+  } else {
+    taosArrayDestroy(pColIds);
   }
 
   // create the pseduo columns info
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 757ab09d1a..02be01cdb8 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1706,14 +1706,19 @@ void destroyStreamFinalIntervalOperatorInfo(void* param, int32_t numOfOutput) {
   blockDataDestroy(pInfo->pPullDataRes);
   taosArrayDestroy(pInfo->pRecycledPages);
   blockDataDestroy(pInfo->pUpdateRes);
+  taosArrayDestroy(pInfo->pDelWins);
+  blockDataDestroy(pInfo->pDelRes);
 
   if (pInfo->pChildren) {
     int32_t size = taosArrayGetSize(pInfo->pChildren);
     for (int32_t i = 0; i < size; i++) {
       SOperatorInfo* pChildOp = taosArrayGetP(pInfo->pChildren, i);
       destroyStreamFinalIntervalOperatorInfo(pChildOp->info, numOfOutput);
+      taosMemoryFree(pChildOp->pDownstream);
+      cleanupExprSupp(&pChildOp->exprSupp);
       taosMemoryFreeClear(pChildOp);
     }
+    taosArrayDestroy(pInfo->pChildren);
   }
   nodesDestroyNode((SNode*)pInfo->pPhyNode);
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
@@ -2644,7 +2649,6 @@ void destroyTimeSliceOperatorInfo(void* param, int32_t numOfOutput) {
   taosMemoryFreeClear(param);
 }
 
-
 SOperatorInfo* createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo) {
   STimeSliceOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(STimeSliceOperatorInfo));
   SOperatorInfo*          pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index d588d90543..4009a47c65 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -152,11 +152,12 @@ int32_t tDecodeSStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
 }
 
 void tFreeSStreamTask(SStreamTask* pTask) {
+  qDebug("free stream task %d", pTask->taskId);
   if (pTask->inputQueue) streamQueueClose(pTask->inputQueue);
   if (pTask->outputQueue) streamQueueClose(pTask->outputQueue);
   if (pTask->exec.qmsg) taosMemoryFree(pTask->exec.qmsg);
   if (pTask->exec.executor) qDestroyTask(pTask->exec.executor);
-  taosArrayDestroy(pTask->childEpInfo);
+  taosArrayDestroyP(pTask->childEpInfo, taosMemoryFree);
   if (pTask->outputType == TASK_OUTPUT__TABLE) {
     tDeleteSSchemaWrapper(pTask->tbSink.pSchemaWrapper);
     taosMemoryFree(pTask->tbSink.pTSchema);

From 98fc185e9255fa40e65633abe17ba0ef6de1795d Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Thu, 18 Aug 2022 18:53:23 +0800
Subject: [PATCH 77/98] fix: escape character problem in auto create table
 insert

---
 include/libs/nodes/nodes.h                    |   6 +-
 include/util/tdef.h                           |   6 +-
 source/common/src/systable.c                  |   2 +-
 source/libs/executor/inc/executorimpl.h       |   4 +-
 source/libs/executor/src/timewindowoperator.c |   3 +-
 source/libs/nodes/src/nodesToSQLFuncs.c       | 122 ++++++++++++------
 source/libs/parser/src/parInsert.c            |   4 +-
 7 files changed, 98 insertions(+), 49 deletions(-)

diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h
index bb75efa00a..5743d33608 100644
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -105,7 +105,7 @@ typedef enum ENodeType {
   QUERY_NODE_COLUMN_REF,
 
   // Statement nodes are used in parser and planner module.
-  QUERY_NODE_SET_OPERATOR,
+  QUERY_NODE_SET_OPERATOR = 100,
   QUERY_NODE_SELECT_STMT,
   QUERY_NODE_VNODE_MODIF_STMT,
   QUERY_NODE_CREATE_DATABASE_STMT,
@@ -198,7 +198,7 @@ typedef enum ENodeType {
   QUERY_NODE_QUERY,
 
   // logic plan node
-  QUERY_NODE_LOGIC_PLAN_SCAN,
+  QUERY_NODE_LOGIC_PLAN_SCAN = 1000,
   QUERY_NODE_LOGIC_PLAN_JOIN,
   QUERY_NODE_LOGIC_PLAN_AGG,
   QUERY_NODE_LOGIC_PLAN_PROJECT,
@@ -215,7 +215,7 @@ typedef enum ENodeType {
   QUERY_NODE_LOGIC_PLAN,
 
   // physical plan node
-  QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN,
+  QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN = 1100,
   QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN,
diff --git a/include/util/tdef.h b/include/util/tdef.h
index a3deb73fd4..e40d382aea 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -133,7 +133,6 @@ typedef enum EOperatorType {
   OP_TYPE_REM,
   // unary arithmetic operator
   OP_TYPE_MINUS,
-  OP_TYPE_ASSIGN,
 
   // bitwise operator
   OP_TYPE_BIT_AND,
@@ -164,7 +163,10 @@ typedef enum EOperatorType {
 
   // json operator
   OP_TYPE_JSON_GET_VALUE,
-  OP_TYPE_JSON_CONTAINS
+  OP_TYPE_JSON_CONTAINS,
+
+  // internal operator
+  OP_TYPE_ASSIGN
 } EOperatorType;
 
 #define OP_TYPE_CALC_MAX OP_TYPE_BIT_OR
diff --git a/source/common/src/systable.c b/source/common/src/systable.c
index 6dddcc2f74..65041e1f12 100644
--- a/source/common/src/systable.c
+++ b/source/common/src/systable.c
@@ -88,7 +88,7 @@ static const SSysDbTableSchema userDBSchema[] = {
     {.name = "comp", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT},
     {.name = "precision", .bytes = 2 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
     {.name = "status", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
-    {.name = "retention", .bytes = 60 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "retentions", .bytes = 60 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
     {.name = "single_stable", .bytes = 1, .type = TSDB_DATA_TYPE_BOOL},
     {.name = "cachemodel", .bytes = TSDB_CACHE_MODEL_STR_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
     {.name = "cachesize", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 311d82c8a2..74810d4d07 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -205,7 +205,7 @@ typedef struct SExprSupp {
 } SExprSupp;
 
 typedef struct SOperatorInfo {
-  uint8_t                operatorType;
+  uint16_t               operatorType;
   bool                   blocking;  // block operator or not
   uint8_t                status;    // denote if current operator is completed
   char*                  name;      // name, for debug purpose
@@ -434,7 +434,7 @@ typedef struct SStreamAggSupporter {
 typedef struct SessionWindowSupporter {
   SStreamAggSupporter* pStreamAggSup;
   int64_t              gap;
-  uint8_t              parentType;
+  uint16_t             parentType;
   SAggSupporter*       pIntervalAggSup;
 } SessionWindowSupporter;
 
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 6418f5305c..6101501605 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1780,7 +1780,7 @@ void increaseTs(SqlFunctionCtx* pCtx) {
   }
 }
 
-void initIntervalDownStream(SOperatorInfo* downstream, uint8_t type, SAggSupporter* pSup) {
+void initIntervalDownStream(SOperatorInfo* downstream, uint16_t type, SAggSupporter* pSup) {
   if (downstream->operatorType != QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN) {
     // Todo(liuyao) support partition by column
     return;
@@ -2644,7 +2644,6 @@ void destroyTimeSliceOperatorInfo(void* param, int32_t numOfOutput) {
   taosMemoryFreeClear(param);
 }
 
-
 SOperatorInfo* createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo) {
   STimeSliceOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(STimeSliceOperatorInfo));
   SOperatorInfo*          pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
diff --git a/source/libs/nodes/src/nodesToSQLFuncs.c b/source/libs/nodes/src/nodesToSQLFuncs.c
index 3b129740e8..ba0232fb1a 100644
--- a/source/libs/nodes/src/nodesToSQLFuncs.c
+++ b/source/libs/nodes/src/nodesToSQLFuncs.c
@@ -21,36 +21,89 @@
 #include "taoserror.h"
 #include "thash.h"
 
-char *gOperatorStr[] = {NULL,
-                        "+",
-                        "-",
-                        "*",
-                        "/",
-                        "%",
-                        "-",
-                        "&",
-                        "|",
-                        ">",
-                        ">=",
-                        "<",
-                        "<=",
-                        "=",
-                        "<>",
-                        "IN",
-                        "NOT IN",
-                        "LIKE",
-                        "NOT LIKE",
-                        "MATCH",
-                        "NMATCH",
-                        "IS NULL",
-                        "IS NOT NULL",
-                        "IS TRUE",
-                        "IS FALSE",
-                        "IS UNKNOWN",
-                        "IS NOT TRUE",
-                        "IS NOT FALSE",
-                        "IS NOT UNKNOWN"};
-char *gLogicConditionStr[] = {"AND", "OR", "NOT"};
+static const char *operatorTypeStr(EOperatorType type) {
+  switch (type) {
+    case OP_TYPE_ADD:
+      return "+";
+    case OP_TYPE_SUB:
+      return "-";
+    case OP_TYPE_MULTI:
+      return "*";
+    case OP_TYPE_DIV:
+      return "/";
+    case OP_TYPE_REM:
+      return "%";
+    case OP_TYPE_MINUS:
+      return "-";
+    case OP_TYPE_BIT_AND:
+      return "&";
+    case OP_TYPE_BIT_OR:
+      return "|";
+    case OP_TYPE_GREATER_THAN:
+      return ">";
+    case OP_TYPE_GREATER_EQUAL:
+      return ">=";
+    case OP_TYPE_LOWER_THAN:
+      return "<";
+    case OP_TYPE_LOWER_EQUAL:
+      return "<=";
+    case OP_TYPE_EQUAL:
+      return "=";
+    case OP_TYPE_NOT_EQUAL:
+      return "<>";
+    case OP_TYPE_IN:
+      return "IN";
+    case OP_TYPE_NOT_IN:
+      return "NOT IN";
+    case OP_TYPE_LIKE:
+      return "LIKE";
+    case OP_TYPE_NOT_LIKE:
+      return "NOT LIKE";
+    case OP_TYPE_MATCH:
+      return "MATCH";
+    case OP_TYPE_NMATCH:
+      return "NMATCH";
+    case OP_TYPE_IS_NULL:
+      return "IS NULL";
+    case OP_TYPE_IS_NOT_NULL:
+      return "IS NOT NULL";
+    case OP_TYPE_IS_TRUE:
+      return "IS TRUE";
+    case OP_TYPE_IS_FALSE:
+      return "IS FALSE";
+    case OP_TYPE_IS_UNKNOWN:
+      return "IS UNKNOWN";
+    case OP_TYPE_IS_NOT_TRUE:
+      return "IS NOT TRUE";
+    case OP_TYPE_IS_NOT_FALSE:
+      return "IS NOT FALSE";
+    case OP_TYPE_IS_NOT_UNKNOWN:
+      return "IS NOT UNKNOWN";
+    case OP_TYPE_JSON_GET_VALUE:
+      return "=>";
+    case OP_TYPE_JSON_CONTAINS:
+      return "CONTAINS";
+    case OP_TYPE_ASSIGN:
+      return "=";
+    default:
+      break;
+  }
+  return "UNKNOWN";
+}
+
+static const char *logicConditionTypeStr(ELogicConditionType type) {
+  switch (type) {
+    case LOGIC_COND_TYPE_AND:
+      return "AND";
+    case LOGIC_COND_TYPE_OR:
+      return "OR";
+    case LOGIC_COND_TYPE_NOT:
+      return "NOT";
+    default:
+      break;
+  }
+  return "UNKNOWN";
+}
 
 int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
   switch (pNode->type) {
@@ -94,12 +147,7 @@ int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
         NODES_ERR_RET(nodesNodeToSQL(pOpNode->pLeft, buf, bufSize, len));
       }
 
-      if (pOpNode->opType >= (sizeof(gOperatorStr) / sizeof(gOperatorStr[0]))) {
-        nodesError("unknown operation type:%d", pOpNode->opType);
-        NODES_ERR_RET(TSDB_CODE_QRY_APP_ERROR);
-      }
-
-      *len += snprintf(buf + *len, bufSize - *len, " %s ", gOperatorStr[pOpNode->opType]);
+      *len += snprintf(buf + *len, bufSize - *len, " %s ", operatorTypeStr(pOpNode->opType));
 
       if (pOpNode->pRight) {
         NODES_ERR_RET(nodesNodeToSQL(pOpNode->pRight, buf, bufSize, len));
@@ -118,7 +166,7 @@ int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
 
       FOREACH(node, pLogicNode->pParameterList) {
         if (!first) {
-          *len += snprintf(buf + *len, bufSize - *len, " %s ", gLogicConditionStr[pLogicNode->condType]);
+          *len += snprintf(buf + *len, bufSize - *len, " %s ", logicConditionTypeStr(pLogicNode->condType));
         }
         NODES_ERR_RET(nodesNodeToSQL(node, buf, bufSize, len));
         first = false;
diff --git a/source/libs/parser/src/parInsert.c b/source/libs/parser/src/parInsert.c
index 31ae35e717..0922cdb6b9 100644
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
@@ -143,9 +143,9 @@ static int32_t createSName(SName* pName, SToken* pTableName, int32_t acctId, con
     }
     char name[TSDB_DB_FNAME_LEN] = {0};
     strncpy(name, pTableName->z, dbLen);
-    dbLen = strdequote(name);
+    int32_t actualDbLen = strdequote(name);
 
-    code = tNameSetDbName(pName, acctId, name, dbLen);
+    code = tNameSetDbName(pName, acctId, name, actualDbLen);
     if (code != TSDB_CODE_SUCCESS) {
       return buildInvalidOperationMsg(pMsgBuf, msg1);
     }

From 4344ba56f51c1c177ce7c6c6d9ed736620ddce7d Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 18 Aug 2022 19:04:26 +0800
Subject: [PATCH 78/98] add test cases

---
 tests/system-test/2-query/interp.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index 9348a8ca8f..57f2d3b1b1 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -551,6 +551,34 @@ class TDTestCase:
         tdSql.checkData(0, 0, 15)
         tdSql.checkData(1, 0, 15)
 
+        tdLog.printNoPrefix("==========step9:test error cases")
+
+        tdSql.query(f"select interp(c0) from tb where ts >= '2020-02-10 00:00:05' and ts <= '2020-02-15 00:00:05' range('2022-02-05 00:05:00', '2022-02-06 00:05:00') every(1d) fill(null)");
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, None)
+
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname}")
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05')")
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d)")
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') fill(null)")
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname} every(1s) fill(null)")
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname} where ts >= '2020-02-10 00:00:05' and ts <= '2020-02-15 00:00:05' every(1s) fill(null)")
+
+        # input can only be numerical types
+        tdSql.error(f"select interp(ts) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp(c6) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp(c7) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp(c8) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+
+        # input can only be columns
+        tdSql.error(f"select interp(1) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp(1.5) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp(true) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp(false) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp('abcd') from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+        tdSql.error(f"select interp('中文字符') from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
+
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")

From 5a79aa1978b2633f84c86fc3101722b2e7f6745b Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Thu, 18 Aug 2022 18:48:17 +0800
Subject: [PATCH 79/98] fix(sma): memory leak

---
 source/dnode/mnode/impl/src/mndSma.c    | 4 +++-
 source/dnode/mnode/impl/src/mndVgroup.c | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndSma.c b/source/dnode/mnode/impl/src/mndSma.c
index 6db9b59c69..2fb934aaad 100644
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
@@ -530,7 +530,7 @@ static int32_t mndCreateSma(SMnode *pMnode, SRpcMsg *pReq, SMCreateSmaReq *pCrea
   streamObj.sourceDbUid = pDb->uid;
   streamObj.targetDbUid = pDb->uid;
   streamObj.version = 1;
-  streamObj.sql = pCreate->sql;
+  streamObj.sql = strdup(pCreate->sql);
   streamObj.smaId = smaObj.uid;
   streamObj.watermark = pCreate->watermark;
   streamObj.trigger = STREAM_TRIGGER_WINDOW_CLOSE;
@@ -585,6 +585,7 @@ static int32_t mndCreateSma(SMnode *pMnode, SRpcMsg *pReq, SMCreateSmaReq *pCrea
     return -1;
   }
   if (pAst != NULL) nodesDestroyNode(pAst);
+  nodesDestroyNode((SNode *)pPlan);
 
   int32_t code = -1;
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_DB, pReq);
@@ -609,6 +610,7 @@ static int32_t mndCreateSma(SMnode *pMnode, SRpcMsg *pReq, SMCreateSmaReq *pCrea
   code = 0;
 
 _OVER:
+  tFreeStreamObj(&streamObj);
   mndDestroySmaObj(&smaObj);
   mndTransDrop(pTrans);
   return code;
diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c
index 0567ec4e14..09eed7fb32 100644
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
@@ -509,6 +509,7 @@ int32_t mndAllocSmaVgroup(SMnode *pMnode, SDbObj *pDb, SVgObj *pVgroup) {
   pVgroup->replica = 1;
 
   if (mndGetAvailableDnode(pMnode, pDb, pVgroup, pArray) != 0) return -1;
+  taosArrayDestroy(pArray);
 
   mInfo("db:%s, sma vgId:%d is alloced", pDb->name, pVgroup->vgId);
   return 0;
@@ -1862,4 +1863,4 @@ _OVER:
 #endif
 }
 
-bool mndVgroupInDb(SVgObj *pVgroup, int64_t dbUid) { return !pVgroup->isTsma && pVgroup->dbUid == dbUid; }
\ No newline at end of file
+bool mndVgroupInDb(SVgObj *pVgroup, int64_t dbUid) { return !pVgroup->isTsma && pVgroup->dbUid == dbUid; }

From 31872611bdab9641e6f8d6e397d449f3484be1c5 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 18 Aug 2022 19:32:14 +0800
Subject: [PATCH 80/98] fix test case

---
 .../tsim/alter/cached_schema_after_alter.sim  | 36 +++++++++----------
 tests/script/tsim/alter/dnode.sim             |  4 +--
 tests/script/tsim/alter/table.sim             |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/script/tsim/alter/cached_schema_after_alter.sim b/tests/script/tsim/alter/cached_schema_after_alter.sim
index bd2b1d272c..30b879b612 100644
--- a/tests/script/tsim/alter/cached_schema_after_alter.sim
+++ b/tests/script/tsim/alter/cached_schema_after_alter.sim
@@ -14,7 +14,7 @@ print ========== cached_schema_after_alter.sim
 
 sql drop database $db -x step1
 step1:
-sql create database $db 
+sql create database $db
 print ====== create tables
 sql use $db
 
@@ -32,10 +32,10 @@ if $rows != 1 then
 endi
 if $data01 != 1 then
   return -1
-endi 
+endi
 if $data02 != 1 then
   return -1
-endi 
+endi
 
 sql select * from $tb2
 if $rows != 1 then
@@ -43,10 +43,10 @@ if $rows != 1 then
 endi
 if $data01 != 1 then
   return -1
-endi 
+endi
 if $data02 != 1 then
   return -1
-endi 
+endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -61,10 +61,10 @@ if $rows != 1 then
 endi
 if $data01 != 1 then
   return -1
-endi 
+endi
 if $data02 != 1 then
   return -1
-endi 
+endi
 
 sql select * from $tb2
 print select * from $tb2 ==> $data00 $data01 $data02
@@ -73,10 +73,10 @@ if $rows != 1 then
 endi
 if $data01 != 1 then
   return -1
-endi 
+endi
 if $data02 != 1 then
   return -1
-endi 
+endi
 
 $ts = $ts0 + $delta
 sql insert into $tb2 values ( $ts , 2, 2)
@@ -86,16 +86,16 @@ if $rows != 2 then
 endi
 if $data01 != 1 then
   return -1
-endi 
+endi
 if $data02 != 1 then
   return -1
-endi 
+endi
 if $data11 != 2 then
   return -1
-endi 
+endi
 if $data12 != 2 then
   return -1
-endi 
+endi
 
 sql select * from $tb2 order by ts asc
 if $rows != 2 then
@@ -103,15 +103,15 @@ if $rows != 2 then
 endi
 if $data01 != 1 then
   return -1
-endi 
+endi
 if $data02 != 1 then
   return -1
-endi 
+endi
 if $data11 != 2 then
   return -1
-endi 
+endi
 if $data12 != 2 then
   return -1
-endi 
+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
diff --git a/tests/script/tsim/alter/dnode.sim b/tests/script/tsim/alter/dnode.sim
index d773c1f8a9..be3c385d45 100644
--- a/tests/script/tsim/alter/dnode.sim
+++ b/tests/script/tsim/alter/dnode.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql alter dnode 1 'resetlog'
 sql alter dnode 1 'monitor' '1'
 sql alter dnode 1 'monitor' '0'
@@ -65,4 +65,4 @@ sql alter dnode 1 balance "vnode:2-dnode:1" -x step4
 step4:
 
 print ======= over
-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
diff --git a/tests/script/tsim/alter/table.sim b/tests/script/tsim/alter/table.sim
index 48ab7ddab0..dccfc7f5d6 100644
--- a/tests/script/tsim/alter/table.sim
+++ b/tests/script/tsim/alter/table.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d1
 sql use d1
 sql create table tb (ts timestamp, a int)

From 234b89767d3b4136fa23db5ec93bfc437bce5f7c Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 18 Aug 2022 19:32:14 +0800
Subject: [PATCH 81/98] fix test case

---
 tests/script/tsim/bnode/basic1.sim          | 46 +++++++-------
 tests/script/tsim/compress/commitlog.sim    | 20 +++---
 tests/script/tsim/compress/compress.sim     | 20 +++---
 tests/script/tsim/compress/compress2.sim    | 20 +++---
 tests/script/tsim/compress/uncompress.sim   | 20 +++---
 tests/script/tsim/db/alter_option.sim       | 34 +++++-----
 tests/script/tsim/db/alter_replica_13.sim   | 10 +--
 tests/script/tsim/db/alter_replica_31.sim   | 10 +--
 tests/script/tsim/db/back_insert.sim        | 10 +--
 tests/script/tsim/db/basic1.sim             | 24 +++----
 tests/script/tsim/db/basic2.sim             |  8 +--
 tests/script/tsim/db/basic3.sim             |  8 +--
 tests/script/tsim/db/basic4.sim             | 54 ++++++++--------
 tests/script/tsim/db/basic5.sim             |  8 +--
 tests/script/tsim/db/basic6.sim             | 70 ++++++++++-----------
 tests/script/tsim/db/commit.sim             |  8 +--
 tests/script/tsim/db/delete_reuse1.sim      | 20 +++---
 tests/script/tsim/db/delete_reuse2.sim      | 26 ++++----
 tests/script/tsim/db/delete_reusevnode.sim  | 10 +--
 tests/script/tsim/db/delete_reusevnode2.sim |  2 +-
 tests/script/tsim/db/delete_writing1.sim    | 12 ++--
 tests/script/tsim/db/delete_writing2.sim    | 16 ++---
 tests/script/tsim/db/dropdnodes.sim         | 16 ++---
 tests/script/tsim/db/keep.sim               | 16 ++---
 tests/script/tsim/db/len.sim                | 24 +++----
 tests/script/tsim/db/repeat.sim             |  2 +-
 tests/script/tsim/db/show_create_db.sim     |  8 +--
 tests/script/tsim/db/show_create_table.sim  | 24 +++----
 tests/script/tsim/db/tables.sim             |  4 +-
 29 files changed, 275 insertions(+), 275 deletions(-)

diff --git a/tests/script/tsim/bnode/basic1.sim b/tests/script/tsim/bnode/basic1.sim
index 003d0ceb3d..0a20001636 100644
--- a/tests/script/tsim/bnode/basic1.sim
+++ b/tests/script/tsim/bnode/basic1.sim
@@ -7,24 +7,24 @@ sql connect
 
 print =============== select * from information_schema.ins_dnodes
 sql select * from information_schema.ins_dnodes;
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
 
 sql select * from information_schema.ins_mnodes;
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
 
-if $data02 != leader then 
+if $data02 != leader then
   return -1
 endi
 
@@ -33,62 +33,62 @@ sql create dnode $hostname port 7200
 sleep 2000
 
 sql select * from information_schema.ins_dnodes;
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
 
-if $data10 != 2 then 
+if $data10 != 2 then
   return -1
 endi
 
 print $data02
-if $data02 != 0 then 
+if $data02 != 0 then
   return -1
 endi
 
-if $data12 != 0 then 
+if $data12 != 0 then
   return -1
 endi
 
-if $data04 != ready then 
+if $data04 != ready then
   return -1
 endi
 
-if $data14 != ready then 
+if $data14 != ready then
   return -1
 endi
 
 sql select * from information_schema.ins_mnodes;
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
 
-if $data02 != leader then 
+if $data02 != leader then
   return -1
 endi
 
 #print =============== create drop bnode 1
 #sql create bnode on dnode 1
 #sql show bnodes
-#if $rows != 1 then 
+#if $rows != 1 then
 #  return -1
 #endi
-#if $data00 != 1 then 
+#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 
+#if $rows != 0 then
 #  return -1
 #endi
 #sql_error drop bnode on dnode 1
@@ -96,17 +96,17 @@ endi
 #print =============== create drop bnode 2
 #sql create bnode on dnode 2
 #sql show bnodes
-#if $rows != 1 then 
+#if $rows != 1 then
 #  return -1
 #endi
-#if $data00 != 2 then 
+#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 
+#if $rows != 0 then
 #  return -1
 #endi
 #sql_error drop bnode on dnode 2
@@ -115,7 +115,7 @@ endi
 #sql create bnode on dnode 1
 #sql create bnode on dnode 2
 #sql show bnodes
-#if $rows != 2 then 
+#if $rows != 2 then
 #  return -1
 #endi
 
@@ -127,7 +127,7 @@ endi
 #
 #sleep 2000
 #sql show bnodes
-#if $rows != 2 then 
+#if $rows != 2 then
 #  return -1
 #endi
 
diff --git a/tests/script/tsim/compress/commitlog.sim b/tests/script/tsim/compress/commitlog.sim
index bc9c231a9e..38899b95ba 100644
--- a/tests/script/tsim/compress/commitlog.sim
+++ b/tests/script/tsim/compress/commitlog.sim
@@ -25,7 +25,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -46,7 +46,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -67,7 +67,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -83,7 +83,7 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -93,18 +93,18 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
- 
+
 $i = 2
 $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
-endi  
- 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/compress/compress.sim b/tests/script/tsim/compress/compress.sim
index 766f97450c..4752f1ba50 100644
--- a/tests/script/tsim/compress/compress.sim
+++ b/tests/script/tsim/compress/compress.sim
@@ -25,7 +25,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -47,7 +47,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -69,7 +69,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -85,7 +85,7 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -95,18 +95,18 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
- 
+
 $i = 2
 $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
-endi  
- 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/compress/compress2.sim b/tests/script/tsim/compress/compress2.sim
index 87e50cce5b..c55b74f246 100644
--- a/tests/script/tsim/compress/compress2.sim
+++ b/tests/script/tsim/compress/compress2.sim
@@ -26,7 +26,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -48,7 +48,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -70,7 +70,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -86,7 +86,7 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -96,18 +96,18 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
- 
+
 $i = 2
 $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
-endi  
- 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/compress/uncompress.sim b/tests/script/tsim/compress/uncompress.sim
index ccd5db4b0c..f48fc6da23 100644
--- a/tests/script/tsim/compress/uncompress.sim
+++ b/tests/script/tsim/compress/uncompress.sim
@@ -26,7 +26,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -48,7 +48,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -70,7 +70,7 @@ while $count < $N
 endw
 
 sql select * from $tb
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -85,7 +85,7 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -95,18 +95,18 @@ $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
- 
+
 $i = 2
 $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 sql use $db
 sql select * from $tb
 print select * from $tb ==> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
-endi  
- 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim
index d81671eebd..3d260235f2 100644
--- a/tests/script/tsim/db/alter_option.sim
+++ b/tests/script/tsim/db/alter_option.sim
@@ -186,13 +186,13 @@ sql_error alter database db replica 0
 #sql alter database db replica 1
 #sql select * from information_schema.ins_databases
 #print replica: $data4_db
-#if $data4_db != 1 then 
+#if $data4_db != 1 then
 #  return -1
 #endi
 #sql alter database db replica 3
 #sql select * from information_schema.ins_databases
 #print replica: $data4_db
-#if $data4_db != 3 then 
+#if $data4_db != 3 then
 #  return -1
 #endi
 
@@ -200,13 +200,13 @@ sql_error alter database db replica 0
 #sql alter database db quorum 2
 #sql select * from information_schema.ins_databases
 #print quorum $data5_db
-#if $data5_db != 2 then 
+#if $data5_db != 2 then
 #  return -1
 #endi
 #sql alter database db quorum 1
 #sql select * from information_schema.ins_databases
 #print quorum $data5_db
-#if $data5_db != 1 then 
+#if $data5_db != 1 then
 #  return -1
 #endi
 
@@ -233,7 +233,7 @@ endi
 #sql alter database db keep 1000,2000
 #sql select * from information_schema.ins_databases
 #print keep $data7_db
-#if $data7_db != 500,500,500 then 
+#if $data7_db != 500,500,500 then
 #  return -1
 #endi
 
@@ -263,13 +263,13 @@ sql_error alter database db keep -1
 #sql alter database db blocks 3
 #sql select * from information_schema.ins_databases
 #print blocks $data9_db
-#if $data9_db != 3 then 
+#if $data9_db != 3 then
 #  return -1
 #endi
 #sql alter database db blocks 11
 #sql select * from information_schema.ins_databases
 #print blocks $data9_db
-#if $data9_db != 11 then 
+#if $data9_db != 11 then
 #  return -1
 #endi
 
@@ -300,13 +300,13 @@ print ============== step wal_level
 sql alter database db wal_level 1
 sql select * from information_schema.ins_databases
 print wal_level $data20_db
-if $data20_db != 1 then 
+if $data20_db != 1 then
   return -1
 endi
 sql alter database db wal_level 2
 sql select * from information_schema.ins_databases
 print wal_level $data20_db
-if $data20_db != 2 then 
+if $data20_db != 2 then
   return -1
 endi
 
@@ -319,19 +319,19 @@ print ============== modify wal_fsync_period
 sql alter database db wal_fsync_period 2000
 sql select * from information_schema.ins_databases
 print wal_fsync_period $data21_db
-if $data21_db != 2000 then 
+if $data21_db != 2000 then
   return -1
 endi
 sql alter database db wal_fsync_period 500
 sql select * from information_schema.ins_databases
 print wal_fsync_period $data21_db
-if $data21_db != 500 then 
+if $data21_db != 500 then
   return -1
 endi
 sql alter database db wal_fsync_period 0
 sql select * from information_schema.ins_databases
 print wal_fsync_period $data21_db
-if $data21_db != 0 then 
+if $data21_db != 0 then
   return -1
 endi
 sql_error alter database db wal_fsync_period 180001
@@ -351,31 +351,31 @@ print ============== modify cachelast [0, 1, 2, 3]
 sql alter database db cachemodel 'last_value'
 sql select * from information_schema.ins_databases
 print cachelast $data18_db
-if $data18_db != last_value then 
+if $data18_db != last_value then
   return -1
 endi
 sql alter database db cachemodel 'last_row'
 sql select * from information_schema.ins_databases
 print cachelast $data18_db
-if $data18_db != last_row then 
+if $data18_db != last_row then
   return -1
 endi
 sql alter database db cachemodel 'none'
 sql select * from information_schema.ins_databases
 print cachelast $data18_db
-if $data18_db != none then 
+if $data18_db != none then
   return -1
 endi
 sql alter database db cachemodel 'last_value'
 sql select * from information_schema.ins_databases
 print cachelast $data18_db
-if $data18_db != last_value then 
+if $data18_db != last_value then
   return -1
 endi
 sql alter database db cachemodel 'both'
 sql select * from information_schema.ins_databases
 print cachelast $data18_db
-if $data18_db != both then 
+if $data18_db != both then
   return -1
 endi
 
diff --git a/tests/script/tsim/db/alter_replica_13.sim b/tests/script/tsim/db/alter_replica_13.sim
index d232c9bcd3..1d06d3abb9 100644
--- a/tests/script/tsim/db/alter_replica_13.sim
+++ b/tests/script/tsim/db/alter_replica_13.sim
@@ -36,10 +36,10 @@ endi
 print =============== step2: create database
 sql create database db vgroups 1
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
-if $data(db)[4] != 1 then 
+if $data(db)[4] != 1 then
   return -1
 endi
 
@@ -82,7 +82,7 @@ step3:
 		return -1
 	endi
 sql select * from information_schema.ins_dnodes
-print ===> rows: $rows 
+print ===> rows: $rows
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
 print ===> $data20 $data21 $data22 $data23 $data24 $data25
@@ -115,7 +115,7 @@ step4:
 		return -1
 	endi
 sql show db.vgroups
-print ===> rows: $rows 
+print ===> rows: $rows
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 if $data[0][4] != leader then
   goto step4
@@ -137,4 +137,4 @@ endi
 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 dnode3 -s stop -x SIGINT
-system sh/exec.sh -n dnode4 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
diff --git a/tests/script/tsim/db/alter_replica_31.sim b/tests/script/tsim/db/alter_replica_31.sim
index 17ab040520..4ab6783d07 100644
--- a/tests/script/tsim/db/alter_replica_31.sim
+++ b/tests/script/tsim/db/alter_replica_31.sim
@@ -23,7 +23,7 @@ step1:
 		return -1
 	endi
 sql select * from information_schema.ins_dnodes
-print ===> rows: $rows 
+print ===> rows: $rows
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
 print ===> $data20 $data21 $data22 $data23 $data24 $data25
@@ -47,10 +47,10 @@ endi
 print =============== step2: create database
 sql create database db vgroups 1 replica 3
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
-if $data(db)[4] != 3 then 
+if $data(db)[4] != 3 then
   return -1
 endi
 
@@ -139,7 +139,7 @@ step3:
 		return -1
 	endi
 sql show db.vgroups
-print ===> rows: $rows 
+print ===> rows: $rows
 if $rows != 1 then
   goto step3
 endi
@@ -165,4 +165,4 @@ endi
 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 dnode3 -s stop -x SIGINT
-system sh/exec.sh -n dnode4 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
diff --git a/tests/script/tsim/db/back_insert.sim b/tests/script/tsim/db/back_insert.sim
index e2bdb3a64b..b3f8207293 100644
--- a/tests/script/tsim/db/back_insert.sim
+++ b/tests/script/tsim/db/back_insert.sim
@@ -2,8 +2,8 @@ sql connect
 $x = 1
 begin:
   sql reset query cache
-  sleep 100 
-  sql insert into db.tb values(now, $x ) -x begin  
-  #print ===> insert successed $x 
-  $x = $x + 1   
-goto begin
\ No newline at end of file
+  sleep 100
+  sql insert into db.tb values(now, $x ) -x begin
+  #print ===> insert successed $x
+  $x = $x + 1
+goto begin
diff --git a/tests/script/tsim/db/basic1.sim b/tests/script/tsim/db/basic1.sim
index 679440590f..69eeb9347b 100644
--- a/tests/script/tsim/db/basic1.sim
+++ b/tests/script/tsim/db/basic1.sim
@@ -25,15 +25,15 @@ endi
 print =============== show vgroups1
 sql use d1
 sql show vgroups
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-if $data00 != 2 then 
+if $data00 != 2 then
   return -1
 endi
 
-if $data10 != 3 then 
+if $data10 != 3 then
   return -1
 endi
 
@@ -59,11 +59,11 @@ if $rows != 2 then
   return -1
 endi
 
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
-if $data10 != 5 then 
+if $data10 != 5 then
   return -1
 endi
 
@@ -73,15 +73,15 @@ if $rows != 3 then
   return -1
 endi
 
-if $data00 != 6 then 
+if $data00 != 6 then
   return -1
 endi
 
-if $data10 != 7 then 
+if $data10 != 7 then
   return -1
 endi
 
-if $data20 != 8 then 
+if $data20 != 8 then
   return -1
 endi
 
@@ -91,19 +91,19 @@ if $rows != 4 then
   return -1
 endi
 
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
 
-if $data10 != 10 then 
+if $data10 != 10 then
   return -1
 endi
 
-if $data20 != 11 then 
+if $data20 != 11 then
   return -1
 endi
 
-if $data30 != 12 then 
+if $data30 != 12 then
   return -1
 endi
 
diff --git a/tests/script/tsim/db/basic2.sim b/tests/script/tsim/db/basic2.sim
index 2ba7d806af..b7ac0b5edd 100644
--- a/tests/script/tsim/db/basic2.sim
+++ b/tests/script/tsim/db/basic2.sim
@@ -27,7 +27,7 @@ sql create table t3 (ts timestamp, i int);
 sql create table t4 (ts timestamp, i int);
 
 sql select * from information_schema.ins_databases
-print rows: $rows 
+print rows: $rows
 print $data00 $data01 $data02 $data03
 print $data10 $data11 $data12 $data13
 if $rows != 3 then
@@ -47,7 +47,7 @@ endi
 #endi
 
 sql show tables
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
@@ -64,8 +64,8 @@ if $rows != 4 then
 endi
 
 sql show tables
-if $rows != 3 then 
+if $rows != 3 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
diff --git a/tests/script/tsim/db/basic3.sim b/tests/script/tsim/db/basic3.sim
index 30faec0494..db355213db 100644
--- a/tests/script/tsim/db/basic3.sim
+++ b/tests/script/tsim/db/basic3.sim
@@ -23,12 +23,12 @@ if $data22 != 2 then
   return -1
 endi
 
-#if $data03 != 4 then 
+#if $data03 != 4 then
 #  return -1
 #endi
 
 sql show d1.tables
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
@@ -44,8 +44,8 @@ if $rows != 4 then
 endi
 
 sql show d2.tables
-if $rows != 3 then 
+if $rows != 3 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
diff --git a/tests/script/tsim/db/basic4.sim b/tests/script/tsim/db/basic4.sim
index f407c6352d..7a5e0ec764 100644
--- a/tests/script/tsim/db/basic4.sim
+++ b/tests/script/tsim/db/basic4.sim
@@ -11,109 +11,109 @@ sql create table d1.t3 (ts timestamp, i int);
 sql create table d1.t4 (ts timestamp, i int);
 
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
-if $data20 != d1 then 
+if $data20 != d1 then
   return -1
 endi
 
-if $data22 != 1 then 
+if $data22 != 1 then
   return -1
 endi
 
-if $data24 != 1 then 
+if $data24 != 1 then
   return -1
 endi
 
 sql show d1.tables
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
 sql show d1.vgroups
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 2 then 
+if $data00 != 2 then
   return -1
 endi
-if $data01 != d1 then 
+if $data01 != d1 then
   return -1
 endi
 
-print =============== drop table 
+print =============== drop table
 sql drop table d1.t1
 
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
-if $data20 != d1 then 
+if $data20 != d1 then
   return -1
 endi
 
-if $data22 != 1 then 
+if $data22 != 1 then
   return -1
 endi
 
-if $data24 != 1 then 
+if $data24 != 1 then
   return -1
 endi
 
 sql show d1.tables
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
 sql show d1.vgroups
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 2 then 
+if $data00 != 2 then
   return -1
 endi
-if $data01 != d1 then 
+if $data01 != d1 then
   return -1
 endi
-print =============== drop all table 
+print =============== drop all table
 sql drop table d1.t2
 sql drop table d1.t3
 sql drop table d1.t4
 
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
-if $data20 != d1 then 
+if $data20 != d1 then
   return -1
 endi
 
-if $data22 != 1 then 
+if $data22 != 1 then
   return -1
 endi
 
-if $data24 != 1 then 
+if $data24 != 1 then
   return -1
 endi
 
 sql show d1.tables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql show d1.vgroups
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 2 then 
+if $data00 != 2 then
   return -1
 endi
-if $data01 != d1 then 
+if $data01 != d1 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
diff --git a/tests/script/tsim/db/basic5.sim b/tests/script/tsim/db/basic5.sim
index 9b809c35f0..933fb8cf4b 100644
--- a/tests/script/tsim/db/basic5.sim
+++ b/tests/script/tsim/db/basic5.sim
@@ -13,13 +13,13 @@ sql create table tb1 using st1 tags(1);
 sql insert into tb1 values (now, 1);
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   print $rows
   return -1
 endi
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -35,12 +35,12 @@ sql use db1;
 sql create stable st1 (ts timestamp, f1 int) tags(t1 int)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql show tables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
diff --git a/tests/script/tsim/db/basic6.sim b/tests/script/tsim/db/basic6.sim
index 2377a65ac0..5043574787 100644
--- a/tests/script/tsim/db/basic6.sim
+++ b/tests/script/tsim/db/basic6.sim
@@ -14,7 +14,7 @@ $st = $stPrefix . $i
 $tb = $tbPrefix . $i
 
 print =============== step1
-# quorum  presicion 
+# quorum  presicion
 sql create database $db vgroups 8 replica 1 duration 2 keep 10 minrows 80 maxrows 10000 wal_level 2 wal_fsync_period 1000 comp 0 cachemodel 'last_value' precision 'us'
 sql select * from information_schema.ins_databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
@@ -46,7 +46,7 @@ endi
 #if $data29 != 12 then
 #  return -1
 #endi
- 
+
 print =============== step2
 sql_error create database $db
 sql create database if not exists $db
@@ -60,7 +60,7 @@ sql drop database $db
 sql select * from information_schema.ins_databases
 if $rows != 2 then
   return -1
-endi 
+endi
 
 print =============== step4
 sql_error drop database $db
@@ -102,22 +102,22 @@ while $i < 5
   sql create table $tb using $st tags(1)
 
   sql show stables
-  if $rows != 1 then 
+  if $rows != 1 then
     return -1
   endi
 
   print $data00 $data01 $data02 $data03
-  if $data00 != $st then 
+  if $data00 != $st then
     return -1
   endi
 
   sql show tables
-  if $rows != 1 then 
+  if $rows != 1 then
     return -1
   endi
 
   print $data00 $data01 $data02 $data03
-  if $data00 != $tb then 
+  if $data00 != $tb then
     return -1
   endi
 
@@ -127,8 +127,8 @@ endw
 print =============== step7
 $i = 0
 while $i < 5
-  $db = $dbPrefix . $i  
-  sql drop database $db 
+  $db = $dbPrefix . $i
+  sql drop database $db
   $i = $i + 1
 endw
 
@@ -143,20 +143,20 @@ sql create table $st (ts timestamp, i int) tags (j int)
 sql create table $tb using $st tags(1)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $st then 
+if $data00 != $st then
   return -1
 endi
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $tb then 
+if $data00 != $tb then
   return -1
 endi
 
@@ -168,12 +168,12 @@ sql create database $db
 sql use $db
 
 sql show stables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql show tables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -182,20 +182,20 @@ sql create table $st (ts timestamp, i int) tags (j int)
 sql create table $tb using $st tags(1)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $st then 
+if $data00 != $st then
   return -1
 endi
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $tb then 
+if $data00 != $tb then
   return -1
 endi
 
@@ -207,12 +207,12 @@ sql create database $db
 sql use $db
 
 sql show stables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql show tables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -221,20 +221,20 @@ sql create table $st (ts timestamp, i int) tags (j int)
 sql create table $tb using $st tags(1)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $st then 
+if $data00 != $st then
   return -1
 endi
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $tb then 
+if $data00 != $tb then
   return -1
 endi
 
@@ -245,12 +245,12 @@ sql insert into $tb values (now+4a, 3)
 sql insert into $tb values (now+5a, 4)
 
 sql select * from $tb
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 sql select * from $st
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
@@ -262,12 +262,12 @@ sql create database $db
 sql use $db
 
 sql show stables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql show tables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -276,20 +276,20 @@ sql create table $st (ts timestamp, i int) tags (j int)
 sql create table $tb using $st tags(1)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $st then 
+if $data00 != $st then
   return -1
 endi
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != $tb then 
+if $data00 != $tb then
   return -1
 endi
 
@@ -300,12 +300,12 @@ sql insert into $tb values (now+4a, 3)
 sql insert into $tb values (now+5a, 4)
 
 sql select * from $tb
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 sql select * from $st
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
diff --git a/tests/script/tsim/db/commit.sim b/tests/script/tsim/db/commit.sim
index 731f2aa256..2233245034 100644
--- a/tests/script/tsim/db/commit.sim
+++ b/tests/script/tsim/db/commit.sim
@@ -39,9 +39,9 @@ sql create table tb (ts timestamp, i int)
 $x = 1
 while $x < 41
   $time = $x . m
-  sql insert into tb values (now + $time , $x ) 
+  sql insert into tb values (now + $time , $x )
   $x = $x + 1
-endw 
+endw
 
 sql select * from tb order by ts desc
 print ===> rows $rows
@@ -71,7 +71,7 @@ if $data01 != 40 then
 	return -1
 endi
 
-$oldnum = $rows 
+$oldnum = $rows
 $num = $rows + 2
 
 print ======== step3 import old data
@@ -120,4 +120,4 @@ if $data01 != 40 then
 endi
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
diff --git a/tests/script/tsim/db/delete_reuse1.sim b/tests/script/tsim/db/delete_reuse1.sim
index 680fe6b2ed..9dcb3c6ac1 100644
--- a/tests/script/tsim/db/delete_reuse1.sim
+++ b/tests/script/tsim/db/delete_reuse1.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d1 replica 1 vgroups 1
 sql create database d2 replica 1 vgroups 1
 sql create database d3 replica 1 vgroups 1
@@ -47,7 +47,7 @@ step2:
 
 print ========= step3
 sql reset query cache
-sleep 50 
+sleep 50
 
 sql create database d1 replica 1
 sql create table d1.t1 (ts timestamp, i int)
@@ -65,20 +65,20 @@ while $x < 20
   sql insert into d1.t1 values(now, -1) -x step4
     return -1
   step4:
-  
+
   sql create database d1 replica 1
   sql reset query cache
-  sleep 50 
+  sleep 50
   sql create table d1.t1 (ts timestamp, i int)
   sql insert into d1.t1 values(now, $x )
   sql select * from d1.t1
   if $rows != 1 then
 	return -1
   endi
-  
-  $x = $x + 1
-  
-  print ===> loop times: $x
-endw 
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+  $x = $x + 1
+
+  print ===> loop times: $x
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/db/delete_reuse2.sim b/tests/script/tsim/db/delete_reuse2.sim
index d181b6b780..4480b60b1b 100644
--- a/tests/script/tsim/db/delete_reuse2.sim
+++ b/tests/script/tsim/db/delete_reuse2.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d1 replica 1
 sql create database d2 replica 1
 sql create database d3 replica 1
@@ -48,7 +48,7 @@ step2:
 print ========= step3
 sql create database db1 replica 1
 sql reset query cache
-sleep 50  
+sleep 50
 
 sql create table db1.tb1 (ts timestamp, i int)
 sql insert into db1.tb1 values(now, 2)
@@ -61,7 +61,7 @@ print ========= step4
 $x = 1
 while $x < 20
 
-  $db = db . $x 
+  $db = db . $x
   $tb = tb . $x
   sql use $db
   sql drop database $db
@@ -69,14 +69,14 @@ while $x < 20
   sql insert into $tb values(now, -1) -x step4
     return -1
   step4:
-  
-  $x = $x + 1  
-  $db = db . $x 
+
+  $x = $x + 1
+  $db = db . $x
   $tb = tb . $x
-  
+
   sql reset query cache
-  sleep 50  
-  
+  sleep 50
+
   sql create database $db replica 1
   sql use $db
   sql create table $tb (ts timestamp, i int)
@@ -85,8 +85,8 @@ while $x < 20
   if $rows != 1 then
 	return -1
   endi
-  
-  print ===> loop times: $x
-endw 
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+  print ===> loop times: $x
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/db/delete_reusevnode.sim b/tests/script/tsim/db/delete_reusevnode.sim
index d194f82d08..7af5c9d39d 100644
--- a/tests/script/tsim/db/delete_reusevnode.sim
+++ b/tests/script/tsim/db/delete_reusevnode.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 
 $tbPrefix = t
 $i = 0
@@ -21,13 +21,13 @@ while $i < 30
   print times $i
   $i = $i + 1
 
-endw 
+endw
 
 print ======== step2
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
-endi 
+endi
 
 system sh/stop_dnodes.sh
 
@@ -94,4 +94,4 @@ if $rows != 2 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
diff --git a/tests/script/tsim/db/delete_reusevnode2.sim b/tests/script/tsim/db/delete_reusevnode2.sim
index 754a6d695b..91473e5ee1 100644
--- a/tests/script/tsim/db/delete_reusevnode2.sim
+++ b/tests/script/tsim/db/delete_reusevnode2.sim
@@ -62,4 +62,4 @@ if $rows != 2 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
diff --git a/tests/script/tsim/db/delete_writing1.sim b/tests/script/tsim/db/delete_writing1.sim
index 279f8dece8..6fec09989d 100644
--- a/tests/script/tsim/db/delete_writing1.sim
+++ b/tests/script/tsim/db/delete_writing1.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql create database db 
+sql create database db
 sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
@@ -11,18 +11,18 @@ print ======== start back
 run_back tsim/db/back_insert.sim
 sleep 1000
 
-print ======== step1 
-$x = 1 	
+print ======== step1
+$x = 1
 while $x < 10
 
     print drop database times $x
 	sql drop database if exists db
-	sql create database db 
+	sql create database db
 	sql create table db.tb (ts timestamp, i int)
 
 	sleep 1000
-	
+
 	$x = $x + 1
 endw
 
-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
diff --git a/tests/script/tsim/db/delete_writing2.sim b/tests/script/tsim/db/delete_writing2.sim
index 8eab126ae8..ad156f30eb 100644
--- a/tests/script/tsim/db/delete_writing2.sim
+++ b/tests/script/tsim/db/delete_writing2.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql create database db 
+sql create database db
 sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
@@ -11,11 +11,11 @@ sql create database db2
 sql create table db2.tb2 (ts timestamp, i int)
 sql insert into db2.tb2 values(now, 1)
 
-sql create database db3 
+sql create database db3
 sql create table db3.tb3 (ts timestamp, i int)
 sql insert into db3.tb3 values(now, 1)
 
-sql create database db4 
+sql create database db4
 sql create table db4.tb4 (ts timestamp, i int)
 sql insert into db4.tb4 values(now, 1)
 
@@ -23,19 +23,19 @@ print ======== start back
 run_back tsim/db/back_insert.sim
 sleep 1000
 
-print ======== step1 
-$x = 1 	
+print ======== step1
+$x = 1
 while $x < 10
 
     print drop database times $x
 	sql drop database if exists db
 
-	sql create database db 
+	sql create database db
 	sql create table db.tb (ts timestamp, i int)
 
 	sleep 1000
-	
+
 	$x = $x + 1
 endw
 
-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
diff --git a/tests/script/tsim/db/dropdnodes.sim b/tests/script/tsim/db/dropdnodes.sim
index 8a46d5f9ce..20b4a136df 100644
--- a/tests/script/tsim/db/dropdnodes.sim
+++ b/tests/script/tsim/db/dropdnodes.sim
@@ -12,7 +12,7 @@ system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 
 sleep 2000
-sql connect 
+sql connect
 
 sql create dnode $hostname2
 sleep 2000
@@ -61,13 +61,13 @@ sql show tables
 print $rows
 if $rows != 16 then
   return -1
-endi  
+endi
 
 sql select * from mt
 print $rows
 if $rows != 16 then
   return -1
-endi  
+endi
 
 print ========== step3
 
@@ -82,26 +82,26 @@ sql show tables
 print $rows
 if $rows != 8 then
   return -1
-endi  
+endi
 
 sql select * from mt
 print $rows
 if $rows != 8 then
   return -1
-endi  
+endi
 
 sql select * from db.t5
 if $rows != 1 then
   return -1
-endi  
+endi
 
 sql select * from db.t13
 if $rows != 1 then
   return -1
-endi  
+endi
 
 sql_error select * from db.t1
 sql_error select * from db.t9
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
diff --git a/tests/script/tsim/db/keep.sim b/tests/script/tsim/db/keep.sim
index e146a666d0..f0653c4801 100644
--- a/tests/script/tsim/db/keep.sim
+++ b/tests/script/tsim/db/keep.sim
@@ -14,7 +14,7 @@ while $x < 41
   sql insert into tb values (now - $time , $x ) -x step2
   step2:
   $x = $x + 1
-endw 
+endw
 
 sql select * from tb
 print ===> rows $rows last $data01
@@ -42,10 +42,10 @@ sql alter database keepdb keep 60
 sql flush database keepdb
 sql select * from information_schema.ins_databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
-if $data22 != 2 then 
+if $data22 != 2 then
   return -1
 endi
-if $data27 != 86400m,86400m,86400m then 
+if $data27 != 86400m,86400m,86400m then
   return -1
 endi
 
@@ -56,7 +56,7 @@ while $x < 81
   sql insert into tb values (now - $time , $x ) -x step4
   step4:
   $x = $x + 1
-endw 
+endw
 
 sql select * from tb
 print ===> rows $rows last $data01
@@ -83,10 +83,10 @@ endi
 print ======== step6 alter db
 sql alter database keepdb keep 30
 sql select * from information_schema.ins_databases
-if $data22 != 2 then 
+if $data22 != 2 then
   return -1
 endi
-if $data27 != 43200m,43200m,43200m then 
+if $data27 != 43200m,43200m,43200m then
   return -1
 endi
 
@@ -110,7 +110,7 @@ while $x < 121
   sql insert into tb values (now - $time , $x ) -x step8
   step8:
   $x = $x + 1
-endw 
+endw
 
 sql select * from tb
 print ===> rows $rows last $data01
@@ -137,4 +137,4 @@ error3:
 print ======= test success
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
diff --git a/tests/script/tsim/db/len.sim b/tests/script/tsim/db/len.sim
index ae475ddf47..047dafd5f8 100644
--- a/tests/script/tsim/db/len.sim
+++ b/tests/script/tsim/db/len.sim
@@ -11,33 +11,33 @@ sql create database -x step1
 step1:
 
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 print =============== step2
 sql create database a
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
 sql drop database a
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 print =============== step3
 sql create database a12345678
 sql select * from information_schema.ins_databases
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
 sql drop database a12345678
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -46,15 +46,15 @@ sql create database a012345678901201234567890120123456789012a0123456789012012345
 	return -1
 step4:
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 print =============== step5
-sql create database a;1 
+sql create database a;1
 sql drop database a
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -64,7 +64,7 @@ sql create database a'1 -x step6
 step6:
 
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -73,7 +73,7 @@ sql create database (a) -x step7
 	return -1
 step7:
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -82,8 +82,8 @@ sql create database a.1 -x step8
 	return -1
 step8:
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 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
diff --git a/tests/script/tsim/db/repeat.sim b/tests/script/tsim/db/repeat.sim
index 98d66244f5..b0627659d0 100644
--- a/tests/script/tsim/db/repeat.sim
+++ b/tests/script/tsim/db/repeat.sim
@@ -56,4 +56,4 @@ sql drop database d10
 sql drop database d11
 sql drop database d12
 
-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
diff --git a/tests/script/tsim/db/show_create_db.sim b/tests/script/tsim/db/show_create_db.sim
index 45007d01d6..3a51fedbff 100644
--- a/tests/script/tsim/db/show_create_db.sim
+++ b/tests/script/tsim/db/show_create_db.sim
@@ -7,7 +7,7 @@ print =============== step2
 sql create database db
 sql show create database db
 
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -15,13 +15,13 @@ print =============== step3
 sql use db
 sql show create database db
 
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-if $data00 != db then 
+if $data00 != db then
   return -1
-endi  
+endi
 
 sql drop database db
 
diff --git a/tests/script/tsim/db/show_create_table.sim b/tests/script/tsim/db/show_create_table.sim
index 44fa09577e..0aeee42d21 100644
--- a/tests/script/tsim/db/show_create_table.sim
+++ b/tests/script/tsim/db/show_create_table.sim
@@ -11,14 +11,14 @@ sql create table t0 using meters tags(1,'ch')
 sql create table normalTbl(ts timestamp, zone binary(8))
 
 sql use db
-sql show create table meters 
-if $rows != 1 then 
+sql show create table meters
+if $rows != 1 then
   return -1
 endi
 
 print ===============check sub table
 sql show create table t0
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data00 == 't0' then
@@ -27,8 +27,8 @@ endi
 
 print ===============check normal table
 
-sql show create table normalTbl 
-if $rows != 1 then 
+sql show create table normalTbl
+if $rows != 1 then
   return -1
 endi
 
@@ -37,8 +37,8 @@ if $data00 == 'normalTbl' then
 endi
 
 print ===============check super table
-sql show create table meters 
-if $rows != 1 then 
+sql show create table meters
+if $rows != 1 then
   return -1
 endi
 
@@ -49,7 +49,7 @@ endi
 print ===============check sub table with prefix
 
 sql show create table db.t0
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -58,8 +58,8 @@ if $data00 == 't0' then
 endi
 
 print ===============check normal table with prefix
-sql show create table db.normalTbl 
-if $rows != 1 then 
+sql show create table db.normalTbl
+if $rows != 1 then
   return -1
 endi
 
@@ -69,8 +69,8 @@ endi
 
 
 print ===============check super table with prefix
-sql show create table db.meters 
-if $rows != 1 then 
+sql show create table db.meters
+if $rows != 1 then
   return -1
 endi
 
diff --git a/tests/script/tsim/db/tables.sim b/tests/script/tsim/db/tables.sim
index cdee504753..273a1fd45d 100644
--- a/tests/script/tsim/db/tables.sim
+++ b/tests/script/tsim/db/tables.sim
@@ -8,7 +8,7 @@ sql create database db
 sql select * from information_schema.ins_databases
 print $rows $data07
 
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
@@ -125,4 +125,4 @@ if $data01 != 4 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 8f5fa8b98270cbb47b909797054e7842008cd404 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 18 Aug 2022 19:36:40 +0800
Subject: [PATCH 82/98] fix invalid packet

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

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index f50711c59c..68b911f553 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -278,7 +278,7 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
         if (pBuf->invalid) {
           tTrace("%s conn %p alread read invalid packet", transLabel(pTransInst), conn);
           destroyConn(conn, true);
-          break;
+          return;
         } else {
           if (false == uvHandleReq(conn)) break;
         }

From 65903a7c0d3d65be07c3137f2ee84f71d03f222e Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 18 Aug 2022 18:57:49 +0800
Subject: [PATCH 83/98] fix: refact mutex locking

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 1d2c5c3b32..bb367ff8b1 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -1119,7 +1119,10 @@ int32_t tsdbCacheGetLastrowH(SLRUCache *pCache, tb_uid_t uid, STsdb *pTsdb, LRUH
           taosMemoryFree(pRow);
         }
 
+        taosThreadMutexUnlock(&pTsdb->lruMutex);
+
         *handle = NULL;
+
         return 0;
       }
 
@@ -1131,15 +1134,11 @@ int32_t tsdbCacheGetLastrowH(SLRUCache *pCache, tb_uid_t uid, STsdb *pTsdb, LRUH
       }
 
       taosThreadMutexUnlock(&pTsdb->lruMutex);
+
+      h = taosLRUCacheLookup(pCache, key, keyLen);
     } else {
       taosThreadMutexUnlock(&pTsdb->lruMutex);
-
-      *handle = h;
-
-      return code;
     }
-
-    h = taosLRUCacheLookup(pCache, key, keyLen);
   }
 
   *handle = h;

From 4e5315f1ac4ca551fdf49aacb898b61b5cbaa0c6 Mon Sep 17 00:00:00 2001
From: shenglian zhou <slzhou@taosdata.com>
Date: Thu, 18 Aug 2022 20:41:25 +0800
Subject: [PATCH 84/98] fix: process remaining rows out of loop

---
 source/libs/executor/src/scanoperator.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index e578e34b82..7d188dadc7 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2220,14 +2220,25 @@ static SSDataBlock* sysTableScanUserTables(SOperatorInfo* pOperator) {
         doFilterResult(pInfo);
 
         blockDataCleanup(p);
+        numOfRows = 0;
+
         if (pInfo->pRes->info.rows > 0) {
           break;
-        } else {
-          numOfRows = 0;
-          continue;
         }
       }
     }
+
+    if (numOfRows > 0) {
+      p->info.rows = numOfRows;
+      pInfo->pRes->info.rows = numOfRows;
+
+      relocateColumnData(pInfo->pRes, pInfo->scanCols, p->pDataBlock, false);
+      doFilterResult(pInfo);
+
+      blockDataCleanup(p);
+      numOfRows = 0;
+    }
+
     blockDataDestroy(p);
 
     // todo temporarily free the cursor here, the true reason why the free is not valid needs to be found

From 24bfe2e2ebaef14a8d199f213ce996371183b5fa Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 18 Aug 2022 20:51:28 +0800
Subject: [PATCH 85/98] test: valgrind case

---
 tests/script/tsim/stream/basic0.sim | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/script/tsim/stream/basic0.sim b/tests/script/tsim/stream/basic0.sim
index 9a5fb8012f..6d05f69dcf 100644
--- a/tests/script/tsim/stream/basic0.sim
+++ b/tests/script/tsim/stream/basic0.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sleep 50
+system sh/cfg.sh -n dnode1 -c debugflag -v 131
+system sh/exec.sh -n dnode1 -s start -v
 sql connect
 
 print =============== create database
@@ -137,4 +137,17 @@ if $data13 != 789 then
   return -1
 endi
 
+_OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
+print =============== check
+$null=
+
+system_content sh/checkValgrind.sh -n dnode1 
+print cmd return result ----> [ $system_content ]
+if $system_content > 0 then
+  return -1
+endi 
+
+if $system_content == $null then
+  return -1
+endi 

From ff22c97d9964790ac3aa34b7b6a3356edd0644aa Mon Sep 17 00:00:00 2001
From: shenglian zhou <slzhou@taosdata.com>
Date: Fri, 19 Aug 2022 08:39:19 +0800
Subject: [PATCH 86/98] fix: user tags scan filter produces zero row will not
 end the sys table scan operator

---
 source/libs/executor/src/scanoperator.c | 34 ++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 7d188dadc7..5689b70824 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2038,10 +2038,34 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
     metaReaderClear(&smr);
 
     if (numOfRows >= pOperator->resultInfo.capacity) {
-      break;
+      p->info.rows = numOfRows;
+      pInfo->pRes->info.rows = numOfRows;
+
+      relocateColumnData(pInfo->pRes, pInfo->scanCols, p->pDataBlock, false);
+      doFilterResult(pInfo);
+
+      blockDataCleanup(p);
+      numOfRows = 0;
+
+      if (pInfo->pRes->info.rows > 0) {
+        break;
+      }
     }
   }
 
+  if (numOfRows > 0) {
+    p->info.rows = numOfRows;
+    pInfo->pRes->info.rows = numOfRows;
+
+    relocateColumnData(pInfo->pRes, pInfo->scanCols, p->pDataBlock, false);
+    doFilterResult(pInfo);
+
+    blockDataCleanup(p);
+    numOfRows = 0;
+  }
+
+  blockDataDestroy(p);
+
   // todo temporarily free the cursor here, the true reason why the free is not valid needs to be found
   if (ret != 0) {
     metaCloseTbCursor(pInfo->pCur);
@@ -2049,14 +2073,6 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
     doSetOperatorCompleted(pOperator);
   }
 
-  p->info.rows = numOfRows;
-  pInfo->pRes->info.rows = numOfRows;
-
-  relocateColumnData(pInfo->pRes, pInfo->scanCols, p->pDataBlock, false);
-  doFilterResult(pInfo);
-
-  blockDataDestroy(p);
-
   pInfo->loadInfo.totalRows += pInfo->pRes->info.rows;
   return (pInfo->pRes->info.rows == 0) ? NULL : pInfo->pRes;
 }

From 823fbf9f777e62855c9ba0db0645e2536cba72c9 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 19 Aug 2022 10:05:55 +0800
Subject: [PATCH 87/98] fix test case

---
 tests/system-test/2-query/interp.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index 57f2d3b1b1..934ba9e161 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -553,11 +553,6 @@ class TDTestCase:
 
         tdLog.printNoPrefix("==========step9:test error cases")
 
-        tdSql.query(f"select interp(c0) from tb where ts >= '2020-02-10 00:00:05' and ts <= '2020-02-15 00:00:05' range('2022-02-05 00:05:00', '2022-02-06 00:05:00') every(1d) fill(null)");
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, None)
-        tdSql.checkData(1, 0, None)
-
         tdSql.error(f"select interp(c0) from {dbname}.{tbname}")
         tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05')")
         tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d)")

From 06c8d14f99c075b4e08743a1d00c87f3c05fc4d7 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 19 Aug 2022 10:25:16 +0800
Subject: [PATCH 88/98] refactor rpc code

---
 source/libs/transport/src/transSvr.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index db05aefe7b..447db76136 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -275,16 +275,15 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
     if (pBuf->len <= TRANS_PACKET_LIMIT) {
       while (transReadComplete(pBuf)) {
         tTrace("%s conn %p alread read complete packet", transLabel(pTransInst), conn);
-        if (pBuf->invalid) {
-          tTrace("%s conn %p alread read invalid packet", transLabel(pTransInst), conn);
+        if (true == pBuf->invalid || false == uvHandleReq(conn)) {
+          tError("%s conn %p read invalid packet", transLabel(pTransInst), conn);
           destroyConn(conn, true);
           return;
-        } else {
-          if (false == uvHandleReq(conn)) break;
         }
       }
       return;
     } else {
+      tError("%s conn %p read invalid packet, exceed limit", transLabel(pTransInst), conn);
       destroyConn(conn, true);
       return;
     }

From 09cb575300a720f5c2e470885d4dffc15af825e0 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Fri, 19 Aug 2022 11:10:56 +0800
Subject: [PATCH 89/98] fix: escape character problem in auto create table
 insert

---
 include/util/tdef.h                           | 12 ++++++------
 source/libs/executor/src/executor.c           | 16 ++++++++--------
 source/libs/executor/src/timewindowoperator.c |  2 +-
 source/libs/nodes/src/nodesCodeFuncs.c        |  1 -
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/include/util/tdef.h b/include/util/tdef.h
index e40d382aea..f3ab9ecffa 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -132,14 +132,14 @@ typedef enum EOperatorType {
   OP_TYPE_DIV,
   OP_TYPE_REM,
   // unary arithmetic operator
-  OP_TYPE_MINUS,
+  OP_TYPE_MINUS = 20,
 
   // bitwise operator
-  OP_TYPE_BIT_AND,
+  OP_TYPE_BIT_AND = 30,
   OP_TYPE_BIT_OR,
 
   // binary comparison operator
-  OP_TYPE_GREATER_THAN,
+  OP_TYPE_GREATER_THAN = 40,
   OP_TYPE_GREATER_EQUAL,
   OP_TYPE_LOWER_THAN,
   OP_TYPE_LOWER_EQUAL,
@@ -152,7 +152,7 @@ typedef enum EOperatorType {
   OP_TYPE_MATCH,
   OP_TYPE_NMATCH,
   // unary comparison operator
-  OP_TYPE_IS_NULL,
+  OP_TYPE_IS_NULL = 100,
   OP_TYPE_IS_NOT_NULL,
   OP_TYPE_IS_TRUE,
   OP_TYPE_IS_FALSE,
@@ -162,11 +162,11 @@ typedef enum EOperatorType {
   OP_TYPE_IS_NOT_UNKNOWN,
 
   // json operator
-  OP_TYPE_JSON_GET_VALUE,
+  OP_TYPE_JSON_GET_VALUE = 150,
   OP_TYPE_JSON_CONTAINS,
 
   // internal operator
-  OP_TYPE_ASSIGN
+  OP_TYPE_ASSIGN = 250
 } EOperatorType;
 
 #define OP_TYPE_CALC_MAX OP_TYPE_BIT_OR
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 4c3d5cf7af..d8f63cb008 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -348,7 +348,7 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
   taosThreadOnce(&initPoolOnce, initRefPool);
   atexit(cleanupRefPool);
 
-  qDebug("start to create subplan task, TID:0x%"PRIx64 " QID:0x%"PRIx64, taskId, pSubplan->id.queryId);
+  qDebug("start to create subplan task, TID:0x%" PRIx64 " QID:0x%" PRIx64, taskId, pSubplan->id.queryId);
 
   int32_t code = createExecTaskInfoImpl(pSubplan, pTask, readHandle, taskId, sql, model);
   if (code != TSDB_CODE_SUCCESS) {
@@ -374,7 +374,7 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
     }
   }
 
-  qDebug("subplan task create completed, TID:0x%"PRIx64 " QID:0x%"PRIx64, taskId, pSubplan->id.queryId);
+  qDebug("subplan task create completed, TID:0x%" PRIx64 " QID:0x%" PRIx64, taskId, pSubplan->id.queryId);
 
 _error:
   // if failed to add ref for all tables in this query, abort current query
@@ -427,7 +427,7 @@ int waitMoment(SQInfo* pQInfo) {
 #endif
 
 static void freeBlock(void* param) {
-  SSDataBlock* pBlock = *(SSDataBlock**) param;
+  SSDataBlock* pBlock = *(SSDataBlock**)param;
   blockDataDestroy(pBlock);
 }
 
@@ -467,12 +467,12 @@ int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds) {
 
   qDebug("%s execTask is launched", GET_TASKID(pTaskInfo));
 
-  int32_t current = 0;
+  int32_t      current = 0;
   SSDataBlock* pRes = NULL;
 
   int64_t st = taosGetTimestampUs();
 
-  while((pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot)) != NULL) {
+  while ((pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot)) != NULL) {
     SSDataBlock* p = createOneDataBlock(pRes, true);
     current += p->info.rows;
     ASSERT(p->info.rows > 0);
@@ -494,7 +494,7 @@ int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds) {
   uint64_t total = pTaskInfo->pRoot->resultInfo.totalRows;
 
   qDebug("%s task suspended, %d rows in %d blocks returned, total:%" PRId64 " rows, in sinkNode:%d, elapsed:%.2f ms",
-         GET_TASKID(pTaskInfo), current, (int32_t) taosArrayGetSize(pResList), total, 0, el / 1000.0);
+         GET_TASKID(pTaskInfo), current, (int32_t)taosArrayGetSize(pResList), total, 0, el / 1000.0);
 
   atomic_store_64(&pTaskInfo->owner, 0);
   return pTaskInfo->code;
@@ -632,7 +632,7 @@ int32_t qExtractStreamScanner(qTaskInfo_t tinfo, void** scanner) {
   SOperatorInfo* pOperator = pTaskInfo->pRoot;
 
   while (1) {
-    uint8_t type = pOperator->operatorType;
+    uint16_t type = pOperator->operatorType;
     if (type == QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN) {
       *scanner = pOperator->info;
       return 0;
@@ -691,7 +691,7 @@ int32_t qStreamPrepareScan(qTaskInfo_t tinfo, const STqOffsetVal* pOffset) {
   pTaskInfo->streamInfo.prepareStatus = *pOffset;
   if (!tOffsetEqual(pOffset, &pTaskInfo->streamInfo.lastStatus)) {
     while (1) {
-      uint8_t type = pOperator->operatorType;
+      uint16_t type = pOperator->operatorType;
       pOperator->status = OP_OPENED;
       // TODO add more check
       if (type != QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN) {
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 6101501605..ed68fd2964 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -3541,7 +3541,7 @@ void initDummyFunction(SqlFunctionCtx* pDummy, SqlFunctionCtx* pCtx, int32_t num
 }
 
 void initDownStream(SOperatorInfo* downstream, SStreamAggSupporter* pAggSup, int64_t gap, int64_t waterMark,
-                    uint8_t type) {
+                    uint16_t type) {
   ASSERT(downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN);
   SStreamScanInfo* pScanInfo = downstream->info;
   pScanInfo->sessionSup = (SessionWindowSupporter){.pStreamAggSup = pAggSup, .gap = gap, .parentType = type};
diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c
index a6546f3299..0f32001c47 100644
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
@@ -4673,7 +4673,6 @@ static int32_t jsonToNode(const SJson* pJson, void* pObj) {
 
   int32_t code;
   tjsonGetNumberValue(pJson, jkNodeType, pNode->type, code);
-  ;
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonToObject(pJson, nodesNodeName(pNode->type), jsonToSpecificNode, pNode);
     if (TSDB_CODE_SUCCESS != code) {

From 69173f769482f5a1cb853ec057a83e77298458cd Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <59301069+xiao-yu-wang@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:15:02 +0800
Subject: [PATCH 90/98] Update index.mdx

---
 docs/zh/07-develop/02-model/index.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/07-develop/02-model/index.mdx b/docs/zh/07-develop/02-model/index.mdx
index be545e8813..1609eb5362 100644
--- a/docs/zh/07-develop/02-model/index.mdx
+++ b/docs/zh/07-develop/02-model/index.mdx
@@ -11,10 +11,10 @@ TDengine 采用类关系型数据模型，需要建库、建表。因此对于
 不同类型的数据采集点往往具有不同的数据特征，包括数据采集频率的高低，数据保留时间的长短，副本的数目，数据块的大小，是否允许更新数据等等。为了在各种场景下 TDengine 都能最大效率的工作，TDengine 建议将不同数据特征的表创建在不同的库里，因为每个库可以配置不同的存储策略。创建一个库时，除 SQL 标准的选项外，还可以指定保留时长、副本数、缓存大小、时间精度、文件块里最大最小记录条数、是否压缩、一个数据文件覆盖的天数等多种参数。比如：
 
 ```sql
-CREATE DATABASE power KEEP 365 DURATION 10 BUFFER 16 VGROUPS 100 WAL 1;
+CREATE DATABASE power KEEP 365 DURATION 10 BUFFER 16 WAL_LEVEL 1;
 ```
 
-上述语句将创建一个名为 power 的库，这个库的数据将保留 365 天（超过 365 天将被自动删除），每 10 天一个数据文件，每个 VNODE 的写入内存池的大小为 16 MB，数据库的 VGROUPS 数量，对该数据库入会写 WAL 但不执行 FSYNC。详细的语法及参数请见 [数据库管理](/taos-sql/database) 章节。
+上述语句将创建一个名为 power 的库，这个库的数据将保留 365 天（超过 365 天将被自动删除），每 10 天一个数据文件，每个 VNODE 的写入内存池的大小为 16 MB，对该数据库入会写 WAL 但不执行 FSYNC。详细的语法及参数请见 [数据库管理](/taos-sql/database) 章节。
 
 创建库之后，需要使用 SQL 命令 `USE` 将当前库切换过来，例如：
 

From 692fdf3397482b77c4a356ca7e74ff8eeff63515 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 19 Aug 2022 11:31:52 +0800
Subject: [PATCH 91/98] enh(stream): optimize output

---
 source/libs/executor/src/timewindowoperator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 02be01cdb8..60822ce770 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -910,11 +910,11 @@ int32_t compareWinRes(void* pKey, void* data, int32_t index) {
 }
 
 static void removeDeleteResults(SHashObj* pUpdatedMap, SArray* pDelWins) {
-  if (!pUpdatedMap || taosHashGetSize(pUpdatedMap) == 0) {
+  int32_t delSize = taosArrayGetSize(pDelWins);
+  if (taosHashGetSize(pUpdatedMap) == 0 || delSize == 0) {
     return;
   }
-  int32_t delSize = taosArrayGetSize(pDelWins);
-  void*   pIte = NULL;
+  void* pIte = NULL;
   while ((pIte = taosHashIterate(pUpdatedMap, pIte)) != NULL) {
     SResKeyPos* pResKey = (SResKeyPos*)pIte;
     int32_t     index = binarySearchCom(pDelWins, delSize, pResKey, TSDB_ORDER_DESC, compareWinRes);

From 98012440d44414bd5b2549ce4ddbafcac35ac169 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 19 Aug 2022 11:37:00 +0800
Subject: [PATCH 92/98] fix possible deadlock

---
 source/libs/scheduler/src/schRemote.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/source/libs/scheduler/src/schRemote.c b/source/libs/scheduler/src/schRemote.c
index 8c9003a9b2..ecd9daf1bc 100644
--- a/source/libs/scheduler/src/schRemote.c
+++ b/source/libs/scheduler/src/schRemote.c
@@ -20,7 +20,7 @@
 #include "tmsg.h"
 #include "tref.h"
 #include "trpc.h"
-
+// clang-format off
 int32_t schValidateRspMsgType(SSchJob *pJob, SSchTask *pTask, int32_t msgType) {
   int32_t lastMsgType = pTask->lastMsgType;
   int32_t taskStatus = SCH_GET_TASK_STATUS(pTask);
@@ -402,7 +402,7 @@ int32_t schHandleDropCallback(void *param, SDataBuf *pMsg, int32_t code) {
   qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 " drop task rsp received, code:0x%x", pParam->queryId, pParam->taskId,
          code);
   if (pMsg) {
-    taosMemoryFree(pMsg->pData);       
+    taosMemoryFree(pMsg->pData);
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -415,7 +415,7 @@ int32_t schHandleLinkBrokenCallback(void *param, SDataBuf *pMsg, int32_t code) {
 
   if (head->isHbParam) {
     taosMemoryFree(pMsg->pData);
-    
+
     SSchHbCallbackParam *hbParam = (SSchHbCallbackParam *)param;
     SSchTrans            trans = {.pTrans = hbParam->pTrans, .pHandle = NULL};
     SCH_ERR_RET(schUpdateHbConnection(&hbParam->nodeEpId, &trans));
@@ -1104,7 +1104,7 @@ int32_t schBuildAndSendMsg(SSchJob *pJob, SSchTask *pTask, SQueryNodeAddr *addr,
 
 #if 1
   SSchTrans trans = {.pTrans = pJob->conn.pTrans, .pHandle = SCH_GET_TASK_HANDLE(pTask)};
-  schAsyncSendMsg(pJob, pTask, &trans, addr, msgType, msg, msgSize, persistHandle, (rpcCtx.args ? &rpcCtx : NULL));
+  code = schAsyncSendMsg(pJob, pTask, &trans, addr, msgType, msg, msgSize, persistHandle, (rpcCtx.args ? &rpcCtx : NULL));
   msg = NULL;
   SCH_ERR_JRET(code);
 
@@ -1114,7 +1114,7 @@ int32_t schBuildAndSendMsg(SSchJob *pJob, SSchTask *pTask, SQueryNodeAddr *addr,
 #else
   if (TDMT_VND_SUBMIT != msgType) {
     SSchTrans trans = {.pTrans = pJob->conn.pTrans, .pHandle = SCH_GET_TASK_HANDLE(pTask)};
-    schAsyncSendMsg(pJob, pTask, &trans, addr, msgType, msg, msgSize, persistHandle, (rpcCtx.args ? &rpcCtx : NULL));
+    code = schAsyncSendMsg(pJob, pTask, &trans, addr, msgType, msg, msgSize, persistHandle, (rpcCtx.args ? &rpcCtx : NULL));
     msg = NULL;
     SCH_ERR_JRET(code);
 
@@ -1136,3 +1136,4 @@ _return:
   taosMemoryFreeClear(msg);
   SCH_RET(code);
 }
+// clang-format on

From cd6c9def671c8cb639baefd922ca7eed9a5b1937 Mon Sep 17 00:00:00 2001
From: Xuefeng Tan <1172915550@qq.com>
Date: Fri, 19 Aug 2022 11:38:41 +0800
Subject: [PATCH 93/98] feat(taosAdapter): taosAdapter supports Windows
 (#16229)

---
 cmake/taosadapter_CMakeLists.txt.in |  2 +-
 packaging/tools/make_install.bat    | 10 ++++++++
 tools/CMakeLists.txt                | 37 ++++++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/cmake/taosadapter_CMakeLists.txt.in b/cmake/taosadapter_CMakeLists.txt.in
index ed8216be91..f182beed33 100644
--- a/cmake/taosadapter_CMakeLists.txt.in
+++ b/cmake/taosadapter_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
         GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG 3d21433
+        GIT_TAG abed566
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/packaging/tools/make_install.bat b/packaging/tools/make_install.bat
index 3c27c1beca..d4dde391c8 100644
--- a/packaging/tools/make_install.bat
+++ b/packaging/tools/make_install.bat
@@ -28,6 +28,13 @@ if not exist %tagert_dir%\\driver (
 if not exist C:\\TDengine\\cfg\\taos.cfg (
     copy %source_dir%\\packaging\\cfg\\taos.cfg %tagert_dir%\\cfg\\taos.cfg > nul
 )
+
+if exist %binary_dir%\\test\\cfg\\taosadapter.toml (
+    if not exist %tagert_dir%\\cfg\\taosadapter.toml (
+        copy %binary_dir%\\test\\cfg\\taosadapter.toml %tagert_dir%\\cfg\\taosadapter.toml > nul
+    )
+)
+
 copy %source_dir%\\include\\client\\taos.h %tagert_dir%\\include > nul
 copy %source_dir%\\include\\util\\taoserror.h %tagert_dir%\\include > nul
 copy %source_dir%\\include\\libs\\function\\taosudf.h %tagert_dir%\\include > nul
@@ -40,6 +47,9 @@ copy %binary_dir%\\build\\bin\\udfd.exe %tagert_dir% > nul
 if exist %binary_dir%\\build\\bin\\taosBenchmark.exe (
     copy %binary_dir%\\build\\bin\\taosBenchmark.exe %tagert_dir% > nul
 )
+if exist %binary_dir%\\build\\bin\\taosadapter.exe (
+    copy %binary_dir%\\build\\bin\\taosadapter.exe %tagert_dir% > nul
+)
 
 mshta vbscript:createobject("shell.application").shellexecute("%~s0",":hasAdmin","","runas",1)(window.close)&& echo To start/stop TDengine with administrator privileges: sc start/stop taosd &goto :eof
 :hasAdmin
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 25d6e33175..a79cbbe77d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -128,6 +128,7 @@ ELSE ()
                 COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
                 COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
                 )
+        unset(_upx_prefix)
     ELSEIF (TD_DARWIN)
         include(ExternalProject)
         ExternalProject_Add(taosadapter
@@ -149,8 +150,42 @@ ELSE ()
                 COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
                 COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
                 )
+#        unset(_upx_prefix)
+    ELSEIF (TD_WINDOWS)
+        include(ExternalProject)
+        set(_upx_prefix "${CMAKE_BINARY_DIR}/.taos/externals/upx")
+        ExternalProject_Add(upx
+                PREFIX              "${_upx_prefix}"
+                URL                 https://github.com/upx/upx/releases/download/v3.96/upx-3.96-win32.zip
+                CONFIGURE_COMMAND   cmake -E true
+                BUILD_COMMAND       cmake -E true
+                INSTALL_COMMAND     cmake -E true
+                )
+
+        ExternalProject_Add(taosadapter
+                PREFIX        "taosadapter"
+                SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+                BUILD_ALWAYS         off
+                DEPENDS             taos
+                BUILD_IN_SOURCE     1
+                CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
+                PATCH_COMMAND
+                COMMAND     git clean -f -d
+                BUILD_COMMAND
+                COMMAND set CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client
+                COMMAND set CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib
+                COMMAND go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND go build -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                INSTALL_COMMAND
+                COMMAND ${_upx_prefix}/src/upx/upx taosadapter.exe
+                COMMAND cmake -E copy taosadapter.exe ${CMAKE_BINARY_DIR}/build/bin
+                COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+                )
         unset(_upx_prefix)
     ELSE ()
-        MESSAGE("${Yellow} Windows system still use original embedded httpd ${ColourReset}")
+        MESSAGE("${Yellow} taosAdapter Not supported yet  ${ColourReset}")
     ENDIF ()
 ENDIF ()

From e5da9167ffc5de9cd82bde709715edd5fe4cb7bb Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Fri, 19 Aug 2022 11:52:30 +0800
Subject: [PATCH 94/98] fix: escape character problem in auto create table
 insert

---
 include/libs/nodes/querynodes.h               |  3 ++
 include/util/tdef.h                           |  2 +-
 source/libs/nodes/src/nodesToSQLFuncs.c       |  4 +-
 source/libs/scalar/inc/filterInt.h            |  1 -
 source/libs/scalar/src/filter.c               | 46 ++-----------------
 .../libs/scalar/test/scalar/scalarTests.cpp   |  6 +--
 6 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 088da73a1a..e1f86bae58 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -428,6 +428,9 @@ void    nodesValueNodeToVariant(const SValueNode* pNode, SVariant* pVal);
 char*   nodesGetFillModeString(EFillMode mode);
 int32_t nodesMergeConds(SNode** pDst, SNodeList** pSrc);
 
+const char* operatorTypeStr(EOperatorType type);
+const char* logicConditionTypeStr(ELogicConditionType type);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/util/tdef.h b/include/util/tdef.h
index f3ab9ecffa..6ce1571656 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -166,7 +166,7 @@ typedef enum EOperatorType {
   OP_TYPE_JSON_CONTAINS,
 
   // internal operator
-  OP_TYPE_ASSIGN = 250
+  OP_TYPE_ASSIGN = 200
 } EOperatorType;
 
 #define OP_TYPE_CALC_MAX OP_TYPE_BIT_OR
diff --git a/source/libs/nodes/src/nodesToSQLFuncs.c b/source/libs/nodes/src/nodesToSQLFuncs.c
index ba0232fb1a..e521c57c3d 100644
--- a/source/libs/nodes/src/nodesToSQLFuncs.c
+++ b/source/libs/nodes/src/nodesToSQLFuncs.c
@@ -21,7 +21,7 @@
 #include "taoserror.h"
 #include "thash.h"
 
-static const char *operatorTypeStr(EOperatorType type) {
+const char *operatorTypeStr(EOperatorType type) {
   switch (type) {
     case OP_TYPE_ADD:
       return "+";
@@ -91,7 +91,7 @@ static const char *operatorTypeStr(EOperatorType type) {
   return "UNKNOWN";
 }
 
-static const char *logicConditionTypeStr(ELogicConditionType type) {
+const char *logicConditionTypeStr(ELogicConditionType type) {
   switch (type) {
     case LOGIC_COND_TYPE_AND:
       return "AND";
diff --git a/source/libs/scalar/inc/filterInt.h b/source/libs/scalar/inc/filterInt.h
index 54e873065b..23693c785a 100644
--- a/source/libs/scalar/inc/filterInt.h
+++ b/source/libs/scalar/inc/filterInt.h
@@ -350,7 +350,6 @@ struct SFilterInfo {
 
 extern bool filterDoCompare(__compar_fn_t func, uint8_t optr, void *left, void *right);
 extern __compar_fn_t filterGetCompFunc(int32_t type, int32_t optr);
-extern OptrStr gOptrStr[];
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 1664a4d612..4377dbf14e 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -24,46 +24,6 @@
 #include "ttime.h"
 #include "functionMgt.h"
 
-OptrStr gOptrStr[] = {
-  {0,                                      "invalid"},
-  {OP_TYPE_ADD,                            "+"},
-  {OP_TYPE_SUB,                            "-"},
-  {OP_TYPE_MULTI,                          "*"},
-  {OP_TYPE_DIV,                            "/"},
-  {OP_TYPE_REM,                            "%"},
-  {OP_TYPE_MINUS,                          "minus"},
-  {OP_TYPE_ASSIGN,                         "assign"},
-  // bit operator
-  {OP_TYPE_BIT_AND,                        "&"},
-  {OP_TYPE_BIT_OR,                         "|"},
-
-  // comparison operator
-  {OP_TYPE_GREATER_THAN,                   ">"},
-  {OP_TYPE_GREATER_EQUAL,                  ">="},
-  {OP_TYPE_LOWER_THAN,                     "<"},
-  {OP_TYPE_LOWER_EQUAL,                    "<="},
-  {OP_TYPE_EQUAL,                          "=="},
-  {OP_TYPE_NOT_EQUAL,                      "!="},
-  {OP_TYPE_IN,                             "in"},
-  {OP_TYPE_NOT_IN,                         "not in"},
-  {OP_TYPE_LIKE,                           "like"},
-  {OP_TYPE_NOT_LIKE,                       "not like"},
-  {OP_TYPE_MATCH,                          "match"},
-  {OP_TYPE_NMATCH,                         "nmatch"},
-  {OP_TYPE_IS_NULL,                        "is null"},
-  {OP_TYPE_IS_NOT_NULL,                    "not null"},
-  {OP_TYPE_IS_TRUE,                        "is true"},
-  {OP_TYPE_IS_FALSE,                       "is false"},
-  {OP_TYPE_IS_UNKNOWN,                     "is unknown"},
-  {OP_TYPE_IS_NOT_TRUE,                    "not true"},
-  {OP_TYPE_IS_NOT_FALSE,                   "not false"},
-  {OP_TYPE_IS_NOT_UNKNOWN,                 "not unknown"},
-
-  // json operator
-  {OP_TYPE_JSON_GET_VALUE,                 "->"},
-  {OP_TYPE_JSON_CONTAINS,                  "json contains"}
-};
-
 bool filterRangeCompGi (const void *minv, const void *maxv, const void *minr, const void *maxr, __compar_fn_t cfunc) {
   int32_t result = cfunc(maxv, minr);
   return result >= 0;
@@ -986,7 +946,7 @@ int32_t filterAddUnit(SFilterInfo *info, uint8_t optr, SFilterFieldId *left, SFi
   } else {
     int32_t paramNum = scalarGetOperatorParamNum(optr);
     if (1 != paramNum) {
-      fltError("invalid right field in unit, operator:%s, rightType:%d", gOptrStr[optr].str, u->right.type);
+      fltError("invalid right field in unit, operator:%s, rightType:%d", operatorTypeStr(optr), u->right.type);
       return TSDB_CODE_QRY_APP_ERROR;
     }
   }
@@ -1517,7 +1477,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options)
         SFilterField *left = FILTER_UNIT_LEFT_FIELD(info, unit);
         SColumnNode *refNode = (SColumnNode *)left->desc;
         if (unit->compare.optr >= 0 && unit->compare.optr <= OP_TYPE_JSON_CONTAINS){
-          len = sprintf(str, "UNIT[%d] => [%d][%d]  %s  [", i, refNode->dataBlockId, refNode->slotId, gOptrStr[unit->compare.optr].str);
+          len = sprintf(str, "UNIT[%d] => [%d][%d]  %s  [", i, refNode->dataBlockId, refNode->slotId, operatorTypeStr(unit->compare.optr));
         }
 
         if (unit->right.type == FLD_TYPE_VALUE && FILTER_UNIT_OPTR(unit) != OP_TYPE_IN) {
@@ -1536,7 +1496,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options)
         if (unit->compare.optr2) {
           strcat(str, " && ");
           if (unit->compare.optr2 >= 0 && unit->compare.optr2 <= OP_TYPE_JSON_CONTAINS){
-            sprintf(str + strlen(str), "[%d][%d]  %s  [", refNode->dataBlockId, refNode->slotId, gOptrStr[unit->compare.optr2].str);
+            sprintf(str + strlen(str), "[%d][%d]  %s  [", refNode->dataBlockId, refNode->slotId, operatorTypeStr(unit->compare.optr2));
           }
 
           if (unit->right2.type == FLD_TYPE_VALUE && FILTER_UNIT_OPTR(unit) != OP_TYPE_IN) {
diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp
index 9b40f0a465..7229fdec38 100644
--- a/source/libs/scalar/test/scalar/scalarTests.cpp
+++ b/source/libs/scalar/test/scalar/scalarTests.cpp
@@ -1089,16 +1089,16 @@ void makeCalculate(void *json, void *key, int32_t rightType, void *rightData, do
 
  }else if(opType == OP_TYPE_ADD || opType == OP_TYPE_SUB || opType == OP_TYPE_MULTI || opType == OP_TYPE_DIV ||
             opType == OP_TYPE_REM || opType == OP_TYPE_MINUS){
-   printf("op:%s,1result:%f,except:%f\n", gOptrStr[opType].str, *((double *)colDataGetData(column, 0)), exceptValue);
+   printf("op:%s,1result:%f,except:%f\n", operatorTypeStr(opType), *((double *)colDataGetData(column, 0)), exceptValue);
    ASSERT_TRUE(fabs(*((double *)colDataGetData(column, 0)) - exceptValue) < 0.0001);
  }else if(opType == OP_TYPE_BIT_AND || opType == OP_TYPE_BIT_OR){
-   printf("op:%s,2result:%" PRId64 ",except:%f\n", gOptrStr[opType].str, *((int64_t *)colDataGetData(column, 0)), exceptValue);
+   printf("op:%s,2result:%" PRId64 ",except:%f\n", operatorTypeStr(opType), *((int64_t *)colDataGetData(column, 0)), exceptValue);
    ASSERT_EQ(*((int64_t *)colDataGetData(column, 0)), exceptValue);
  }else if(opType == OP_TYPE_GREATER_THAN || opType == OP_TYPE_GREATER_EQUAL || opType == OP_TYPE_LOWER_THAN ||
             opType == OP_TYPE_LOWER_EQUAL || opType == OP_TYPE_EQUAL || opType == OP_TYPE_NOT_EQUAL ||
             opType == OP_TYPE_IS_NULL || opType == OP_TYPE_IS_NOT_NULL || opType == OP_TYPE_IS_TRUE ||
             opType == OP_TYPE_LIKE || opType == OP_TYPE_NOT_LIKE || opType == OP_TYPE_MATCH || opType == OP_TYPE_NMATCH){
-   printf("op:%s,3result:%d,except:%f\n", gOptrStr[opType].str, *((bool *)colDataGetData(column, 0)), exceptValue);
+   printf("op:%s,3result:%d,except:%f\n", operatorTypeStr(opType), *((bool *)colDataGetData(column, 0)), exceptValue);
    ASSERT_EQ(*((bool *)colDataGetData(column, 0)), exceptValue);
  }
 

From e25600e8e8035a581be2a9ffaf22ee063ce83f14 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 19 Aug 2022 11:57:32 +0800
Subject: [PATCH 95/98] fix crash_gen error

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

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 763483cbf6..7052b0b915 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -1432,7 +1432,7 @@ int transSendRequest(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STran
   if (pThrd == NULL && valid == false) {
     transFreeMsg(pReq->pCont);
     transReleaseExHandle(transGetInstMgt(), (int64_t)shandle);
-    return -1;
+    return TSDB_CODE_RPC_BROKEN_LINK;
   }
 
   TRACE_SET_MSGID(&pReq->info.traceId, tGenIdPI64());
@@ -1477,7 +1477,7 @@ int transSendRecv(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STransMs
   if (pThrd == NULL && valid == false) {
     transFreeMsg(pReq->pCont);
     transReleaseExHandle(transGetInstMgt(), (int64_t)shandle);
-    return -1;
+    return TSDB_CODE_RPC_BROKEN_LINK;
   }
 
   tsem_t* sem = taosMemoryCalloc(1, sizeof(tsem_t));

From f20887ee97bc6a6daf2a74d0e39cda1ab17e0789 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 19 Aug 2022 12:28:27 +0800
Subject: [PATCH 96/98] fix(query): fix interp + fill(linear) datapoint outside
 interpolation window will be included

TD-18392
---
 source/libs/executor/src/timewindowoperator.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 02be01cdb8..c870d9d939 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2413,11 +2413,11 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
             break;
           }
         }
+      }
 
-        if (pSliceInfo->current > pSliceInfo->win.ekey) {
-          doSetOperatorCompleted(pOperator);
-          break;
-        }
+      if (pSliceInfo->current > pSliceInfo->win.ekey) {
+        doSetOperatorCompleted(pOperator);
+        break;
       }
 
       if (ts == pSliceInfo->current) {

From 390c2aa36056cc3373b14c221f22da50edc9a851 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Fri, 19 Aug 2022 14:26:08 +0800
Subject: [PATCH 97/98] fix: escape character problem in auto create table
 insert

---
 tests/system-test/1-insert/time_range_wise.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system-test/1-insert/time_range_wise.py b/tests/system-test/1-insert/time_range_wise.py
index 8f61da221d..c31d8d2547 100644
--- a/tests/system-test/1-insert/time_range_wise.py
+++ b/tests/system-test/1-insert/time_range_wise.py
@@ -293,7 +293,7 @@ class TDTestCase:
         dbname =  tdSql.getData(0,0)
         tdSql.query("select * from information_schema.ins_databases")
         for index , value in enumerate(tdSql.cursor.description):
-            if value[0] == "retention":
+            if value[0] == "retentions":
                 r_index = index
                 break
         for row in tdSql.queryResult:

From 721593ec8f8d1501c11dbc724f67a8665f00275d Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Fri, 19 Aug 2022 15:03:55 +0800
Subject: [PATCH 98/98] docs: query data doc adjust

---
 docs/en/07-develop/02-model/index.mdx      |  2 +-
 docs/en/07-develop/04-query-data/index.mdx | 49 +++++++++++-----------
 docs/zh/07-develop/04-query-data/index.mdx | 49 +++++++++++-----------
 3 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/docs/en/07-develop/02-model/index.mdx b/docs/en/07-develop/02-model/index.mdx
index b647c845d0..06a5346141 100644
--- a/docs/en/07-develop/02-model/index.mdx
+++ b/docs/en/07-develop/02-model/index.mdx
@@ -9,7 +9,7 @@ The data model employed by TDengine is similar to that of a relational database.
 The [characteristics of time-series data](https://www.taosdata.com/blog/2019/07/09/86.html) from different data collection points may be different. Characteristics include collection frequency, retention policy and others which determine how you create and configure the database. For e.g. days to keep, number of replicas, data block size, whether data updates are allowed and other configurable parameters would be determined by the characteristics of your data and your business requirements. For TDengine to operate with the best performance, we strongly recommend that you create and configure different databases for data with different characteristics. This allows you, for example, to set up different storage and retention policies. When creating a database, there are a lot of parameters that can be configured such as, the days to keep data, the number of replicas, the number of memory blocks, time precision, the minimum and maximum number of rows in each data block, whether compression is enabled, the time range of the data in single data file and so on. Below is an example of the SQL statement to create a database.
 
 ```sql
-CREATE DATABASE power KEEP 365 DURATION 10 BUFFER 16 VGROUPS 100 WAL 1;
+CREATE DATABASE power KEEP 365 DURATION 10 BUFFER 16 WAL_LEVEL 1;
 ```
 
 In the above SQL statement:
diff --git a/docs/en/07-develop/04-query-data/index.mdx b/docs/en/07-develop/04-query-data/index.mdx
index a212fa9529..1dfcecc359 100644
--- a/docs/en/07-develop/04-query-data/index.mdx
+++ b/docs/en/07-develop/04-query-data/index.mdx
@@ -61,20 +61,20 @@ In summary, records across subtables can be aggregated by a simple query on thei
 In TDengine CLI `taos`, use the SQL below to get the average voltage of all the meters in California grouped by location.
 
 ```
-taos> SELECT AVG(voltage) FROM meters GROUP BY location;
-       avg(voltage)        |            location            |
-=============================================================
-             222.000000000 | California.LosAngeles                |
-             219.200000000 | California.SanFrancisco               |
-Query OK, 2 row(s) in set (0.002136s)
+taos> SELECT AVG(voltage), location FROM meters GROUP BY location;
+       avg(voltage)        |                             location                             |
+===============================================================================================
+             219.200000000 | California.SanFrancisco                                          |
+             221.666666667 | California.LosAngeles                                            |
+Query OK, 2 rows in database (0.005995s)
 ```
 
 ### Example 2
 
-In TDengine CLI `taos`, use the SQL below to get the number of rows and the maximum current in the past 24 hours from meters whose groupId is 2.
+In TDengine CLI `taos`, use the SQL below to get the number of rows and the maximum current from meters whose groupId is 2.
 
 ```
-taos> SELECT count(*), max(current) FROM meters where groupId = 2 and ts > now - 24h;
+taos> SELECT count(*), max(current) FROM meters where groupId = 2;
      count(*)  |    max(current)  |
 ==================================
             5 |             13.4 |
@@ -88,40 +88,41 @@ Join queries are only allowed between subtables of the same STable. In [Select](
 In IoT use cases, down sampling is widely used to aggregate data by time range. The `INTERVAL` keyword in TDengine can be used to simplify the query by time window. For example, the SQL statement below can be used to get the sum of current every 10 seconds from meters table d1001.
 
 ```
-taos> SELECT sum(current) FROM d1001 INTERVAL(10s);
-           ts            |       sum(current)        |
+taos> SELECT _wstart, sum(current) FROM d1001 INTERVAL(10s);
+         _wstart         |       sum(current)        |
 ======================================================
  2018-10-03 14:38:00.000 |              10.300000191 |
  2018-10-03 14:38:10.000 |              24.900000572 |
-Query OK, 2 row(s) in set (0.000883s)
+Query OK, 2 rows in database (0.003139s)
 ```
 
 Down sampling can also be used for STable. For example, the below SQL statement can be used to get the sum of current from all meters in California.
 
 ```
-taos> SELECT SUM(current) FROM meters where location like "California%" INTERVAL(1s);
-           ts            |       sum(current)        |
+taos> SELECT _wstart, SUM(current) FROM meters where location like "California%" INTERVAL(1s);
+         _wstart         |       sum(current)        |
 ======================================================
  2018-10-03 14:38:04.000 |              10.199999809 |
- 2018-10-03 14:38:05.000 |              32.900000572 |
+ 2018-10-03 14:38:05.000 |              23.699999809 |
  2018-10-03 14:38:06.000 |              11.500000000 |
  2018-10-03 14:38:15.000 |              12.600000381 |
- 2018-10-03 14:38:16.000 |              36.000000000 |
-Query OK, 5 row(s) in set (0.001538s)
+ 2018-10-03 14:38:16.000 |              34.400000572 |
+Query OK, 5 rows in database (0.007413s)
 ```
 
 Down sampling also supports time offset. For example, the below SQL statement can be used to get the sum of current from all meters but each time window must start at the boundary of 500 milliseconds.
 
 ```
-taos> SELECT SUM(current) FROM meters INTERVAL(1s, 500a);
-           ts            |       sum(current)        |
+taos> SELECT _wstart, SUM(current) FROM meters INTERVAL(1s, 500a);
+         _wstart         |       sum(current)        |
 ======================================================
- 2018-10-03 14:38:04.500 |              11.189999809 |
- 2018-10-03 14:38:05.500 |              31.900000572 |
- 2018-10-03 14:38:06.500 |              11.600000000 |
- 2018-10-03 14:38:15.500 |              12.300000381 |
- 2018-10-03 14:38:16.500 |              35.000000000 |
-Query OK, 5 row(s) in set (0.001521s)
+ 2018-10-03 14:38:03.500 |              10.199999809 |
+ 2018-10-03 14:38:04.500 |              10.300000191 |
+ 2018-10-03 14:38:05.500 |              13.399999619 |
+ 2018-10-03 14:38:06.500 |              11.500000000 |
+ 2018-10-03 14:38:14.500 |              12.600000381 |
+ 2018-10-03 14:38:16.500 |              34.400000572 |
+Query OK, 6 rows in database (0.005515s)
 ```
 
 In many use cases, it's hard to align the timestamp of the data collected by each collection point. However, a lot of algorithms like FFT require the data to be aligned with same time interval and application programs have to handle this by themselves. In TDengine, it's easy to achieve the alignment using down sampling.
diff --git a/docs/zh/07-develop/04-query-data/index.mdx b/docs/zh/07-develop/04-query-data/index.mdx
index 68f49d9f2b..2631d147a5 100644
--- a/docs/zh/07-develop/04-query-data/index.mdx
+++ b/docs/zh/07-develop/04-query-data/index.mdx
@@ -54,20 +54,20 @@ Query OK, 2 row(s) in set (0.001100s)
 在 TAOS Shell，查找加利福尼亚州所有智能电表采集的电压平均值，并按照 location 分组。
 
 ```
-taos> SELECT AVG(voltage) FROM meters GROUP BY location;
-       avg(voltage)        |            location            |
-=============================================================
-             222.000000000 | California.LosAngeles                |
-             219.200000000 | California.SanFrancisco               |
-Query OK, 2 row(s) in set (0.002136s)
+taos> SELECT AVG(voltage), location FROM meters GROUP BY location;
+       avg(voltage)        |                             location                             |
+===============================================================================================
+             219.200000000 | California.SanFrancisco                                          |
+             221.666666667 | California.LosAngeles                                            |
+Query OK, 2 rows in database (0.005995s)
 ```
 
 ### 示例二
 
-在 TAOS shell, 查找 groupId 为 2 的所有智能电表过去 24 小时的记录条数，电流的最大值。
+在 TAOS shell, 查找 groupId 为 2 的所有智能电表的记录条数，电流的最大值。
 
 ```
-taos> SELECT count(*), max(current) FROM meters where groupId = 2 and ts > now - 24h;
+taos> SELECT count(*), max(current) FROM meters where groupId = 2;
      cunt(*)  |    max(current)  |
 ==================================
             5 |             13.4 |
@@ -81,40 +81,41 @@ Query OK, 1 row(s) in set (0.002136s)
 物联网场景里，经常需要通过降采样（down sampling）将采集的数据按时间段进行聚合。TDengine 提供了一个简便的关键词 interval 让按照时间窗口的查询操作变得极为简单。比如，将智能电表 d1001 采集的电流值每 10 秒钟求和
 
 ```
-taos> SELECT sum(current) FROM d1001 INTERVAL(10s);
-           ts            |       sum(current)        |
+taos> SELECT _wstart, sum(current) FROM d1001 INTERVAL(10s);
+         _wstart         |       sum(current)        |
 ======================================================
  2018-10-03 14:38:00.000 |              10.300000191 |
  2018-10-03 14:38:10.000 |              24.900000572 |
-Query OK, 2 row(s) in set (0.000883s)
+Query OK, 2 rows in database (0.003139s)
 ```
 
 降采样操作也适用于超级表，比如：将加利福尼亚州所有智能电表采集的电流值每秒钟求和
 
 ```
-taos> SELECT SUM(current) FROM meters where location like "California%" INTERVAL(1s);
-           ts            |       sum(current)        |
+taos> SELECT _wstart, SUM(current) FROM meters where location like "California%" INTERVAL(1s);
+         _wstart         |       sum(current)        |
 ======================================================
  2018-10-03 14:38:04.000 |              10.199999809 |
- 2018-10-03 14:38:05.000 |              32.900000572 |
+ 2018-10-03 14:38:05.000 |              23.699999809 |
  2018-10-03 14:38:06.000 |              11.500000000 |
  2018-10-03 14:38:15.000 |              12.600000381 |
- 2018-10-03 14:38:16.000 |              36.000000000 |
-Query OK, 5 row(s) in set (0.001538s)
+ 2018-10-03 14:38:16.000 |              34.400000572 |
+Query OK, 5 rows in database (0.007413s)
 ```
 
 降采样操作也支持时间偏移，比如：将所有智能电表采集的电流值每秒钟求和，但要求每个时间窗口从 500 毫秒开始
 
 ```
-taos> SELECT SUM(current) FROM meters INTERVAL(1s, 500a);
-           ts            |       sum(current)        |
+taos> SELECT _wstart, SUM(current) FROM meters INTERVAL(1s, 500a);
+         _wstart         |       sum(current)        |
 ======================================================
- 2018-10-03 14:38:04.500 |              11.189999809 |
- 2018-10-03 14:38:05.500 |              31.900000572 |
- 2018-10-03 14:38:06.500 |              11.600000000 |
- 2018-10-03 14:38:15.500 |              12.300000381 |
- 2018-10-03 14:38:16.500 |              35.000000000 |
-Query OK, 5 row(s) in set (0.001521s)
+ 2018-10-03 14:38:03.500 |              10.199999809 |
+ 2018-10-03 14:38:04.500 |              10.300000191 |
+ 2018-10-03 14:38:05.500 |              13.399999619 |
+ 2018-10-03 14:38:06.500 |              11.500000000 |
+ 2018-10-03 14:38:14.500 |              12.600000381 |
+ 2018-10-03 14:38:16.500 |              34.400000572 |
+Query OK, 6 rows in database (0.005515s)
 ```
 
 物联网场景里，每个数据采集点采集数据的时间是难同步的，但很多分析算法(比如 FFT)需要把采集的数据严格按照时间等间隔的对齐，在很多系统里，需要应用自己写程序来处理，但使用 TDengine 的降采样操作就轻松解决。