Merge branch 'fix/dnode' into feature/sync-refactor

docs-cn/27-train-faq/01-faq.md

@@ -74,7 +74,7 @@ title: 常见问题及反馈
    检查服务器侧 TCP 端口连接是否工作：`nc -l {port}`
    检查客户端侧 TCP 端口连接是否工作：`nc {hostIP} {port}`
 
- - Windows 系统请使用 PowerShell 命令 Net-TestConnection -ComputerName {fqdn} -Port {port} 检测服务段端口是否访问
+ - Windows 系统请使用 PowerShell 命令 Test-NetConnection -ComputerName {fqdn} -Port {port} 检测服务段端口是否访问
 
 10. 也可以使用 taos 程序内嵌的网络连通检测功能，来验证服务器和客户端之间指定的端口连接是否通畅（包括 TCP 和 UDP）：[TDengine 内嵌网络检测工具使用指南](https://www.taosdata.com/blog/2020/09/08/1816.html)。
 

docs-en/14-reference/03-connector/python.mdx

@@ -199,8 +199,7 @@ The `connect()` function returns a `taos.TaosConnection` instance. In client-sid
 
 All arguments to the `connect()` function are optional keyword arguments. The following are the connection parameters specified.
 
-- - `url`： The URL of taosAdapter REST service. The default is <http://localhost:6041>.
+- `url`： The URL of taosAdapter REST service. The default is <http://localhost:6041>.
-- `host`: The host to connect to. The default is localhost.
 - `user`: TDengine user name. The default is `root`.
 - `password`: TDengine user password. The default is `taosdata`.
 - `timeout`: HTTP request timeout in seconds. The default is `socket._GLOBAL_DEFAULT_TIMEOUT`. Usually, no configuration is needed.

docs-en/27-train-faq/01-faq.md

@@ -45,7 +45,7 @@ When the client is unable to connect to the server, you can try the following wa
    Check whether a TCP port on server side is open: `nc -l {port}`
    Check whether a TCP port on client side is open: `nc {hostIP} {port}`
 
- - On Windows system `Net-TestConnection -ComputerName {fqdn} -Port {port}` on PowerShell can be used to check whether the port on server side is open for access.
+ - On Windows system `Test-NetConnection -ComputerName {fqdn} -Port {port}` on PowerShell can be used to check whether the port on server side is open for access.
 
 7.  TDengine CLI `taos` can also be used to check network, please refer to [TDengine CLI](/reference/taos-shell).
 

include/common/tcommon.h

@@ -108,6 +108,7 @@ typedef struct SColumnInfoData {
 
 typedef struct SQueryTableDataCond {
   // STimeWindow  twindow;
+  uint64_t     suid;
   int32_t      order;  // desc|asc order to iterate the data block
   int32_t      numOfCols;
   SColumnInfo* colList;

include/common/tdatablock.h

@@ -223,7 +223,8 @@ int32_t blockDataTrimFirstNRows(SSDataBlock* pBlock, size_t n);
 
 SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData);
 
-void  blockCompressEncode(const SSDataBlock* pBlock, char* data, int32_t* dataLen, int32_t numOfCols, int8_t needCompress);
+void        blockCompressEncode(const SSDataBlock* pBlock, char* data, int32_t* dataLen, int32_t numOfCols,
+                                int8_t needCompress);
 const char* blockCompressDecode(SSDataBlock* pBlock, int32_t numOfCols, int32_t numOfRows, const char* pData);
 
 void blockDebugShowData(const SArray* dataBlocks, const char* flag);
@@ -231,6 +232,8 @@ void blockDebugShowData(const SArray* dataBlocks, const char* flag);
 int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SArray* pDataBlocks, STSchema* pTSchema, int32_t vgId,
                                     tb_uid_t suid);
 
+char* buildCtbNameByGroupId(const char* stbName, uint64_t groupId);
+
 SSubmitReq* tdBlockToSubmit(const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid,
                             const char* stbFullName, int32_t vgId);
 

include/common/tmsg.h

@@ -1315,6 +1315,31 @@ typedef struct {
 int32_t tSerializeSKillTransReq(void* buf, int32_t bufLen, SKillTransReq* pReq);
 int32_t tDeserializeSKillTransReq(void* buf, int32_t bufLen, SKillTransReq* pReq);
 
+typedef struct {
+  int32_t useless;  // useless
+} SBalanceVgroupReq;
+
+int32_t tSerializeSBalanceVgroupReq(void* buf, int32_t bufLen, SBalanceVgroupReq* pReq);
+int32_t tDeserializeSBalanceVgroupReq(void* buf, int32_t bufLen, SBalanceVgroupReq* pReq);
+
+typedef struct {
+  int32_t vgId1;
+  int32_t vgId2;
+} SMergeVgroupReq;
+
+int32_t tSerializeSMergeVgroupReq(void* buf, int32_t bufLen, SMergeVgroupReq* pReq);
+int32_t tDeserializeSMergeVgroupReq(void* buf, int32_t bufLen, SMergeVgroupReq* pReq);
+
+typedef struct {
+  int32_t vgId;
+  int32_t dnodeId1;
+  int32_t dnodeId2;
+  int32_t dnodeId3;
+} SRedistributeVgroupReq;
+
+int32_t tSerializeSRedistributeVgroupReq(void* buf, int32_t bufLen, SRedistributeVgroupReq* pReq);
+int32_t tDeserializeSRedistributeVgroupReq(void* buf, int32_t bufLen, SRedistributeVgroupReq* pReq);
+
 typedef struct {
   char user[TSDB_USER_LEN];
   char spi;
@@ -2460,6 +2485,32 @@ typedef struct {
 int32_t tSerializeSUserIndexRsp(void* buf, int32_t bufLen, const SUserIndexRsp* pRsp);
 int32_t tDeserializeSUserIndexRsp(void* buf, int32_t bufLen, SUserIndexRsp* pRsp);
 
+typedef struct {
+  char tbFName[TSDB_TABLE_FNAME_LEN];
+} STableIndexReq;
+
+int32_t tSerializeSTableIndexReq(void* buf, int32_t bufLen, STableIndexReq* pReq);
+int32_t tDeserializeSTableIndexReq(void* buf, int32_t bufLen, STableIndexReq* pReq);
+
+typedef struct {
+  int8_t    intervalUnit;
+  int8_t    slidingUnit;
+  int64_t   interval;
+  int64_t   offset;
+  int64_t   sliding;
+  int64_t   dstTbUid;  
+  int32_t   dstVgId;  // for stream  
+  char*     expr;
+} STableIndexInfo;
+
+typedef struct {
+  SArray* pIndex;
+} STableIndexRsp;
+
+int32_t tSerializeSTableIndexRsp(void* buf, int32_t bufLen, const STableIndexRsp* pRsp);
+int32_t tDeserializeSTableIndexRsp(void* buf, int32_t bufLen, STableIndexRsp* pRsp);
+
+
 typedef struct {
   int8_t  mqMsgType;
   int32_t code;

include/common/tmsgdef.h

@@ -130,6 +130,7 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_MND_CREATE_INDEX, "create-index", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_DROP_INDEX, "drop-index", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_GET_INDEX, "get-index", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_GET_TABLE_INDEX, "get-table-index", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_CREATE_TOPIC, "create-topic", SMCreateTopicReq, SMCreateTopicRsp)
   TD_DEF_MSG_TYPE(TDMT_MND_ALTER_TOPIC, "alter-topic", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_DROP_TOPIC, "drop-topic", NULL, NULL)
@@ -153,6 +154,9 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_MND_GRANT, "grant", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_AUTH, "auth", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_APPLY_MSG, "mnode-apply", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_BALANCE_VGROUP, "balance-vgroup", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_MERGE_VGROUP, "merge-vgroup", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_REDISTRIBUTE_VGROUP, "redistribute-vgroup", NULL, NULL)
 
   TD_NEW_MSG_SEG(TDMT_VND_MSG)
   TD_DEF_MSG_TYPE(TDMT_VND_SUBMIT, "submit", SSubmitReq, SSubmitRsp)
@@ -169,10 +173,6 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_VND_CREATE_STB, "vnode-create-stb", SVCreateStbReq, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_ALTER_STB, "vnode-alter-stb", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_DROP_STB, "vnode-drop-stb", SVDropStbReq, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_MQ_CONSUME, "vnode-mq-consume", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_MQ_QUERY, "vnode-mq-query", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_MQ_CONNECT, "vnode-mq-connect", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_MQ_DISCONNECT, "vnode-mq-disconnect", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_MQ_VG_CHANGE, "vnode-mq-vg-change", SMqRebVgReq, SMqRebVgRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_MQ_VG_DELETE, "vnode-mq-vg-delete", SMqVDeleteReq, SMqVDeleteRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_TASK, "vnode-cancel-task", NULL, NULL)
@@ -183,12 +183,8 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_VND_EXPLAIN, "vnode-explain", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_SUBSCRIBE, "vnode-subscribe", SMVSubscribeReq, SMVSubscribeRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_CONSUME, "vnode-consume", SMqPollReq, SMqDataBlkRsp)
-  TD_DEF_MSG_TYPE(TDMT_VND_TASK_DEPLOY, "vnode-task-deploy", SStreamTaskDeployReq, SStreamTaskDeployRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_STREAM_TRIGGER, "vnode-stream-trigger", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_TASK_RUN, "vnode-stream-task-run", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_VND_STREAM_DISPATCH_WRITE, "vnode-stream-task-dispatch-write", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_TASK_DISPATCH, "vnode-stream-task-dispatch", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_TASK_DISPATCH_WRITE, "vnode-stream-task-dispatch-write", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_TASK_RECOVER, "vnode-stream-task-recover", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_CREATE_SMA, "vnode-create-sma", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_SMA, "vnode-cancel-sma", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL)
@@ -202,11 +198,12 @@ enum {
 
   TD_NEW_MSG_SEG(TDMT_QND_MSG)
 
-  TD_NEW_MSG_SEG(TDMT_SND_MSG)
+  //shared by snode and vnode
-  TD_DEF_MSG_TYPE(TDMT_SND_TASK_DEPLOY, "snode-task-deploy", SStreamTaskDeployReq, SStreamTaskDeployRsp)
+  TD_NEW_MSG_SEG(TDMT_STREAM_MSG)
-  TD_DEF_MSG_TYPE(TDMT_SND_TASK_RUN, "snode-stream-task-run", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_DEPLOY, "stream-task-deploy", SStreamTaskDeployReq, SStreamTaskDeployRsp)
-  TD_DEF_MSG_TYPE(TDMT_SND_TASK_DISPATCH, "snode-stream-task-dispatch", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_RUN, "stream-task-run", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_SND_TASK_RECOVER, "snode-stream-task-recover", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_DISPATCH, "stream-task-dispatch", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_RECOVER, "stream-task-recover", NULL, NULL)
 
   TD_NEW_MSG_SEG(TDMT_SCH_MSG)
   TD_DEF_MSG_TYPE(TDMT_SCH_LINK_BROKEN, "link-broken", NULL, NULL)

include/common/ttokendef.h

@@ -188,10 +188,10 @@
 #define TK_KILL          170
 #define TK_CONNECTION    171
 #define TK_TRANSACTION   172
-#define TK_MERGE         173
+#define TK_BALANCE       173
 #define TK_VGROUP        174
-#define TK_REDISTRIBUTE  175
+#define TK_MERGE         175
-#define TK_SPLIT         176
+#define TK_REDISTRIBUTE  176
 #define TK_SYNCDB        177
 #define TK_DELETE        178
 #define TK_NULL          179

include/libs/catalog/catalog.h

@@ -272,6 +272,8 @@ int32_t catalogGetDBCfg(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, cons
 
 int32_t catalogGetIndexMeta(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char* indexName, SIndexInfo* pInfo);
 
+int32_t catalogGetTableIndex(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, const char* tbFName, SArray** pRes);
+
 int32_t catalogGetUdfInfo(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char* funcName, SFuncInfo* pInfo);
 
 int32_t catalogChkAuth(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, const char* user, const char* dbFName, AUTH_TYPE type, bool *pass);
@@ -280,7 +282,6 @@ int32_t catalogUpdateUserAuthInfo(SCatalog* pCtg, SGetUserAuthRsp* pAuth);
 
 int32_t catalogUpdateVgEpSet(SCatalog* pCtg, const char* dbFName, int32_t vgId, SEpSet *epSet);
 
-
 int32_t ctgdLaunchAsyncCall(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, uint64_t reqId, bool forceUpdate);
 
 

include/libs/nodes/cmdnodes.h

@@ -28,6 +28,14 @@ extern "C" {
 #define DESCRIBE_RESULT_TYPE_LEN  (20 + VARSTR_HEADER_SIZE)
 #define DESCRIBE_RESULT_NOTE_LEN  (8 + VARSTR_HEADER_SIZE)
 
+#define PRIVILEGE_TYPE_MASK(n) (1 << n)
+
+#define PRIVILEGE_TYPE_ALL   PRIVILEGE_TYPE_MASK(0)
+#define PRIVILEGE_TYPE_READ  PRIVILEGE_TYPE_MASK(1)
+#define PRIVILEGE_TYPE_WRITE PRIVILEGE_TYPE_MASK(2)
+
+#define PRIVILEGE_TYPE_TEST_MASK(val, mask) (((val) & (mask)) != 0)
+
 typedef struct SDatabaseOptions {
   ENodeType   type;
   int32_t     buffer;
@@ -316,14 +324,6 @@ typedef struct SDropFunctionStmt {
   bool      ignoreNotExists;
 } SDropFunctionStmt;
 
-#define PRIVILEGE_TYPE_MASK(n) (1 << n)
-
-#define PRIVILEGE_TYPE_ALL   PRIVILEGE_TYPE_MASK(0)
-#define PRIVILEGE_TYPE_READ  PRIVILEGE_TYPE_MASK(1)
-#define PRIVILEGE_TYPE_WRITE PRIVILEGE_TYPE_MASK(2)
-
-#define PRIVILEGE_TYPE_TEST_MASK(val, mask) (((val) & (mask)) != 0)
-
 typedef struct SGrantStmt {
   ENodeType type;
   char      userName[TSDB_USER_LEN];
@@ -333,6 +333,30 @@ typedef struct SGrantStmt {
 
 typedef SGrantStmt SRevokeStmt;
 
+typedef struct SBalanceVgroupStmt {
+  ENodeType type;
+} SBalanceVgroupStmt;
+
+typedef struct SMergeVgroupStmt {
+  ENodeType type;
+  int32_t   vgId1;
+  int32_t   vgId2;
+} SMergeVgroupStmt;
+
+typedef struct SRedistributeVgroupStmt {
+  ENodeType  type;
+  int32_t    vgId;
+  int32_t    dnodeId1;
+  int32_t    dnodeId2;
+  int32_t    dnodeId3;
+  SNodeList* pDnodes;
+} SRedistributeVgroupStmt;
+
+typedef struct SSplitVgroupStmt {
+  ENodeType type;
+  int32_t   vgId;
+} SSplitVgroupStmt;
+
 #ifdef __cplusplus
 }
 #endif

include/libs/nodes/nodes.h

@@ -140,6 +140,7 @@ typedef enum ENodeType {
   QUERY_NODE_DROP_FUNCTION_STMT,
   QUERY_NODE_CREATE_STREAM_STMT,
   QUERY_NODE_DROP_STREAM_STMT,
+  QUERY_NODE_BALANCE_VGROUP_STMT,
   QUERY_NODE_MERGE_VGROUP_STMT,
   QUERY_NODE_REDISTRIBUTE_VGROUP_STMT,
   QUERY_NODE_SPLIT_VGROUP_STMT,

include/libs/stream/tstream.h

@@ -131,40 +131,13 @@ static FORCE_INLINE void* streamQueueNextItem(SStreamQueue* queue) {
 
 SStreamDataSubmit* streamDataSubmitNew(SSubmitReq* pReq);
 
-static FORCE_INLINE void streamDataSubmitRefDec(SStreamDataSubmit* pDataSubmit) {
+void streamDataSubmitRefDec(SStreamDataSubmit* pDataSubmit);
-  int32_t ref = atomic_sub_fetch_32(pDataSubmit->dataRef, 1);
-  ASSERT(ref >= 0);
-  if (ref == 0) {
-    taosMemoryFree(pDataSubmit->data);
-    taosMemoryFree(pDataSubmit->dataRef);
-  }
-}
 
 SStreamDataSubmit* streamSubmitRefClone(SStreamDataSubmit* pSubmit);
 
 #if 0
 int32_t streamDataBlockEncode(void** buf, const SStreamDataBlock* pOutput);
 void*   streamDataBlockDecode(const void* buf, SStreamDataBlock* pInput);
-
-static FORCE_INLINE int32_t streamEnqueue1(SStreamQueue* queue, SStreamQueueItem* pItem) {
-  int8_t inputStatus = atomic_load_8(&queue->enqueueStatus);
-  if (inputStatus == TASK_INPUT_STATUS__NORMAL) {
-    if (pItem->type == STREAM_INPUT__DATA_SUBMIT) {
-      SStreamDataSubmit* pSubmitClone = streamSubmitRefClone((SStreamDataSubmit*)pItem);
-      if (pSubmitClone == NULL) {
-        atomic_store_8(&queue->enqueueStatus, TASK_INPUT_STATUS__FAILED);
-        return -1;
-      }
-      taosWriteQitem(queue->queue, pSubmitClone);
-    } else if (pItem->type == STREAM_INPUT__DATA_BLOCK) {
-      taosWriteQitem(queue->queue, pItem);
-    } else if (pItem->type == STREAM_INPUT__CHECKPOINT) {
-      taosWriteQitem(queue->queue, pItem);
-    }
-    return 0;
-  }
-  return 0;
-}
 #endif
 
 typedef struct {
@@ -209,6 +182,7 @@ typedef void FSmaSink(void* vnode, int64_t smaId, const SArray* data);
 typedef struct {
   int64_t smaId;
   // following are not applicable to encoder and decoder
+  void*     vnode;
   FSmaSink* smaSink;
 } STaskSinkSma;
 
@@ -290,7 +264,7 @@ struct SStreamTask {
   SStreamQueue* outputQueue;
 
   // application storage
-  void* ahandle;
+  // void* ahandle;
 };
 
 SStreamTask* tNewSStreamTask(int64_t streamId, int32_t childId);
@@ -331,7 +305,16 @@ static FORCE_INLINE void streamTaskInputFail(SStreamTask* pTask) {
 }
 
 static FORCE_INLINE int32_t streamTaskOutput(SStreamTask* pTask, SStreamDataBlock* pBlock) {
+  if (pTask->sinkType == TASK_SINK__TABLE) {
+    ASSERT(pTask->dispatchType == TASK_DISPATCH__NONE);
+    pTask->tbSink.tbSinkFunc(pTask, pTask->tbSink.vnode, 0, pBlock->blocks);
+  } else if (pTask->sinkType == TASK_SINK__SMA) {
+    ASSERT(pTask->dispatchType == TASK_DISPATCH__NONE);
+    pTask->smaSink.smaSink(pTask->smaSink.vnode, pTask->smaSink.smaId, pBlock->blocks);
+  } else {
+    ASSERT(pTask->dispatchType != TASK_DISPATCH__NONE);
     taosWriteQitem(pTask->outputQueue->queue, pBlock);
+  }
   return 0;
 }
 
@@ -339,26 +322,11 @@ typedef struct {
   int32_t reserved;
 } SStreamTaskDeployRsp;
 
-typedef struct {
-  // SMsgHead head;
-  int64_t streamId;
-  int32_t taskId;
-  SArray* data;  // SArray<SSDataBlock>
-} SStreamTaskExecReq;
-
 typedef struct {
   // SMsgHead     head;
   SStreamTask* task;
 } SStreamTaskDeployReq;
 
-int32_t tEncodeSStreamTaskExecReq(void** buf, const SStreamTaskExecReq* pReq);
-void*   tDecodeSStreamTaskExecReq(const void* buf, SStreamTaskExecReq* pReq);
-void    tFreeSStreamTaskExecReq(SStreamTaskExecReq* pReq);
-
-typedef struct {
-  int32_t reserved;
-} SStreamTaskExecRsp;
-
 typedef struct {
   SMsgHead head;
   int64_t  streamId;

include/util/taoserror.h

@@ -653,6 +653,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_PAR_VALUE_TOO_LONG            TAOS_DEF_ERROR_CODE(0, 0x2653)
 #define TSDB_CODE_PAR_INTERNAL_ERROR            TAOS_DEF_ERROR_CODE(0, 0x2654)
 #define TSDB_CODE_PAR_INVALID_DELETE_WHERE      TAOS_DEF_ERROR_CODE(0, 0x2655)
+#define TSDB_CODE_PAR_INVALID_REDISTRIBUTE_VG   TAOS_DEF_ERROR_CODE(0, 0x2656)
 
 //planner
 #define TSDB_CODE_PLAN_INTERNAL_ERROR           TAOS_DEF_ERROR_CODE(0, 0x2700)

source/client/src/tmq.c

@@ -195,7 +195,7 @@ typedef struct {
 
 tmq_conf_t* tmq_conf_new() {
   tmq_conf_t* conf = taosMemoryCalloc(1, sizeof(tmq_conf_t));
-  conf->withTbName = -1;
+  conf->withTbName = false;
   conf->autoCommit = true;
   conf->autoCommitInterval = 5000;
   conf->resetOffset = TMQ_CONF__RESET_OFFSET__EARLIEAST;
@@ -256,13 +256,10 @@ tmq_conf_res_t tmq_conf_set(tmq_conf_t* conf, const char* key, const char* value
 
   if (strcmp(key, "msg.with.table.name") == 0) {
     if (strcmp(value, "true") == 0) {
-      conf->withTbName = 1;
+      conf->withTbName = true;
       return TMQ_CONF_OK;
     } else if (strcmp(value, "false") == 0) {
-      conf->withTbName = 0;
+      conf->withTbName = false;
-      return TMQ_CONF_OK;
-    } else if (strcmp(value, "none") == 0) {
-      conf->withTbName = -1;
       return TMQ_CONF_OK;
     } else {
       return TMQ_CONF_INVALID;

source/common/src/tdatablock.c

@@ -18,6 +18,7 @@
 #include "tcompare.h"
 #include "tglobal.h"
 #include "tlog.h"
+#include "tname.h"
 
 int32_t taosGetFqdnPortFromEp(const char* ep, SEp* pEp) {
   pEp->port = 0;
@@ -1316,7 +1317,6 @@ static void doShiftBitmap(char* nullBitmap, size_t n, size_t total) {
   }
 }
 
-
 static void colDataTrimFirstNRows(SColumnInfoData* pColInfoData, size_t n, size_t total) {
   if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
     memmove(pColInfoData->varmeta.offset, &pColInfoData->varmeta.offset[n], (total - n) * sizeof(int32_t));
@@ -1544,7 +1544,8 @@ void blockDebugShowData(const SArray* dataBlocks, const char* flag) {
  *
  * TODO: colId should be set
  */
-int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SArray* pDataBlocks, STSchema* pTSchema, int32_t vgId, tb_uid_t suid) {
+int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SArray* pDataBlocks, STSchema* pTSchema, int32_t vgId,
+                                    tb_uid_t suid) {
   int32_t sz = taosArrayGetSize(pDataBlocks);
   int32_t bufSize = sizeof(SSubmitReq);
   for (int32_t i = 0; i < sz; ++i) {
@@ -1599,15 +1600,18 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SArray* pDataBlocks
                                   offset, k);
 
             } else {
-              tdAppendColValToRow(&rb, PRIMARYKEY_TIMESTAMP_COL_ID + k, TSDB_DATA_TYPE_TIMESTAMP, TD_VTYPE_NORM, var, true, offset, k);
+              tdAppendColValToRow(&rb, PRIMARYKEY_TIMESTAMP_COL_ID + k, TSDB_DATA_TYPE_TIMESTAMP, TD_VTYPE_NORM, var,
+                                  true, offset, k);
             }
             break;
           case TSDB_DATA_TYPE_NCHAR: {
-            tdAppendColValToRow(&rb, PRIMARYKEY_TIMESTAMP_COL_ID + k, TSDB_DATA_TYPE_NCHAR, TD_VTYPE_NORM, var, true, offset, k);
+            tdAppendColValToRow(&rb, PRIMARYKEY_TIMESTAMP_COL_ID + k, TSDB_DATA_TYPE_NCHAR, TD_VTYPE_NORM, var, true,
+                                offset, k);
             break;
           }
           case TSDB_DATA_TYPE_VARCHAR: {  // TSDB_DATA_TYPE_BINARY
-            tdAppendColValToRow(&rb, PRIMARYKEY_TIMESTAMP_COL_ID + k, TSDB_DATA_TYPE_VARCHAR, TD_VTYPE_NORM, var, true, offset, k);
+            tdAppendColValToRow(&rb, PRIMARYKEY_TIMESTAMP_COL_ID + k, TSDB_DATA_TYPE_VARCHAR, TD_VTYPE_NORM, var, true,
+                                offset, k);
             break;
           }
           case TSDB_DATA_TYPE_VARBINARY:
@@ -1681,6 +1685,33 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SArray* pDataBlocks
   return TSDB_CODE_SUCCESS;
 }
 
+char* buildCtbNameByGroupId(const char* stbName, uint64_t groupId) {
+  SArray* tags = taosArrayInit(0, sizeof(void*));
+  SSmlKv* pTag = taosMemoryCalloc(1, sizeof(SSmlKv));
+  pTag->key = "group_id";
+  pTag->keyLen = strlen(pTag->key);
+  pTag->type = TSDB_DATA_TYPE_UBIGINT;
+  pTag->u = groupId;
+  taosArrayPush(tags, &pTag);
+
+  void* cname = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + 1);
+
+  RandTableName rname = {
+      .tags = tags,
+      .sTableName = stbName,
+      .sTableNameLen = strlen(stbName),
+      .childTableName = cname,
+  };
+
+  buildChildTableName(&rname);
+
+  taosMemoryFree(pTag);
+  taosArrayDestroy(tags);
+
+  ASSERT(rname.childTableName && rname.childTableName[0]);
+  return rname.childTableName;
+}
+
 SSubmitReq* tdBlockToSubmit(const SArray* pBlocks, const STSchema* pTSchema, bool createTb, int64_t suid,
                             const char* stbFullName, int32_t vgId) {
   SSubmitReq* ret = NULL;
@@ -1703,15 +1734,12 @@ SSubmitReq* tdBlockToSubmit(const SArray* pBlocks, const STSchema* pTSchema, boo
 
     if (createTb) {
       SVCreateTbReq createTbReq = {0};
-      char*         cname = taosMemoryCalloc(1, TSDB_TABLE_FNAME_LEN);
+      char*         cname = buildCtbNameByGroupId(stbFullName, pDataBlock->info.groupId);
-      snprintf(cname, TSDB_TABLE_FNAME_LEN, "%s:%ld", stbFullName, pDataBlock->info.groupId);
       createTbReq.name = cname;
       createTbReq.flags = 0;
       createTbReq.type = TSDB_CHILD_TABLE;
       createTbReq.ctb.suid = suid;
 
-
-
       STagVal tagVal = {.cid = 1,
                         .type = TSDB_DATA_TYPE_UBIGINT,
                         .pData = (uint8_t*)&pDataBlock->info.groupId,

source/common/src/tmsg.c

@@ -2394,6 +2394,102 @@ int32_t tDeserializeSUserIndexRsp(void *buf, int32_t bufLen, SUserIndexRsp *pRsp
   return 0;
 }
 
+int32_t tSerializeSTableIndexReq(void *buf, int32_t bufLen, STableIndexReq *pReq) {
+  SEncoder encoder = {0};
+  tEncoderInit(&encoder, buf, bufLen);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeCStr(&encoder, pReq->tbFName) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tEncoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSTableIndexReq(void *buf, int32_t bufLen, STableIndexReq *pReq) {
+  SDecoder decoder = {0};
+  tDecoderInit(&decoder, buf, bufLen);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pReq->tbFName) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tDecoderClear(&decoder);
+  return 0;
+}
+
+int32_t tSerializeSTableIndexInfo(SEncoder *pEncoder, STableIndexInfo* pInfo) {
+  if (tEncodeI8(pEncoder, pInfo->intervalUnit) < 0) return -1;
+  if (tEncodeI8(pEncoder, pInfo->slidingUnit) < 0) return -1;
+  if (tEncodeI64(pEncoder, pInfo->interval) < 0) return -1;
+  if (tEncodeI64(pEncoder, pInfo->offset) < 0) return -1;
+  if (tEncodeI64(pEncoder, pInfo->sliding) < 0) return -1;
+  if (tEncodeI64(pEncoder, pInfo->dstTbUid) < 0) return -1;
+  if (tEncodeI32(pEncoder, pInfo->dstVgId) < 0) return -1;
+  if (tEncodeCStr(pEncoder, pInfo->expr) < 0) return -1;
+  return 0;
+}
+
+int32_t tSerializeSTableIndexRsp(void *buf, int32_t bufLen, const STableIndexRsp *pRsp) {
+  SEncoder encoder = {0};
+  tEncoderInit(&encoder, buf, bufLen);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  int32_t num = taosArrayGetSize(pRsp->pIndex);
+  if (tEncodeI32(&encoder, num) < 0) return -1;
+  if (num > 0) {
+    for (int32_t i = 0; i < num; ++i) {
+      STableIndexInfo* pInfo = (STableIndexInfo*)taosArrayGet(pRsp->pIndex, i);
+      if (tSerializeSTableIndexInfo(&encoder, pInfo) < 0) return -1;
+    }
+  }
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tEncoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSTableIndexInfo(SDecoder *pDecoder, STableIndexInfo *pInfo) {
+  if (tDecodeI8(pDecoder, &pInfo->intervalUnit) < 0) return -1;
+  if (tDecodeI8(pDecoder, &pInfo->slidingUnit) < 0) return -1;
+  if (tDecodeI64(pDecoder, &pInfo->interval) < 0) return -1;
+  if (tDecodeI64(pDecoder, &pInfo->offset) < 0) return -1;
+  if (tDecodeI64(pDecoder, &pInfo->sliding) < 0) return -1;
+  if (tDecodeI64(pDecoder, &pInfo->dstTbUid) < 0) return -1;
+  if (tDecodeI32(pDecoder, &pInfo->dstVgId) < 0) return -1;
+  if (tDecodeCStrAlloc(pDecoder, &pInfo->expr) < 0) return -1;
+
+  return 0;
+}
+
+int32_t tDeserializeSTableIndexRsp(void *buf, int32_t bufLen, STableIndexRsp *pRsp) {
+  SDecoder decoder = {0};
+  tDecoderInit(&decoder, buf, bufLen);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  int32_t num = 0;
+  if (tDecodeI32(&decoder, &num) < 0) return -1;
+  if (num > 0) {
+    pRsp->pIndex = taosArrayInit(num, sizeof(STableIndexInfo));
+    if (NULL == pRsp->pIndex) return -1;
+    STableIndexInfo info;
+    for (int32_t i = 0; i < num; ++i) {
+      if (tDeserializeSTableIndexInfo(&decoder, &info) < 0) return -1;
+      if (NULL == taosArrayPush(pRsp->pIndex, &info)) {
+        taosMemoryFree(info.expr);
+        return -1;
+      }
+    }
+  }
+  tEndDecode(&decoder);
+
+  tDecoderClear(&decoder);
+  return 0;
+}
+
+
 int32_t tSerializeSShowReq(void *buf, int32_t bufLen, SShowReq *pReq) {
   SEncoder encoder = {0};
   tEncoderInit(&encoder, buf, bufLen);
@@ -3258,6 +3354,89 @@ int32_t tDeserializeSKillTransReq(void *buf, int32_t bufLen, SKillTransReq *pReq
   return 0;
 }
 
+int32_t tSerializeSBalanceVgroupReq(void *buf, int32_t bufLen, SBalanceVgroupReq *pReq) {
+  SEncoder encoder = {0};
+  tEncoderInit(&encoder, buf, bufLen);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->useless) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tEncoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSBalanceVgroupReq(void *buf, int32_t bufLen, SBalanceVgroupReq *pReq) {
+  SDecoder decoder = {0};
+  tDecoderInit(&decoder, buf, bufLen);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->useless) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tDecoderClear(&decoder);
+  return 0;
+}
+
+int32_t tSerializeSMergeVgroupReq(void *buf, int32_t bufLen, SMergeVgroupReq *pReq) {
+  SEncoder encoder = {0};
+  tEncoderInit(&encoder, buf, bufLen);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->vgId1) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->vgId2) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tEncoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSMergeVgroupReq(void *buf, int32_t bufLen, SMergeVgroupReq *pReq) {
+  SDecoder decoder = {0};
+  tDecoderInit(&decoder, buf, bufLen);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->vgId1) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->vgId2) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tDecoderClear(&decoder);
+  return 0;
+}
+
+int32_t tSerializeSRedistributeVgroupReq(void *buf, int32_t bufLen, SRedistributeVgroupReq *pReq) {
+  SEncoder encoder = {0};
+  tEncoderInit(&encoder, buf, bufLen);
+
+  if (tStartEncode(&encoder) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->vgId) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->dnodeId1) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->dnodeId2) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->dnodeId3) < 0) return -1;
+  tEndEncode(&encoder);
+
+  int32_t tlen = encoder.pos;
+  tEncoderClear(&encoder);
+  return tlen;
+}
+
+int32_t tDeserializeSRedistributeVgroupReq(void *buf, int32_t bufLen, SRedistributeVgroupReq *pReq) {
+  SDecoder decoder = {0};
+  tDecoderInit(&decoder, buf, bufLen);
+
+  if (tStartDecode(&decoder) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->vgId) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->dnodeId1) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->dnodeId2) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->dnodeId3) < 0) return -1;
+  tEndDecode(&decoder);
+
+  tDecoderClear(&decoder);
+  return 0;
+}
+
 int32_t tSerializeSDCreateMnodeReq(void *buf, int32_t bufLen, SDCreateMnodeReq *pReq) {
   SEncoder encoder = {0};
   tEncoderInit(&encoder, buf, bufLen);

source/dnode/mgmt/mgmt_mnode/src/mmHandle.c

@@ -181,6 +181,7 @@ SArray *mmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_MND_DROP_SMA, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_CREATE_STREAM, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_GET_INDEX, mmPutNodeMsgToReadQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_MND_GET_TABLE_INDEX, mmPutNodeMsgToReadQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_CREATE_TOPIC, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_ALTER_TOPIC, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_DROP_TOPIC, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
@@ -210,7 +211,7 @@ SArray *mmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_VG_CHANGE_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_VG_DELETE_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_DROP_TASK, mmPutNodeMsgToQueryQueue, 1) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_DEPLOY_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DEPLOY_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_CONFIG_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_REPLICA_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_CONFIRM_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;

source/dnode/mgmt/mgmt_snode/src/smHandle.c

@@ -94,9 +94,10 @@ SArray *smGetMsgHandles() {
 
   if (dmSetMgmtHandle(pArray, TDMT_MON_SM_INFO, smPutNodeMsgToMonitorQueue, 0) == NULL) goto _OVER;
 
-  // Requests handled by SNODE
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DEPLOY, smPutNodeMsgToMgmtQueue, 1) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_SND_TASK_DEPLOY, smPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RUN, smPutNodeMsgToMgmtQueue, 1) == NULL) goto _OVER;
-  /*if (dmSetMgmtHandle(pArray, TDMT_SND_TASK_EXEC, smPutNodeMsgToExecQueue, 0) == NULL) goto _OVER;*/
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DISPATCH, smPutNodeMsgToMgmtQueue, 1) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RECOVER, smPutNodeMsgToMgmtQueue, 1) == NULL) goto _OVER;
 
   code = 0;
 _OVER:

source/dnode/mgmt/mgmt_vnode/src/vmHandle.c

@@ -210,8 +210,7 @@ int32_t vmProcessCreateVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) {
     return -1;
   }
 
-  dDebug("vgId:%d, start to create vnode, tsma:%d standby:%d", createReq.vgId, createReq.isTsma,
+  dDebug("vgId:%d, start to create vnode, tsma:%d standby:%d", createReq.vgId, createReq.isTsma, createReq.standby);
-         createReq.standby);
   vmGenerateVnodeCfg(&createReq, &vnodeCfg);
 
   if (vmTsmaAdjustDays(&vnodeCfg, &createReq) < 0) {
@@ -333,11 +332,6 @@ SArray *vmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_VND_UPDATE_TAG_VAL, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_TABLE_META, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_TABLES_META, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_CONSUME, vmPutMsgToQueryQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_QUERY, vmPutMsgToQueryQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_CONNECT, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_DISCONNECT, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
-  // if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_SET_CUR, vmPutMsgToWriteQueue, 0)== NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_CANCEL_TASK, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_DROP_TASK, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_CREATE_STB, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
@@ -352,13 +346,14 @@ SArray *vmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_VG_CHANGE, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_VG_DELETE, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_CONSUME, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_DEPLOY, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_QUERY_HEARTBEAT, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_STREAM_TRIGGER, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_RUN, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_DISPATCH, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_RECOVER, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_DELETE, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_VND_QUERY_HEARTBEAT, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
+
+  if (dmSetMgmtHandle(pArray, TDMT_VND_STREAM_TRIGGER, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DEPLOY, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RUN, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DISPATCH, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RECOVER, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
 
   if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_REPLICA, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_CONFIG, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;

source/dnode/mgmt/node_mgmt/src/dmTransport.c

@@ -95,6 +95,8 @@ static void dmProcessRpcMsg(SDnode *pDnode, SRpcMsg *pRpc, SEpSet *pEpSet) {
         int32_t   vgId = ntohl(pHead->vgId);
         if (vgId == QNODE_HANDLE) {
           pWrapper = &pDnode->wrappers[QNODE];
+        } else if (vgId == SNODE_HANDLE) {
+          pWrapper = &pDnode->wrappers[SNODE];
         } else if (vgId == MNODE_HANDLE) {
           pWrapper = &pDnode->wrappers[MNODE];
         } else {

source/dnode/mnode/impl/inc/mndDef.h

@@ -309,6 +309,7 @@ typedef struct {
   int8_t    slidingUnit;
   int8_t    timezone;
   int32_t   dstVgId;  // for stream
+  int64_t   dstTbUid;
   int64_t   interval;
   int64_t   offset;
   int64_t   sliding;

source/dnode/mnode/impl/src/mndDnode.c

@@ -566,9 +566,11 @@ static int32_t mndDropDnode(SMnode *pMnode, SRpcMsg *pReq, SDnodeObj *pDnode, SM
   pRaw = NULL;
 
   if (pMObj != NULL) {
+    mDebug("trans:%d, mnode on dnode:%d will be dropped", pTrans->id, pDnode->id);
     if (mndSetDropMnodeInfoToTrans(pMnode, pTrans, pMObj) != 0) goto _OVER;
   }
   if (numOfVnodes > 0) {
+    mDebug("trans:%d, %d vnodes on dnode:%d will be dropped", pTrans->id, numOfVnodes, pDnode->id);
     if (mndSetMoveVgroupsInfoToTrans(pMnode, pTrans, pDnode->id) != 0) goto _OVER;
   }
   if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;

source/dnode/mnode/impl/src/mndScheduler.c

@@ -132,7 +132,7 @@ int32_t mndAssignTaskToVg(SMnode* pMnode, STrans* pTrans, SStreamTask* pTask, SS
     terrno = TSDB_CODE_QRY_INVALID_INPUT;
     return -1;
   }
-  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet, TDMT_VND_TASK_DEPLOY, pVgroup->vgId);
+  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet, TDMT_STREAM_TASK_DEPLOY, pVgroup->vgId);
   return 0;
 }
 
@@ -156,7 +156,7 @@ int32_t mndAssignTaskToSnode(SMnode* pMnode, STrans* pTrans, SStreamTask* pTask,
     terrno = TSDB_CODE_QRY_INVALID_INPUT;
     return -1;
   }
-  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet, TDMT_SND_TASK_DEPLOY, 0);
+  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet, TDMT_STREAM_TASK_DEPLOY, 0);
   return 0;
 }
 
@@ -222,7 +222,7 @@ int32_t mndAddShuffledSinkToStream(SMnode* pMnode, STrans* pTrans, SStreamObj* p
     // dispatch
     pTask->dispatchType = TASK_DISPATCH__NONE;
 
-    mndPersistTaskDeployReq(pTrans, pTask, &pTask->epSet, TDMT_VND_TASK_DEPLOY, pVgroup->vgId);
+    mndPersistTaskDeployReq(pTrans, pTask, &pTask->epSet, TDMT_STREAM_TASK_DEPLOY, pVgroup->vgId);
   }
   return 0;
 }
@@ -267,8 +267,7 @@ int32_t mndAddFixedSinkToStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStr
   // dispatch
   pTask->dispatchType = TASK_DISPATCH__NONE;
 
-  /*mndPersistTaskDeployReq(pTrans, pTask, &pTask->epSet, TDMT_VND_TASK_DEPLOY, pVgroup->vgId);*/
+  mndPersistTaskDeployReq(pTrans, pTask, &pTask->epSet, TDMT_STREAM_TASK_DEPLOY, pStream->fixedSinkVg.vgId);
-  mndPersistTaskDeployReq(pTrans, pTask, &pTask->epSet, TDMT_VND_TASK_DEPLOY, pStream->fixedSinkVg.vgId);
 
   return 0;
 }
@@ -361,7 +360,7 @@ int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
           ASSERT(taosArrayGetSize(pArray) == 1);
           SStreamTask* lastLevelTask = taosArrayGetP(pArray, 0);
           /*pTask->dispatchMsgType = TDMT_VND_TASK_MERGE_EXEC;*/
-          pTask->dispatchMsgType = TDMT_VND_TASK_DISPATCH;
+          pTask->dispatchMsgType = TDMT_STREAM_TASK_DISPATCH;
           pTask->dispatchType = TASK_DISPATCH__FIXED;
 
           pTask->fixedEpDispatcher.taskId = lastLevelTask->taskId;
@@ -407,7 +406,7 @@ int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
           pTask->dispatchType = TASK_DISPATCH__SHUFFLE;
 
           /*pTask->dispatchMsgType = TDMT_VND_TASK_WRITE_EXEC;*/
-          pTask->dispatchMsgType = TDMT_VND_TASK_DISPATCH;
+          pTask->dispatchMsgType = TDMT_STREAM_TASK_DISPATCH;
           SDbObj* pDb = mndAcquireDb(pMnode, pStream->targetDb);
           ASSERT(pDb);
           if (mndExtractDbInfo(pMnode, pDb, &pTask->shuffleDispatcher.dbInfo, NULL) < 0) {
@@ -438,7 +437,7 @@ int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
         } else {
           pTask->dispatchType = TASK_DISPATCH__FIXED;
           /*pTask->dispatchMsgType = TDMT_VND_TASK_WRITE_EXEC;*/
-          pTask->dispatchMsgType = TDMT_VND_TASK_DISPATCH;
+          pTask->dispatchMsgType = TDMT_STREAM_TASK_DISPATCH;
           SArray* pArray = taosArrayGetP(pStream->tasks, 0);
           // one sink only
           ASSERT(taosArrayGetSize(pArray) == 1);

source/dnode/mnode/impl/src/mndSma.c

@@ -40,6 +40,7 @@ static int32_t  mndSmaGetVgEpSet(SMnode *pMnode, SDbObj *pDb, SVgEpSet **ppVgEpS
 static int32_t  mndProcessMCreateSmaReq(SRpcMsg *pReq);
 static int32_t  mndProcessMDropSmaReq(SRpcMsg *pReq);
 static int32_t  mndProcessGetSmaReq(SRpcMsg *pReq);
+static int32_t mndProcessGetTbSmaReq(SRpcMsg *pReq);
 static int32_t  mndRetrieveSma(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows);
 static void     mndCancelGetNextSma(SMnode *pMnode, void *pIter);
 
@@ -59,6 +60,7 @@ int32_t mndInitSma(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_VND_CREATE_SMA_RSP, mndTransProcessRsp);
   mndSetMsgHandle(pMnode, TDMT_VND_DROP_SMA_RSP, mndTransProcessRsp);
   mndSetMsgHandle(pMnode, TDMT_MND_GET_INDEX, mndProcessGetSmaReq);
+  mndSetMsgHandle(pMnode, TDMT_MND_GET_TABLE_INDEX, mndProcessGetTbSmaReq);
 
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_INDEX, mndRetrieveSma);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_INDEX, mndCancelGetNextSma);
@@ -870,6 +872,55 @@ static int32_t mndGetSma(SMnode *pMnode, SUserIndexReq *indexReq, SUserIndexRsp
   return code;
 }
 
+static int32_t mndGetTableSma(SMnode *pMnode, STableIndexReq *indexReq, STableIndexRsp *rsp, bool *exist) {
+  int32_t  code = 0;
+  SSmaObj *pSma = NULL;
+  SSdb   *pSdb = pMnode->pSdb;
+  void   *pIter = NULL;
+  STableIndexInfo info;
+
+  while (1) {
+    pIter = sdbFetch(pSdb, SDB_SMA, pIter, (void **)&pSma);
+    if (pIter == NULL) break;
+
+    if (pSma->stb[0] != indexReq->tbFName[0] || strcmp(pSma->stb, indexReq->tbFName)) {
+      continue;
+    }
+
+    info.intervalUnit = pSma->intervalUnit;
+    info.slidingUnit = pSma->slidingUnit;
+    info.interval = pSma->interval;
+    info.offset = pSma->offset;
+    info.sliding = pSma->sliding;
+    info.dstTbUid = pSma->dstTbUid;
+    info.dstVgId = pSma->dstVgId;
+    info.expr = taosMemoryMalloc(pSma->exprLen + 1);
+    if (info.expr == NULL) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = -1;
+      sdbRelease(pSdb, pSma);
+      return code;
+    }
+
+    memcpy(info.expr, pSma->expr, pSma->exprLen);
+    info.expr[pSma->exprLen] = 0;
+
+    if (NULL == taosArrayPush(rsp->pIndex, &info)) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = -1;
+      taosMemoryFree(info.expr);
+      sdbRelease(pSdb, pSma);
+      return code;
+    }
+
+    *exist = true;
+
+    sdbRelease(pSdb, pSma);
+  }
+  
+  return code;
+}
+
 static int32_t mndProcessGetSmaReq(SRpcMsg *pReq) {
   SUserIndexReq indexReq = {0};
   SMnode       *pMnode = pReq->info.node;
@@ -916,6 +967,59 @@ _OVER:
   return code;
 }
 
+static int32_t mndProcessGetTbSmaReq(SRpcMsg *pReq) {
+  STableIndexReq indexReq = {0};
+  SMnode       *pMnode = pReq->info.node;
+  int32_t       code = -1;
+  STableIndexRsp rsp = {0};
+  bool          exist = false;
+
+  if (tDeserializeSTableIndexReq(pReq->pCont, pReq->contLen, &indexReq) != 0) {
+    terrno = TSDB_CODE_INVALID_MSG;
+    goto _OVER;
+  }
+
+  rsp.pIndex = taosArrayInit(10, sizeof(STableIndexInfo));
+  if (NULL == rsp.pIndex) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = -1;
+    goto _OVER;
+  }
+
+  code = mndGetTableSma(pMnode, &indexReq, &rsp, &exist);
+  if (code) {
+    goto _OVER;
+  }
+
+  if (!exist) {
+    code = -1;
+    terrno = TSDB_CODE_MND_DB_INDEX_NOT_EXIST;
+  } else {
+    int32_t contLen = tSerializeSTableIndexRsp(NULL, 0, &rsp);
+    void   *pRsp = rpcMallocCont(contLen);
+    if (pRsp == NULL) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = -1;
+      goto _OVER;
+    }
+
+    tSerializeSTableIndexRsp(pRsp, contLen, &rsp);
+
+    pReq->info.rsp = pRsp;
+    pReq->info.rspLen = contLen;
+
+    code = 0;
+  }
+
+_OVER:
+  if (code != 0) {
+    mError("failed to get table index %s since %s", indexReq.tbFName, terrstr());
+  }
+
+  return code;
+}
+
+
 static int32_t mndRetrieveSma(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
   SMnode  *pMnode = pReq->info.node;
   SSdb    *pSdb = pMnode->pSdb;

source/dnode/mnode/impl/src/mndStream.c

@@ -54,8 +54,8 @@ int32_t mndInitStream(SMnode *pMnode) {
   };
 
   mndSetMsgHandle(pMnode, TDMT_MND_CREATE_STREAM, mndProcessCreateStreamReq);
-  mndSetMsgHandle(pMnode, TDMT_VND_TASK_DEPLOY_RSP, mndTransProcessRsp);
+  mndSetMsgHandle(pMnode, TDMT_STREAM_TASK_DEPLOY_RSP, mndTransProcessRsp);
-  mndSetMsgHandle(pMnode, TDMT_SND_TASK_DEPLOY_RSP, mndTransProcessRsp);
+  /*mndSetMsgHandle(pMnode, TDMT_SND_TASK_DEPLOY_RSP, mndTransProcessRsp);*/
   /*mndSetMsgHandle(pMnode, TDMT_MND_DROP_STREAM, mndProcessDropStreamReq);*/
   /*mndSetMsgHandle(pMnode, TDMT_MND_DROP_STREAM_RSP, mndProcessDropStreamInRsp);*/
 

source/dnode/snode/src/snode.c

@@ -90,7 +90,7 @@ void sndProcessUMsg(SSnode *pSnode, SRpcMsg *pMsg) {
   // stream deploy
   // stream stop/resume
   // operator exec
-  if (pMsg->msgType == TDMT_SND_TASK_DEPLOY) {
+  if (pMsg->msgType == TDMT_STREAM_TASK_DEPLOY) {
     void        *msg = POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead));
     SStreamTask *pTask = taosMemoryMalloc(sizeof(SStreamTask));
     if (pTask == NULL) {

source/dnode/vnode/CMakeLists.txt

@@ -36,12 +36,12 @@ target_sources(
 
     # tsdb
     "src/tsdb/tsdbCommit.c"
-    "src/tsdb/tsdbCommit2.c"
+    # "src/tsdb/tsdbCommit2.c"
     "src/tsdb/tsdbFile.c"
     "src/tsdb/tsdbFS.c"
     "src/tsdb/tsdbOpen.c"
     "src/tsdb/tsdbMemTable.c"
-    "src/tsdb/tsdbMemTable2.c"
+    # "src/tsdb/tsdbMemTable2.c"
     "src/tsdb/tsdbRead.c"
     "src/tsdb/tsdbReadImpl.c"
     "src/tsdb/tsdbWrite.c"

source/dnode/vnode/src/inc/tsdb.h

@@ -39,24 +39,46 @@ typedef struct SDelOp  SDelOp;
 
 static int tsdbKeyCmprFn(const void *p1, const void *p2);
 
-// tsdbMemTable2.c ==============================================================================================
+// tsdbMemTable ==============================================================================================
+typedef struct STbData     STbData;
 typedef struct SMemTable   SMemTable;
-typedef struct SMemData     SMemData;
+typedef struct STbDataIter STbDataIter;
-typedef struct SMemDataIter SMemDataIter;
+typedef struct SMergeInfo  SMergeInfo;
+typedef struct STable      STable;
 
-int32_t tsdbMemTableCreate2(STsdb *pTsdb, SMemTable **ppMemTable);
+// SMemTable
-void    tsdbMemTableDestroy2(SMemTable *pMemTable);
+int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable);
-int32_t tsdbInsertTableData2(STsdb *pTsdb, int64_t version, SVSubmitBlk *pSubmitBlk);
+void    tsdbMemTableDestroy(SMemTable *pMemTable);
-int32_t tsdbDeleteTableData2(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKEY eKey);
+void    tsdbGetTbDataFromMemTable(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid, STbData **ppTbData);
 
-/* SMemDataIter */
+// STbDataIter
-void tsdbMemDataIterOpen(SMemData *pMemData, TSDBKEY *pKey, int8_t backward, SMemDataIter *pIter);
+int32_t tsdbTbDataIterCreate(STbData *pTbData, TSDBKEY *pFrom, int8_t backward, STbDataIter **ppIter);
-bool tsdbMemDataIterNext(SMemDataIter *pIter);
+void   *tsdbTbDataIterDestroy(STbDataIter *pIter);
-void tsdbMemDataIterGet(SMemDataIter *pIter, TSDBROW **ppRow);
+void    tsdbTbDataIterOpen(STbData *pTbData, TSDBKEY *pFrom, int8_t backward, STbDataIter *pIter);
+bool    tsdbTbDataIterNext(STbDataIter *pIter);
+bool    tsdbTbDataIterGet(STbDataIter *pIter, TSDBROW *pRow);
 
-// tsdbCommit2.c ==============================================================================================
+int tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, STbDataIter *pIter, TSKEY maxKey, int maxRowsToRead,
-int32_t tsdbBegin2(STsdb *pTsdb);
+                          SDataCols *pCols, TKEY *filterKeys, int nFilterKeys, bool keepDup, SMergeInfo *pMergeInfo);
-int32_t tsdbCommit2(STsdb *pTsdb);
+
+// tsdbMemTable2.c ==============================================================================================
+// typedef struct SMemTable2   SMemTable2;
+// typedef struct SMemData     SMemData;
+// typedef struct SMemDataIter SMemDataIter;
+
+// int32_t tsdbMemTableCreate2(STsdb *pTsdb, SMemTable2 **ppMemTable);
+// void    tsdbMemTableDestroy2(SMemTable2 *pMemTable);
+// int32_t tsdbInsertTableData2(STsdb *pTsdb, int64_t version, SVSubmitBlk *pSubmitBlk);
+// int32_t tsdbDeleteTableData2(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKEY eKey);
+
+// /* SMemDataIter */
+// void tsdbMemDataIterOpen(SMemData *pMemData, TSDBKEY *pKey, int8_t backward, SMemDataIter *pIter);
+// bool tsdbMemDataIterNext(SMemDataIter *pIter);
+// void tsdbMemDataIterGet(SMemDataIter *pIter, TSDBROW **ppRow);
+
+// // tsdbCommit2.c ==============================================================================================
+// int32_t tsdbBegin2(STsdb *pTsdb);
+// int32_t tsdbCommit2(STsdb *pTsdb);
 
 // tsdbFile.c ==============================================================================================
 typedef int32_t          TSDB_FILE_T;
@@ -124,17 +146,6 @@ int        tsdbRLockFS(STsdbFS *pFs);
 int        tsdbWLockFS(STsdbFS *pFs);
 int        tsdbUnLockFS(STsdbFS *pFs);
 
-// tsdbMemTable ================
-typedef struct STbData       STbData;
-typedef struct STsdbMemTable STsdbMemTable;
-typedef struct SMergeInfo    SMergeInfo;
-typedef struct STable        STable;
-
-int  tsdbMemTableCreate(STsdb *pTsdb, STsdbMemTable **ppMemTable);
-void tsdbMemTableDestroy(STsdbMemTable *pMemTable);
-int  tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead,
-                           SDataCols *pCols, TKEY *filterKeys, int nFilterKeys, bool keepDup, SMergeInfo *pMergeInfo);
-
 // structs
 typedef struct {
   int   minFid;
@@ -151,8 +162,8 @@ struct STsdb {
   char          dir[TSDB_DATA_DIR_LEN];
   bool          repoLocked;
   STsdbKeepCfg  keepCfg;
-  STsdbMemTable *mem;
+  SMemTable    *mem;
-  STsdbMemTable *imem;
+  SMemTable    *imem;
   SRtn          rtn;
   STsdbFS      *fs;
 };
@@ -160,15 +171,12 @@ struct STsdb {
 #if 1  // ======================================
 
 struct STable {
-  uint64_t  tid;
+  uint64_t  suid;
   uint64_t  uid;
   STSchema *pSchema;       // latest schema
   STSchema *pCacheSchema;  // cached cache
 };
 
-#define TABLE_TID(t) (t)->tid
-#define TABLE_UID(t) (t)->uid
-
 // int tsdbPrepareCommit(STsdb *pTsdb);
 typedef enum {
   TSDB_FILE_HEAD = 0,  // .head
@@ -206,27 +214,44 @@ struct SDFileSet {
   SDFile   files[TSDB_FILE_MAX];
 };
 
-struct STbData {
+struct TSDBKEY {
-  tb_uid_t   uid;
+  int64_t version;
-  TSKEY      keyMin;
+  TSKEY   ts;
-  TSKEY      keyMax;
-  int64_t    minVer;
-  int64_t    maxVer;
-  int64_t    nrows;
-  SSkipList *pData;
 };
 
-struct STsdbMemTable {
+typedef struct SMemSkipListNode SMemSkipListNode;
-  SVBufPool *pPool;
+struct SMemSkipListNode {
-  T_REF_DECLARE()
+  int8_t            level;
+  SMemSkipListNode *forwards[0];
+};
+typedef struct SMemSkipList {
+  uint32_t          seed;
+  int64_t           size;
+  int8_t            maxLevel;
+  int8_t            level;
+  SMemSkipListNode *pHead;
+  SMemSkipListNode *pTail;
+} SMemSkipList;
+
+struct STbData {
+  tb_uid_t     suid;
+  tb_uid_t     uid;
+  TSDBKEY      minKey;
+  TSDBKEY      maxKey;
+  SDelOp      *pHead;
+  SDelOp      *pTail;
+  SMemSkipList sl;
+};
+
+struct SMemTable {
   SRWLatch latch;
-  TSKEY      keyMin;
+  STsdb   *pTsdb;
-  TSKEY      keyMax;
+  int32_t  nRef;
-  int64_t    minVer;
+  TSDBKEY  minKey;
-  int64_t    maxVer;
+  TSDBKEY  maxKey;
   int64_t  nRow;
-  SSkipList *pSlIdx;  // SSkiplist<STbData>
+  int64_t  nDelOp;
-  SHashObj  *pHashIdx;
+  SArray  *aTbData;  // SArray<STbData>
 };
 
 struct STsdbFSMeta {
@@ -238,6 +263,8 @@ struct STsdbFSMeta {
 // ==================
 typedef struct {
   STsdbFSMeta meta;       // FS meta
+  SDFile      cacheFile;  // cache file
+  SDFile      tombstone;  // tomestome file
   SArray     *df;         // data file array
   SArray     *sf;         // sma data file array    v2f1900.index_name_1
 } SFSStatus;
@@ -292,16 +319,24 @@ static void  *taosTZfree(void *ptr);
 static size_t taosTSizeof(void *ptr);
 static void   taosTMemset(void *ptr, int c);
 
-static FORCE_INLINE STSRow *tsdbNextIterRow(SSkipListIterator *pIter) {
+struct TSDBROW {
+  int64_t version;
+  STSRow *pTSRow;
+};
+
+static FORCE_INLINE STSRow *tsdbNextIterRow(STbDataIter *pIter) {
+  TSDBROW row;
+
   if (pIter == NULL) return NULL;
 
-  SSkipListNode *node = tSkipListIterGet(pIter);
+  if (tsdbTbDataIterGet(pIter, &row)) {
-  if (node == NULL) return NULL;
+    return row.pTSRow;
-
-  return (STSRow *)SL_GET_NODE_DATA(node);
   }
 
-static FORCE_INLINE TSKEY tsdbNextIterKey(SSkipListIterator *pIter) {
+  return NULL;
+}
+
+static FORCE_INLINE TSKEY tsdbNextIterKey(STbDataIter *pIter) {
   STSRow *row = tsdbNextIterRow(pIter);
   if (row == NULL) return TSDB_DATA_TIMESTAMP_NULL;
 
@@ -311,11 +346,6 @@ static FORCE_INLINE TSKEY tsdbNextIterKey(SSkipListIterator *pIter) {
 // tsdbReadImpl
 typedef struct SReadH SReadH;
 
-struct TSDBKEY {
-  int64_t version;
-  TSKEY   ts;
-};
-
 typedef struct {
   uint64_t suid;
   uint64_t uid;
@@ -354,7 +384,7 @@ typedef struct {
 
 typedef struct {
   int32_t  delimiter;  // For recovery usage
-  int32_t  tid;
+  uint64_t suid;
   uint64_t uid;
   SBlock   blocks[];
 } SBlockInfo;
@@ -650,11 +680,6 @@ struct SFSIter {
 #define TSDB_FS_ITER_FORWARD  TSDB_ORDER_ASC
 #define TSDB_FS_ITER_BACKWARD TSDB_ORDER_DESC
 
-struct TSDBROW {
-  int64_t version;
-  STSRow2 tsRow;
-};
-
 struct TABLEID {
   tb_uid_t suid;
   tb_uid_t uid;
@@ -675,7 +700,7 @@ typedef struct {
   TSKEY    eKey;
 } SDelInfo;
 
-struct SMemTable {
+struct SMemTable2 {
   STsdb  *pTsdb;
   int32_t nRef;
   TSDBKEY minKey;
@@ -705,16 +730,6 @@ static FORCE_INLINE int tsdbKeyCmprFn(const void *p1, const void *p2) {
   return 0;
 }
 
-typedef struct SMemSkipListNode SMemSkipListNode;
-typedef struct SMemSkipList {
-  uint32_t          seed;
-  int32_t           size;
-  int8_t            maxLevel;
-  int8_t            level;
-  SMemSkipListNode *pHead;
-  SMemSkipListNode *pTail;
-} SMemSkipList;
-
 struct SMemData {
   tb_uid_t     suid;
   tb_uid_t     uid;
@@ -726,13 +741,19 @@ struct SMemData {
 };
 
 struct SMemDataIter {
-  SMemData         *pMemData;
+  STbData          *pMemData;
   int8_t            backward;
   TSDBROW          *pRow;
   SMemSkipListNode *pNode;  // current node
   TSDBROW           row;
 };
 
+struct STbDataIter {
+  STbData          *pTbData;
+  int8_t            backward;
+  SMemSkipListNode *pNode;
+};
+
 #endif
 
 #ifdef __cplusplus

source/dnode/vnode/src/inc/vnodeInt.h

@@ -116,7 +116,9 @@ int          tsdbBegin(STsdb* pTsdb);
 int32_t      tsdbCommit(STsdb* pTsdb);
 int          tsdbScanAndConvertSubmitMsg(STsdb* pTsdb, SSubmitReq* pMsg);
 int          tsdbInsertData(STsdb* pTsdb, int64_t version, SSubmitReq* pMsg, SSubmitRsp* pRsp);
-int          tsdbInsertTableData(STsdb* pTsdb, SSubmitMsgIter* pMsgIter, SSubmitBlk* pBlock, SSubmitBlkRsp* pRsp);
+int32_t      tsdbInsertTableData(STsdb* pTsdb, int64_t version, SSubmitMsgIter* pMsgIter, SSubmitBlk* pBlock,
+                                 SSubmitBlkRsp* pRsp);
+int32_t      tsdbDeleteTableData(STsdb* pTsdb, int64_t version, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKEY eKey);
 tsdbReaderT* tsdbQueryTables(SVnode* pVnode, SQueryTableDataCond* pCond, STableListInfo* tableList, uint64_t qId,
                              uint64_t taskId);
 tsdbReaderT  tsdbQueryCacheLastT(STsdb* tsdb, SQueryTableDataCond* pCond, STableListInfo* tableList, uint64_t qId,

source/dnode/vnode/src/meta/metaQuery.c

@@ -163,7 +163,7 @@ SSchemaWrapper *metaGetTableSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver, boo
   SDecoder        dc = {0};
 
   metaRLock(pMeta);
-  if (sver < 0) {
+_query:
   if (tdbTbGet(pMeta->pUidIdx, &uid, sizeof(uid), &pData, &nData) < 0) {
     goto _err;
   }
@@ -171,19 +171,29 @@ SSchemaWrapper *metaGetTableSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver, boo
   version = *(int64_t *)pData;
 
   tdbTbGet(pMeta->pTbDb, &(STbDbKey){.uid = uid, .version = version}, sizeof(STbDbKey), &pData, &nData);
-
   SMetaEntry me = {0};
   tDecoderInit(&dc, pData, nData);
   metaDecodeEntry(&dc, &me);
   if (me.type == TSDB_SUPER_TABLE) {
+    if (sver == -1 || sver == me.stbEntry.schemaRow.version) {
       pSchema = tCloneSSchemaWrapper(&me.stbEntry.schemaRow);
-    } else if (me.type == TSDB_NORMAL_TABLE) {
+      tDecoderClear(&dc);
-      pSchema = tCloneSSchemaWrapper(&me.ntbEntry.schemaRow);
+      goto _exit;
+    }
+  } else if (me.type == TSDB_CHILD_TABLE) {
+    uid = me.ctbEntry.suid;
+    tDecoderClear(&dc);
+    goto _query;
   } else {
-      ASSERT(0);
+    if (sver == -1 || sver == me.ntbEntry.schemaRow.version) {
+      pSchema = tCloneSSchemaWrapper(&me.ntbEntry.schemaRow);
+      tDecoderClear(&dc);
+      goto _exit;
+    }
   }
   tDecoderClear(&dc);
-  } else {
+
+  // query from skm db
   if (tdbTbGet(pMeta->pSkmDb, &(SSkmDbKey){.uid = uid, .sver = sver}, sizeof(SSkmDbKey), &pData, &nData) < 0) {
     goto _err;
   }
@@ -192,8 +202,8 @@ SSchemaWrapper *metaGetTableSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver, boo
   tDecodeSSchemaWrapper(&dc, &schema);
   pSchema = tCloneSSchemaWrapper(&schema);
   tDecoderClear(&dc);
-  }
 
+_exit:
   metaULock(pMeta);
   tdbFree(pData);
   return pSchema;
@@ -279,25 +289,13 @@ tb_uid_t metaCtbCursorNext(SMCtbCursor *pCtbCur) {
 }
 
 STSchema *metaGetTbTSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver) {
-  tb_uid_t        quid;
+  // SMetaReader     mr = {0};
-  SMetaReader     mr = {0};
   STSchema       *pTSchema = NULL;
   SSchemaWrapper *pSW = NULL;
   STSchemaBuilder sb = {0};
   SSchema        *pSchema;
 
-  metaReaderInit(&mr, pMeta, 0);
+  pSW = metaGetTableSchema(pMeta, uid, sver, 0);
-  metaGetTableEntryByUid(&mr, uid);
-
-  if (mr.me.type == TSDB_CHILD_TABLE) {
-    quid = mr.me.ctbEntry.suid;
-  } else {
-    quid = uid;
-  }
-
-  metaReaderClear(&mr);
-
-  pSW = metaGetTableSchema(pMeta, quid, sver, 0);
   if (!pSW) return NULL;
 
   tdInitTSchemaBuilder(&sb, pSW->version);

source/dnode/vnode/src/sma/sma.c

@@ -47,7 +47,7 @@ int32_t tdUpdateExpireWindow(SSma* pSma, const SSubmitReq* pMsg, int64_t version
 int32_t tdGetTSmaData(SSma* pSma, char* pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult) {
   int32_t code = TSDB_CODE_SUCCESS;
   if ((code = tdGetTSmaDataImpl(pSma, pData, indexUid, querySKey, nMaxResult)) < 0) {
-    smaWarn("vgId:%d, get tSma data failed since %s", SMA_VID(pSma), tstrerror(terrno));
+    smaWarn("vgId:%d, get tsma data failed since %s", SMA_VID(pSma), tstrerror(terrno));
   }
   return code;
 }
@@ -55,7 +55,8 @@ int32_t tdGetTSmaData(SSma* pSma, char* pData, int64_t indexUid, TSKEY querySKey
 int32_t smaGetTSmaDays(SVnodeCfg* pCfg, void* pCont, uint32_t contLen, int32_t* days) {
   int32_t code = TSDB_CODE_SUCCESS;
   if ((code = tdGetTSmaDaysImpl(pCfg, pCont, contLen, days)) < 0) {
-    smaWarn("vgId:%d get tSma days failed since %s", pCfg->vgId, tstrerror(terrno));
+    smaWarn("vgId:%d, get tsma days failed since %s", pCfg->vgId, tstrerror(terrno));
   }
+  smaDebug("vgId:%d, get tsma days %d", pCfg->vgId, *days);
   return code;
 }

source/dnode/vnode/src/sma/smaTimeRange2.c

@@ -97,12 +97,16 @@ int32_t tdGetTSmaDaysImpl(SVnodeCfg *pCfg, void *pCont, uint32_t contLen, int32_
     goto _err;
   }
   STsdbCfg *pTsdbCfg = &pCfg->tsdbCfg;
-  int64_t   mInterval = convertTimeFromPrecisionToUnit(tsma.interval, pTsdbCfg->precision, TIME_UNIT_MINUTE);
+  int64_t   sInterval = convertTimeFromPrecisionToUnit(tsma.interval, pTsdbCfg->precision, TIME_UNIT_SECOND);
-  int64_t records = pTsdbCfg->days / mInterval;
+  if (sInterval <= 0) {
-
+    *days = pTsdbCfg->days;
+    return 0;
+  }
+  int64_t records = pTsdbCfg->days * 60 / sInterval;
   if (records >= SMA_STORAGE_SPLIT_FACTOR) {
     *days = pTsdbCfg->days;
   } else {
+    int64_t mInterval = convertTimeFromPrecisionToUnit(tsma.interval, pTsdbCfg->precision, TIME_UNIT_MINUTE);
     int64_t daysPerFile = mInterval * SMA_STORAGE_MINUTES_DAY * 2;
 
     if (daysPerFile > SMA_STORAGE_MINUTES_MAX) {

source/dnode/vnode/src/tq/tq.c

@@ -349,8 +349,9 @@ int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen) {
   }
 
   // sink
-  pTask->ahandle = pTq->pVnode;
+  /*pTask->ahandle = pTq->pVnode;*/
   if (pTask->sinkType == TASK_SINK__SMA) {
+    pTask->smaSink.vnode = pTq->pVnode;
     pTask->smaSink.smaSink = smaHandleRes;
   } else if (pTask->sinkType == TASK_SINK__TABLE) {
     pTask->tbSink.vnode = pTq->pVnode;

source/dnode/vnode/src/tq/tqRead.c

@@ -141,10 +141,10 @@ int32_t tqRetrieveDataBlock(SArray** ppCols, STqReadHandle* pHandle, uint64_t* p
     }
 
     // this interface use suid instead of uid
-    pHandle->pSchemaWrapper = metaGetTableSchema(pHandle->pVnodeMeta, pHandle->msgIter.suid, sversion, true);
+    pHandle->pSchemaWrapper = metaGetTableSchema(pHandle->pVnodeMeta, pHandle->msgIter.uid, sversion, true);
     if (pHandle->pSchemaWrapper == NULL) {
       tqWarn("cannot found schema wrapper for table: suid: %ld, version %d, possibly dropped table",
-             pHandle->msgIter.suid, pHandle->cachedSchemaVer);
+             pHandle->msgIter.uid, pHandle->cachedSchemaVer);
       /*ASSERT(0);*/
       terrno = TSDB_CODE_TQ_TABLE_SCHEMA_NOT_FOUND;
       return -1;

source/dnode/vnode/src/tsdb/tsdbCommit.c

@@ -19,7 +19,7 @@
 
 typedef struct {
   STable      *pTable;
-  SSkipListIterator *pIter;
+  STbDataIter *pIter;
 } SCommitIter;
 
 typedef struct {
@@ -64,7 +64,7 @@ static int  tsdbInitCommitH(SCommitH *pCommith, STsdb *pRepo);
 static void    tsdbSeekCommitIter(SCommitH *pCommith, TSKEY key);
 static int     tsdbNextCommitFid(SCommitH *pCommith);
 static void    tsdbDestroyCommitH(SCommitH *pCommith);
-static int  tsdbCreateCommitIters(SCommitH *pCommith);
+static int32_t tsdbCreateCommitIters(SCommitH *pCommith);
 static void    tsdbDestroyCommitIters(SCommitH *pCommith);
 static int     tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid);
 static void    tsdbResetCommitFile(SCommitH *pCommith);
@@ -92,7 +92,7 @@ static int  tsdbApplyRtnOnFSet(STsdb *pRepo, SDFileSet *pSet, SRtn *pRtn);
 int tsdbBegin(STsdb *pTsdb) {
   if (!pTsdb) return 0;
 
-  STsdbMemTable *pMem;
+  SMemTable *pMem;
 
   if (tsdbMemTableCreate(pTsdb, &pTsdb->mem) < 0) {
     return -1;
@@ -244,7 +244,7 @@ void tsdbGetRtnSnap(STsdb *pRepo, SRtn *pRtn) {
 }
 
 static void tsdbStartCommit(STsdb *pRepo) {
-  STsdbMemTable *pMem = pRepo->imem;
+  SMemTable *pMem = pRepo->imem;
 
   tsdbInfo("vgId:%d, start to commit", REPO_ID(pRepo));
 
@@ -400,7 +400,7 @@ static int tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid) {
       break;
     }
 
-    if (pIter && pIter->pTable && (!pIdx || (pIter->pTable->uid <= pIdx->uid))) {
+    if (pIter && pIter->pTable && (!pIdx || (pIter->pTable->suid <= pIdx->suid || pIter->pTable->uid <= pIdx->uid))) {
       if (tsdbCommitToTable(pCommith, mIter) < 0) {
         tsdbCloseCommitFile(pCommith, true);
         // revert the file change
@@ -453,57 +453,48 @@ static int tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid) {
   return 0;
 }
 
-static int tsdbCreateCommitIters(SCommitH *pCommith) {
+static int32_t tsdbCreateCommitIters(SCommitH *pCommith) {
+  int32_t      code = 0;
   STsdb       *pRepo = TSDB_COMMIT_REPO(pCommith);
-  STsdbMemTable     *pMem = pRepo->imem;
+  SMemTable   *pMem = pRepo->imem;
-  SSkipListIterator *pSlIter;
-  SCommitIter       *pCommitIter;
-  SSkipListNode     *pNode;
   STbData     *pTbData;
+  SCommitIter *pCommitIter;
   STSchema    *pTSchema = NULL;
 
-  pCommith->niters = SL_SIZE(pMem->pSlIdx);
+  pCommith->niters = taosArrayGetSize(pMem->aTbData);
   pCommith->iters = (SCommitIter *)taosMemoryCalloc(pCommith->niters, sizeof(SCommitIter));
   if (pCommith->iters == NULL) {
-    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
+    goto _err;
   }
 
-  // Loop to create iters for each skiplist
+  for (int32_t iIter = 0; iIter < pCommith->niters; iIter++) {
-  pSlIter = tSkipListCreateIter(pMem->pSlIdx);
+    pTbData = (STbData *)taosArrayGetP(pMem->aTbData, iIter);
-  if (pSlIter == NULL) {
+    pCommitIter = &pCommith->iters[iIter];
-    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
-    return -1;
-  }
-  for (int i = 0; i < pCommith->niters; i++) {
-    tSkipListIterNext(pSlIter);
-    pNode = tSkipListIterGet(pSlIter);
-    pTbData = (STbData *)pNode->pData;
 
-    pCommitIter = pCommith->iters + i;
     pTSchema = metaGetTbTSchema(REPO_META(pRepo), pTbData->uid, -1);
-
     if (pTSchema) {
-      pCommitIter->pIter = tSkipListCreateIter(pTbData->pData);
+      tsdbTbDataIterCreate(pTbData, NULL, 0, &pCommitIter->pIter);
-      tSkipListIterNext(pCommitIter->pIter);
 
       pCommitIter->pTable = (STable *)taosMemoryMalloc(sizeof(STable));
       pCommitIter->pTable->uid = pTbData->uid;
-      pCommitIter->pTable->tid = pTbData->uid;
+      pCommitIter->pTable->suid = pTbData->suid;
       pCommitIter->pTable->pSchema = pTSchema;
       pCommitIter->pTable->pCacheSchema = NULL;
     }
   }
-  tSkipListDestroyIter(pSlIter);
 
-  return 0;
+  return code;
+
+_err:
+  return code;
 }
 
 static void tsdbDestroyCommitIters(SCommitH *pCommith) {
   if (pCommith->iters == NULL) return;
 
   for (int i = 1; i < pCommith->niters; i++) {
-    tSkipListDestroyIter(pCommith->iters[i].pIter);
+    tsdbTbDataIterDestroy(pCommith->iters[i].pIter);
     if (pCommith->iters[i].pTable) {
       tdFreeSchema(pCommith->iters[i].pTable->pSchema);
       tdFreeSchema(pCommith->iters[i].pTable->pCacheSchema);
@@ -743,8 +734,8 @@ static int tsdbWriteBlockInfoImpl(SDFile *pHeadf, STable *pTable, SArray *pSupA,
   pBlkInfo = *ppBuf;
 
   pBlkInfo->delimiter = TSDB_FILE_DELIMITER;
-  pBlkInfo->tid = TABLE_TID(pTable);
+  pBlkInfo->suid = pTable->suid;
-  pBlkInfo->uid = TABLE_UID(pTable);
+  pBlkInfo->uid = pTable->uid;
 
   memcpy((void *)(pBlkInfo->blocks), taosArrayGet(pSupA, 0), nSupBlocks * sizeof(SBlock));
   if (nSubBlocks > 0) {
@@ -770,7 +761,8 @@ static int tsdbWriteBlockInfoImpl(SDFile *pHeadf, STable *pTable, SArray *pSupA,
   // Set pIdx
   pBlock = taosArrayGetLast(pSupA);
 
-  pIdx->uid = TABLE_UID(pTable);
+  pIdx->suid = pTable->suid;
+  pIdx->uid = pTable->uid;
   pIdx->hasLast = pBlock->last ? 1 : 0;
   pIdx->maxKey = pBlock->maxKey;
   pIdx->numOfBlocks = (uint32_t)nSupBlocks;
@@ -925,7 +917,7 @@ static int tsdbMoveBlkIdx(SCommitH *pCommith, SBlockIdx *pIdx) {
     return -1;
   }
 
-  STable table = {.tid = pIdx->uid, .uid = pIdx->uid, .pSchema = NULL};
+  STable table = {.suid = pIdx->suid, .uid = pIdx->uid, .pSchema = NULL};
   pCommith->pTable = &table;
 
   while (bidx < nBlocks) {
@@ -1186,7 +1178,7 @@ static int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFi
   }
 
   pBlockData->delimiter = TSDB_FILE_DELIMITER;
-  pBlockData->uid = TABLE_UID(pTable);
+  pBlockData->uid = pTable->uid;
   pBlockData->numOfCols = nColsNotAllNull;
 
   taosCalcChecksumAppend(0, (uint8_t *)pBlockData, tsize);
@@ -1226,7 +1218,7 @@ static int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFi
 
   tsdbDebug("vgId:%d, uid:%" PRId64 " a block of data is written to file %s, offset %" PRId64
             " numOfRows %d len %d numOfCols %" PRId16 " keyFirst %" PRId64 " keyLast %" PRId64,
-            REPO_ID(pRepo), TABLE_UID(pTable), TSDB_FILE_FULL_NAME(pDFile), offset, rowsToWrite, pBlock->len,
+            REPO_ID(pRepo), pTable->uid, TSDB_FILE_FULL_NAME(pDFile), offset, rowsToWrite, pBlock->len,
             pBlock->numOfCols, pBlock->minKey.ts, pBlock->maxKey.ts);
 
   return 0;
@@ -1313,7 +1305,7 @@ static int tsdbMergeMemData(SCommitH *pCommith, SCommitIter *pIter, int bidx) {
     keyLimit = pBlock[1].minKey.ts - 1;
   }
 
-  SSkipListIterator titer = *(pIter->pIter);
+  STbDataIter titer = *(pIter->pIter);
   if (tsdbLoadBlockDataCols(&(pCommith->readh), pBlock, NULL, &colId, 1, false) < 0) return -1;
 
   tsdbLoadDataFromCache(TSDB_COMMIT_REPO(pCommith), pIter->pTable, &titer, keyLimit, INT32_MAX, NULL,
@@ -1522,7 +1514,7 @@ static void tsdbLoadAndMergeFromCache(STsdb *pTsdb, SDataCols *pDataCols, int *i
         lastKey = key2;
       }
 
-      tSkipListIterNext(pCommitIter->pIter);
+      tsdbTbDataIterNext(pCommitIter->pIter);
     } else {
       if (lastKey != key1) {
         if (lastKey != TSKEY_INITIAL_VAL) {
@@ -1554,7 +1546,7 @@ static void tsdbLoadAndMergeFromCache(STsdb *pTsdb, SDataCols *pDataCols, int *i
         tdAppendSTSRowToDataCol(row, pSchema, pTarget, true);
       }
       ++(*iter);
-      tSkipListIterNext(pCommitIter->pIter);
+      tsdbTbDataIterNext(pCommitIter->pIter);
     }
 
     if (pTarget->numOfRows >= (maxRows - 1)) break;

source/dnode/vnode/src/tsdb/tsdbCommit2.c

@@ -16,7 +16,7 @@
 #include "tsdb.h"
 
 typedef struct {
-  SMemTable *pMemTable;
+  SMemTable2 *pMemTable;
   int32_t     minutes;
   int8_t      precision;
   TSKEY       nCommitKey;
@@ -39,7 +39,7 @@ int32_t tsdbBegin2(STsdb *pTsdb) {
   int32_t code = 0;
 
   ASSERT(pTsdb->mem == NULL);
-  code = tsdbMemTableCreate2(pTsdb, (SMemTable **)&pTsdb->mem);
+  code = tsdbMemTableCreate2(pTsdb, (SMemTable2 **)&pTsdb->mem);
   if (code) {
     tsdbError("vgId:%d failed to begin TSDB since %s", TD_VID(pTsdb->pVnode), tstrerror(code));
     goto _exit;
@@ -81,7 +81,7 @@ _err:
 
 static int32_t tsdbCommitStart(SCommitH *pCHandle, STsdb *pTsdb) {
   int32_t     code = 0;
-  SMemTable *pMemTable = (SMemTable *)pTsdb->mem;
+  SMemTable2 *pMemTable = (SMemTable2 *)pTsdb->mem;
 
   tsdbInfo("vgId:%d start to commit", TD_VID(pTsdb->pVnode));
 
@@ -133,7 +133,7 @@ _err:
 static int32_t tsdbCommitEnd(SCommitH *pCHandle) {
   int32_t     code = 0;
   STsdb      *pTsdb = pCHandle->pMemTable->pTsdb;
-  SMemTable *pMemTable = (SMemTable *)pTsdb->imem;
+  SMemTable2 *pMemTable = (SMemTable2 *)pTsdb->imem;
 
   // end transaction
   code = tsdbEndFSTxn(pTsdb);

source/dnode/vnode/src/tsdb/tsdbFile.c

@@ -26,7 +26,6 @@ static const char *TSDB_FNAME_SUFFIX[] = {
 };
 
 static void  tsdbGetFilename(int vid, int fid, uint32_t ver, TSDB_FILE_T ftype, const char *dname, char *fname);
-// static int   tsdbRollBackMFile(SMFile *pMFile);
 static int   tsdbEncodeDFInfo(void **buf, SDFInfo *pInfo);
 static void *tsdbDecodeDFInfo(void *buf, SDFInfo *pInfo);
 static int   tsdbRollBackDFile(SDFile *pDFile);

source/dnode/vnode/src/tsdb/tsdbMemTable.c

@@ -15,67 +15,299 @@
 
 #include "tsdb.h"
 
-static STbData *tsdbNewTbData(tb_uid_t uid);
+#define SL_MAX_LEVEL 5
-static void     tsdbFreeTbData(STbData *pTbData);
-static char    *tsdbGetTsTupleKey(const void *data);
-static int      tsdbTbDataComp(const void *arg1, const void *arg2);
-static char    *tsdbTbDataGetUid(const void *arg);
-static int tsdbAppendTableRowToCols(STsdb *pTsdb, STable *pTable, SDataCols *pCols, STSchema **ppSchema, STSRow *row,
-                                    bool merge);
 
-int tsdbMemTableCreate(STsdb *pTsdb, STsdbMemTable **ppMemTable) {
+#define SL_NODE_SIZE(l)        (sizeof(SMemSkipListNode) + sizeof(SMemSkipListNode *) * (l)*2)
-  STsdbMemTable *pMemTable;
+#define SL_NODE_FORWARD(n, l)  ((n)->forwards[l])
-  SVnode        *pVnode;
+#define SL_NODE_BACKWARD(n, l) ((n)->forwards[(n)->level + (l)])
+#define SL_NODE_DATA(n)        (&SL_NODE_BACKWARD(n, (n)->level))
 
-  *ppMemTable = NULL;
+#define SL_MOVE_BACKWARD 0x1
-  pVnode = pTsdb->pVnode;
+#define SL_MOVE_FROM_POS 0x2
 
-  // alloc handle
+static int32_t tPutTSDBRow(uint8_t *p, TSDBROW *pRow);
-  pMemTable = (STsdbMemTable *)taosMemoryCalloc(1, sizeof(*pMemTable));
+static int32_t tGetTSDBRow(uint8_t *p, TSDBROW *pRow);
+static void    tbDataMovePosTo(STbData *pTbData, SMemSkipListNode **pos, TSDBKEY *pKey, int32_t flags);
+static int32_t tsdbGetOrCreateTbData(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid, STbData **ppTbData);
+static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, STbData *pTbData, int64_t version,
+                                       SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlock, SSubmitBlkRsp *pRsp);
+
+int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) {
+  int32_t    code = 0;
+  SMemTable *pMemTable = NULL;
+
+  pMemTable = (SMemTable *)taosMemoryCalloc(1, sizeof(*pMemTable));
   if (pMemTable == NULL) {
-    return -1;
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
   }
-
-  pMemTable->pPool = pTsdb->pVnode->inUse;
-  T_REF_INIT_VAL(pMemTable, 1);
   taosInitRWLatch(&pMemTable->latch);
-  pMemTable->keyMin = TSKEY_MAX;
+  pMemTable->pTsdb = pTsdb;
-  pMemTable->keyMax = TSKEY_MIN;
+  pMemTable->nRef = 1;
+  pMemTable->minKey = (TSDBKEY){.ts = TSKEY_MAX, .version = INT64_MAX};
+  pMemTable->maxKey = (TSDBKEY){.ts = TSKEY_MIN, .version = -1};
   pMemTable->nRow = 0;
-  pMemTable->pSlIdx = tSkipListCreate(pVnode->config.tsdbCfg.slLevel, TSDB_DATA_TYPE_BIGINT, sizeof(tb_uid_t),
+  pMemTable->nDelOp = 0;
-                                      tsdbTbDataComp, SL_DISCARD_DUP_KEY, tsdbTbDataGetUid);
+  pMemTable->aTbData = taosArrayInit(128, sizeof(STbData *));
-  if (pMemTable->pSlIdx == NULL) {
+  if (pMemTable->aTbData == NULL) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
     taosMemoryFree(pMemTable);
-    return -1;
+    goto _err;
-  }
-
-  pMemTable->pHashIdx = taosHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-  if (pMemTable->pHashIdx == NULL) {
-    tSkipListDestroy(pMemTable->pSlIdx);
-    taosMemoryFree(pMemTable);
-    return -1;
   }
 
   *ppMemTable = pMemTable;
+  return code;
+
+_err:
+  *ppMemTable = NULL;
+  return code;
+}
+
+void tsdbMemTableDestroy(SMemTable *pMemTable) {
+  if (pMemTable) {
+    taosArrayDestroy(pMemTable->aTbData);
+    taosMemoryFree(pMemTable);
+  }
+}
+
+static int32_t tbDataPCmprFn(const void *p1, const void *p2) {
+  STbData *pTbData1 = *(STbData **)p1;
+  STbData *pTbData2 = *(STbData **)p2;
+
+  if (pTbData1->suid < pTbData2->suid) {
+    return -1;
+  } else if (pTbData1->suid > pTbData2->suid) {
+    return 1;
+  }
+
+  if (pTbData1->uid < pTbData2->uid) {
+    return -1;
+  } else if (pTbData1->uid > pTbData2->uid) {
+    return 1;
+  }
+
+  return 0;
+}
+void tsdbGetTbDataFromMemTable(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid, STbData **ppTbData) {
+  STbData *pTbData = &(STbData){.suid = suid, .uid = uid};
+  void    *p = taosArraySearch(pMemTable->aTbData, &pTbData, tbDataPCmprFn, TD_EQ);
+  *ppTbData = p ? *(STbData **)p : NULL;
+}
+
+int32_t tsdbInsertTableData(STsdb *pTsdb, int64_t version, SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlock,
+                            SSubmitBlkRsp *pRsp) {
+  int32_t    code = 0;
+  SMemTable *pMemTable = pTsdb->mem;
+  STbData   *pTbData = NULL;
+  tb_uid_t   suid = pMsgIter->suid;
+  tb_uid_t   uid = pMsgIter->uid;
+  int32_t    sverNew;
+
+  // check if table exists (todo: refact)
+  SMetaReader mr = {0};
+  SMetaEntry  me = {0};
+  metaReaderInit(&mr, pTsdb->pVnode->pMeta, 0);
+  if (metaGetTableEntryByUid(&mr, pMsgIter->uid) < 0) {
+    metaReaderClear(&mr);
+    code = TSDB_CODE_PAR_TABLE_NOT_EXIST;
+    goto _err;
+  }
+  if (pRsp->tblFName) strcat(pRsp->tblFName, mr.me.name);
+
+  if (mr.me.type == TSDB_NORMAL_TABLE) {
+    sverNew = mr.me.ntbEntry.schemaRow.version;
+  } else {
+    metaGetTableEntryByUid(&mr, mr.me.ctbEntry.suid);
+    sverNew = mr.me.stbEntry.schemaRow.version;
+  }
+  metaReaderClear(&mr);
+  pRsp->sver = sverNew;
+
+  // create/get STbData to op
+  code = tsdbGetOrCreateTbData(pMemTable, suid, uid, &pTbData);
+  if (code) {
+    goto _err;
+  }
+
+  // do insert impl
+  code = tsdbInsertTableDataImpl(pMemTable, pTbData, version, pMsgIter, pBlock, pRsp);
+  if (code) {
+    goto _err;
+  }
+
+  return code;
+
+_err:
+  return code;
+}
+
+int32_t tsdbDeleteTableData(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKEY eKey) {
+  int32_t    code = 0;
+  SMemTable *pMemTable = pTsdb->mem;
+  STbData   *pTbData = NULL;
+  SVBufPool *pPool = pTsdb->pVnode->inUse;
+
+  // check if table exists (todo)
+
+  code = tsdbGetOrCreateTbData(pMemTable, suid, uid, &pTbData);
+  if (code) {
+    goto _err;
+  }
+
+  // do delete
+  SDelOp *pDelOp = (SDelOp *)vnodeBufPoolMalloc(pPool, sizeof(*pDelOp));
+  if (pDelOp == NULL) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+  pDelOp->version = version;
+  pDelOp->sKey = sKey;
+  pDelOp->eKey = eKey;
+  pDelOp->pNext = NULL;
+  if (pTbData->pHead == NULL) {
+    ASSERT(pTbData->pTail == NULL);
+    pTbData->pHead = pTbData->pTail = pDelOp;
+  } else {
+    pTbData->pTail->pNext = pDelOp;
+    pTbData->pTail = pDelOp;
+  }
+
+  // update the state of pMemTable and other (todo)
+
+  pMemTable->nDelOp++;
+
+  tsdbError("vgId:%d delete data from table suid:%" PRId64 " uid:%" PRId64 " skey:%" PRId64 " eKey:%" PRId64
+            " since %s",
+            TD_VID(pTsdb->pVnode), suid, uid, sKey, eKey, tstrerror(code));
+  return code;
+
+_err:
+  tsdbError("vgId:%d failed to delete data from table suid:%" PRId64 " uid:%" PRId64 " skey:%" PRId64 " eKey:%" PRId64
+            " since %s",
+            TD_VID(pTsdb->pVnode), suid, uid, sKey, eKey, tstrerror(code));
+  return code;
+}
+
+static int tsdbAppendTableRowToCols(STsdb *pTsdb, STable *pTable, SDataCols *pCols, STSchema **ppSchema, STSRow *row,
+                                    bool merge) {
+  if (pCols) {
+    if (*ppSchema == NULL || schemaVersion(*ppSchema) != TD_ROW_SVER(row)) {
+      *ppSchema = tsdbGetTableSchemaImpl(pTsdb, pTable, false, false, TD_ROW_SVER(row));
+      if (*ppSchema == NULL) {
+        ASSERT(false);
+        return -1;
+      }
+    }
+
+    tdAppendSTSRowToDataCol(row, *ppSchema, pCols, merge);
+  }
+
   return 0;
 }
 
-void tsdbMemTableDestroy(STsdbMemTable *pMemTable) {
+int32_t tsdbTbDataIterCreate(STbData *pTbData, TSDBKEY *pFrom, int8_t backward, STbDataIter **ppIter) {
-  if (pMemTable) {
+  int32_t code = 0;
-    taosHashCleanup(pMemTable->pHashIdx);
+
-    SSkipListIterator *pIter = tSkipListCreateIter(pMemTable->pSlIdx);
+  (*ppIter) = (STbDataIter *)taosMemoryCalloc(1, sizeof(STbDataIter));
-    SSkipListNode     *pNode = NULL;
+  if ((*ppIter) == NULL) {
-    STbData           *pTbData = NULL;
+    code = TSDB_CODE_OUT_OF_MEMORY;
-    for (;;) {
+    goto _exit;
-      if (!tSkipListIterNext(pIter)) break;
-      pNode = tSkipListIterGet(pIter);
-      pTbData = (STbData *)pNode->pData;
-      tsdbFreeTbData(pTbData);
   }
-    tSkipListDestroyIter(pIter);
+
-    tSkipListDestroy(pMemTable->pSlIdx);
+  tsdbTbDataIterOpen(pTbData, pFrom, backward, *ppIter);
-    taosMemoryFree(pMemTable);
+
+_exit:
+  return code;
 }
+
+void *tsdbTbDataIterDestroy(STbDataIter *pIter) {
+  if (pIter) {
+    taosMemoryFree(pIter);
+  }
+
+  return NULL;
+}
+
+void tsdbTbDataIterOpen(STbData *pTbData, TSDBKEY *pFrom, int8_t backward, STbDataIter *pIter) {
+  SMemSkipListNode *pos[SL_MAX_LEVEL];
+
+  pIter->pTbData = pTbData;
+  pIter->backward = backward;
+  if (pFrom == NULL) {
+    // create from head or tail
+    if (backward) {
+      pIter->pNode = SL_NODE_BACKWARD(pTbData->sl.pTail, 0);
+    } else {
+      pIter->pNode = SL_NODE_FORWARD(pTbData->sl.pHead, 0);
+    }
+  } else {
+    // create from a key
+    if (backward) {
+      tbDataMovePosTo(pTbData, pos, pFrom, SL_MOVE_BACKWARD);
+      pIter->pNode = SL_NODE_BACKWARD(pos[0], 0);
+    } else {
+      tbDataMovePosTo(pTbData, pos, pFrom, 0);
+      pIter->pNode = SL_NODE_FORWARD(pos[0], 0);
+    }
+  }
+}
+
+bool tsdbTbDataIterNext(STbDataIter *pIter) {
+  SMemSkipListNode *pHead = pIter->pTbData->sl.pHead;
+  SMemSkipListNode *pTail = pIter->pTbData->sl.pTail;
+
+  if (pIter->backward) {
+    ASSERT(pIter->pNode != pTail);
+
+    if (pIter->pNode == pHead) {
+      return false;
+    }
+
+    pIter->pNode = SL_NODE_BACKWARD(pIter->pNode, 0);
+    if (pIter->pNode == pHead) {
+      return false;
+    }
+  } else {
+    ASSERT(pIter->pNode != pHead);
+
+    if (pIter->pNode == pTail) {
+      return false;
+    }
+
+    pIter->pNode = SL_NODE_FORWARD(pIter->pNode, 0);
+    if (pIter->pNode == pTail) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool tsdbTbDataIterGet(STbDataIter *pIter, TSDBROW *pRow) {
+  SMemSkipListNode *pHead = pIter->pTbData->sl.pHead;
+  SMemSkipListNode *pTail = pIter->pTbData->sl.pTail;
+  TSDBROW           row = {0};
+
+  if (pRow == NULL) {
+    pRow = &row;
+  }
+
+  if (pIter->backward) {
+    ASSERT(pIter->pNode != pTail);
+
+    if (pIter->pNode == pHead) {
+      return false;
+    }
+  } else {
+    ASSERT(pIter->pNode != pHead);
+
+    if (pIter->pNode == pTail) {
+      return false;
+    }
+  }
+
+  tGetTSDBRow((uint8_t *)SL_NODE_DATA(pIter->pNode), pRow);
+  return true;
 }
 
 /**
@@ -89,7 +321,7 @@ void tsdbMemTableDestroy(STsdbMemTable *pMemTable) {
  *
  * The function tries to procceed AS MUCH AS POSSIBLE.
  */
-int tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead,
+int tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, STbDataIter *pIter, TSKEY maxKey, int maxRowsToRead,
                           SDataCols *pCols, TKEY *filterKeys, int nFilterKeys, bool keepDup, SMergeInfo *pMergeInfo) {
   ASSERT(maxRowsToRead > 0 && nFilterKeys >= 0);
   if (pIter == NULL) return 0;
@@ -172,7 +404,7 @@ int tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, SSkipListIterator *pIter
         }
       }
 
-      tSkipListIterNext(pIter);
+      tsdbTbDataIterNext(pIter);
       row = tsdbNextIterRow(pIter);
       if (row == NULL || TD_ROW_KEY(row) > maxKey) {
         rowKey = INT64_MAX;
@@ -212,7 +444,7 @@ int tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, SSkipListIterator *pIter
         }
       }
 
-      tSkipListIterNext(pIter);
+      tsdbTbDataIterNext(pIter);
       row = tsdbNextIterRow(pIter);
       if (row == NULL || TD_ROW_KEY(row) > maxKey) {
         rowKey = INT64_MAX;
@@ -238,151 +470,281 @@ int tsdbLoadDataFromCache(STsdb *pTsdb, STable *pTable, SSkipListIterator *pIter
   return 0;
 }
 
-int tsdbInsertTableData(STsdb *pTsdb, SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlock, SSubmitBlkRsp *pRsp) {
+static int32_t tsdbGetOrCreateTbData(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid, STbData **ppTbData) {
-  SSubmitBlkIter blkIter = {0};
+  int32_t  code = 0;
-  STsdbMemTable *pMemTable = pTsdb->mem;
+  int32_t  idx = 0;
-  void          *tptr;
+  STbData *pTbData = NULL;
-  STbData       *pTbData;
+  STbData *pTbDataT = &(STbData){.suid = suid, .uid = uid};
-  STSRow        *row;
-  TSKEY          keyMin;
-  TSKEY          keyMax;
-  SSubmitBlk    *pBlkCopy;
-  int64_t        sverNew;
 
-  // check if table exists
+  // get
-  SMetaReader mr = {0};
+  idx = taosArraySearchIdx(pMemTable->aTbData, &pTbDataT, tbDataPCmprFn, TD_GE);
-  SMetaEntry  me = {0};
+  if (idx >= 0) {
-  metaReaderInit(&mr, pTsdb->pVnode->pMeta, 0);
+    pTbData = (STbData *)taosArrayGetP(pMemTable->aTbData, idx);
-  if (metaGetTableEntryByUid(&mr, pMsgIter->uid) < 0) {
+    if (tbDataPCmprFn(&pTbDataT, &pTbData) == 0) goto _exit;
-    metaReaderClear(&mr);
-    terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
-    return -1;
   }
-  if (pRsp->tblFName) strcat(pRsp->tblFName, mr.me.name);
 
-  if (mr.me.type == TSDB_NORMAL_TABLE) {
+  // create
-    sverNew = mr.me.ntbEntry.schemaRow.version;
+  SVBufPool *pPool = pMemTable->pTsdb->pVnode->inUse;
-  } else {
+  int8_t     maxLevel = pMemTable->pTsdb->pVnode->config.tsdbCfg.slLevel;
-    metaGetTableEntryByUid(&mr, mr.me.ctbEntry.suid);
-    sverNew = mr.me.stbEntry.schemaRow.version;
-  }
-  metaReaderClear(&mr);
 
-  // create container is nedd
+  pTbData = vnodeBufPoolMalloc(pPool, sizeof(*pTbData) + SL_NODE_SIZE(maxLevel) * 2);
-  tptr = taosHashGet(pMemTable->pHashIdx, &(pMsgIter->uid), sizeof(pMsgIter->uid));
-  if (tptr == NULL) {
-    pTbData = tsdbNewTbData(pMsgIter->uid);
   if (pTbData == NULL) {
-      return -1;
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
   }
-
+  pTbData->suid = suid;
-    // Put into hash
-    taosHashPut(pMemTable->pHashIdx, &(pMsgIter->uid), sizeof(pMsgIter->uid), &(pTbData), sizeof(pTbData));
-
-    // Put into skiplist
-    tSkipListPut(pMemTable->pSlIdx, pTbData);
-  } else {
-    pTbData = *(STbData **)tptr;
-  }
-
-  // copy data to buffer pool
-  int32_t tlen = pMsgIter->dataLen + pMsgIter->schemaLen + sizeof(*pBlock);
-  pBlkCopy = (SSubmitBlk *)vnodeBufPoolMalloc(pTsdb->mem->pPool, tlen);
-  memcpy(pBlkCopy, pBlock, tlen);
-
-  tInitSubmitBlkIter(pMsgIter, pBlkCopy, &blkIter);
-  if (blkIter.row == NULL) return 0;
-  keyMin = TD_ROW_KEY(blkIter.row);
-
-  tSkipListPutBatchByIter(pTbData->pData, &blkIter, (iter_next_fn_t)tGetSubmitBlkNext);
-
-#ifdef TD_DEBUG_PRINT_ROW
-  printf("!!! %s:%d vgId:%d dir:%s table:%" PRIi64 " has %d rows in skiplist\n\n", __func__, __LINE__,
-         TD_VID(pTsdb->pVnode), pTsdb->dir, pTbData->uid, SL_SIZE(pTbData->pData));
-#endif
-
-  // Set statistics
-  keyMax = TD_ROW_KEY(blkIter.row);
-
-  pTbData->nrows += pMsgIter->numOfRows;
-  if (pTbData->keyMin > keyMin) pTbData->keyMin = keyMin;
-  if (pTbData->keyMax < keyMax) pTbData->keyMax = keyMax;
-
-  pMemTable->nRow += pMsgIter->numOfRows;
-  if (pMemTable->keyMin > keyMin) pMemTable->keyMin = keyMin;
-  if (pMemTable->keyMax < keyMax) pMemTable->keyMax = keyMax;
-
-  pRsp->numOfRows = pMsgIter->numOfRows;
-  pRsp->affectedRows = pMsgIter->numOfRows;
-  pRsp->sver = sverNew;
-
-  return 0;
-}
-
-static STbData *tsdbNewTbData(tb_uid_t uid) {
-  STbData *pTbData = (STbData *)taosMemoryCalloc(1, sizeof(*pTbData));
-  if (pTbData == NULL) {
-    return NULL;
-  }
-
   pTbData->uid = uid;
-  pTbData->keyMin = TSKEY_MAX;
+  pTbData->minKey = (TSDBKEY){.ts = TSKEY_MAX, .version = INT64_MAX};
-  pTbData->keyMax = TSKEY_MIN;
+  pTbData->maxKey = (TSDBKEY){.ts = TSKEY_MIN, .version = -1};
-  pTbData->nrows = 0;
+  pTbData->pHead = NULL;
-#if 0
+  pTbData->pTail = NULL;
-  pTbData->pData = tSkipListCreate(5, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), tkeyComparFn, SL_DISCARD_DUP_KEY,
+  pTbData->sl.seed = taosRand();
-                                   tsdbGetTsTupleKey);
+  pTbData->sl.size = 0;
-#endif
+  pTbData->sl.maxLevel = maxLevel;
-  pTbData->pData =
+  pTbData->sl.level = 0;
-      tSkipListCreate(5, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), tkeyComparFn, SL_ALLOW_DUP_KEY, tsdbGetTsTupleKey);
+  pTbData->sl.pHead = (SMemSkipListNode *)&pTbData[1];
-  if (pTbData->pData == NULL) {
+  pTbData->sl.pTail = (SMemSkipListNode *)POINTER_SHIFT(pTbData->sl.pHead, SL_NODE_SIZE(maxLevel));
-    taosMemoryFree(pTbData);
+  pTbData->sl.pHead->level = maxLevel;
-    return NULL;
+  pTbData->sl.pTail->level = maxLevel;
+  for (int8_t iLevel = 0; iLevel < maxLevel; iLevel++) {
+    SL_NODE_FORWARD(pTbData->sl.pHead, iLevel) = pTbData->sl.pTail;
+    SL_NODE_BACKWARD(pTbData->sl.pTail, iLevel) = pTbData->sl.pHead;
+
+    SL_NODE_BACKWARD(pTbData->sl.pHead, iLevel) = NULL;
+    SL_NODE_FORWARD(pTbData->sl.pTail, iLevel) = NULL;
   }
 
-  return pTbData;
+  void *p;
-}
+  if (idx < 0) {
-
+    p = taosArrayPush(pMemTable->aTbData, &pTbData);
-static void tsdbFreeTbData(STbData *pTbData) {
-  if (pTbData) {
-    tSkipListDestroy(pTbData->pData);
-    taosMemoryFree(pTbData);
-  }
-}
-
-static char *tsdbGetTsTupleKey(const void *data) { return (char *)TD_ROW_KEY_ADDR((STSRow *)data); }
-
-static int tsdbTbDataComp(const void *arg1, const void *arg2) {
-  STbData *pTbData1 = (STbData *)arg1;
-  STbData *pTbData2 = (STbData *)arg2;
-
-  if (pTbData1->uid > pTbData2->uid) {
-    return 1;
-  } else if (pTbData1->uid == pTbData2->uid) {
-    return 0;
   } else {
-    return -1;
+    p = taosArrayInsert(pMemTable->aTbData, idx, &pTbData);
+  }
+  if (p == NULL) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+_exit:
+  *ppTbData = pTbData;
+  return code;
+
+_err:
+  *ppTbData = NULL;
+  return code;
+}
+
+static void tbDataMovePosTo(STbData *pTbData, SMemSkipListNode **pos, TSDBKEY *pKey, int32_t flags) {
+  SMemSkipListNode *px;
+  SMemSkipListNode *pn;
+  TSDBKEY          *pTKey;
+  int               c;
+  int               backward = flags & SL_MOVE_BACKWARD;
+  int               fromPos = flags & SL_MOVE_FROM_POS;
+
+  if (backward) {
+    px = pTbData->sl.pTail;
+
+    for (int8_t iLevel = pTbData->sl.maxLevel - 1; iLevel >= pTbData->sl.level; iLevel--) {
+      pos[iLevel] = px;
+    }
+
+    if (pTbData->sl.level) {
+      if (fromPos) px = pos[pTbData->sl.level - 1];
+
+      for (int8_t iLevel = pTbData->sl.level - 1; iLevel >= 0; iLevel--) {
+        pn = SL_NODE_BACKWARD(px, iLevel);
+        while (pn != pTbData->sl.pHead) {
+          pTKey = (TSDBKEY *)SL_NODE_DATA(pn);
+
+          c = tsdbKeyCmprFn(pTKey, pKey);
+          if (c <= 0) {
+            break;
+          } else {
+            px = pn;
+            pn = SL_NODE_BACKWARD(px, iLevel);
           }
         }
 
-static char *tsdbTbDataGetUid(const void *arg) {
+        pos[iLevel] = px;
-  STbData *pTbData = (STbData *)arg;
+      }
-  return (char *)(&(pTbData->uid));
+    }
+  } else {
+    px = pTbData->sl.pHead;
+
+    for (int8_t iLevel = pTbData->sl.maxLevel - 1; iLevel >= pTbData->sl.level; iLevel--) {
+      pos[iLevel] = px;
     }
 
-static int tsdbAppendTableRowToCols(STsdb *pTsdb, STable *pTable, SDataCols *pCols, STSchema **ppSchema, STSRow *row,
+    if (pTbData->sl.level) {
-                                    bool merge) {
+      if (fromPos) px = pos[pTbData->sl.level - 1];
-  if (pCols) {
+
-    if (*ppSchema == NULL || schemaVersion(*ppSchema) != TD_ROW_SVER(row)) {
+      for (int8_t iLevel = pTbData->sl.level - 1; iLevel >= 0; iLevel--) {
-      *ppSchema = tsdbGetTableSchemaImpl(pTsdb, pTable, false, false, TD_ROW_SVER(row));
+        pn = SL_NODE_FORWARD(px, iLevel);
-      if (*ppSchema == NULL) {
+        while (pn != pTbData->sl.pTail) {
-        ASSERT(false);
+          pTKey = (TSDBKEY *)SL_NODE_DATA(pn);
-        return -1;
+
+          c = tsdbKeyCmprFn(pTKey, pKey);
+          if (c >= 0) {
+            break;
+          } else {
+            px = pn;
+            pn = SL_NODE_FORWARD(px, iLevel);
           }
         }
 
-    tdAppendSTSRowToDataCol(row, *ppSchema, pCols, merge);
+        pos[iLevel] = px;
+      }
+    }
+  }
 }
 
-  return 0;
+static FORCE_INLINE int8_t tsdbMemSkipListRandLevel(SMemSkipList *pSl) {
+  int8_t         level = 1;
+  int8_t         tlevel = TMIN(pSl->maxLevel, pSl->level + 1);
+  const uint32_t factor = 4;
+
+  while ((taosRandR(&pSl->seed) % factor) == 0 && level < tlevel) {
+    level++;
+  }
+
+  return level;
+}
+static int32_t tbDataDoPut(SMemTable *pMemTable, STbData *pTbData, SMemSkipListNode **pos, TSDBROW *pRow,
+                           int8_t forward) {
+  int32_t           code = 0;
+  int8_t            level;
+  SMemSkipListNode *pNode;
+  SVBufPool        *pPool = pMemTable->pTsdb->pVnode->inUse;
+
+  // node
+  level = tsdbMemSkipListRandLevel(&pTbData->sl);
+  pNode = (SMemSkipListNode *)vnodeBufPoolMalloc(pPool, SL_NODE_SIZE(level) + tPutTSDBRow(NULL, pRow));
+  if (pNode == NULL) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _exit;
+  }
+  pNode->level = level;
+  for (int8_t iLevel = 0; iLevel < level; iLevel++) {
+    SL_NODE_FORWARD(pNode, iLevel) = NULL;
+    SL_NODE_BACKWARD(pNode, iLevel) = NULL;
+  }
+
+  tPutTSDBRow((uint8_t *)SL_NODE_DATA(pNode), pRow);
+
+  // put
+  for (int8_t iLevel = 0; iLevel < pNode->level; iLevel++) {
+    SMemSkipListNode *px = pos[iLevel];
+
+    if (forward) {
+      SMemSkipListNode *pNext = SL_NODE_FORWARD(px, iLevel);
+
+      SL_NODE_FORWARD(pNode, iLevel) = pNext;
+      SL_NODE_BACKWARD(pNode, iLevel) = px;
+
+      SL_NODE_BACKWARD(pNext, iLevel) = pNode;
+      SL_NODE_FORWARD(px, iLevel) = pNode;
+    } else {
+      SMemSkipListNode *pPrev = SL_NODE_BACKWARD(px, iLevel);
+
+      SL_NODE_FORWARD(pNode, iLevel) = px;
+      SL_NODE_BACKWARD(pNode, iLevel) = pPrev;
+
+      SL_NODE_FORWARD(pPrev, iLevel) = pNode;
+      SL_NODE_BACKWARD(px, iLevel) = pNode;
+    }
+  }
+
+  pTbData->sl.size++;
+  if (pTbData->sl.level < pNode->level) {
+    pTbData->sl.level = pNode->level;
+  }
+
+_exit:
+  return code;
+}
+
+static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, STbData *pTbData, int64_t version,
+                                       SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlock, SSubmitBlkRsp *pRsp) {
+  int32_t           code = 0;
+  SSubmitBlkIter    blkIter = {0};
+  TSDBKEY           key = {.version = version};
+  SMemSkipListNode *pos[SL_MAX_LEVEL];
+  TSDBROW           row = {.version = version, .pTSRow = NULL};
+  int32_t           nRow = 0;
+
+  tInitSubmitBlkIter(pMsgIter, pBlock, &blkIter);
+
+  // backward put first data
+  row.pTSRow = tGetSubmitBlkNext(&blkIter);
+  key.ts = row.pTSRow->ts;
+  nRow++;
+  tbDataMovePosTo(pTbData, pos, &key, SL_MOVE_BACKWARD);
+  code = tbDataDoPut(pMemTable, pTbData, pos, &row, 0);
+  if (code) {
+    goto _err;
+  }
+
+  if (tsdbKeyCmprFn(&key, &pTbData->minKey) < 0) {
+    pTbData->minKey = key;
+  }
+
+  if (tsdbKeyCmprFn(&key, &pMemTable->minKey) < 0) {
+    pMemTable->minKey = key;
+  }
+
+  // forward put rest data
+  row.pTSRow = tGetSubmitBlkNext(&blkIter);
+  if (row.pTSRow) {
+    for (int8_t iLevel = 0; iLevel < pTbData->sl.maxLevel; iLevel++) {
+      pos[iLevel] = SL_NODE_BACKWARD(pos[iLevel], iLevel);
+    }
+    do {
+      key.ts = row.pTSRow->ts;
+      nRow++;
+      tbDataMovePosTo(pTbData, pos, &key, SL_MOVE_FROM_POS);
+      code = tbDataDoPut(pMemTable, pTbData, pos, &row, 1);
+      if (code) {
+        goto _err;
+      }
+
+      row.pTSRow = tGetSubmitBlkNext(&blkIter);
+    } while (row.pTSRow);
+  }
+
+  if (tsdbKeyCmprFn(&key, &pTbData->maxKey) > 0) {
+    pTbData->maxKey = key;
+  }
+
+  if (tsdbKeyCmprFn(&key, &pMemTable->maxKey) > 0) {
+    pMemTable->maxKey = key;
+  }
+  pMemTable->nRef++;
+  pRsp->numOfRows = nRow;
+  pRsp->affectedRows = nRow;
+
+  return code;
+
+_err:
+  return code;
+}
+
+static int32_t tPutTSDBRow(uint8_t *p, TSDBROW *pRow) {
+  int32_t n = 0;
+
+  n += tPutI64(p, pRow->version);
+  if (p) memcpy(p + n, pRow->pTSRow, pRow->pTSRow->len);
+  n += pRow->pTSRow->len;
+
+  return n;
+}
+
+static int32_t tGetTSDBRow(uint8_t *p, TSDBROW *pRow) {
+  int32_t n = 0;
+
+  n += tGetI64(p, &pRow->version);
+  pRow->pTSRow = (STSRow *)(p + n);
+  n += pRow->pTSRow->len;
+
+  return n;
 }

source/dnode/vnode/src/tsdb/tsdbMemTable2.c

@@ -15,11 +15,6 @@
 
 #include "tsdb.h"
 
-struct SMemSkipListNode {
-  int8_t            level;
-  SMemSkipListNode *forwards[0];
-};
-
 typedef struct {
   tb_uid_t  uid;
   STSchema *pTSchema;
@@ -35,21 +30,21 @@ typedef struct {
 #define SL_MOVE_BACKWARD 0x1
 #define SL_MOVE_FROM_POS 0x2
 
-static int32_t tsdbGetOrCreateMemData(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid, SMemData **ppMemData);
+static int32_t tsdbGetOrCreateMemData(SMemTable2 *pMemTable, tb_uid_t suid, tb_uid_t uid, SMemData **ppMemData);
 static int     memDataPCmprFn(const void *p1, const void *p2);
 static int32_t tPutTSDBRow(uint8_t *p, TSDBROW *pRow);
 static int32_t tGetTSDBRow(uint8_t *p, TSDBROW *pRow);
 static int8_t  tsdbMemSkipListRandLevel(SMemSkipList *pSl);
-static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, int64_t version,
+static int32_t tsdbInsertTableDataImpl(SMemTable2 *pMemTable, SMemData *pMemData, int64_t version,
                                        SVSubmitBlk *pSubmitBlk);
 static void    memDataMovePosTo(SMemData *pMemData, SMemSkipListNode **pos, TSDBKEY *pKey, int32_t flags);
 
 // SMemTable ==============================================
-int32_t tsdbMemTableCreate2(STsdb *pTsdb, SMemTable **ppMemTable) {
+int32_t tsdbMemTableCreate2(STsdb *pTsdb, SMemTable2 **ppMemTable) {
   int32_t     code = 0;
-  SMemTable *pMemTable = NULL;
+  SMemTable2 *pMemTable = NULL;
 
-  pMemTable = (SMemTable *)taosMemoryCalloc(1, sizeof(*pMemTable));
+  pMemTable = (SMemTable2 *)taosMemoryCalloc(1, sizeof(*pMemTable));
   if (pMemTable == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
@@ -75,14 +70,14 @@ _err:
   return code;
 }
 
-void tsdbMemTableDestroy2(SMemTable *pMemTable) {
+void tsdbMemTableDestroy2(SMemTable2 *pMemTable) {
   taosArrayDestroyEx(pMemTable->aMemData, NULL /*TODO*/);
   taosMemoryFree(pMemTable);
 }
 
 int32_t tsdbInsertTableData2(STsdb *pTsdb, int64_t version, SVSubmitBlk *pSubmitBlk) {
   int32_t     code = 0;
-  SMemTable *pMemTable = (SMemTable *)pTsdb->mem;  // TODO
+  SMemTable2 *pMemTable = (SMemTable2 *)pTsdb->mem;  // TODO
   SMemData   *pMemData;
   TSDBROW     row = {.version = version};
 
@@ -113,7 +108,7 @@ _err:
 
 int32_t tsdbDeleteTableData2(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKEY eKey) {
   int32_t     code = 0;
-  SMemTable *pMemTable = (SMemTable *)pTsdb->mem;  // TODO
+  SMemTable2 *pMemTable = (SMemTable2 *)pTsdb->mem;  // TODO
   SMemData   *pMemData;
   SVBufPool  *pPool = pTsdb->pVnode->inUse;
 
@@ -250,7 +245,7 @@ void tsdbMemDataIterGet(SMemDataIter *pIter, TSDBROW **ppRow) {
   }
 }
 
-static int32_t tsdbGetOrCreateMemData(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid, SMemData **ppMemData) {
+static int32_t tsdbGetOrCreateMemData(SMemTable2 *pMemTable, tb_uid_t suid, tb_uid_t uid, SMemData **ppMemData) {
   int32_t    code = 0;
   int32_t    idx = 0;
   SMemData  *pMemDataT = &(SMemData){.suid = suid, .uid = uid};
@@ -421,7 +416,7 @@ static void memDataMovePosTo(SMemData *pMemData, SMemSkipListNode **pos, TSDBKEY
   }
 }
 
-static int32_t memDataDoPut(SMemTable *pMemTable, SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow,
+static int32_t memDataDoPut(SMemTable2 *pMemTable, SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow,
                             int8_t forward) {
   int32_t           code = 0;
   int8_t            level;
@@ -475,7 +470,7 @@ _exit:
   return code;
 }
 
-static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, int64_t version,
+static int32_t tsdbInsertTableDataImpl(SMemTable2 *pMemTable, SMemData *pMemData, int64_t version,
                                        SVSubmitBlk *pSubmitBlk) {
   int32_t  code = 0;
   int32_t  n = 0;

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -67,6 +67,7 @@ enum {
 };
 
 typedef struct STableCheckInfo {
+  uint64_t     suid;
   uint64_t     tableId;
   TSKEY        lastKey;
   SBlockInfo*  pCompInfo;
@@ -74,8 +75,8 @@ typedef struct STableCheckInfo {
   int32_t      numOfBlocks : 29;  // number of qualified data blocks not the original blocks
   uint8_t      chosen : 2;        // indicate which iterator should move forward
   bool         initBuf : 1;       // whether to initialize the in-memory skip list iterator or not
-  SSkipListIterator* iter;              // mem buffer skip list iterator
+  STbDataIter* iter;              // mem buffer skip list iterator
-  SSkipListIterator* iiter;             // imem buffer skip list iterator
+  STbDataIter* iiter;             // imem buffer skip list iterator
 } STableCheckInfo;
 
 typedef struct STableBlockInfo {
@@ -107,6 +108,7 @@ typedef struct SBlockLoadSuppInfo {
 
 typedef struct STsdbReadHandle {
   STsdb*        pTsdb;
+  uint64_t      suid;
   SQueryFilePos cur;  // current position
   int16_t       order;
   STimeWindow   window;  // the primary query time window that applies to all queries
@@ -201,7 +203,7 @@ int64_t tsdbGetNumOfRowsInMemTable(tsdbReaderT* pHandle) {
   STsdbReadHandle* pTsdbReadHandle = (STsdbReadHandle*)pHandle;
 
   int64_t    rows = 0;
-  STsdbMemTable* pMemTable = NULL;  // pTsdbReadHandle->pMemTable;
+  SMemTable* pMemTable = NULL;  // pTsdbReadHandle->pMemTable;
   if (pMemTable == NULL) {
     return rows;
   }
@@ -237,6 +239,7 @@ static SArray* createCheckInfoFromTableGroup(STsdbReadHandle* pTsdbReadHandle, S
     STableKeyInfo* pKeyInfo = (STableKeyInfo*)taosArrayGet(pTableList->pTableList, j);
 
     STableCheckInfo info = {.lastKey = pKeyInfo->lastKey, .tableId = pKeyInfo->uid};
+    info.suid = pTsdbReadHandle->suid;
     if (ASCENDING_TRAVERSE(pTsdbReadHandle->order)) {
       if (info.lastKey == INT64_MIN || info.lastKey < pTsdbReadHandle->window.skey) {
         info.lastKey = pTsdbReadHandle->window.skey;
@@ -265,8 +268,8 @@ static void resetCheckInfo(STsdbReadHandle* pTsdbReadHandle) {
   for (int32_t i = 0; i < numOfTables; ++i) {
     STableCheckInfo* pCheckInfo = (STableCheckInfo*)taosArrayGet(pTsdbReadHandle->pTableCheckInfo, i);
     pCheckInfo->lastKey = pTsdbReadHandle->window.skey;
-    pCheckInfo->iter = tSkipListDestroyIter(pCheckInfo->iter);
+    pCheckInfo->iter = tsdbTbDataIterDestroy(pCheckInfo->iter);
-    pCheckInfo->iiter = tSkipListDestroyIter(pCheckInfo->iiter);
+    pCheckInfo->iiter = tsdbTbDataIterDestroy(pCheckInfo->iiter);
     pCheckInfo->initBuf = false;
 
     if (ASCENDING_TRAVERSE(pTsdbReadHandle->order)) {
@@ -387,6 +390,7 @@ static STsdbReadHandle* tsdbQueryTablesImpl(SVnode* pVnode, SQueryTableDataCond*
   pReadHandle->locateStart = false;
   pReadHandle->loadType = pCond->type;
 
+  pReadHandle->suid = pCond->suid;
   pReadHandle->outputCapacity = 4096;  //((STsdb*)tsdb)->config.maxRowsPerFileBlock;
   pReadHandle->loadExternalRow = pCond->loadExternalRows;
   pReadHandle->currentLoadExternalRows = pCond->loadExternalRows;
@@ -658,7 +662,7 @@ tsdbReaderT tsdbQueryLastRow(SVnode* pVnode, SQueryTableDataCond* pCond, STableL
 }
 
 #if 0
-tsdbReaderT tsdbQueryCacheLastT(STsdb *tsdb, SQueryTableDataCond *pCond, STableGroupInfo *groupList, uint64_t qId, STsdbMemTable* pMemRef) {
+tsdbReaderT tsdbQueryCacheLastT(STsdb *tsdb, SQueryTableDataCond *pCond, STableGroupInfo *groupList, uint64_t qId, SMemTable* pMemRef) {
   STsdbReadHandle *pTsdbReadHandle = (STsdbReadHandle*) tsdbQueryTablesT(tsdb, pCond, groupList, qId, pMemRef);
   if (pTsdbReadHandle == NULL) {
     return NULL;
@@ -752,23 +756,22 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe
   pCheckInfo->initBuf = true;
   int32_t order = pHandle->order;
 
-  STbData** pMem = NULL;
+  STbData* pMem = NULL;
-  STbData** pIMem = NULL;
+  STbData* pIMem = NULL;
+  int8_t   backward = (pHandle->order == TSDB_ORDER_DESC) ? 1 : 0;
 
   TSKEY tLastKey = keyToTkey(pCheckInfo->lastKey);
   if (pHandle->pTsdb->mem != NULL) {
-    pMem = taosHashGet(pHandle->pTsdb->mem->pHashIdx, &pCheckInfo->tableId, sizeof(pCheckInfo->tableId));
+    tsdbGetTbDataFromMemTable(pHandle->pTsdb->mem, pCheckInfo->suid, pCheckInfo->tableId, &pMem);
     if (pMem != NULL) {
-      pCheckInfo->iter =
+      tsdbTbDataIterCreate(pMem, &(TSDBKEY){.version = 0, .ts = tLastKey}, backward, &pCheckInfo->iter);
-          tSkipListCreateIterFromVal((*pMem)->pData, (const char*)&tLastKey, TSDB_DATA_TYPE_TIMESTAMP, order);
     }
   }
 
   if (pHandle->pTsdb->imem != NULL) {
-    pIMem = taosHashGet(pHandle->pTsdb->imem->pHashIdx, &pCheckInfo->tableId, sizeof(pCheckInfo->tableId));
+    tsdbGetTbDataFromMemTable(pHandle->pTsdb->mem, pCheckInfo->suid, pCheckInfo->tableId, &pIMem);
     if (pIMem != NULL) {
-      pCheckInfo->iiter =
+      tsdbTbDataIterCreate(pIMem, &(TSDBKEY){.version = 0, .ts = tLastKey}, backward, &pCheckInfo->iiter);
-          tSkipListCreateIterFromVal((*pIMem)->pData, (const char*)&tLastKey, TSDB_DATA_TYPE_TIMESTAMP, order);
     }
   }
 
@@ -777,22 +780,23 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe
     return false;
   }
 
-  bool memEmpty = (pCheckInfo->iter == NULL) || (pCheckInfo->iter != NULL && !tSkipListIterNext(pCheckInfo->iter));
+  bool memEmpty =
-  bool imemEmpty = (pCheckInfo->iiter == NULL) || (pCheckInfo->iiter != NULL && !tSkipListIterNext(pCheckInfo->iiter));
+      (pCheckInfo->iter == NULL) || (pCheckInfo->iter != NULL && !tsdbTbDataIterGet(pCheckInfo->iter, NULL));
+  bool imemEmpty =
+      (pCheckInfo->iiter == NULL) || (pCheckInfo->iiter != NULL && !tsdbTbDataIterGet(pCheckInfo->iiter, NULL));
   if (memEmpty && imemEmpty) {  // buffer is empty
     return false;
   }
 
   if (!memEmpty) {
-    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
+    TSDBROW row;
-    assert(node != NULL);
 
-    STSRow* row = (STSRow*)SL_GET_NODE_DATA(node);
+    tsdbTbDataIterGet(pCheckInfo->iter, &row);
-    TSKEY   key = TD_ROW_KEY(row);  // first timestamp in buffer
+    TSKEY key = row.pTSRow->ts;  // first timestamp in buffer
     tsdbDebug("%p uid:%" PRId64 ", check data in mem from skey:%" PRId64 ", order:%d, ts range in buf:%" PRId64
               "-%" PRId64 ", lastKey:%" PRId64 ", numOfRows:%" PRId64 ", %s",
-              pHandle, pCheckInfo->tableId, key, order, (*pMem)->keyMin, (*pMem)->keyMax, pCheckInfo->lastKey,
+              pHandle, pCheckInfo->tableId, key, order, pMem->minKey.ts, pMem->maxKey.ts, pCheckInfo->lastKey,
-              (*pMem)->nrows, pHandle->idStr);
+              pMem->sl.size, pHandle->idStr);
 
     if (ASCENDING_TRAVERSE(order)) {
       assert(pCheckInfo->lastKey <= key);
@@ -805,15 +809,14 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe
   }
 
   if (!imemEmpty) {
-    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
+    TSDBROW row;
-    assert(node != NULL);
 
-    STSRow* row = (STSRow*)SL_GET_NODE_DATA(node);
+    tsdbTbDataIterGet(pCheckInfo->iter, &row);
-    TSKEY   key = TD_ROW_KEY(row);  // first timestamp in buffer
+    TSKEY key = row.pTSRow->ts;  // first timestamp in buffer
     tsdbDebug("%p uid:%" PRId64 ", check data in imem from skey:%" PRId64 ", order:%d, ts range in buf:%" PRId64
               "-%" PRId64 ", lastKey:%" PRId64 ", numOfRows:%" PRId64 ", %s",
-              pHandle, pCheckInfo->tableId, key, order, (*pIMem)->keyMin, (*pIMem)->keyMax, pCheckInfo->lastKey,
+              pHandle, pCheckInfo->tableId, key, order, pIMem->minKey.ts, pIMem->maxKey.ts, pCheckInfo->lastKey,
-              (*pIMem)->nrows, pHandle->idStr);
+              pIMem->sl.size, pHandle->idStr);
 
     if (ASCENDING_TRAVERSE(order)) {
       assert(pCheckInfo->lastKey <= key);
@@ -828,31 +831,23 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe
 }
 
 static void destroyTableMemIterator(STableCheckInfo* pCheckInfo) {
-  tSkipListDestroyIter(pCheckInfo->iter);
+  tsdbTbDataIterDestroy(pCheckInfo->iter);
-  tSkipListDestroyIter(pCheckInfo->iiter);
+  tsdbTbDataIterDestroy(pCheckInfo->iiter);
 }
 
 static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order, int32_t update, TDRowVerT maxVer) {
+  TSDBROW row = {0};
   STSRow *rmem = NULL, *rimem = NULL;
+
   if (pCheckInfo->iter) {
-    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
+    if (tsdbTbDataIterGet(pCheckInfo->iter, &row)) {
-    if (node != NULL) {
+      rmem = row.pTSRow;
-      rmem = (STSRow*)SL_GET_NODE_DATA(node);
-      // TODO: filter max version
-      // if (TD_ROW_VER(rmem) > maxVer) {
-      //   rmem = NULL;
-      // }
     }
   }
 
   if (pCheckInfo->iiter) {
-    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
+    if (tsdbTbDataIterGet(pCheckInfo->iiter, &row)) {
-    if (node != NULL) {
+      rimem = row.pTSRow;
-      rimem = (STSRow*)SL_GET_NODE_DATA(node);
-      // TODO: filter max version
-      // if (TD_ROW_VER(rimem) > maxVer) {
-      //   rimem = NULL;
-      // }
     }
   }
 
@@ -889,7 +884,7 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
       pCheckInfo->chosen = CHECKINFO_CHOSEN_BOTH;
     } else {
       pCheckInfo->chosen = CHECKINFO_CHOSEN_IMEM;
-      tSkipListIterNext(pCheckInfo->iter);
+      tsdbTbDataIterNext(pCheckInfo->iter);
     }
     return r1;
   } else if (r1 < r2 && ASCENDING_TRAVERSE(order)) {
@@ -903,28 +898,17 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
 
 static STSRow* getSRowInTableMem(STableCheckInfo* pCheckInfo, int32_t order, int32_t update, STSRow** extraRow,
                                  TDRowVerT maxVer) {
+  TSDBROW row;
   STSRow *rmem = NULL, *rimem = NULL;
   if (pCheckInfo->iter) {
-    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
+    if (tsdbTbDataIterGet(pCheckInfo->iter, &row)) {
-    if (node != NULL) {
+      rmem = row.pTSRow;
-      rmem = (STSRow*)SL_GET_NODE_DATA(node);
-#if 0  // TODO: skiplist refactor
-      if (TD_ROW_VER(rmem) > maxVer) {
-        rmem = NULL;
-      }
-#endif
     }
   }
 
   if (pCheckInfo->iiter) {
-    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
+    if (tsdbTbDataIterGet(pCheckInfo->iiter, &row)) {
-    if (node != NULL) {
+      rimem = row.pTSRow;
-      rimem = (STSRow*)SL_GET_NODE_DATA(node);
-#if 0  // TODO: skiplist refactor
-      if (TD_ROW_VER(rimem) > maxVer) {
-        rimem = NULL;
-      }
-#endif
     }
   }
 
@@ -966,7 +950,7 @@ static STSRow* getSRowInTableMem(STableCheckInfo* pCheckInfo, int32_t order, int
       *extraRow = rimem;
       return rmem;
     } else {
-      tSkipListIterNext(pCheckInfo->iter);
+      tsdbTbDataIterNext(pCheckInfo->iter);
       pCheckInfo->chosen = CHECKINFO_CHOSEN_IMEM;
       return rimem;
     }
@@ -995,7 +979,7 @@ static bool moveToNextRowInMem(STableCheckInfo* pCheckInfo) {
   bool hasNext = false;
   if (pCheckInfo->chosen == CHECKINFO_CHOSEN_MEM) {
     if (pCheckInfo->iter != NULL) {
-      hasNext = tSkipListIterNext(pCheckInfo->iter);
+      hasNext = tsdbTbDataIterNext(pCheckInfo->iter);
     }
 
     if (hasNext) {
@@ -1003,11 +987,11 @@ static bool moveToNextRowInMem(STableCheckInfo* pCheckInfo) {
     }
 
     if (pCheckInfo->iiter != NULL) {
-      return tSkipListIterGet(pCheckInfo->iiter) != NULL;
+      return tsdbTbDataIterGet(pCheckInfo->iiter, NULL);
     }
   } else if (pCheckInfo->chosen == CHECKINFO_CHOSEN_IMEM) {
     if (pCheckInfo->iiter != NULL) {
-      hasNext = tSkipListIterNext(pCheckInfo->iiter);
+      hasNext = tsdbTbDataIterNext(pCheckInfo->iiter);
     }
 
     if (hasNext) {
@@ -1015,14 +999,14 @@ static bool moveToNextRowInMem(STableCheckInfo* pCheckInfo) {
     }
 
     if (pCheckInfo->iter != NULL) {
-      return tSkipListIterGet(pCheckInfo->iter) != NULL;
+      return tsdbTbDataIterGet(pCheckInfo->iter, NULL);
     }
   } else {
     if (pCheckInfo->iter != NULL) {
-      hasNext = tSkipListIterNext(pCheckInfo->iter);
+      hasNext = tsdbTbDataIterNext(pCheckInfo->iter);
     }
     if (pCheckInfo->iiter != NULL) {
-      hasNext = tSkipListIterNext(pCheckInfo->iiter) || hasNext;
+      hasNext = tsdbTbDataIterNext(pCheckInfo->iiter) || hasNext;
     }
   }
 
@@ -1126,7 +1110,7 @@ static int32_t loadBlockInfo(STsdbReadHandle* pTsdbReadHandle, int32_t index, in
   STableCheckInfo* pCheckInfo = taosArrayGet(pTsdbReadHandle->pTableCheckInfo, index);
   pCheckInfo->numOfBlocks = 0;
 
-  STable table = {.uid = pCheckInfo->tableId, .tid = pCheckInfo->tableId};
+  STable table = {.uid = pCheckInfo->tableId, .suid = pCheckInfo->suid};
   table.pSchema = pTsdbReadHandle->pSchema;
 
   if (tsdbSetReadTable(&pTsdbReadHandle->rhelper, &table) != TSDB_CODE_SUCCESS) {
@@ -2924,7 +2908,7 @@ static bool loadBlockOfActiveTable(STsdbReadHandle* pTsdbReadHandle) {
   // current result is empty
   if (pTsdbReadHandle->currentLoadExternalRows && pTsdbReadHandle->window.skey == pTsdbReadHandle->window.ekey &&
       pTsdbReadHandle->cur.rows == 0) {
-    //    STsdbMemTable* pMemRef = pTsdbReadHandle->pMemTable;
+    //    SMemTable* pMemRef = pTsdbReadHandle->pMemTable;
 
     //    doGetExternalRow(pTsdbReadHandle, TSDB_PREV_ROW, pMemRef);
     //    doGetExternalRow(pTsdbReadHandle, TSDB_NEXT_ROW, pMemRef);
@@ -3222,7 +3206,7 @@ bool tsdbNextDataBlock(tsdbReaderT pHandle) {
   }
 }
 
-// static int32_t doGetExternalRow(STsdbReadHandle* pTsdbReadHandle, int16_t type, STsdbMemTable* pMemRef) {
+// static int32_t doGetExternalRow(STsdbReadHandle* pTsdbReadHandle, int16_t type, SMemTable* pMemRef) {
 //  STsdbReadHandle* pSecQueryHandle = NULL;
 //
 //  if (type == TSDB_PREV_ROW && pTsdbReadHandle->prev) {

source/dnode/vnode/src/tsdb/tsdbReadImpl.c

@@ -156,6 +156,24 @@ int tsdbLoadBlockIdx(SReadH *pReadh) {
   return 0;
 }
 
+static int32_t tsdbBlockIdxCmprFn(const void *p1, const void *p2) {
+  SBlockIdx *pBlockIdx1 = (SBlockIdx *)p1;
+  SBlockIdx *pBlockIdx2 = (SBlockIdx *)p2;
+
+  if (pBlockIdx1->suid < pBlockIdx2->suid) {
+    return -1;
+  } else if (pBlockIdx1->suid > pBlockIdx2->suid) {
+    return 1;
+  }
+
+  if (pBlockIdx1->uid < pBlockIdx2->uid) {
+    return -1;
+  } else if (pBlockIdx1->uid > pBlockIdx2->uid) {
+    return 1;
+  }
+
+  return 0;
+}
 int tsdbSetReadTable(SReadH *pReadh, STable *pTable) {
   STSchema *pSchema = tsdbGetTableSchemaImpl(TSDB_READ_REPO(pReadh), pTable, false, false, -1);
 
@@ -171,33 +189,40 @@ int tsdbSetReadTable(SReadH *pReadh, STable *pTable) {
     return -1;
   }
 
-  size_t size = taosArrayGetSize(pReadh->aBlkIdx);
+  uint8_t *p = taosArraySearch(pReadh->aBlkIdx, &(SBlockIdx){.suid = pTable->suid, .uid = pTable->uid},
-  if (size > 0) {
+                               tsdbBlockIdxCmprFn, TD_EQ);
-    while (true) {
+  if (p == NULL) {
-      if (pReadh->cidx >= size) {
     pReadh->pBlkIdx = NULL;
-        break;
+  } else {
+    pReadh->pBlkIdx = (SBlockIdx *)p;
   }
+  // size_t size = taosArrayGetSize(pReadh->aBlkIdx);
+  // if (size > 0) {
+  //   while (true) {
+  //     if (pReadh->cidx >= size) {
+  //       pReadh->pBlkIdx = NULL;
+  //       break;
+  //     }
 
-      SBlockIdx *pBlkIdx = taosArrayGet(pReadh->aBlkIdx, pReadh->cidx);
+  //     SBlockIdx *pBlkIdx = taosArrayGet(pReadh->aBlkIdx, pReadh->cidx);
-      if (pBlkIdx->uid == TABLE_TID(pTable)) {
+  //     if (pBlkIdx->uid == TABLE_TID(pTable)) {
-        if (pBlkIdx->uid == TABLE_UID(pTable)) {
+  //       if (pBlkIdx->uid == TABLE_UID(pTable)) {
-          pReadh->pBlkIdx = pBlkIdx;
+  //         pReadh->pBlkIdx = pBlkIdx;
-        } else {
+  //       } else {
-          pReadh->pBlkIdx = NULL;
+  //         pReadh->pBlkIdx = NULL;
-        }
+  //       }
-        pReadh->cidx++;
+  //       pReadh->cidx++;
-        break;
+  //       break;
-      } else if (pBlkIdx->uid > TABLE_TID(pTable)) {
+  //     } else if (pBlkIdx->uid > TABLE_TID(pTable)) {
-        pReadh->pBlkIdx = NULL;
+  //       pReadh->pBlkIdx = NULL;
-        break;
+  //       break;
-      } else {
+  //     } else {
-        pReadh->cidx++;
+  //       pReadh->cidx++;
-      }
+  //     }
-    }
+  //   }
-  } else {
+  // } else {
-    pReadh->pBlkIdx = NULL;
+  //   pReadh->pBlkIdx = NULL;
-  }
+  // }
 
   return 0;
 }
@@ -553,12 +578,12 @@ static int tsdbLoadBlockOffset(SReadH *pReadh, SBlock *pBlock) {
 int tsdbEncodeSBlockIdx(void **buf, SBlockIdx *pIdx) {
   int tlen = 0;
 
-  // tlen += taosEncodeVariantI32(buf, pIdx->tid);
+  tlen += taosEncodeFixedU64(buf, pIdx->suid);
+  tlen += taosEncodeFixedU64(buf, pIdx->uid);
   tlen += taosEncodeVariantU32(buf, pIdx->len);
   tlen += taosEncodeVariantU32(buf, pIdx->offset);
   tlen += taosEncodeFixedU8(buf, pIdx->hasLast);
   tlen += taosEncodeVariantU32(buf, pIdx->numOfBlocks);
-  tlen += taosEncodeFixedU64(buf, pIdx->uid);
   tlen += taosEncodeFixedU64(buf, pIdx->maxKey.ts);
 
   return tlen;
@@ -570,6 +595,10 @@ void *tsdbDecodeSBlockIdx(void *buf, SBlockIdx *pIdx) {
   uint64_t value = 0;
 
   // if ((buf = taosDecodeVariantI32(buf, &(pIdx->tid))) == NULL) return NULL;
+  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
+  pIdx->suid = (int64_t)value;
+  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
+  pIdx->uid = (int64_t)value;
   if ((buf = taosDecodeVariantU32(buf, &(pIdx->len))) == NULL) return NULL;
   if ((buf = taosDecodeVariantU32(buf, &(pIdx->offset))) == NULL) return NULL;
   if ((buf = taosDecodeFixedU8(buf, &(hasLast))) == NULL) return NULL;
@@ -577,8 +606,6 @@ void *tsdbDecodeSBlockIdx(void *buf, SBlockIdx *pIdx) {
   if ((buf = taosDecodeVariantU32(buf, &(numOfBlocks))) == NULL) return NULL;
   pIdx->numOfBlocks = numOfBlocks;
   if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
-  pIdx->uid = (int64_t)value;
-  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
   pIdx->maxKey.ts = (TSKEY)value;
 
   return buf;

source/dnode/vnode/src/tsdb/tsdbWrite.c

@@ -39,7 +39,7 @@ int tsdbInsertData(STsdb *pTsdb, int64_t version, SSubmitReq *pMsg, SSubmitRsp *
     SSubmitBlkRsp r = {0};
     tGetSubmitMsgNext(&msgIter, &pBlock);
     if (pBlock == NULL) break;
-    if (tsdbInsertTableData(pTsdb, &msgIter, pBlock, &r) < 0) {
+    if (tsdbInsertTableData(pTsdb, version, &msgIter, pBlock, &r) < 0) {
       return -1;
     }
 

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -158,7 +158,7 @@ int32_t vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
         // TODO: handle error
       }
       break;
-    case TDMT_VND_TASK_DEPLOY: {
+    case TDMT_STREAM_TASK_DEPLOY: {
       if (tqProcessTaskDeploy(pVnode->pTq, POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead)),
                               pMsg->contLen - sizeof(SMsgHead)) < 0) {
       }
@@ -238,21 +238,19 @@ int32_t vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
 
     case TDMT_VND_TABLE_META:
       return vnodeGetTableMeta(pVnode, pMsg);
+
     case TDMT_VND_CONSUME:
       return tqProcessPollReq(pVnode->pTq, pMsg, pInfo->workerId);
 
-    case TDMT_VND_TASK_RUN: {
+    case TDMT_STREAM_TASK_RUN:
-      int32_t code = tqProcessTaskRunReq(pVnode->pTq, pMsg);
+      return tqProcessTaskRunReq(pVnode->pTq, pMsg);
-      pMsg->pCont = NULL;
+    case TDMT_STREAM_TASK_DISPATCH:
-      return code;
-    }
-    case TDMT_VND_TASK_DISPATCH:
       return tqProcessTaskDispatchReq(pVnode->pTq, pMsg);
-    case TDMT_VND_TASK_RECOVER:
+    case TDMT_STREAM_TASK_RECOVER:
       return tqProcessTaskRecoverReq(pVnode->pTq, pMsg);
-    case TDMT_VND_TASK_DISPATCH_RSP:
+    case TDMT_STREAM_TASK_DISPATCH_RSP:
       return tqProcessTaskDispatchRsp(pVnode->pTq, pMsg);
-    case TDMT_VND_TASK_RECOVER_RSP:
+    case TDMT_STREAM_TASK_RECOVER_RSP:
       return tqProcessTaskRecoverRsp(pVnode->pTq, pMsg);
     default:
       vError("unknown msg type:%d in fetch queue", pMsg->msgType);
@@ -799,7 +797,7 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
       sprintf(submitBlkRsp.tblFName, "%s.", pVnode->config.dbname);
     }
 
-    if (tsdbInsertTableData(pVnode->pTsdb, &msgIter, pBlock, &submitBlkRsp) < 0) {
+    if (tsdbInsertTableData(pVnode->pTsdb, version, &msgIter, pBlock, &submitBlkRsp) < 0) {
       submitBlkRsp.code = terrno;
     }
 

source/libs/catalog/inc/catalogInt.h

@@ -310,22 +310,19 @@ typedef struct SCtgCacheOperation {
   int32_t  opId;
   void    *data;
   bool     syncOp;
-  uint64_t seqId;
+  tsem_t   rspSem;  
 } SCtgCacheOperation;
 
 typedef struct SCtgQNode {
-  SCtgCacheOperation     op;
+  SCtgCacheOperation    *op;
   struct SCtgQNode      *next;
 } SCtgQNode;
 
 typedef struct SCtgQueue {
   SRWLatch              qlock;
-  uint64_t              seqId;
-  uint64_t              seqDone;
   SCtgQNode            *head;
   SCtgQNode            *tail;
   tsem_t                reqSem;  
-  tsem_t                rspSem;  
   uint64_t              qRemainNum;
 } SCtgQueue;
 
@@ -493,6 +490,7 @@ int32_t ctgGetDBVgInfoFromMnode(CTG_PARAMS, SBuildUseDBInput *input, SUseDbOutpu
 int32_t ctgGetQnodeListFromMnode(CTG_PARAMS, SArray *out, SCtgTask* pTask);
 int32_t ctgGetDBCfgFromMnode(CTG_PARAMS, const char *dbFName, SDbCfgInfo *out, SCtgTask* pTask);
 int32_t ctgGetIndexInfoFromMnode(CTG_PARAMS, const char *indexName, SIndexInfo *out, SCtgTask* pTask);
+int32_t ctgGetTbIndexFromMnode(CTG_PARAMS, const char *tbFName, SArray** out, SCtgTask* pTask);
 int32_t ctgGetUdfInfoFromMnode(CTG_PARAMS, const char *funcName, SFuncInfo *out, SCtgTask* pTask);
 int32_t ctgGetUserDbAuthFromMnode(CTG_PARAMS, const char *user, SGetUserAuthRsp *out, SCtgTask* pTask);
 int32_t ctgGetTbMetaFromMnodeImpl(CTG_PARAMS, char *dbFName, char* tbName, STableMetaOutput* out, SCtgTask* pTask);

source/libs/catalog/src/catalog.c

@@ -506,11 +506,6 @@ int32_t catalogInit(SCatalogCfg *cfg) {
     CTG_ERR_RET(TSDB_CODE_CTG_SYS_ERROR);
   }
   
-  if (tsem_init(&gCtgMgmt.queue.rspSem, 0, 0)) {
-    qError("tsem_init failed, error:%s", tstrerror(TAOS_SYSTEM_ERROR(errno)));
-    CTG_ERR_RET(TSDB_CODE_CTG_SYS_ERROR);
-  }
-
   gCtgMgmt.queue.head = taosMemoryCalloc(1, sizeof(SCtgQNode));
   if (NULL == gCtgMgmt.queue.head) {
     qError("calloc %d failed", (int32_t)sizeof(SCtgQNode));
@@ -1141,6 +1136,17 @@ int32_t catalogGetIndexMeta(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps
   CTG_API_LEAVE(ctgGetIndexInfoFromMnode(CTG_PARAMS_LIST(), indexName, pInfo, NULL));
 }
 
+int32_t catalogGetTableIndex(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, const char* tbFName, SArray** pRes) {
+  CTG_API_ENTER();
+  
+  if (NULL == pCtg || NULL == pTrans || NULL == pMgmtEps || NULL == tbFName || NULL == pRes) {
+    CTG_API_LEAVE(TSDB_CODE_CTG_INVALID_INPUT);
+  }
+
+  CTG_API_LEAVE(ctgGetTbIndexFromMnode(CTG_PARAMS_LIST(), tbFName, pRes, NULL));
+}
+
+
 int32_t catalogGetUdfInfo(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, const char* funcName, SFuncInfo* pInfo) {
   CTG_API_ENTER();
   
@@ -1195,10 +1201,6 @@ void catalogDestroy(void) {
     qError("tsem_post failed, error:%s", tstrerror(TAOS_SYSTEM_ERROR(errno)));
   }
 
-  if (tsem_post(&gCtgMgmt.queue.rspSem)) {
-    qError("tsem_post failed, error:%s", tstrerror(TAOS_SYSTEM_ERROR(errno)));
-  }
-
   while (CTG_IS_LOCKED(&gCtgMgmt.lock)) {
     taosUsleep(1);
   }

source/libs/catalog/src/ctgCache.c

@@ -501,25 +501,6 @@ _return:
   return TSDB_CODE_SUCCESS;
 }
 
-
-void ctgWaitOpDone(SCtgCacheOperation *action) {
-  while (true) {
-    tsem_wait(&gCtgMgmt.queue.rspSem);
-    
-    if (atomic_load_8((int8_t*)&gCtgMgmt.exit)) {
-      tsem_post(&gCtgMgmt.queue.rspSem);
-      break;
-    }
-
-    if (gCtgMgmt.queue.seqDone >= action->seqId) {
-      break;
-    }
-
-    tsem_post(&gCtgMgmt.queue.rspSem);
-    sched_yield();
-  }
-}
-
 void ctgDequeue(SCtgCacheOperation **op) {
   SCtgQNode *orig = gCtgMgmt.queue.head;
   
@@ -530,7 +511,7 @@ void ctgDequeue(SCtgCacheOperation **op) {
   
   taosMemoryFreeClear(orig);
 
-  *op = &node->op;
+  *op = node->op;
 }
 
 
@@ -541,9 +522,11 @@ int32_t ctgEnqueue(SCatalog* pCtg, SCtgCacheOperation *operation) {
     CTG_RET(TSDB_CODE_CTG_MEM_ERROR);
   }
 
-  operation->seqId = atomic_add_fetch_64(&gCtgMgmt.queue.seqId, 1);
+  if (operation->syncOp) {
+    tsem_init(&operation->rspSem, 0, 0);
+  }
   
-  node->op = *operation;
+  node->op = operation;
 
   CTG_LOCK(CTG_WRITE, &gCtgMgmt.queue.qlock);
   gCtgMgmt.queue.tail->next = node;
@@ -558,7 +541,8 @@ int32_t ctgEnqueue(SCatalog* pCtg, SCtgCacheOperation *operation) {
   ctgDebug("action [%s] added into queue", gCtgCacheOperation[operation->opId].name);
 
   if (operation->syncOp) {
-    ctgWaitOpDone(operation);
+    tsem_wait(&operation->rspSem);
+    taosMemoryFree(operation);
   }
 
   return TSDB_CODE_SUCCESS;
@@ -567,7 +551,9 @@ int32_t ctgEnqueue(SCatalog* pCtg, SCtgCacheOperation *operation) {
 
 int32_t ctgDropDbCacheEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_DROP_DB_CACHE};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_DROP_DB_CACHE;
+  
   SCtgDropDBMsg *msg = taosMemoryMalloc(sizeof(SCtgDropDBMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgDropDBMsg));
@@ -583,21 +569,24 @@ int32_t ctgDropDbCacheEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId)
   strncpy(msg->dbFName, dbFName, sizeof(msg->dbFName));
   msg->dbId = dbId;
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
 
 _return:
 
-  taosMemoryFreeClear(action.data);
+  taosMemoryFreeClear(op->data);
   CTG_RET(code);
 }
 
 int32_t ctgDropDbVgroupEnqueue(SCatalog* pCtg, const char *dbFName, bool syncOp) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_DROP_DB_VGROUP, .syncOp = syncOp};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_DROP_DB_VGROUP;
+  op->syncOp = syncOp;
+  
   SCtgDropDbVgroupMsg *msg = taosMemoryMalloc(sizeof(SCtgDropDbVgroupMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgDropDbVgroupMsg));
@@ -612,15 +601,15 @@ int32_t ctgDropDbVgroupEnqueue(SCatalog* pCtg, const char *dbFName, bool syncOp)
   msg->pCtg = pCtg;
   strncpy(msg->dbFName, dbFName, sizeof(msg->dbFName));
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
 
 _return:
 
-  taosMemoryFreeClear(action.data);
+  taosMemoryFreeClear(op->data);
   CTG_RET(code);
 }
 
@@ -628,7 +617,10 @@ _return:
 
 int32_t ctgDropStbMetaEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId, const char *stbName, uint64_t suid, bool syncOp) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_DROP_STB_META, .syncOp = syncOp};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_DROP_STB_META;
+  op->syncOp = syncOp;
+  
   SCtgDropStbMetaMsg *msg = taosMemoryMalloc(sizeof(SCtgDropStbMetaMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgDropStbMetaMsg));
@@ -641,15 +633,15 @@ int32_t ctgDropStbMetaEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId,
   msg->dbId = dbId;
   msg->suid = suid;
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
 
 _return:
 
-  taosMemoryFreeClear(action.data);
+  taosMemoryFreeClear(op->data);
   CTG_RET(code);
 }
 
@@ -657,7 +649,10 @@ _return:
 
 int32_t ctgDropTbMetaEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId, const char *tbName, bool syncOp) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_DROP_TB_META, .syncOp = syncOp};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_DROP_TB_META;
+  op->syncOp = syncOp;
+  
   SCtgDropTblMetaMsg *msg = taosMemoryMalloc(sizeof(SCtgDropTblMetaMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgDropTblMetaMsg));
@@ -669,21 +664,24 @@ int32_t ctgDropTbMetaEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId,
   strncpy(msg->tbName, tbName, sizeof(msg->tbName));
   msg->dbId = dbId;
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
 
 _return:
 
-  taosMemoryFreeClear(action.data);
+  taosMemoryFreeClear(op->data);
   CTG_RET(code);
 }
 
 int32_t ctgUpdateVgroupEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId, SDBVgInfo* dbInfo, bool syncOp) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_UPDATE_VGROUP, .syncOp = syncOp};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_UPDATE_VGROUP;
+  op->syncOp = syncOp;
+  
   SCtgUpdateVgMsg *msg = taosMemoryMalloc(sizeof(SCtgUpdateVgMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgUpdateVgMsg));
@@ -701,22 +699,25 @@ int32_t ctgUpdateVgroupEnqueue(SCatalog* pCtg, const char *dbFName, int64_t dbId
   msg->dbId = dbId;
   msg->dbInfo = dbInfo;
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
 
 _return:
 
   ctgFreeVgInfo(dbInfo);
-  taosMemoryFreeClear(action.data);
+  taosMemoryFreeClear(op->data);
   CTG_RET(code);
 }
 
 int32_t ctgUpdateTbMetaEnqueue(SCatalog* pCtg, STableMetaOutput *output, bool syncOp) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_UPDATE_TB_META, .syncOp = syncOp};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_UPDATE_TB_META;
+  op->syncOp = syncOp;
+  
   SCtgUpdateTblMsg *msg = taosMemoryMalloc(sizeof(SCtgUpdateTblMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgUpdateTblMsg));
@@ -731,9 +732,9 @@ int32_t ctgUpdateTbMetaEnqueue(SCatalog* pCtg, STableMetaOutput *output, bool sy
   msg->pCtg = pCtg;
   msg->output = output;
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
   
@@ -746,7 +747,9 @@ _return:
 
 int32_t ctgUpdateVgEpsetEnqueue(SCatalog* pCtg, char *dbFName, int32_t vgId, SEpSet* pEpSet) {
   int32_t code = 0;
-  SCtgCacheOperation operation= {.opId = CTG_OP_UPDATE_VG_EPSET};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_UPDATE_VG_EPSET;
+  
   SCtgUpdateEpsetMsg *msg = taosMemoryMalloc(sizeof(SCtgUpdateEpsetMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgUpdateEpsetMsg));
@@ -758,9 +761,9 @@ int32_t ctgUpdateVgEpsetEnqueue(SCatalog* pCtg, char *dbFName, int32_t vgId, SEp
   msg->vgId = vgId;
   msg->epSet = *pEpSet;
 
-  operation.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &operation));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
 
   return TSDB_CODE_SUCCESS;
   
@@ -775,7 +778,10 @@ _return:
 
 int32_t ctgUpdateUserEnqueue(SCatalog* pCtg, SGetUserAuthRsp *pAuth, bool syncOp) {
   int32_t code = 0;
-  SCtgCacheOperation action= {.opId = CTG_OP_UPDATE_USER, .syncOp = syncOp};
+  SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
+  op->opId = CTG_OP_UPDATE_USER;
+  op->syncOp = syncOp;
+  
   SCtgUpdateUserMsg *msg = taosMemoryMalloc(sizeof(SCtgUpdateUserMsg));
   if (NULL == msg) {
     ctgError("malloc %d failed", (int32_t)sizeof(SCtgUpdateUserMsg));
@@ -785,9 +791,9 @@ int32_t ctgUpdateUserEnqueue(SCatalog* pCtg, SGetUserAuthRsp *pAuth, bool syncOp
   msg->pCtg = pCtg;
   msg->userAuth = *pAuth;
 
-  action.data = msg;
+  op->data = msg;
 
-  CTG_ERR_JRET(ctgEnqueue(pCtg, &action));
+  CTG_ERR_JRET(ctgEnqueue(pCtg, op));
   
   return TSDB_CODE_SUCCESS;
   
@@ -1607,6 +1613,39 @@ void ctgUpdateThreadUnexpectedStopped(void) {
   if (CTG_IS_LOCKED(&gCtgMgmt.lock) > 0) CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
 }
 
+void ctgCleanupCacheQueue(void) {
+  SCtgQNode *node = NULL;
+  SCtgQNode *nodeNext = NULL;
+
+  while (true) {
+    node = gCtgMgmt.queue.head->next;
+    while (node) {
+      if (node->op) {
+        taosMemoryFree(node->op->data);
+        if (node->op->syncOp) {
+          tsem_post(&node->op->rspSem);
+        } else {
+          taosMemoryFree(node->op);
+        }
+      }
+
+      nodeNext = node->next;
+      taosMemoryFree(node);
+      
+      node = nodeNext;
+    }
+
+    if (CTG_IS_LOCKED(&gCtgMgmt.lock)) {
+      taosUsleep(1);
+    } else {
+      break;
+    }
+  }
+
+  taosMemoryFreeClear(gCtgMgmt.queue.head);
+  gCtgMgmt.queue.tail = NULL;
+}
+
 void* ctgUpdateThreadFunc(void* param) {
   setThreadName("catalog");
 #ifdef WINDOWS
@@ -1622,7 +1661,8 @@ void* ctgUpdateThreadFunc(void* param) {
     }
     
     if (atomic_load_8((int8_t*)&gCtgMgmt.exit)) {
-      tsem_post(&gCtgMgmt.queue.rspSem);
+      CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
+      ctgCleanupCacheQueue();
       break;
     }
 
@@ -1634,10 +1674,8 @@ void* ctgUpdateThreadFunc(void* param) {
     
     (*gCtgCacheOperation[operation->opId].func)(operation);
 
-    gCtgMgmt.queue.seqDone = operation->seqId;
-
     if (operation->syncOp) {
-      tsem_post(&gCtgMgmt.queue.rspSem);
+      tsem_post(&operation->rspSem);
     }
 
     CTG_RT_STAT_INC(qDoneNum, 1); 

source/libs/catalog/src/ctgRemote.c

@@ -85,6 +85,21 @@ int32_t ctgProcessRspMsg(void* out, int32_t reqType, char* msg, int32_t msgSize,
       qDebug("Got index from mnode, indexName:%s", target);
       break;
     }
+    case TDMT_MND_GET_TABLE_INDEX: {
+      if (TSDB_CODE_SUCCESS != rspCode) {
+        qError("error rsp for get table index, error:%s, tbFName:%s", tstrerror(rspCode), target);
+        CTG_ERR_RET(rspCode);
+      }
+      
+      code = queryProcessMsgRsp[TMSG_INDEX(reqType)](out, msg, msgSize);
+      if (code) {
+        qError("Process get table index rsp failed, error:%s, tbFName:%s", tstrerror(code), target);
+        CTG_ERR_RET(code);
+      }
+      
+      qDebug("Got table index from mnode, tbFName:%s", target);
+      break;
+    }
     case TDMT_MND_RETRIEVE_FUNC: {
       if (TSDB_CODE_SUCCESS != rspCode) {
         qError("error rsp for get udf, error:%s, funcName:%s", tstrerror(rspCode), target);
@@ -412,6 +427,44 @@ int32_t ctgGetIndexInfoFromMnode(CTG_PARAMS, const char *indexName, SIndexInfo *
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t ctgGetTbIndexFromMnode(CTG_PARAMS, const char *tbFName, SArray** out, SCtgTask* pTask) {
+  char *msg = NULL;
+  int32_t msgLen = 0;
+  int32_t reqType = TDMT_MND_GET_TABLE_INDEX;
+  void*(*mallocFp)(int32_t) = pTask ? taosMemoryMalloc : rpcMallocCont;
+
+  ctgDebug("try to get tb index from mnode, tbFName:%s", tbFName);
+
+  int32_t code = queryBuildMsg[TMSG_INDEX(reqType)]((void *)tbFName, &msg, 0, &msgLen, mallocFp);
+  if (code) {
+    ctgError("Build get index msg failed, code:%s, tbFName:%s", tstrerror(code), tbFName);
+    CTG_ERR_RET(code);
+  }
+
+  if (pTask) {
+    void* pOut = taosMemoryCalloc(1, POINTER_BYTES);
+    if (NULL == pOut) {
+      CTG_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+    }
+    CTG_ERR_RET(ctgUpdateMsgCtx(&pTask->msgCtx, reqType, pOut, (char*)tbFName));
+    
+    CTG_RET(ctgAsyncSendMsg(CTG_PARAMS_LIST(), pTask, reqType, msg, msgLen));
+  }
+  
+  SRpcMsg rpcMsg = {
+      .msgType = reqType,
+      .pCont   = msg,
+      .contLen = msgLen,
+  };
+
+  SRpcMsg rpcRsp = {0};
+  rpcSendRecv(pTrans, (SEpSet*)pMgmtEps, &rpcMsg, &rpcRsp);
+
+  CTG_ERR_RET(ctgProcessRspMsg(out, reqType, rpcRsp.pCont, rpcRsp.contLen, rpcRsp.code, (char*)tbFName));
+  
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t ctgGetUdfInfoFromMnode(CTG_PARAMS, const char *funcName, SFuncInfo *out, SCtgTask* pTask) {
   char *msg = NULL;
   int32_t msgLen = 0;

source/libs/executor/src/executorimpl.c

@@ -4760,6 +4760,7 @@ int32_t initQueryTableDataCond(SQueryTableDataCond* pCond, const STableScanPhysi
   pCond->numOfTWindows = 1;
   pCond->twindows = taosMemoryCalloc(pCond->numOfTWindows, sizeof(STimeWindow));
   pCond->twindows[0] = pTableScanNode->scanRange;
+  pCond->suid = pTableScanNode->scan.suid;
 
 #if 1
   // todo work around a problem, remove it later

source/libs/executor/src/timewindowoperator.c

@@ -1,3 +1,17 @@
+/*
+ * 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 "executorimpl.h"
 #include "function.h"
 #include "functionMgt.h"

source/libs/nodes/src/nodesCloneFuncs.c

@@ -449,6 +449,34 @@ static SNode* logicSubplanCopy(const SLogicSubplan* pSrc, SLogicSubplan* pDst) {
   return (SNode*)pDst;
 }
 
+static SNode* physiNodeCopy(const SPhysiNode* pSrc, SPhysiNode* pDst) {
+  CLONE_NODE_FIELD(pOutputDataBlockDesc);
+  CLONE_NODE_FIELD(pConditions);
+  CLONE_NODE_LIST_FIELD(pChildren);
+  return (SNode*)pDst;
+}
+
+static SNode* physiWindowCopy(const SWinodwPhysiNode* pSrc, SWinodwPhysiNode* pDst) {
+  COPY_BASE_OBJECT_FIELD(node, physiNodeCopy);
+  CLONE_NODE_LIST_FIELD(pExprs);
+  CLONE_NODE_LIST_FIELD(pFuncs);
+  CLONE_NODE_FIELD(pTspk);
+  COPY_SCALAR_FIELD(triggerType);
+  COPY_SCALAR_FIELD(watermark);
+  COPY_SCALAR_FIELD(filesFactor);
+  return (SNode*)pDst;
+}
+
+static SNode* physiIntervalCopy(const SIntervalPhysiNode* pSrc, SIntervalPhysiNode* pDst) {
+  COPY_BASE_OBJECT_FIELD(window, physiWindowCopy);
+  COPY_SCALAR_FIELD(interval);
+  COPY_SCALAR_FIELD(offset);
+  COPY_SCALAR_FIELD(sliding);
+  COPY_SCALAR_FIELD(intervalUnit);
+  COPY_SCALAR_FIELD(slidingUnit);
+  return (SNode*)pDst;
+}
+
 static SNode* dataBlockDescCopy(const SDataBlockDescNode* pSrc, SDataBlockDescNode* pDst) {
   COPY_SCALAR_FIELD(dataBlockId);
   CLONE_NODE_LIST_FIELD(pSlots);
@@ -575,6 +603,12 @@ SNodeptr nodesCloneNode(const SNodeptr pNode) {
       return logicIndefRowsFuncCopy((const SIndefRowsFuncLogicNode*)pNode, (SIndefRowsFuncLogicNode*)pDst);
     case QUERY_NODE_LOGIC_SUBPLAN:
       return logicSubplanCopy((const SLogicSubplan*)pNode, (SLogicSubplan*)pDst);
+    case QUERY_NODE_PHYSICAL_PLAN_HASH_INTERVAL:
+    case QUERY_NODE_PHYSICAL_PLAN_MERGE_INTERVAL:
+    case QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERVAL:
+    case QUERY_NODE_PHYSICAL_PLAN_STREAM_FINAL_INTERVAL:
+    case QUERY_NODE_PHYSICAL_PLAN_STREAM_SEMI_INTERVAL:
+      return physiIntervalCopy((const SIntervalPhysiNode*)pNode, (SIntervalPhysiNode*)pDst);
     default:
       break;
   }

source/libs/nodes/src/nodesUtilFuncs.c

@@ -164,9 +164,14 @@ SNodeptr nodesMakeNode(ENodeType type) {
       return makeNode(type, sizeof(SCreateStreamStmt));
     case QUERY_NODE_DROP_STREAM_STMT:
       return makeNode(type, sizeof(SDropStreamStmt));
+    case QUERY_NODE_BALANCE_VGROUP_STMT:
+      return makeNode(type, sizeof(SBalanceVgroupStmt));
     case QUERY_NODE_MERGE_VGROUP_STMT:
+      return makeNode(type, sizeof(SMergeVgroupStmt));
     case QUERY_NODE_REDISTRIBUTE_VGROUP_STMT:
+      return makeNode(type, sizeof(SRedistributeVgroupStmt));
     case QUERY_NODE_SPLIT_VGROUP_STMT:
+      return makeNode(type, sizeof(SSplitVgroupStmt));
     case QUERY_NODE_SYNCDB_STMT:
       break;
     case QUERY_NODE_GRANT_STMT:

source/libs/parser/inc/parAst.h

@@ -187,6 +187,7 @@ SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, const
                               SNode* pOptions, SNode* pQuery);
 SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pStreamName);
 SNode* createKillStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pId);
+SNode* createBalanceVgroupStmt(SAstCreateContext* pCxt);
 SNode* createMergeVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId1, const SToken* pVgId2);
 SNode* createRedistributeVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId, SNodeList* pDnodes);
 SNode* createSplitVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId);

source/libs/parser/inc/parInsertData.h

@@ -116,8 +116,7 @@ static FORCE_INLINE void getSTSRowAppendInfo(uint8_t rowType, SParsedDataColInfo
 }
 
 static FORCE_INLINE int32_t setBlockInfo(SSubmitBlk *pBlocks, STableDataBlocks *dataBuf, int32_t numOfRows) {
-  pBlocks->suid =
+  pBlocks->suid = (TSDB_NORMAL_TABLE == dataBuf->pTableMeta->tableType ? 0 : dataBuf->pTableMeta->suid);
-      (TSDB_NORMAL_TABLE == dataBuf->pTableMeta->tableType ? dataBuf->pTableMeta->uid : dataBuf->pTableMeta->suid);
   pBlocks->uid = dataBuf->pTableMeta->uid;
   pBlocks->sversion = dataBuf->pTableMeta->sversion;
   pBlocks->schemaLen = dataBuf->createTbReqLen;

source/libs/parser/inc/sql.y

@@ -469,9 +469,10 @@ cmd ::= KILL QUERY NK_INTEGER(A).
 cmd ::= KILL TRANSACTION NK_INTEGER(A).                                           { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_TRANSACTION_STMT, &A); }
 
 /************************************************ merge/redistribute/ vgroup ******************************************/
+cmd ::= BALANCE VGROUP.                                                           { pCxt->pRootNode = createBalanceVgroupStmt(pCxt); }
 cmd ::= MERGE VGROUP NK_INTEGER(A) NK_INTEGER(B).                                 { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &A, &B); }
 cmd ::= REDISTRIBUTE VGROUP NK_INTEGER(A) dnode_list(B).                          { pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &A, B); }
-cmd ::= SPLIT VGROUP NK_INTEGER(A).                                               { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &A); }
+//cmd ::= SPLIT VGROUP NK_INTEGER(A).                                               { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &A); }
 
 %type dnode_list                                                                  { SNodeList* }
 %destructor dnode_list                                                            { nodesDestroyList($$); }

source/libs/parser/src/parAstCreater.c

@@ -1435,25 +1435,37 @@ SNode* createKillStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pId
   return (SNode*)pStmt;
 }
 
+SNode* createBalanceVgroupStmt(SAstCreateContext* pCxt) {
+  CHECK_PARSER_STATUS(pCxt);
+  SBalanceVgroupStmt* pStmt = nodesMakeNode(QUERY_NODE_BALANCE_VGROUP_STMT);
+  CHECK_OUT_OF_MEM(pStmt);
+  return (SNode*)pStmt;
+}
+
 SNode* createMergeVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId1, const SToken* pVgId2) {
   CHECK_PARSER_STATUS(pCxt);
-  SNode* pStmt = nodesMakeNode(QUERY_NODE_MERGE_VGROUP_STMT);
+  SMergeVgroupStmt* pStmt = nodesMakeNode(QUERY_NODE_MERGE_VGROUP_STMT);
   CHECK_OUT_OF_MEM(pStmt);
-  return pStmt;
+  pStmt->vgId1 = taosStr2Int32(pVgId1->z, NULL, 10);
+  pStmt->vgId2 = taosStr2Int32(pVgId2->z, NULL, 10);
+  return (SNode*)pStmt;
 }
 
 SNode* createRedistributeVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId, SNodeList* pDnodes) {
   CHECK_PARSER_STATUS(pCxt);
-  SNode* pStmt = nodesMakeNode(QUERY_NODE_REDISTRIBUTE_VGROUP_STMT);
+  SRedistributeVgroupStmt* pStmt = nodesMakeNode(QUERY_NODE_REDISTRIBUTE_VGROUP_STMT);
   CHECK_OUT_OF_MEM(pStmt);
-  return pStmt;
+  pStmt->vgId = taosStr2Int32(pVgId->z, NULL, 10);
+  pStmt->pDnodes = pDnodes;
+  return (SNode*)pStmt;
 }
 
 SNode* createSplitVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId) {
   CHECK_PARSER_STATUS(pCxt);
-  SNode* pStmt = nodesMakeNode(QUERY_NODE_SPLIT_VGROUP_STMT);
+  SSplitVgroupStmt* pStmt = nodesMakeNode(QUERY_NODE_SPLIT_VGROUP_STMT);
   CHECK_OUT_OF_MEM(pStmt);
-  return pStmt;
+  pStmt->vgId = taosStr2Int32(pVgId->z, NULL, 10);
+  return (SNode*)pStmt;
 }
 
 SNode* createSyncdbStmt(SAstCreateContext* pCxt, const SToken* pDbName) {

source/libs/parser/src/parTokenizer.c

@@ -41,6 +41,7 @@ static SKeyword keywordTable[] = {
     {"AS",            TK_AS},
     {"ASC",           TK_ASC},
     {"AT_ONCE",       TK_AT_ONCE},
+    {"BALANCE",       TK_BALANCE},
     {"BETWEEN",       TK_BETWEEN},
     {"BINARY",        TK_BINARY},
     {"BIGINT",        TK_BIGINT},
@@ -116,6 +117,7 @@ static SKeyword keywordTable[] = {
     {"LOCAL",         TK_LOCAL},
     {"MATCH",         TK_MATCH},
     {"MAXROWS",       TK_MAXROWS},
+    {"MERGE",         TK_MERGE},
     {"MINROWS",       TK_MINROWS},
     {"MINUS",         TK_MINUS},
     {"MNODE",         TK_MNODE},
@@ -151,6 +153,7 @@ static SKeyword keywordTable[] = {
     {"QUERY",         TK_QUERY},
     {"RATIO",         TK_RATIO},
     {"READ",          TK_READ},
+    {"REDISTRIBUTE",  TK_REDISTRIBUTE},
     {"RENAME",        TK_RENAME},
     {"REPLICA",       TK_REPLICA},
     {"RESET",         TK_RESET},
@@ -171,6 +174,7 @@ static SKeyword keywordTable[] = {
     {"SNODE",         TK_SNODE},
     {"SNODES",        TK_SNODES},
     {"SOFFSET",       TK_SOFFSET},
+    // {"SPLIT",         TK_SPLIT},
     {"STABLE",        TK_STABLE},
     {"STABLES",       TK_STABLES},
     {"STATE",         TK_STATE},
@@ -208,6 +212,7 @@ static SKeyword keywordTable[] = {
     {"VARCHAR",       TK_VARCHAR},
     {"VARIABLES",     TK_VARIABLES},
     {"VERBOSE",       TK_VERBOSE},
+    {"VGROUP",        TK_VGROUP},
     {"VGROUPS",       TK_VGROUPS},
     {"VNODES",        TK_VNODES},
     {"WAL",           TK_WAL},

source/libs/parser/src/parTranslater.c

@@ -3611,6 +3611,55 @@ static int32_t translateRevoke(STranslateContext* pCxt, SRevokeStmt* pStmt) {
   return buildCmdMsg(pCxt, TDMT_MND_ALTER_USER, (FSerializeFunc)tSerializeSAlterUserReq, &req);
 }
 
+static int32_t translateBalanceVgroup(STranslateContext* pCxt, SBalanceVgroupStmt* pStmt) {
+  SBalanceVgroupReq req = {0};
+  return buildCmdMsg(pCxt, TDMT_MND_BALANCE_VGROUP, (FSerializeFunc)tSerializeSBalanceVgroupReq, &req);
+}
+
+static int32_t translateMergeVgroup(STranslateContext* pCxt, SMergeVgroupStmt* pStmt) {
+  SMergeVgroupReq req = {.vgId1 = pStmt->vgId1, .vgId2 = pStmt->vgId2};
+  return buildCmdMsg(pCxt, TDMT_MND_MERGE_VGROUP, (FSerializeFunc)tSerializeSMergeVgroupReq, &req);
+}
+
+static int32_t checkDnodeIds(STranslateContext* pCxt, SRedistributeVgroupStmt* pStmt) {
+  int32_t numOfDnodes = LIST_LENGTH(pStmt->pDnodes);
+  if (numOfDnodes > 3 || numOfDnodes < 1) {
+    return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_REDISTRIBUTE_VG);
+  }
+
+  SNode* pNode = NULL;
+  FOREACH(pNode, pStmt->pDnodes) {
+    SValueNode* pVal = (SValueNode*)pNode;
+    if (DEAL_RES_ERROR == translateValue(pCxt, pVal)) {
+      return pCxt->errCode;
+    }
+  }
+
+  pStmt->dnodeId1 = getBigintFromValueNode((SValueNode*)nodesListGetNode(pStmt->pDnodes, 0));
+  pStmt->dnodeId2 = -1;
+  pStmt->dnodeId3 = -1;
+  if (numOfDnodes > 1) {
+    pStmt->dnodeId2 = getBigintFromValueNode((SValueNode*)nodesListGetNode(pStmt->pDnodes, 1));
+  }
+  if (numOfDnodes > 2) {
+    pStmt->dnodeId3 = getBigintFromValueNode((SValueNode*)nodesListGetNode(pStmt->pDnodes, 2));
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t translateRedistributeVgroup(STranslateContext* pCxt, SRedistributeVgroupStmt* pStmt) {
+  SRedistributeVgroupReq req = {.vgId = pStmt->vgId};
+  int32_t                code = checkDnodeIds(pCxt, pStmt);
+  if (TSDB_CODE_SUCCESS == code) {
+    req.dnodeId1 = pStmt->dnodeId1;
+    req.dnodeId2 = pStmt->dnodeId2;
+    req.dnodeId3 = pStmt->dnodeId3;
+    code = buildCmdMsg(pCxt, TDMT_MND_REDISTRIBUTE_VGROUP, (FSerializeFunc)tSerializeSRedistributeVgroupReq, &req);
+  }
+  return code;
+}
+
 static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
   int32_t code = TSDB_CODE_SUCCESS;
   switch (nodeType(pNode)) {
@@ -3733,6 +3782,15 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
     case QUERY_NODE_REVOKE_STMT:
       code = translateRevoke(pCxt, (SRevokeStmt*)pNode);
       break;
+    case QUERY_NODE_BALANCE_VGROUP_STMT:
+      code = translateBalanceVgroup(pCxt, (SBalanceVgroupStmt*)pNode);
+      break;
+    case QUERY_NODE_MERGE_VGROUP_STMT:
+      code = translateMergeVgroup(pCxt, (SMergeVgroupStmt*)pNode);
+      break;
+    case QUERY_NODE_REDISTRIBUTE_VGROUP_STMT:
+      code = translateRedistributeVgroup(pCxt, (SRedistributeVgroupStmt*)pNode);
+      break;
     default:
       break;
   }

source/libs/parser/src/parUtil.c

@@ -180,6 +180,8 @@ static char* getSyntaxErrFormat(int32_t errCode) {
       return "Value too long for column/tag: %s";
     case TSDB_CODE_PAR_INVALID_DELETE_WHERE:
       return "The DELETE statement must have a definite time window range";
+    case TSDB_CODE_PAR_INVALID_REDISTRIBUTE_VG:
+      return "The REDISTRIBUTE VGROUP statement only support 1 to 3 dnodes";
     case TSDB_CODE_OUT_OF_MEMORY:
       return "Out of memory";
     default:

source/libs/parser/src/sql.c

@@ -138,17 +138,17 @@ typedef union {
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
 #define YYFALLBACK 1
-#define YYNSTATE             616
+#define YYNSTATE             615
 #define YYNRULE              452
 #define YYNTOKEN             238
-#define YY_MAX_SHIFT         615
+#define YY_MAX_SHIFT         614
-#define YY_MIN_SHIFTREDUCE   902
+#define YY_MIN_SHIFTREDUCE   901
-#define YY_MAX_SHIFTREDUCE   1353
+#define YY_MAX_SHIFTREDUCE   1352
-#define YY_ERROR_ACTION      1354
+#define YY_ERROR_ACTION      1353
-#define YY_ACCEPT_ACTION     1355
+#define YY_ACCEPT_ACTION     1354
-#define YY_NO_ACTION         1356
+#define YY_NO_ACTION         1355
-#define YY_MIN_REDUCE        1357
+#define YY_MIN_REDUCE        1356
-#define YY_MAX_REDUCE        1808
+#define YY_MAX_REDUCE        1807
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -217,223 +217,223 @@ typedef union {
 *********** Begin parsing tables **********************************************/
 #define YY_ACTTAB_COUNT (2165)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */    72,  355, 1655, 1642,   28,  230,  296, 1465, 1642,  608,
+ /*     0 */    72,  354, 1654, 1641,   28,  230,  296, 1464, 1641,  607,
- /*    10 */   607,  313,   35,   33,  530,   36,   34,   32,   31,   30,
+ /*    10 */   606,  313,   35,   33,  529,   36,   34,   32,   31,   30,
- /*    20 */   305, 1481, 1167, 1639,  530,  490,  106, 1477, 1639,  389,
+ /*    20 */   305, 1480, 1166, 1638,  529,  489,  106, 1476, 1638,  388,
- /*    30 */  1671,  390, 1389,  428,  490,  277,  152,  349,  514, 1635,
+ /*    30 */  1670,  389, 1388,  427,  489,  277,  152,  348,  513, 1634,
- /*    40 */  1641,  529,  133, 1488, 1635, 1641, 1445, 1165,  513,  132,
+ /*    40 */  1640,  528,  133, 1487, 1634, 1640, 1444, 1164,  512,  132,
- /*    50 */   533, 1369, 1625, 1488,  114,  533,  529,  494,   14,  530,
+ /*    50 */   532, 1368, 1624, 1487,  114,  532,  528,  493,   14,  529,
- /*    60 */    35,   33, 1294,  114, 1173, 1416,  932,   63,  305, 1684,
+ /*    60 */    35,   33, 1293,  114, 1172, 1415,  931,   63,  305, 1683,
- /*    70 */  1167,  353,   82, 1656,  516, 1658, 1659,  512, 1786,  533,
+ /*    70 */  1166,  352,   82, 1655,  515, 1657, 1658,  511, 1785,  532,
- /*    80 */   110,    1, 1724,   56, 1532, 1308,  278, 1720, 1488, 1483,
+ /*    80 */   110,    1, 1723,   56, 1531, 1307,  278, 1719, 1487, 1482,
- /*    90 */   147,  295,  112,  517, 1783, 1165, 1530,  529, 1786, 1578,
+ /*    90 */   147,  295,  112,  516, 1782, 1164, 1529,  528, 1785, 1577,
- /*   100 */   564,  112,   39,  612,  936,  937,   14,  145, 1731, 1732,
+ /*   100 */   563,  112,   39,  611,  935,  936,   14,  145, 1730, 1731,
- /*   110 */   149, 1736, 1173, 1166, 1783,  492,  144, 1731, 1732,  563,
+ /*   110 */   149, 1735, 1172, 1165, 1782,  491,  144, 1730, 1731,  562,
- /*   120 */  1736,  562,  561,  560,  407,  588,  587,  586,  320,    2,
+ /*   120 */  1735,  561,  560,  559,  406,  587,  586,  585,  320,    2,
- /*   130 */   585,  584,  583,  116,  578,  577,  576,  575,  574,  573,
+ /*   130 */   584,  583,  582,  116,  577,  576,  575,  574,  573,  572,
- /*   140 */   572,  571,  123,  567, 1358,   36,   34,   32,   31,   30,
+ /*   140 */   571,  570,  123,  566, 1357,   36,   34,   32,   31,   30,
- /*   150 */   397,  612,  390, 1389,  142,  317, 1168, 1191,   38, 1671,
+ /*   150 */   396,  611,  389, 1388,  142,  317, 1167, 1190,   38, 1670,
- /*   160 */    55, 1166, 1568, 1570, 1466,   96, 1526,  483,   95,   94,
+ /*   160 */    55, 1165, 1567, 1569, 1465,   96, 1525,  482,   95,   94,
- /*   170 */    93,   92,   91,   90,   89,   88,   87,  479,  388, 1171,
+ /*   170 */    93,   92,   91,   90,   89,   88,   87,  478,  387, 1170,
- /*   180 */  1172,  392, 1218, 1219, 1221, 1222, 1223, 1224, 1225,  509,
+ /*   180 */  1171,  391, 1217, 1218, 1220, 1221, 1222, 1223, 1224,  508,
- /*   190 */   531, 1233, 1234, 1235, 1236, 1237, 1238,   36,   34,   32,
+ /*   190 */   530, 1232, 1233, 1234, 1235, 1236, 1237,   36,   34,   32,
- /*   200 */    31,   30,  517,  482, 1168,  308,  581,   96, 1577,  150,
+ /*   200 */    31,   30,  516,  481, 1167,  308,  580,   96, 1576,  150,
  /*   210 */    95,   94,   93,   92,   91,   90,   89,   88,   87,  288,
- /*   220 */   130,  407,   36,   34,   32,   31,   30, 1171, 1172, 1491,
+ /*   220 */   130,  406,   36,   34,   32,   31,   30, 1170, 1171, 1490,
- /*   230 */  1218, 1219, 1221, 1222, 1223, 1224, 1225,  509,  531, 1233,
+ /*   230 */  1217, 1218, 1220, 1221, 1222, 1223, 1224,  508,  530, 1232,
- /*   240 */  1234, 1235, 1236, 1237, 1238,   35,   33,  343,  485,  480,
+ /*   240 */  1233, 1234, 1235, 1236, 1237,   35,   33,  342,  484,  479,
- /*   250 */  1355,  442,  441,  305, 1655, 1167,  440,  200,  252,  111,
+ /*   250 */  1354,  441,  440,  305, 1654, 1166,  439,  200,  252,  111,
- /*   260 */   437, 1518,  379,  436,  435,  434,   35,   33,  289,  447,
+ /*   260 */   436, 1517,  378,  435,  434,  433,   35,   33,  289,  446,
- /*   270 */   287,  286, 1001,  430,  305, 1479, 1167,  432,  129,  309,
+ /*   270 */   287,  286, 1000,  429,  305, 1478, 1166,  431,  129,  309,
- /*   280 */  1165,   79, 1671,   55,  455,   66,  150,  130,  150, 1003,
+ /*   280 */  1164,   79, 1670,   55,  454,   66,  150,  130,  150, 1002,
- /*   290 */   514,   14, 1205,  484,  115, 1639, 1490, 1173,  193,  431,
+ /*   290 */   513,   14, 1204,  483,  115, 1638, 1489, 1172,  193,  430,
- /*   300 */   513, 1165, 1480,  949, 1625,  948,  161,  160,  321,  494,
+ /*   300 */   512, 1164, 1479,  948, 1624,  947,  161,  160,  321,  493,
- /*   310 */   450, 1635, 1641,  394,    2,  444, 1192, 1643, 1173, 1189,
+ /*   310 */   449, 1634, 1640,  393,    2,  443, 1191, 1642, 1172, 1188,
- /*   320 */   192, 1684,  533,  490,   82, 1656,  516, 1658, 1659,  512,
+ /*   320 */   192, 1683,  532,  489,   82, 1655,  515, 1657, 1658,  511,
- /*   330 */    24,  533,  950, 1350, 1724,    8,  612, 1639,  278, 1720,
+ /*   330 */    24,  532,  949, 1349, 1723,    8,  611, 1638,  278, 1719,
- /*   340 */    36,   34,   32,   31,   30,   51, 1166, 1464,   50, 1786,
+ /*   340 */    36,   34,   32,   31,   30,   51, 1165, 1463,   50, 1785,
- /*   350 */  1786,  566,  114, 1635, 1641,   65,  294,  612, 1380,  194,
+ /*   350 */  1785,  565,  114, 1634, 1640,   65,  294,  611, 1379,  194,
- /*   360 */   559,  147,  147, 1463,  533, 1783, 1783, 1166, 1357, 1039,
+ /*   360 */   558,  147,  147, 1462,  532, 1782, 1782, 1165, 1356, 1038,
- /*   370 */   556,  555,  554, 1043,  553, 1045, 1046,  552, 1048,  549,
+ /*   370 */   555,  554,  553, 1042,  552, 1044, 1045,  551, 1047,  548,
- /*   380 */  1379, 1054,  546, 1056, 1057,  543,  540,    7,   55, 1168,
+ /*   380 */  1378, 1053,  545, 1055, 1056,  542,  539,    7,   55, 1167,
- /*   390 */   112, 1190,  105,  104,  103,  102,  101,  100,   99,   98,
+ /*   390 */   112, 1189,  105,  104,  103,  102,  101,  100,   99,   98,
- /*   400 */    97,   32,   31,   30,  566,  146, 1731, 1732, 1625, 1736,
+ /*   400 */    97,   32,   31,   30,  565,  146, 1730, 1731, 1624, 1735,
- /*   410 */  1168,  150, 1171, 1172, 1349, 1218, 1219, 1221, 1222, 1223,
+ /*   410 */  1167,  150, 1170, 1171, 1348, 1217, 1218, 1220, 1221, 1222,
- /*   420 */  1224, 1225,  509,  531, 1233, 1234, 1235, 1236, 1237, 1238,
+ /*   420 */  1223, 1224,  508,  530, 1232, 1233, 1234, 1235, 1236, 1237,
- /*   430 */  1625,  569,  157, 1171, 1172,  463, 1218, 1219, 1221, 1222,
+ /*   430 */  1624,  568,  157, 1170, 1171,  462, 1217, 1218, 1220, 1221,
- /*   440 */  1223, 1224, 1225,  509,  531, 1233, 1234, 1235, 1236, 1237,
+ /*   440 */  1222, 1223, 1224,  508,  530, 1232, 1233, 1234, 1235, 1236,
- /*   450 */  1238,   35,   33, 1239,   26, 1378,  564,   61,  466,  305,
+ /*   450 */  1237,   35,   33, 1238,   26, 1377,  563,   61,  465,  305,
- /*   460 */    60, 1167,  564,  150,   36,   34,   32,   31,   30,   63,
+ /*   460 */    60, 1166,  563,  150,   36,   34,   32,   31,   30,   63,
- /*   470 */  1406,  396,   35,   33,  392,  563, 1655,  562,  561,  560,
+ /*   470 */  1405,  395,   35,   33,  391,  562, 1654,  561,  560,  559,
- /*   480 */   305,  563, 1167,  562,  561,  560, 1165, 1193,  530, 1318,
+ /*   480 */   305,  562, 1166,  561,  560,  559, 1164, 1192,  529, 1317,
- /*   490 */   530, 1484,  443,   36,   34,   32,   31,   30, 1786, 1786,
+ /*   490 */   529, 1483,  442,   36,   34,   32,   31,   30, 1785, 1785,
- /*   500 */   354, 1645,  106, 1173, 1671, 1625, 1473, 1165,   55,  433,
+ /*   500 */   353, 1644,  106, 1172, 1670, 1624, 1472, 1164,   55,  432,
- /*   510 */  1785,  147,  493,  456, 1783, 1783,  150, 1488, 1377, 1488,
+ /*   510 */  1784,  147,  492,  455, 1782, 1782,  150, 1487, 1376, 1487,
- /*   520 */     9,  570,  513, 1460, 1173, 1419, 1625,  454,  476, 1316,
+ /*   520 */     9,  569,  512, 1459, 1172, 1418, 1624,  453,  475, 1315,
- /*   530 */  1317, 1319, 1320,   36,   34,   32,   31,   30, 1647,  279,
+ /*   530 */  1316, 1318, 1319,   36,   34,   32,   31,   30, 1646,  279,
- /*   540 */   452,    9,  612, 1684,  439,  438,   83, 1656,  516, 1658,
+ /*   540 */   451,    9,  611, 1683,  438,  437,   83, 1655,  515, 1657,
- /*   550 */  1659,  512, 1166,  533, 1786, 1475, 1724, 1532, 1289,  315,
+ /*   550 */  1658,  511, 1165,  532, 1785, 1474, 1723, 1531, 1288,  315,
- /*   560 */   298, 1720,  143,  612,  310, 1786,  147,  130, 1625, 1530,
+ /*   560 */   298, 1719,  143,  611,  310, 1785,  147,  130, 1624, 1529,
- /*   570 */  1783, 1256, 1301, 1166,  222, 1786, 1490,  148, 1191,  472,
+ /*   570 */  1782, 1255, 1300, 1165,  222, 1785, 1489,  148, 1190,  471,
- /*   580 */  1751, 1783,  348, 1738,  347,  442,  441, 1784,  530,  340,
+ /*   580 */  1750, 1782,  347, 1737,  346,  441,  440, 1783,  529,  339,
- /*   590 */   440, 1783, 1532,  111,  437, 1168, 1532,  436,  435,  434,
+ /*   590 */   439, 1782, 1531,  111,  436, 1167, 1531,  435,  434,  433,
- /*   600 */   364,  582,  580,  316, 1531, 1569, 1570, 1735, 1530,  342,
+ /*   600 */   363,  581,  579,  316, 1530, 1568, 1569, 1734, 1529,  341,
- /*   610 */   338, 1293,  221, 1376,  936,  937, 1168, 1488, 1171, 1172,
+ /*   610 */   337, 1292,  221, 1375,  935,  936, 1167, 1487, 1170, 1171,
- /*   620 */  1257, 1218, 1219, 1221, 1222, 1223, 1224, 1225,  509,  531,
+ /*   620 */  1256, 1217, 1218, 1220, 1221, 1222, 1223, 1224,  508,  530,
- /*   630 */  1233, 1234, 1235, 1236, 1237, 1238,  150,   11,   10, 1171,
+ /*   630 */  1232, 1233, 1234, 1235, 1236, 1237,  150,   11,   10, 1170,
- /*   640 */  1172, 1262, 1218, 1219, 1221, 1222, 1223, 1224, 1225,  509,
+ /*   640 */  1171, 1261, 1217, 1218, 1220, 1221, 1222, 1223, 1224,  508,
- /*   650 */   531, 1233, 1234, 1235, 1236, 1237, 1238,   35,   33,  276,
+ /*   650 */   530, 1232, 1233, 1234, 1235, 1236, 1237,   35,   33,  276,
- /*   660 */  1655, 1189,  530, 1625,  530,  305, 1375, 1167,  372,   54,
+ /*   660 */  1654, 1188,  529, 1624,  529,  305, 1374, 1166,  371,   54,
- /*   670 */  1374,  384, 1373, 1471,  365,  197,  406,  508,   27,  303,
+ /*   670 */  1373,  383, 1372, 1470,  364,  197,  405,  507,   27,  303,
- /*   680 */  1251, 1252, 1253, 1254, 1255, 1259, 1260, 1261, 1671,  385,
+ /*   680 */  1250, 1251, 1252, 1253, 1254, 1258, 1259, 1260, 1670,  384,
- /*   690 */   530, 1488, 1165, 1488, 1244,  530,  514, 1372, 1565,  530,
+ /*   690 */   529, 1487, 1164, 1487, 1243,  529,  513, 1371, 1564,  529,
- /*   700 */  1191,  432, 1485, 1371,  318,  159,  513, 1604, 1191, 1173,
+ /*   700 */  1190,  431, 1484, 1370,  318,  159,  512, 1603, 1190, 1172,
- /*   710 */  1625,  464,  130,  530, 1151, 1152, 1625, 1194, 1270, 1488,
+ /*   710 */  1624,  463,  130,  529, 1150, 1151, 1624, 1193, 1269, 1487,
- /*   720 */  1625, 1490, 1625,  431, 1488,  527,    2, 1684, 1488, 1258,
+ /*   720 */  1624, 1489, 1624,  430, 1487,  526,    2, 1683, 1487, 1257,
- /*   730 */    83, 1656,  516, 1658, 1659,  512,  948,  533, 1368, 1367,
+ /*   730 */    83, 1655,  515, 1657, 1658,  511,  947,  532, 1367, 1366,
- /*   740 */  1724, 1220, 1488,  498,  298, 1720, 1799, 1625,  612,  120,
+ /*   740 */  1723, 1219, 1487,  497,  298, 1719, 1798, 1624,  611,  120,
- /*   750 */  1263, 1743, 1289, 1625, 1366, 1758, 1365, 1364, 1166,  383,
+ /*   750 */  1262, 1742, 1288, 1624, 1365, 1757, 1364, 1363, 1165,  382,
- /*   760 */  1363,  426,  378,  377,  376,  375,  374,  371,  370,  369,
+ /*   760 */  1362,  425,  377,  376,  375,  374,  373,  370,  369,  368,
- /*   770 */   368,  367,  363,  362,  361,  360,  359,  358,  357,  356,
+ /*   770 */   367,  366,  362,  361,  360,  359,  358,  357,  356,  355,
- /*   780 */   530,  131,  530,  530, 1738, 1370,  258,   25, 1625, 1625,
+ /*   780 */   529,  131,  529,  529, 1737, 1369,  258,   25, 1624, 1624,
- /*   790 */   468, 1738,  528, 1362,  243,  319, 1361,  501,  256,   53,
+ /*   790 */   467, 1737,  527, 1361,  243,  319, 1360,  500,  256,   53,
- /*   800 */  1613, 1168,   52, 1360, 1625,  506, 1625, 1625, 1734, 1488,
+ /*   800 */  1613, 1167,   52, 1359, 1624,  505, 1624, 1624, 1733, 1487,
- /*   810 */  1625, 1488, 1488,  185, 1446, 1733,  183, 1292,  187,  162,
+ /*   810 */  1624, 1487, 1487,  185, 1445, 1732,  183, 1291,  187,  162,
- /*   820 */   189,  186, 1176,  188, 1171, 1172,   46, 1218, 1219, 1221,
+ /*   820 */   189,  186, 1175,  188, 1170, 1171,   46, 1217, 1218, 1220,
- /*   830 */  1222, 1223, 1224, 1225,  509,  531, 1233, 1234, 1235, 1236,
+ /*   830 */  1221, 1222, 1223, 1224,  508,  530, 1232, 1233, 1234, 1235,
- /*   840 */  1237, 1238,  206, 1625,   55,  330, 1625,   36,   34,   32,
+ /*   840 */  1236, 1237,  206, 1624,   55,  327, 1624,   36,   34,   32,
- /*   850 */    31,   30,  191, 1625, 1401,  190, 1167, 1399,  209,   11,
+ /*   850 */    31,   30,  191, 1624, 1400,  190, 1166, 1398,  209,   11,
- /*   860 */    10, 1352, 1353, 1220,   46,   37,   37, 1315,   37,  232,
+ /*   860 */    10, 1351, 1352, 1219,   46,   37,   37, 1314,   37,  232,
- /*   870 */   558, 1220,  457,  118,  119,   78,  445,  120, 1175,  448,
+ /*   870 */   557, 1219,  456,  118,  119,   78,  444,  120, 1174,  447,
- /*   880 */    81, 1165,  538,  225,  973,   74,  119,  477, 1179,  120,
+ /*   880 */    81, 1164,  537,  225,  972,   74,  119,  476, 1178,  120,
- /*   890 */   496,  216, 1672,  279,  121, 1390, 1655, 1527, 1173,  211,
+ /*   890 */   495,  216, 1671,  279,  121, 1389, 1654, 1526, 1172,  211,
- /*   900 */   425,  974,  119, 1754,  491,  251, 1264, 1226,  322, 1124,
+ /*   900 */   424,  973,  119, 1753,  490,  251, 1263, 1225,  322, 1123,
- /*   910 */   234,   59,   58,  352,  522,  240,  156, 1205, 1032, 1189,
+ /*   910 */   234,   59,   58,  351,  521,  240,  156, 1204, 1031, 1188,
- /*   920 */   224,  346,    3, 1060, 1671, 1256, 1248, 1064,  499,  227,
+ /*   920 */   224,  345,    3, 1059, 1670, 1255, 1247, 1063,  498,  227,
- /*   930 */  1070,  229,  493,  275,    5, 1068,  336,  612,  332,  328,
+ /*   930 */  1069,  229,  492,  275,    5, 1067,  335,  611,  333,  329,
- /*   940 */   153,  323,  513,  122, 1178,  329, 1625, 1166,  325,  284,
+ /*   940 */   153,  323,  512,  122, 1177,  326, 1624, 1165,  325,  284,
- /*   950 */  1001,  285,  312,  311,  248, 1135,  158,  366, 1567,  373,
+ /*   950 */  1000,  285,  312,  311,  248, 1134,  158,  365, 1566,  372,
- /*   960 */   381,  380, 1181, 1684,  382,  386,   83, 1656,  516, 1658,
+ /*   960 */   380,  379, 1180, 1683,  381,  385,   83, 1655,  515, 1657,
- /*   970 */  1659,  512,  150,  533, 1257, 1655, 1724, 1195, 1198,  387,
+ /*   970 */  1658,  511,  150,  532, 1256, 1654, 1723, 1194, 1197,  386,
- /*   980 */   298, 1720,  143,  395,  502,  398,  399, 1174, 1197,  400,
+ /*   980 */   298, 1719,  143,  394,  501,  397,  398, 1173, 1196,  399,
- /*   990 */  1168,  165,  167, 1199,  170, 1262,  172,  404,  401,  403,
+ /*   990 */  1167,  165,  167, 1198,  170, 1261,  172,  403,  400,  402,
- /*  1000 */  1752, 1196,  175, 1671, 1173,   62,  405,  408,  178,  427,
+ /*  1000 */  1751, 1195,  175, 1670, 1172,   62,  404,  407,  178,  426,
- /*  1010 */  1173,  514,   86, 1171, 1172,  429,  293, 1478, 1608,  182,
+ /*  1010 */  1172,  513,   86, 1170, 1171,  428,  293, 1477, 1607,  182,
- /*  1020 */  1474,  513,  184,  124,  249, 1625,  125, 1476, 1655, 1472,
+ /*  1020 */  1473,  512,  184,  124,  249, 1624,  125, 1475, 1654, 1471,
- /*  1030 */   126,  127,   27,  303, 1251, 1252, 1253, 1254, 1255, 1259,
+ /*  1030 */   126,  127,   27,  303, 1250, 1251, 1252, 1253, 1254, 1258,
- /*  1040 */  1260, 1261, 1684,  534,  195,   83, 1656,  516, 1658, 1659,
+ /*  1040 */  1259, 1260, 1683,  533,  195,   83, 1655,  515, 1657, 1658,
- /*  1050 */   512,  458,  533, 1177,  198, 1724, 1671,  462,  465,  298,
+ /*  1050 */   511,  457,  532, 1176,  198, 1723, 1670,  461,  464,  298,
- /*  1060 */  1720, 1799,  201,  467,  514,  469,  459,  470,  478,  204,
+ /*  1060 */  1719, 1798,  201,  466,  513,  468,  458,  469,  477,  204,
- /*  1070 */  1781, 1194, 1765,  207,  513,  520, 1764,  475, 1625, 1655,
+ /*  1070 */  1780, 1193, 1764,  207,  512,  519, 1763,  474, 1624, 1654,
- /*  1080 */   297, 1755,  210,  481,  215,    6,  487, 1745,  474,  217,
+ /*  1080 */   297, 1754,  210,  480,  215,    6,  486, 1744,  473,  217,
- /*  1090 */  1655, 1289,  113, 1193,   40, 1684, 1182,  503,   83, 1656,
+ /*  1090 */  1654, 1288,  113, 1192,   40, 1683, 1181,  502,   83, 1655,
- /*  1100 */   516, 1658, 1659,  512, 1739,  533,  218, 1671, 1724,  137,
+ /*  1100 */   515, 1657, 1658,  511, 1738,  532,  218, 1670, 1723,  137,
- /*  1110 */   500,  299,  298, 1720, 1799,  514,   18,  518, 1671, 1185,
+ /*  1110 */   499,  299,  298, 1719, 1798,  513,   18,  517, 1670, 1184,
- /*  1120 */   519, 1705, 1576, 1742, 1782,  513,  514,  223,  226, 1625,
+ /*  1120 */   518, 1704, 1575, 1741, 1781,  512,  513,  223,  226, 1624,
- /*  1130 */   531, 1233, 1234,  228,  494, 1575,  513, 1802, 1655,  523,
+ /*  1130 */   530, 1232, 1233,  228,  493, 1574,  512, 1801, 1654,  522,
- /*  1140 */  1625,  307,  236,  497,  524,  494, 1684,  238,  504,  263,
+ /*  1140 */  1624,  307,  236,  496,  523,  493, 1683,  238,  503,  263,
- /*  1150 */  1656,  516, 1658, 1659,  512,  525,  533, 1684,  250,   71,
+ /*  1150 */  1655,  515, 1657, 1658,  511,  524,  532, 1683,  250,   71,
- /*  1160 */   263, 1656,  516, 1658, 1659,  512, 1671,  533, 1489,   73,
+ /*  1160 */   263, 1655,  515, 1657, 1658,  511, 1670,  532, 1488,   73,
- /*  1170 */  1461,  536,  253,  245,  514, 1786,  611,   47, 1655,  255,
+ /*  1170 */  1460,  535,  253,  245,  513, 1785,  610,   47, 1654,  255,
- /*  1180 */   136,  264,  274,  265,  513, 1619, 1786,  149, 1625,  257,
+ /*  1180 */   136,  264,  274,  265,  512, 1618, 1785,  149, 1624,  257,
- /*  1190 */  1618, 1783,   57, 1617,  324, 1614,  326,  327,  147,  331,
+ /*  1190 */  1617, 1782,   57, 1616,  324, 1159, 1160,  154,  147,  328,
- /*  1200 */  1160, 1161, 1783,  154, 1612, 1684, 1671,  333,   84, 1656,
+ /*  1200 */  1612,  330, 1782,  331,  332, 1683, 1670, 1611,   84, 1655,
- /*  1210 */   516, 1658, 1659,  512,  514,  533,  334,  335, 1724, 1611,
+ /*  1210 */   515, 1657, 1658,  511,  513,  532,  334, 1610, 1723,  336,
- /*  1220 */   180,  337, 1723, 1720,  513, 1610,  339, 1609, 1625,  341,
+ /*  1220 */   180, 1609, 1722, 1719,  512,  338, 1608,  340, 1624,  343,
- /*  1230 */  1594,  155,  141, 1138,  344,  345, 1137, 1655,  424,  420,
+ /*  1230 */   344, 1137,  141, 1593,  155, 1136, 1587, 1654,  423,  419,
- /*  1240 */   416,  412,  179, 1588, 1587, 1684,  350,  351,   84, 1656,
+ /*  1240 */   415,  411,  179, 1586,  349, 1683,  350, 1585,   84, 1655,
- /*  1250 */   516, 1658, 1659,  512, 1586,  533, 1585, 1107, 1724, 1109,
+ /*  1250 */   515, 1657, 1658,  511, 1584,  532, 1106, 1559, 1723,  117,
- /*  1260 */   117, 1542,  505, 1720, 1560, 1671, 1559,   64, 1558, 1557,
+ /*  1260 */  1541, 1540,  504, 1719, 1558, 1670, 1557,   64, 1556, 1555,
- /*  1270 */   177, 1556, 1555,  511, 1554, 1553, 1552, 1551, 1550, 1549,
+ /*  1270 */   177, 1554, 1553,  510, 1552, 1551, 1550, 1549, 1548, 1547,
- /*  1280 */  1548, 1547, 1546,  513, 1545, 1544, 1543, 1625, 1541, 1655,
+ /*  1280 */  1546, 1545, 1544,  512, 1543, 1542, 1539, 1624, 1538, 1654,
- /*  1290 */  1540, 1539, 1538, 1537, 1536, 1535, 1534, 1533, 1655, 1418,
+ /*  1290 */  1537, 1536, 1108, 1535, 1534, 1533, 1532, 1417, 1654, 1385,
- /*  1300 */  1386,  140,  163,  939, 1684, 1385, 1602,  272, 1656,  516,
+ /*  1300 */   108,  938,  163,  937, 1683, 1384,  140,  272, 1655,  515,
- /*  1310 */  1658, 1659,  512,  510,  533,  507, 1696, 1671,  938, 1596,
+ /*  1310 */  1657, 1658,  511,  509,  532,  506, 1695, 1670, 1601, 1595,
- /*  1320 */   108, 1584,  171, 1583,  109,  514, 1671,  176, 1573,  168,
+ /*  1320 */  1583,  164,  171, 1582, 1572,  513, 1670,  176, 1466,  168,
- /*  1330 */  1467,  173,  967,  402,  514,  513, 1417, 1415, 1413, 1625,
+ /*  1330 */  1416,  173,  966,  401,  513,  512,  390,  109,  169, 1624,
- /*  1340 */   164, 1411,  391, 1409,  513,  393,  169,  174, 1625,  411,
+ /*  1340 */   174, 1414,  392,  410,  512, 1412,  414, 1410, 1624,  408,
- /*  1350 */   409,  166,  410,  415, 1655,  413, 1684, 1398,  414,  134,
+ /*  1350 */  1408,  166,  409,  418, 1654,  412, 1683,  413,  417,  134,
- /*  1360 */  1656,  516, 1658, 1659,  512, 1684,  533,  417,   84, 1656,
+ /*  1360 */  1655,  515, 1657, 1658,  511, 1683,  532,  421,   84, 1655,
- /*  1370 */   516, 1658, 1659,  512,  418,  533,  419,  422, 1724,  615,
+ /*  1370 */   515, 1657, 1658,  511,  422,  532,  416, 1397, 1723,  614,
- /*  1380 */   421,  423, 1671, 1721, 1397, 1384, 1469, 1074, 1073, 1468,
+ /*  1380 */   420, 1396, 1670, 1720, 1383, 1468, 1073, 1072, 1467,  999,
- /*  1390 */   514,  579, 1000,  247,  999,  998,  997,  581,  994,  993,
+ /*  1390 */   513,  998,  578,  247,   45,  997,  996,  580,  181,  993,
- /*  1400 */   513,  992,  495, 1800, 1625,  107,  181,  473, 1655, 1407,
+ /*  1400 */   512,  992,  494, 1799, 1624,  107,  991,  472, 1654, 1406,
- /*  1410 */   290,  604,  600,  596,  592,  246,   45, 1655, 1402,  291,
+ /*  1410 */  1401,  603,  599,  595,  591,  246,  290, 1654,  291,  445,
- /*  1420 */   446, 1684, 1400,  292,  273, 1656,  516, 1658, 1659,  512,
+ /*  1420 */  1399, 1683,  292,  448,  273, 1655,  515, 1657, 1658,  511,
- /*  1430 */   449,  533, 1383,  451, 1382,  453, 1671,   85, 1601, 1145,
+ /*  1430 */  1382,  532, 1381,  450,  452,   85, 1670, 1600, 1144, 1594,
- /*  1440 */    80, 1595,  460,  241,  514, 1671, 1582, 1581, 1580, 1572,
+ /*  1440 */    80,  459, 1581,  241,  513, 1670, 1580, 1579, 1571,   67,
- /*  1450 */    67,  203,   15,  514,  513,  208,    4,   37, 1625,   49,
+ /*  1450 */   203,   15,  208,  513,  512,    4, 1313,   37, 1624,   49,
- /*  1460 */   461,  135,   48,  513,  199,   43,  213, 1625,   16, 1314,
+ /*  1460 */   460,  205,   48,  512,   43, 1306,  213, 1624,  199,   16,
- /*  1470 */  1655,  205,  212,  214,   22, 1684,  526, 1307,  268, 1656,
+ /*  1470 */  1654,  135,  214,  212,   22, 1683,  525, 1644,  268, 1655,
- /*  1480 */   516, 1658, 1659,  512, 1684,  533,  128,  134, 1656,  516,
+ /*  1480 */   515, 1657, 1658,  511, 1683,  532,  128,  134, 1655,  515,
- /*  1490 */  1658, 1659,  512,   68,  533, 1645,   23,  220, 1671,   42,
+ /*  1490 */  1657, 1658,  511,   23,  532,  220,   42,  138, 1670,   68,
- /*  1500 */  1655,  471,   17, 1286,  202, 1285,  514,  138, 1343, 1338,
+ /*  1500 */  1654,  470,   17, 1285,  202, 1337,  513, 1336, 1284,  300,
- /*  1510 */  1332, 1337,  300, 1342, 1341,  486,  513,  301,   10,   19,
+ /*  1510 */  1341, 1342, 1340, 1331,  301,  485,  512,   10,   19, 1248,
- /*  1520 */  1625, 1228, 1143,  302,  196, 1249,   29,  139, 1671,  151,
+ /*  1520 */  1624,   29, 1142,  302,  196, 1227, 1226,  139, 1670,  151,
- /*  1530 */  1213, 1801, 1227,   12,  515,   20,  511, 1684,   21,  521,
+ /*  1530 */    12, 1800, 1212, 1570,  514,   20,  510, 1683,   41,  231,
- /*  1540 */   273, 1656,  516, 1658, 1659,  512,  513,  533,   13,   41,
+ /*  1540 */   273, 1655,  515, 1657, 1658,  511,  512,  532,   13,   21,
- /*  1550 */  1625,  231, 1655, 1312,  233,  235,   69, 1571,   70,  237,
+ /*  1550 */  1624, 1311, 1654,  233,  235,   69,  237,   70, 1643, 1686,
- /*  1560 */  1687, 1644,  242,   74, 1230,  532, 1183, 1684, 1655,   44,
+ /*  1560 */   520,   74,  239, 1229,  242,  531, 1182, 1683, 1654,   44,
- /*  1570 */   272, 1656,  516, 1658, 1659,  512,  239,  533,  535, 1697,
+ /*  1570 */   272, 1655,  515, 1657, 1658,  511, 1060,  532,  534, 1696,
- /*  1580 */  1671, 1061,  537,  314,  539,  541, 1058,  542,  514, 1055,
+ /*  1580 */  1670,  536,  314,  538, 1052, 1057,  540,  541,  513, 1054,
- /*  1590 */   544,  545,  547, 1049,  548,  550, 1671, 1047,  513, 1053,
+ /*  1590 */   543, 1048,  544,  546,  547,  549, 1670,  550,  512, 1046,
- /*  1600 */   551, 1052, 1625, 1051,  514,  304, 1050, 1038, 1655,   75,
+ /*  1600 */  1051, 1050, 1624, 1049,  513,  304, 1037,   75, 1654,   76,
- /*  1610 */    76, 1069,   77,  557,  513, 1067, 1066,  965, 1625, 1684,
+ /*  1610 */  1068,  556,   77, 1066,  512, 1065,  964,  564, 1624, 1683,
- /*  1620 */  1655,  306,  273, 1656,  516, 1658, 1659,  512,  565,  533,
+ /*  1620 */  1654,  306,  273, 1655,  515, 1657, 1658,  511,  988,  532,
- /*  1630 */   989, 1007,  244,  568,  987, 1684, 1671,  986,  273, 1656,
+ /*  1630 */  1006,  567,  244,  986,  985, 1683, 1670,  984,  273, 1655,
- /*  1640 */   516, 1658, 1659,  512,  514,  533,  985,  984, 1671,  983,
+ /*  1640 */   515, 1657, 1658,  511,  513,  532,  983,  982, 1670,  981,
- /*  1650 */   982,  981,  980, 1004,  513, 1002,  514,  977, 1625,  976,
+ /*  1650 */   980,  979, 1003, 1001,  512,  976,  513,  975, 1624,  974,
- /*  1660 */   975,  972,  971,  970, 1414,  589,  513,  590, 1655,  591,
+ /*  1660 */   971,  970,  969, 1413,  588,  589,  512,  590, 1654,  592,
- /*  1670 */  1625, 1412,  593,  595,  594, 1684, 1410,  597,  259, 1656,
+ /*  1670 */  1624, 1411,  594,  593, 1409, 1683,  596,  597,  259, 1655,
- /*  1680 */   516, 1658, 1659,  512,  598,  533,  599, 1684, 1408,  601,
+ /*  1680 */   515, 1657, 1658,  511,  598,  532, 1407, 1683,  600,  601,
- /*  1690 */   267, 1656,  516, 1658, 1659,  512, 1671,  533,  602,  603,
+ /*  1690 */   267, 1655,  515, 1657, 1658,  511, 1670,  532,  602, 1395,
- /*  1700 */  1655,  605,  606, 1395,  514, 1396, 1381,  609,  610, 1356,
+ /*  1700 */  1654,  604,  605, 1394,  513, 1380,  608, 1168,  609,  613,
- /*  1710 */  1356, 1169,  254,  613,  513,  614, 1356, 1356, 1625, 1356,
+ /*  1710 */   254,  612, 1355, 1355,  512, 1355, 1355, 1355, 1624, 1355,
- /*  1720 */  1356, 1356, 1356, 1356, 1356, 1356, 1356, 1356, 1671, 1356,
+ /*  1720 */  1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1670, 1355,
- /*  1730 */  1655, 1356, 1356, 1356, 1356, 1684,  514, 1356,  269, 1656,
+ /*  1730 */  1654, 1355, 1355, 1355, 1355, 1683,  513, 1355,  269, 1655,
- /*  1740 */   516, 1658, 1659,  512, 1356,  533,  513, 1356, 1356, 1356,
+ /*  1740 */   515, 1657, 1658,  511, 1355,  532,  512, 1355, 1355, 1355,
- /*  1750 */  1625, 1356, 1356, 1356, 1356, 1356, 1356, 1356, 1671, 1356,
+ /*  1750 */  1624, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1670, 1355,
- /*  1760 */  1356, 1356, 1655, 1356, 1356, 1356,  514, 1684, 1356, 1356,
+ /*  1760 */  1355, 1355, 1654, 1355, 1355, 1355,  513, 1683, 1355, 1355,
- /*  1770 */   260, 1656,  516, 1658, 1659,  512,  513,  533, 1655, 1356,
+ /*  1770 */   260, 1655,  515, 1657, 1658,  511,  512,  532, 1654, 1355,
- /*  1780 */  1625, 1356, 1356, 1356, 1356, 1356, 1356, 1356, 1356, 1356,
+ /*  1780 */  1624, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355,
- /*  1790 */  1671, 1356, 1356, 1356, 1655, 1356, 1356, 1684,  514, 1356,
+ /*  1790 */  1670, 1355, 1355, 1355, 1654, 1355, 1355, 1683,  513, 1355,
- /*  1800 */   270, 1656,  516, 1658, 1659,  512, 1671,  533,  513, 1356,
+ /*  1800 */   270, 1655,  515, 1657, 1658,  511, 1670,  532,  512, 1355,
- /*  1810 */  1655, 1356, 1625, 1356,  514, 1356, 1356, 1356, 1356, 1356,
+ /*  1810 */  1654, 1355, 1624, 1355,  513, 1355, 1355, 1355, 1355, 1355,
- /*  1820 */  1356, 1356, 1671, 1356,  513, 1356, 1356, 1356, 1625, 1684,
+ /*  1820 */  1355, 1355, 1670, 1355,  512, 1355, 1355, 1355, 1624, 1683,
- /*  1830 */   514, 1356,  261, 1656,  516, 1658, 1659,  512, 1671,  533,
+ /*  1830 */   513, 1355,  261, 1655,  515, 1657, 1658,  511, 1670,  532,
- /*  1840 */   513, 1356, 1356, 1356, 1625, 1684,  514, 1356,  271, 1656,
+ /*  1840 */   512, 1355, 1355, 1355, 1624, 1683,  513, 1355,  271, 1655,
- /*  1850 */   516, 1658, 1659,  512, 1356,  533,  513, 1356, 1356, 1356,
+ /*  1850 */   515, 1657, 1658,  511, 1355,  532,  512, 1355, 1355, 1355,
- /*  1860 */  1625, 1684, 1655, 1356,  262, 1656,  516, 1658, 1659,  512,
+ /*  1860 */  1624, 1683, 1654, 1355,  262, 1655,  515, 1657, 1658,  511,
- /*  1870 */  1356,  533, 1356, 1356, 1356, 1356, 1356, 1684, 1655, 1356,
+ /*  1870 */  1355,  532, 1355, 1355, 1355, 1355, 1355, 1683, 1654, 1355,
- /*  1880 */  1667, 1656,  516, 1658, 1659,  512, 1356,  533, 1356, 1356,
+ /*  1880 */  1666, 1655,  515, 1657, 1658,  511, 1355,  532, 1355, 1355,
- /*  1890 */  1671, 1356, 1356, 1356, 1356, 1356, 1356, 1356,  514, 1356,
+ /*  1890 */  1670, 1355, 1355, 1355, 1355, 1355, 1355, 1355,  513, 1355,
- /*  1900 */  1356, 1356, 1356, 1356, 1356, 1356, 1671, 1356,  513, 1356,
+ /*  1900 */  1355, 1355, 1355, 1355, 1355, 1355, 1670, 1355,  512, 1355,
- /*  1910 */  1655, 1356, 1625, 1356,  514, 1356, 1356, 1356, 1356, 1356,
+ /*  1910 */  1654, 1355, 1624, 1355,  513, 1355, 1355, 1355, 1355, 1355,
- /*  1920 */  1356, 1356, 1356, 1356,  513, 1356, 1356, 1356, 1625, 1684,
+ /*  1920 */  1355, 1355, 1355, 1355,  512, 1355, 1355, 1355, 1624, 1683,
- /*  1930 */  1356, 1356, 1666, 1656,  516, 1658, 1659,  512, 1671,  533,
+ /*  1930 */  1355, 1355, 1665, 1655,  515, 1657, 1658,  511, 1670,  532,
- /*  1940 */  1356, 1356, 1655, 1356, 1356, 1684,  514, 1356, 1665, 1656,
+ /*  1940 */  1355, 1355, 1654, 1355, 1355, 1683,  513, 1355, 1664, 1655,
- /*  1950 */   516, 1658, 1659,  512, 1356,  533,  513, 1356, 1356, 1356,
+ /*  1950 */   515, 1657, 1658,  511, 1355,  532,  512, 1355, 1355, 1355,
- /*  1960 */  1625, 1356, 1356, 1356, 1356, 1356, 1356, 1356, 1356, 1356,
+ /*  1960 */  1624, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355,
- /*  1970 */  1671, 1356, 1655, 1356, 1356, 1356, 1356, 1684,  514, 1356,
+ /*  1970 */  1670, 1355, 1654, 1355, 1355, 1355, 1355, 1683,  513, 1355,
- /*  1980 */   282, 1656,  516, 1658, 1659,  512, 1356,  533,  513, 1356,
+ /*  1980 */   282, 1655,  515, 1657, 1658,  511, 1355,  532,  512, 1355,
- /*  1990 */  1356, 1356, 1625, 1356, 1356, 1356, 1356, 1356, 1356, 1356,
+ /*  1990 */  1355, 1355, 1624, 1355, 1355, 1355, 1355, 1355, 1355, 1355,
- /*  2000 */  1671, 1356, 1356, 1356, 1655, 1356, 1356, 1356,  514, 1684,
+ /*  2000 */  1670, 1355, 1355, 1355, 1654, 1355, 1355, 1355,  513, 1683,
- /*  2010 */  1356, 1356,  281, 1656,  516, 1658, 1659,  512,  513,  533,
+ /*  2010 */  1355, 1355,  281, 1655,  515, 1657, 1658,  511,  512,  532,
- /*  2020 */  1655, 1356, 1625, 1356, 1356, 1356, 1356, 1356, 1356, 1356,
+ /*  2020 */  1654, 1355, 1624, 1355, 1355, 1355, 1355, 1355, 1355, 1355,
- /*  2030 */  1356, 1356, 1671, 1356, 1356, 1356, 1356, 1356, 1356, 1684,
+ /*  2030 */  1355, 1355, 1670, 1355, 1355, 1355, 1355, 1355, 1355, 1683,
- /*  2040 */   514, 1356,  283, 1656,  516, 1658, 1659,  512, 1671,  533,
+ /*  2040 */   513, 1355,  283, 1655,  515, 1657, 1658,  511, 1670,  532,
- /*  2050 */   513,  490, 1356, 1356, 1625, 1356,  514, 1356, 1356,  490,
+ /*  2050 */   512,  489, 1355, 1355, 1624, 1355,  513, 1355, 1355,  489,
- /*  2060 */  1356, 1356, 1356, 1356, 1356, 1356,  513, 1356, 1356, 1356,
+ /*  2060 */  1355, 1355, 1355, 1355, 1355, 1355,  512, 1355, 1355, 1355,
- /*  2070 */  1625, 1684, 1356, 1356,  280, 1656,  516, 1658, 1659,  512,
+ /*  2070 */  1624, 1683, 1355, 1355,  280, 1655,  515, 1657, 1658,  511,
- /*  2080 */   114,  533, 1356, 1356, 1356, 1356, 1356, 1684,  114, 1356,
+ /*  2080 */   114,  532, 1355, 1355, 1355, 1355, 1355, 1683,  114, 1355,
- /*  2090 */   266, 1656,  516, 1658, 1659,  512, 1356,  533, 1356,  494,
+ /*  2090 */   266, 1655,  515, 1657, 1658,  511, 1355,  532, 1355,  493,
- /*  2100 */  1356, 1356, 1356, 1356, 1356, 1356, 1356,  494, 1356, 1356,
+ /*  2100 */  1355, 1355, 1355, 1355, 1355, 1355, 1355,  493, 1355, 1355,
- /*  2110 */  1356, 1356, 1356, 1356, 1356, 1356, 1356, 1356,  112, 1356,
+ /*  2110 */  1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355,  112, 1355,
- /*  2120 */  1356, 1356, 1356, 1356, 1356, 1356,  112, 1356, 1356, 1356,
+ /*  2120 */  1355, 1355, 1355, 1355, 1355, 1355,  112, 1355, 1355, 1355,
- /*  2130 */  1356, 1356, 1356,  219, 1731,  489, 1356,  488, 1356, 1356,
+ /*  2130 */  1355, 1355, 1355,  219, 1730,  488, 1355,  487, 1355, 1355,
- /*  2140 */  1786,  219, 1731,  489, 1356,  488, 1356, 1356, 1786, 1356,
+ /*  2140 */  1785,  219, 1730,  488, 1355,  487, 1355, 1355, 1785, 1355,
- /*  2150 */  1356, 1356,  149, 1356, 1356, 1356, 1783, 1356, 1356, 1356,
+ /*  2150 */  1355, 1355,  149, 1355, 1355, 1355, 1782, 1355, 1355, 1355,
- /*  2160 */   147, 1356, 1356, 1356, 1783,
+ /*  2160 */   147, 1355, 1355, 1355, 1782,
 };
 static const YYCODETYPE yy_lookahead[] = {
  /*     0 */   251,  248,  241,  271,  322,  323,  274,    0,  271,  249,
@@ -555,59 +555,59 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  1160 */   311,  312,  313,  314,  315,  316,  269,  318,  277,   81,
  /*  1170 */   259,  273,  248,  251,  277,  337,  243,  299,  241,  252,
  /*  1180 */   303,  263,  263,  263,  287,    0,  337,  349,  291,  239,
- /*  1190 */     0,  353,   40,    0,   72,    0,   47,  174,  349,  174,
+ /*  1190 */     0,  353,   40,    0,   72,   47,   47,   47,  349,  174,
- /*  1200 */    47,   47,  353,   47,    0,  308,  269,   47,  311,  312,
+ /*  1200 */     0,   47,  353,   47,  174,  308,  269,    0,  311,  312,
- /*  1210 */   313,  314,  315,  316,  277,  318,   47,  174,  321,    0,
+ /*  1210 */   313,  314,  315,  316,  277,  318,  174,    0,  321,   47,
- /*  1220 */    33,   47,  325,  326,  287,    0,   47,    0,  291,   47,
+ /*  1220 */    33,    0,  325,  326,  287,   47,    0,   47,  291,  160,
- /*  1230 */     0,   81,   45,  113,  160,  159,  156,  241,   51,   52,
+ /*  1230 */   159,  113,   45,    0,   81,  156,    0,  241,   51,   52,
- /*  1240 */    53,   54,   55,    0,    0,  308,  152,  151,  311,  312,
+ /*  1240 */    53,   54,   55,    0,  152,  308,  151,    0,  311,  312,
- /*  1250 */   313,  314,  315,  316,    0,  318,    0,   44,  321,   22,
+ /*  1250 */   313,  314,  315,  316,    0,  318,   44,    0,  321,   40,
- /*  1260 */    40,    0,  325,  326,    0,  269,    0,   80,    0,    0,
+ /*  1260 */     0,    0,  325,  326,    0,  269,    0,   80,    0,    0,
  /*  1270 */    83,    0,    0,  277,    0,    0,    0,    0,    0,    0,
  /*  1280 */     0,    0,    0,  287,    0,    0,    0,  291,    0,  241,
- /*  1290 */     0,    0,    0,    0,    0,    0,    0,    0,  241,    0,
+ /*  1290 */     0,    0,   22,    0,    0,    0,    0,    0,  241,    0,
- /*  1300 */     0,   41,   40,   14,  308,    0,    0,  311,  312,  313,
+ /*  1300 */    37,   14,   40,   14,  308,    0,   41,  311,  312,  313,
- /*  1310 */   314,  315,  316,  317,  318,  319,  320,  269,   14,    0,
+ /*  1310 */   314,  315,  316,  317,  318,  319,  320,  269,    0,    0,
- /*  1320 */    37,    0,  147,    0,   37,  277,  269,  140,    0,  142,
+ /*  1320 */     0,   38,  147,    0,    0,  277,  269,  140,    0,  142,
- /*  1330 */     0,  144,   59,  146,  277,  287,    0,    0,    0,  291,
+ /*  1330 */     0,  144,   59,  146,  277,  287,   44,   37,   37,  291,
- /*  1340 */    38,    0,   44,    0,  287,   44,   37,   37,  291,   37,
+ /*  1340 */    37,    0,   44,   37,  287,    0,   37,    0,  291,   47,
- /*  1350 */    47,  164,   45,   37,  241,   47,  308,    0,   45,  311,
+ /*  1350 */     0,  164,   45,   37,  241,   47,  308,   45,   45,  311,
- /*  1360 */   312,  313,  314,  315,  316,  308,  318,   47,  311,  312,
+ /*  1360 */   312,  313,  314,  315,  316,  308,  318,   45,  311,  312,
- /*  1370 */   313,  314,  315,  316,   45,  318,   37,   45,  321,   19,
+ /*  1370 */   313,  314,  315,  316,   37,  318,   47,    0,  321,   19,
- /*  1380 */    47,   37,  269,  326,    0,    0,    0,   47,   22,    0,
+ /*  1380 */    47,    0,  269,  326,    0,    0,   47,   22,    0,   47,
- /*  1390 */   277,   41,   47,   33,   47,   47,   47,   41,   47,   47,
+ /*  1390 */   277,   47,   41,   33,   90,   47,   47,   41,   88,   47,
- /*  1400 */   287,   47,  354,  355,  291,   45,   88,  294,  241,    0,
+ /*  1400 */   287,   47,  354,  355,  291,   45,   47,  294,  241,    0,
- /*  1410 */    22,   51,   52,   53,   54,   55,   90,  241,    0,   22,
+ /*  1410 */     0,   51,   52,   53,   54,   55,   22,  241,   22,   48,
- /*  1420 */    48,  308,    0,   22,  311,  312,  313,  314,  315,  316,
+ /*  1420 */     0,  308,   22,   47,  311,  312,  313,  314,  315,  316,
- /*  1430 */    47,  318,    0,   22,    0,   22,  269,   20,    0,   47,
+ /*  1430 */     0,  318,    0,   22,   22,   20,  269,    0,   47,    0,
- /*  1440 */    80,    0,   22,   83,  277,  269,    0,    0,    0,    0,
+ /*  1440 */    80,   22,    0,   83,  277,  269,    0,    0,    0,   81,
- /*  1450 */    81,   37,  213,  277,  287,   82,   41,   41,  291,  145,
+ /*  1450 */    37,  213,   82,  277,  287,   41,   82,   41,  291,  145,
- /*  1460 */   145,   81,  145,  287,  142,   41,   41,  291,  213,   82,
+ /*  1460 */   145,  140,  145,  287,   41,   82,   41,  291,  142,  213,
- /*  1470 */   241,  140,   81,   44,   81,  308,  116,   82,  311,  312,
+ /*  1470 */   241,   81,   44,   81,   81,  308,  116,   44,  311,  312,
  /*  1480 */   313,  314,  315,  316,  308,  318,  161,  311,  312,  313,
- /*  1490 */   314,  315,  316,   81,  318,   44,   41,   44,  269,   41,
+ /*  1490 */   314,  315,  316,   41,  318,   44,   41,   44,  269,   81,
- /*  1500 */   241,  141,   41,   82,  144,   82,  277,   44,   82,   47,
+ /*  1500 */   241,  141,   41,   82,  144,   47,  277,   47,   82,   47,
- /*  1510 */    82,   47,   47,   47,   47,  348,  287,   47,    2,   41,
+ /*  1510 */    47,   82,   47,   82,   47,  348,  287,    2,   41,  179,
- /*  1520 */   291,   82,  162,  294,  164,  179,   81,   44,  269,   44,
+ /*  1520 */   291,   81,  162,  294,  164,   82,   82,   44,  269,   44,
- /*  1530 */    22,  355,   82,   81,  181,   81,  277,  308,   81,  143,
+ /*  1530 */    81,  355,   22,    0,  181,   81,  277,  308,  207,   82,
- /*  1540 */   311,  312,  313,  314,  315,  316,  287,  318,  213,  207,
+ /*  1540 */   311,  312,  313,  314,  315,  316,  287,  318,  213,   81,
- /*  1550 */   291,   82,  241,   82,   81,   81,   81,    0,   81,   37,
+ /*  1550 */   291,   82,  241,   81,   81,   81,   37,   81,   44,   81,
- /*  1560 */    81,   44,   44,   91,   82,   81,   22,  308,  241,   81,
+ /*  1560 */   143,   91,  140,   82,   44,   81,   22,  308,  241,   81,
- /*  1570 */   311,  312,  313,  314,  315,  316,  140,  318,   92,  320,
+ /*  1570 */   311,  312,  313,  314,  315,  316,   82,  318,   92,  320,
- /*  1580 */   269,   82,   47,   47,   81,   47,   82,   81,  277,   82,
+ /*  1580 */   269,   47,   47,   81,  105,   82,   47,   81,  277,   82,
- /*  1590 */    47,   81,   47,   82,   81,   47,  269,   82,  287,  105,
+ /*  1590 */    47,   82,   81,   47,   81,   47,  269,   81,  287,   82,
- /*  1600 */    81,  105,  291,  105,  277,  294,  105,   22,  241,   81,
+ /*  1600 */   105,  105,  291,  105,  277,  294,   22,   81,  241,   81,
- /*  1610 */    81,   47,   81,   93,  287,  113,   22,   59,  291,  308,
+ /*  1610 */    47,   93,   81,  113,  287,   22,   59,   58,  291,  308,
- /*  1620 */   241,  294,  311,  312,  313,  314,  315,  316,   58,  318,
+ /*  1620 */   241,  294,  311,  312,  313,  314,  315,  316,   47,  318,
- /*  1630 */    47,   64,   41,   79,   47,  308,  269,   47,  311,  312,
+ /*  1630 */    64,   79,   41,   47,   47,  308,  269,   47,  311,  312,
- /*  1640 */   313,  314,  315,  316,  277,  318,   47,   47,  269,   47,
+ /*  1640 */   313,  314,  315,  316,  277,  318,   47,   47,  269,   22,
- /*  1650 */    22,   47,   47,   64,  287,   47,  277,   47,  291,   47,
+ /*  1650 */    47,   47,   64,   47,  287,   47,  277,   47,  291,   47,
- /*  1660 */    47,   47,   47,   47,    0,   47,  287,   45,  241,   37,
+ /*  1660 */    47,   47,   47,    0,   47,   45,  287,   37,  241,   47,
- /*  1670 */   291,    0,   47,   37,   45,  308,    0,   47,  311,  312,
+ /*  1670 */   291,    0,   37,   45,    0,  308,   47,   45,  311,  312,
- /*  1680 */   313,  314,  315,  316,   45,  318,   37,  308,    0,   47,
+ /*  1680 */   313,  314,  315,  316,   37,  318,    0,  308,   47,   45,
- /*  1690 */   311,  312,  313,  314,  315,  316,  269,  318,   45,   37,
+ /*  1690 */   311,  312,  313,  314,  315,  316,  269,  318,   37,    0,
- /*  1700 */   241,   47,   46,    0,  277,    0,    0,   22,   21,  358,
+ /*  1700 */   241,   47,   46,    0,  277,    0,   22,   22,   21,   20,
- /*  1710 */   358,   22,   22,   21,  287,   20,  358,  358,  291,  358,
+ /*  1710 */    22,   21,  358,  358,  287,  358,  358,  358,  291,  358,
  /*  1720 */   358,  358,  358,  358,  358,  358,  358,  358,  269,  358,
  /*  1730 */   241,  358,  358,  358,  358,  308,  277,  358,  311,  312,
  /*  1740 */   313,  314,  315,  316,  358,  318,  287,  358,  358,  358,
@@ -654,9 +654,9 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  2150 */   358,  358,  349,  358,  358,  358,  353,  358,  358,  358,
  /*  2160 */   349,  358,  358,  358,  353,
 };
-#define YY_SHIFT_COUNT    (615)
+#define YY_SHIFT_COUNT    (614)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (1706)
+#define YY_SHIFT_MAX      (1705)
 static const unsigned short int yy_shift_ofst[] = {
  /*     0 */   763,    0,    0,   48,  233,  233,  233,  233,  254,  254,
  /*    10 */   233,  233,  439,  460,  645,  460,  460,  460,  460,  460,
@@ -690,36 +690,36 @@ static const unsigned short int yy_shift_ofst[] = {
  /*   290 */   470,  854,  857,  506,  547,  708,  785,  817,  858,  667,
  /*   300 */   702,  756,  824,  747,  825,  457,  827,  828,  832,  833,
  /*   310 */   836,  775,  831,  823,  841,  845,  848,  853,  861,  794,
- /*   320 */   837, 1185, 1190, 1152, 1193, 1122, 1195, 1149, 1023, 1153,
+ /*   320 */   837, 1185, 1190, 1152, 1193, 1122, 1148, 1149, 1150, 1025,
- /*   330 */  1154, 1156, 1025, 1204, 1160, 1169, 1043, 1219, 1174, 1225,
+ /*   330 */  1200, 1154, 1156, 1030, 1207, 1042, 1217, 1172, 1221, 1178,
- /*   340 */  1179, 1227, 1182, 1230, 1150, 1074, 1076, 1120, 1080, 1243,
+ /*   340 */  1226, 1180, 1233, 1153, 1069, 1071, 1118, 1079, 1236, 1243,
- /*   350 */  1244, 1094, 1096, 1254, 1256, 1213, 1264, 1266, 1268, 1269,
+ /*   350 */  1092, 1095, 1247, 1254, 1212, 1257, 1264, 1266, 1268, 1269,
  /*   360 */  1271, 1272, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281,
- /*   370 */  1282, 1284, 1285, 1286, 1220, 1261, 1288, 1290, 1291, 1292,
+ /*   370 */  1282, 1284, 1285, 1219, 1260, 1261, 1286, 1288, 1290, 1291,
- /*   380 */  1293, 1237, 1294, 1295, 1296, 1297, 1299, 1300, 1262, 1283,
+ /*   380 */  1270, 1293, 1294, 1295, 1296, 1297, 1299, 1262, 1263, 1265,
- /*   390 */  1260, 1289, 1298, 1304, 1301, 1305, 1302, 1287, 1306, 1319,
+ /*   390 */  1287, 1292, 1289, 1298, 1305, 1283, 1300, 1318, 1319, 1320,
- /*   400 */  1321, 1309, 1175, 1323, 1328, 1310, 1330, 1273, 1336, 1337,
+ /*   400 */  1301, 1175, 1323, 1324, 1303, 1328, 1273, 1330, 1341, 1302,
- /*   410 */  1303, 1307, 1312, 1338, 1308, 1313, 1316, 1341, 1320, 1329,
+ /*   410 */  1307, 1306, 1345, 1308, 1312, 1309, 1347, 1329, 1313, 1316,
- /*   420 */  1339, 1343, 1333, 1332, 1344, 1357, 1384, 1385, 1386, 1326,
+ /*   420 */  1350, 1333, 1322, 1337, 1377, 1381, 1384, 1385, 1304, 1310,
- /*   430 */  1318, 1340, 1366, 1389, 1345, 1347, 1348, 1349, 1350, 1356,
+ /*   430 */  1339, 1365, 1388, 1342, 1344, 1348, 1349, 1351, 1356, 1352,
- /*   440 */  1351, 1352, 1354, 1409, 1388, 1418, 1397, 1372, 1422, 1401,
+ /*   440 */  1354, 1359, 1409, 1394, 1410, 1396, 1371, 1420, 1400, 1376,
- /*   450 */  1383, 1432, 1411, 1434, 1413, 1417, 1438, 1314, 1392, 1441,
+ /*   450 */  1430, 1411, 1432, 1412, 1415, 1437, 1314, 1391, 1439, 1325,
- /*   460 */  1325, 1420, 1315, 1322, 1446, 1447, 1448, 1317, 1449, 1369,
+ /*   460 */  1419, 1315, 1326, 1442, 1446, 1447, 1317, 1448, 1368, 1413,
- /*   470 */  1414, 1331, 1415, 1416, 1239, 1373, 1424, 1387, 1380, 1391,
+ /*   470 */  1321, 1414, 1416, 1238, 1370, 1423, 1374, 1390, 1392, 1393,
- /*   480 */  1393, 1395, 1425, 1429, 1451, 1412, 1455, 1255, 1421, 1423,
+ /*   480 */  1383, 1425, 1428, 1433, 1418, 1452, 1256, 1421, 1426, 1451,
- /*   490 */  1453, 1342, 1458, 1463, 1426, 1461, 1335, 1428, 1462, 1464,
+ /*   490 */  1331, 1455, 1453, 1429, 1461, 1335, 1431, 1458, 1460, 1462,
- /*   500 */  1465, 1466, 1467, 1470, 1428, 1516, 1346, 1478, 1439, 1445,
+ /*   500 */  1463, 1465, 1467, 1431, 1515, 1340, 1477, 1443, 1440, 1444,
- /*   510 */  1450, 1483, 1452, 1454, 1485, 1508, 1353, 1457, 1469, 1471,
+ /*   510 */  1483, 1449, 1454, 1485, 1510, 1353, 1468, 1457, 1469, 1472,
- /*   520 */  1473, 1474, 1396, 1475, 1557, 1522, 1436, 1477, 1472, 1517,
+ /*   520 */  1473, 1417, 1474, 1533, 1519, 1422, 1476, 1470, 1514, 1520,
- /*   530 */  1518, 1479, 1482, 1484, 1544, 1488, 1486, 1499, 1535, 1536,
+ /*   530 */  1478, 1481, 1484, 1544, 1488, 1486, 1494, 1534, 1535, 1502,
- /*   540 */  1503, 1504, 1538, 1506, 1507, 1543, 1510, 1511, 1545, 1513,
+ /*   540 */  1503, 1539, 1506, 1507, 1543, 1511, 1509, 1546, 1513, 1517,
- /*   550 */  1515, 1548, 1519, 1494, 1496, 1498, 1501, 1585, 1520, 1528,
+ /*   550 */  1548, 1516, 1479, 1495, 1496, 1498, 1584, 1518, 1526, 1528,
- /*   560 */  1529, 1564, 1531, 1502, 1594, 1558, 1570, 1583, 1567, 1554,
+ /*   560 */  1563, 1531, 1500, 1593, 1557, 1559, 1581, 1566, 1552, 1591,
- /*   570 */  1591, 1587, 1590, 1599, 1600, 1602, 1628, 1604, 1605, 1589,
+ /*   570 */  1586, 1587, 1590, 1599, 1600, 1627, 1603, 1604, 1588, 1351,
- /*   580 */  1350, 1608, 1356, 1610, 1612, 1613, 1614, 1615, 1616, 1664,
+ /*   580 */  1606, 1356, 1608, 1610, 1612, 1613, 1614, 1615, 1663, 1617,
- /*   590 */  1618, 1622, 1632, 1671, 1625, 1629, 1636, 1676, 1630, 1639,
+ /*   590 */  1620, 1630, 1671, 1622, 1628, 1635, 1674, 1629, 1632, 1647,
- /*   600 */  1649, 1688, 1642, 1653, 1662, 1705, 1654, 1656, 1703, 1706,
+ /*   600 */  1686, 1641, 1644, 1661, 1699, 1654, 1656, 1703, 1705, 1684,
- /*   610 */  1685, 1687, 1689, 1690, 1692, 1695,
+ /*   610 */  1687, 1685, 1688, 1690, 1689,
 };
 #define YY_REDUCE_COUNT (254)
 #define YY_REDUCE_MIN   (-318)
@@ -753,68 +753,68 @@ static const short yy_reduce_ofst[] = {
  /*   250 */   918,  919,  920,  927,  950,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*     0 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    10 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    10 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    20 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    20 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    30 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    30 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    40 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    40 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    50 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    50 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    60 */  1354, 1354, 1354, 1354, 1423, 1354, 1354, 1354, 1354, 1354,
+ /*    60 */  1353, 1353, 1353, 1353, 1422, 1353, 1353, 1353, 1353, 1353,
- /*    70 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    70 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    80 */  1421, 1561, 1354, 1726, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    80 */  1420, 1560, 1353, 1725, 1353, 1353, 1353, 1353, 1353, 1353,
- /*    90 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*    90 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   100 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   100 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   110 */  1423, 1354, 1737, 1737, 1737, 1421, 1354, 1354, 1354, 1354,
+ /*   110 */  1422, 1353, 1736, 1736, 1736, 1420, 1353, 1353, 1353, 1353,
- /*   120 */  1354, 1354, 1517, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   120 */  1353, 1353, 1516, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   130 */  1354, 1597, 1354, 1354, 1803, 1354, 1603, 1761, 1354, 1354,
+ /*   130 */  1353, 1596, 1353, 1353, 1802, 1353, 1602, 1760, 1353, 1353,
- /*   140 */  1354, 1354, 1470, 1753, 1729, 1743, 1730, 1788, 1788, 1788,
+ /*   140 */  1353, 1353, 1469, 1752, 1728, 1742, 1729, 1787, 1787, 1787,
- /*   150 */  1746, 1354, 1757, 1354, 1354, 1354, 1589, 1354, 1354, 1566,
+ /*   150 */  1745, 1353, 1756, 1353, 1353, 1353, 1588, 1353, 1353, 1565,
- /*   160 */  1563, 1563, 1354, 1354, 1354, 1354, 1423, 1354, 1423, 1354,
+ /*   160 */  1562, 1562, 1353, 1353, 1353, 1353, 1422, 1353, 1422, 1353,
- /*   170 */  1354, 1423, 1354, 1423, 1354, 1354, 1423, 1423, 1354, 1423,
+ /*   170 */  1353, 1422, 1353, 1422, 1353, 1353, 1422, 1422, 1353, 1422,
- /*   180 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   180 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   190 */  1354, 1354, 1354, 1354, 1354, 1354, 1421, 1599, 1354, 1421,
+ /*   190 */  1353, 1353, 1353, 1353, 1353, 1353, 1420, 1598, 1353, 1420,
- /*   200 */  1354, 1354, 1421, 1354, 1354, 1421, 1354, 1768, 1766, 1354,
+ /*   200 */  1353, 1353, 1420, 1353, 1353, 1420, 1353, 1767, 1765, 1353,
- /*   210 */  1768, 1766, 1354, 1354, 1354, 1780, 1776, 1759, 1757, 1743,
+ /*   210 */  1767, 1765, 1353, 1353, 1353, 1779, 1775, 1758, 1756, 1742,
- /*   220 */  1354, 1354, 1354, 1794, 1790, 1806, 1794, 1790, 1794, 1790,
+ /*   220 */  1353, 1353, 1353, 1793, 1789, 1805, 1793, 1789, 1793, 1789,
- /*   230 */  1354, 1766, 1354, 1354, 1766, 1354, 1574, 1354, 1354, 1421,
+ /*   230 */  1353, 1765, 1353, 1353, 1765, 1353, 1573, 1353, 1353, 1420,
- /*   240 */  1354, 1421, 1354, 1486, 1354, 1354, 1421, 1354, 1591, 1605,
+ /*   240 */  1353, 1420, 1353, 1485, 1353, 1353, 1420, 1353, 1590, 1604,
- /*   250 */  1520, 1520, 1520, 1424, 1359, 1354, 1354, 1354, 1354, 1354,
+ /*   250 */  1519, 1519, 1519, 1423, 1358, 1353, 1353, 1353, 1353, 1353,
- /*   260 */  1354, 1354, 1354, 1354, 1354, 1354, 1670, 1779, 1778, 1702,
+ /*   260 */  1353, 1353, 1353, 1353, 1353, 1353, 1669, 1778, 1777, 1701,
- /*   270 */  1701, 1700, 1698, 1669, 1482, 1354, 1354, 1354, 1354, 1354,
+ /*   270 */  1700, 1699, 1697, 1668, 1481, 1353, 1353, 1353, 1353, 1353,
- /*   280 */  1663, 1664, 1662, 1661, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   280 */  1662, 1663, 1661, 1660, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   290 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1727, 1354,
+ /*   290 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1726, 1353,
- /*   300 */  1791, 1795, 1354, 1354, 1354, 1646, 1354, 1354, 1354, 1354,
+ /*   300 */  1790, 1794, 1353, 1353, 1353, 1645, 1353, 1353, 1353, 1353,
- /*   310 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   310 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   320 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   320 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   330 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   330 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   340 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   340 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   350 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   350 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   360 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   360 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   370 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   370 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   380 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   380 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1387,
- /*   390 */  1388, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   390 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   400 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   400 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   410 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   410 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   420 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   420 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   430 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1451, 1450,
+ /*   430 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1450, 1449, 1353,
- /*   440 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   440 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   450 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   450 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   460 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   460 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   470 */  1354, 1354, 1750, 1760, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   470 */  1353, 1749, 1759, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   480 */  1354, 1354, 1354, 1354, 1646, 1354, 1777, 1354, 1736, 1732,
+ /*   480 */  1353, 1353, 1353, 1645, 1353, 1776, 1353, 1735, 1731, 1353,
- /*   490 */  1354, 1354, 1728, 1354, 1354, 1789, 1354, 1354, 1354, 1354,
+ /*   490 */  1353, 1727, 1353, 1353, 1788, 1353, 1353, 1353, 1353, 1353,
- /*   500 */  1354, 1354, 1354, 1354, 1354, 1722, 1354, 1695, 1354, 1354,
+ /*   500 */  1353, 1353, 1353, 1353, 1721, 1353, 1694, 1353, 1353, 1353,
- /*   510 */  1354, 1354, 1354, 1354, 1354, 1354, 1657, 1354, 1354, 1354,
+ /*   510 */  1353, 1353, 1353, 1353, 1353, 1656, 1353, 1353, 1353, 1353,
- /*   520 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1645,
+ /*   520 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1644, 1353,
- /*   530 */  1354, 1686, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   530 */  1685, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1513,
- /*   540 */  1514, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   540 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   550 */  1354, 1354, 1354, 1499, 1497, 1496, 1495, 1354, 1492, 1354,
+ /*   550 */  1353, 1353, 1498, 1496, 1495, 1494, 1353, 1491, 1353, 1353,
- /*   560 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   560 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1442,
- /*   570 */  1443, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   570 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1433,
- /*   580 */  1434, 1354, 1433, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   580 */  1353, 1432, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   590 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   590 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   600 */  1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354, 1354,
+ /*   600 */  1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353, 1353,
- /*   610 */  1354, 1354, 1354, 1354, 1354, 1354,
+ /*   610 */  1353, 1353, 1353, 1353, 1353,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -1007,10 +1007,10 @@ static const YYCODETYPE yyFallback[] = {
     0,  /*       KILL => nothing */
     0,  /* CONNECTION => nothing */
     0,  /* TRANSACTION => nothing */
-    0,  /*      MERGE => nothing */
+    0,  /*    BALANCE => nothing */
     0,  /*     VGROUP => nothing */
+    0,  /*      MERGE => nothing */
     0,  /* REDISTRIBUTE => nothing */
-    0,  /*      SPLIT => nothing */
     0,  /*     SYNCDB => nothing */
     0,  /*     DELETE => nothing */
     0,  /*       NULL => nothing */
@@ -1332,10 +1332,10 @@ static const char *const yyTokenName[] = {
   /*  170 */ "KILL",
   /*  171 */ "CONNECTION",
   /*  172 */ "TRANSACTION",
-  /*  173 */ "MERGE",
+  /*  173 */ "BALANCE",
   /*  174 */ "VGROUP",
-  /*  175 */ "REDISTRIBUTE",
+  /*  175 */ "MERGE",
-  /*  176 */ "SPLIT",
+  /*  176 */ "REDISTRIBUTE",
   /*  177 */ "SYNCDB",
   /*  178 */ "DELETE",
   /*  179 */ "NULL",
@@ -1779,9 +1779,9 @@ static const char *const yyRuleName[] = {
  /* 252 */ "cmd ::= KILL CONNECTION NK_INTEGER",
  /* 253 */ "cmd ::= KILL QUERY NK_INTEGER",
  /* 254 */ "cmd ::= KILL TRANSACTION NK_INTEGER",
- /* 255 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER",
+ /* 255 */ "cmd ::= BALANCE VGROUP",
- /* 256 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list",
+ /* 256 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER",
- /* 257 */ "cmd ::= SPLIT VGROUP NK_INTEGER",
+ /* 257 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list",
  /* 258 */ "dnode_list ::= DNODE NK_INTEGER",
  /* 259 */ "dnode_list ::= dnode_list DNODE NK_INTEGER",
  /* 260 */ "cmd ::= SYNCDB db_name REPLICA",
@@ -2823,9 +2823,9 @@ static const struct {
   {  238,   -3 }, /* (252) cmd ::= KILL CONNECTION NK_INTEGER */
   {  238,   -3 }, /* (253) cmd ::= KILL QUERY NK_INTEGER */
   {  238,   -3 }, /* (254) cmd ::= KILL TRANSACTION NK_INTEGER */
-  {  238,   -4 }, /* (255) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
+  {  238,   -2 }, /* (255) cmd ::= BALANCE VGROUP */
-  {  238,   -4 }, /* (256) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
+  {  238,   -4 }, /* (256) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
-  {  238,   -3 }, /* (257) cmd ::= SPLIT VGROUP NK_INTEGER */
+  {  238,   -4 }, /* (257) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
   {  305,   -2 }, /* (258) dnode_list ::= DNODE NK_INTEGER */
   {  305,   -3 }, /* (259) dnode_list ::= dnode_list DNODE NK_INTEGER */
   {  238,   -3 }, /* (260) cmd ::= SYNCDB db_name REPLICA */
@@ -3900,15 +3900,15 @@ static YYACTIONTYPE yy_reduce(
       case 254: /* cmd ::= KILL TRANSACTION NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_TRANSACTION_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 255: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
+      case 255: /* cmd ::= BALANCE VGROUP */
+{ pCxt->pRootNode = createBalanceVgroupStmt(pCxt); }
+        break;
+      case 256: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
 { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 256: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
+      case 257: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
 { pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy60); }
         break;
-      case 257: /* cmd ::= SPLIT VGROUP NK_INTEGER */
-{ pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); }
-        break;
       case 258: /* dnode_list ::= DNODE NK_INTEGER */
 { yymsp[-1].minor.yy60 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
         break;

source/libs/parser/test/parExplainToSyncdbTest.cpp

@@ -19,7 +19,7 @@ using namespace std;
 
 namespace ParserTest {
 
-class ParserExplainToSyncdbTest : public ParserTestBase {};
+class ParserExplainToSyncdbTest : public ParserDdlTest {};
 
 TEST_F(ParserExplainToSyncdbTest, explain) {
   useDb("root", "test");
@@ -43,8 +43,62 @@ TEST_F(ParserExplainToSyncdbTest, grant) {
 // todo kill connection
 // todo kill query
 // todo kill stream
-// todo merge vgroup
+
-// todo redistribute vgroup
+TEST_F(ParserExplainToSyncdbTest, mergeVgroup) {
+  useDb("root", "test");
+
+  SMergeVgroupReq expect = {0};
+
+  auto setMergeVgroupReqFunc = [&](int32_t vgId1, int32_t vgId2) {
+    expect.vgId1 = vgId1;
+    expect.vgId2 = vgId2;
+  };
+
+  setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) {
+    ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_MERGE_VGROUP_STMT);
+    ASSERT_EQ(pQuery->pCmdMsg->msgType, TDMT_MND_MERGE_VGROUP);
+    SMergeVgroupReq req = {0};
+    ASSERT_EQ(tDeserializeSMergeVgroupReq(pQuery->pCmdMsg->pMsg, pQuery->pCmdMsg->msgLen, &req), TSDB_CODE_SUCCESS);
+    ASSERT_EQ(req.vgId1, expect.vgId1);
+    ASSERT_EQ(req.vgId2, expect.vgId2);
+  });
+
+  setMergeVgroupReqFunc(1, 2);
+  run("MERGE VGROUP 1 2");
+}
+
+TEST_F(ParserExplainToSyncdbTest, redistributeVgroup) {
+  useDb("root", "test");
+
+  SRedistributeVgroupReq expect = {0};
+
+  auto setRedistributeVgroupReqFunc = [&](int32_t vgId, int32_t dnodeId1, int32_t dnodeId2 = -1,
+                                          int32_t dnodeId3 = -1) {
+    expect.vgId = vgId;
+    expect.dnodeId1 = dnodeId1;
+    expect.dnodeId2 = dnodeId2;
+    expect.dnodeId3 = dnodeId3;
+  };
+
+  setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) {
+    ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_REDISTRIBUTE_VGROUP_STMT);
+    ASSERT_EQ(pQuery->pCmdMsg->msgType, TDMT_MND_REDISTRIBUTE_VGROUP);
+    SRedistributeVgroupReq req = {0};
+    ASSERT_EQ(tDeserializeSRedistributeVgroupReq(pQuery->pCmdMsg->pMsg, pQuery->pCmdMsg->msgLen, &req),
+              TSDB_CODE_SUCCESS);
+    ASSERT_EQ(req.vgId, expect.vgId);
+    ASSERT_EQ(req.dnodeId1, expect.dnodeId1);
+    ASSERT_EQ(req.dnodeId2, expect.dnodeId2);
+    ASSERT_EQ(req.dnodeId3, expect.dnodeId3);
+  });
+
+  setRedistributeVgroupReqFunc(3, 1);
+  run("REDISTRIBUTE VGROUP 3 DNODE 1");
+
+  setRedistributeVgroupReqFunc(5, 10, 20, 30);
+  run("REDISTRIBUTE VGROUP 5 DNODE 10 DNODE 20 DNODE 30");
+}
+
 // todo reset query cache
 
 TEST_F(ParserExplainToSyncdbTest, revoke) {

source/libs/parser/test/parInitialATest.cpp

@@ -305,6 +305,19 @@ TEST_F(ParserInitialATest, alterUser) {
   run("ALTER user wxy privilege 'write'");
 }
 
+TEST_F(ParserInitialATest, balanceVgroup) {
+  useDb("root", "test");
+
+  setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) {
+    ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_BALANCE_VGROUP_STMT);
+    ASSERT_EQ(pQuery->pCmdMsg->msgType, TDMT_MND_BALANCE_VGROUP);
+    SBalanceVgroupReq req = {0};
+    ASSERT_EQ(tDeserializeSBalanceVgroupReq(pQuery->pCmdMsg->pMsg, pQuery->pCmdMsg->msgLen, &req), TSDB_CODE_SUCCESS);
+  });
+
+  run("BALANCE VGROUP");
+}
+
 TEST_F(ParserInitialATest, bug001) {
   useDb("root", "test");
 

source/libs/qcom/src/querymsg.c

@@ -203,6 +203,24 @@ int32_t queryBuildGetUserAuthMsg(void *input, char **msg, int32_t msgSize, int32
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t queryBuildGetTbIndexMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void*(*mallcFp)(int32_t)) {
+  if (NULL == msg || NULL == msgLen) {
+    return TSDB_CODE_TSC_INVALID_INPUT;
+  }
+
+  STableIndexReq indexReq = {0};
+  strcpy(indexReq.tbFName, input);
+
+  int32_t bufLen = tSerializeSTableIndexReq(NULL, 0, &indexReq);
+  void   *pBuf = (*mallcFp)(bufLen);
+  tSerializeSTableIndexReq(pBuf, bufLen, &indexReq);
+
+  *msg = pBuf;
+  *msgLen = bufLen;
+
+  return TSDB_CODE_SUCCESS;
+}
+
 
 int32_t queryProcessUseDBRsp(void *output, char *msg, int32_t msgSize) {
   SUseDbOutput *pOut = output;
@@ -459,6 +477,22 @@ int32_t queryProcessGetUserAuthRsp(void *output, char *msg, int32_t msgSize) {
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t queryProcessGetTbIndexRsp(void *output, char *msg, int32_t msgSize) {
+  if (NULL == output || NULL == msg || msgSize <= 0) {
+    return TSDB_CODE_TSC_INVALID_INPUT;
+  }
+
+  STableIndexRsp out = {0};
+  if (tDeserializeSTableIndexRsp(msg, msgSize, &out) != 0) {
+    qError("tDeserializeSTableIndexRsp failed, msgSize:%d", msgSize);
+    return TSDB_CODE_INVALID_MSG;
+  }
+
+  *(void **)output = out.pIndex;
+  
+  return TSDB_CODE_SUCCESS;
+}
+
 
 void initQueryModuleMsgHandle() {
   queryBuildMsg[TMSG_INDEX(TDMT_VND_TABLE_META)]       = queryBuildTableMetaReqMsg;
@@ -469,7 +503,7 @@ void initQueryModuleMsgHandle() {
   queryBuildMsg[TMSG_INDEX(TDMT_MND_GET_INDEX)]        = queryBuildGetIndexMsg;
   queryBuildMsg[TMSG_INDEX(TDMT_MND_RETRIEVE_FUNC)]    = queryBuildRetrieveFuncMsg;
   queryBuildMsg[TMSG_INDEX(TDMT_MND_GET_USER_AUTH)]    = queryBuildGetUserAuthMsg;
-  
+  queryBuildMsg[TMSG_INDEX(TDMT_MND_GET_TABLE_INDEX)]  = queryBuildGetTbIndexMsg;
 
   queryProcessMsgRsp[TMSG_INDEX(TDMT_VND_TABLE_META)]      = queryProcessTableMetaRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_TABLE_META)]      = queryProcessTableMetaRsp;
@@ -479,6 +513,7 @@ void initQueryModuleMsgHandle() {
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_GET_INDEX)]       = queryProcessGetIndexRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_RETRIEVE_FUNC)]   = queryProcessRetrieveFuncRsp;
   queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_GET_USER_AUTH)]   = queryProcessGetUserAuthRsp;
+  queryProcessMsgRsp[TMSG_INDEX(TDMT_MND_GET_TABLE_INDEX)] = queryProcessGetTbIndexRsp;
 }
 
 #pragma GCC diagnostic pop

source/libs/qworker/inc/qwInt.h

@@ -356,7 +356,7 @@ int32_t qwOpenRef(void);
 void qwSetHbParam(int64_t refId, SQWHbParam **pParam);
 int32_t qwUpdateTimeInQueue(SQWorker *mgmt, int64_t ts, EQueueType type);
 int64_t qwGetTimeInQueue(SQWorker *mgmt, EQueueType type);
-void qwClearExpiredSch(SArray* pExpiredSch);
+void qwClearExpiredSch(SQWorker *mgmt, SArray* pExpiredSch);
 int32_t qwAcquireScheduler(SQWorker *mgmt, uint64_t sId, int32_t rwType, SQWSchStatus **sch);
 void qwFreeTaskCtx(QW_FPARAMS_DEF, SQWTaskCtx *ctx);
 

source/libs/qworker/src/qwUtil.c

@@ -539,8 +539,23 @@ int64_t qwGetTimeInQueue(SQWorker *mgmt, EQueueType type) {
 }
 
 
-void qwClearExpiredSch(SArray* pExpiredSch) {
+void qwClearExpiredSch(SQWorker *mgmt, SArray* pExpiredSch) {
+  int32_t num = taosArrayGetSize(pExpiredSch);
+  for (int32_t i = 0; i < num; ++i) {
+    uint64_t *sId = taosArrayGet(pExpiredSch, i);
+    SQWSchStatus *pSch = NULL;
+    if (qwAcquireScheduler(mgmt, *sId, QW_WRITE, &pSch)) {
+      continue;
+    }
 
+    if (taosHashGetSize(pSch->tasksHash) <= 0) {
+      qwDestroySchStatus(pSch);
+      taosHashRemove(mgmt->schHash, sId, sizeof(*sId));
+      qError("sch %" PRIx64 "destroyed", *sId);
+    }
+
+    qwReleaseScheduler(QW_WRITE, mgmt);
+  }
 }
 
 

source/libs/qworker/src/qworker.c

@@ -790,9 +790,10 @@ int32_t qwProcessHb(SQWorker *mgmt, SQWMsg *qwMsg, SSchedulerHbReq *req) {
   }
 
   QW_ERR_JRET(qwAcquireAddScheduler(mgmt, req->sId, QW_READ, &sch));
-
   QW_ERR_JRET(qwRegisterHbBrokenLinkArg(mgmt, req->sId, &qwMsg->connInfo));
 
+  sch->hbBrokenTs = 0;
+
   QW_LOCK(QW_WRITE, &sch->hbConnLock);
 
   if (sch->hbConnInfo.handle) {
@@ -912,7 +913,7 @@ _return:
   }
 
   if (taosArrayGetSize(pExpiredSch) > 0) {
-    qwClearExpiredSch(pExpiredSch);
+    qwClearExpiredSch(mgmt, pExpiredSch);
   }
 
   taosMemoryFreeClear(rspList);

source/libs/scalar/src/sclvector.c

@@ -373,9 +373,6 @@ static FORCE_INLINE void ncharToVar(char* buf, SScalarParam* pOut, int32_t rowIn
 
 //TODO opt performance, tmp is not needed.
 int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, int32_t inType, int32_t outType) {
-  int32_t bufSize = pIn->columnData->info.bytes;
-  char *tmp = taosMemoryMalloc(bufSize + VARSTR_HEADER_SIZE);
-
   bool vton = false;
 
   _bufConverteFunc func = NULL;
@@ -423,6 +420,12 @@ int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, in
         continue;
       }
     }
+    int32_t bufSize = pIn->columnData->info.bytes;
+    char *tmp = taosMemoryMalloc(varDataTLen(data));
+    if(!tmp){
+      sclError("out of memory in vectorConvertFromVarData");
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
     if (vton) {
       memcpy(tmp, data, varDataTLen(data));
     } else {
@@ -444,9 +447,9 @@ int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, in
     }
     
     (*func)(tmp, pOut, i);
+    taosMemoryFreeClear(tmp);
   }
   
-  taosMemoryFreeClear(tmp);
   return TSDB_CODE_SUCCESS;
 }
 
@@ -1674,6 +1677,14 @@ void vectorNotNull(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut
 
 void vectorIsTrue(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t _ord) {
   vectorConvertImpl(pLeft, pOut);
+  for(int32_t i = 0; i < pOut->numOfRows; ++i) {
+    if(colDataIsNull_s(pOut->columnData, i)) {
+      int8_t v = 0;
+      colDataAppendInt8(pOut->columnData, i, &v);
+      colDataSetNotNull_f(pOut->columnData->nullbitmap, i);
+    }
+  }
+  pOut->columnData->hasNull = false;
 }
 
 STagVal getJsonValue(char *json, char *key, bool *isExist) {

source/libs/scalar/test/scalar/scalarTests.cpp

@@ -1328,7 +1328,7 @@ TEST(columnTest, json_column_logic_op) {
  printf("--------------------json null---null {1, 8, 2, 2, 3, 0, 0, 0, 0}------------------\n");
 
  key = "k3";   // (null is true) return NULL, so use DBL_MAX represent NULL
-  double eRes2[len+len1] = {false, false, false, false, false, false, true, false, DBL_MAX, false, false, false, false};
+ bool eRes2[len+len1] = {false, false, false, false, false, false, true, false, false, false, false, false, false};
  for(int i = 0; i < len; i++){
    makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes2[i], op[i], false);
  }
@@ -1456,7 +1456,7 @@ TEST(columnTest, json_column_logic_op) {
  printf("---------------------json not exist-- NULL {1, 8, 2, 2, 3, 0, 0, 0, 0}------------------\n");
 
  key = "k10";    // (NULL is true) return NULL, so use DBL_MAX represent NULL
-  double eRes9[len+len1] = {false, false, false, false, false, false, true, false, DBL_MAX, false, false, false, false};
+ bool eRes9[len+len1] = {false, false, false, false, false, false, true, false, false, false, false, false, false};
  for(int i = 0; i < len; i++){
    makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes9[i], op[i], false);
  }

source/libs/scheduler/inc/schedulerInt.h

@@ -207,6 +207,7 @@ typedef struct SSchJob {
   SArray          *dataSrcTasks; // SArray<SQueryTask*>
   int32_t          levelIdx;
   SEpSet           dataSrcEps;
+  SHashObj        *taskList;
   SHashObj        *execTasks; // executing tasks, key:taskid, value:SQueryTask*
   SHashObj        *succTasks; // succeed tasks, key:taskid, value:SQueryTask*
   SHashObj        *failTasks; // failed tasks, key:taskid, value:SQueryTask*

source/libs/scheduler/src/schJob.c

@@ -64,6 +64,13 @@ int32_t schInitJob(SSchJob **pSchJob, SQueryPlan *pDag, void *pTrans, SArray *pN
     pJob->nodeList = taosArrayDup(pNodeList);
   }
   
+  pJob->taskList =
+      taosHashInit(pDag->numOfSubplans, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_ENTRY_LOCK);
+  if (NULL == pJob->taskList) {
+    SCH_JOB_ELOG("taosHashInit %d taskList failed", pDag->numOfSubplans);
+    SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+
   SCH_ERR_JRET(schValidateAndBuildJob(pDag, pJob));
 
   if (SCH_IS_EXPLAIN_JOB(pJob)) {
@@ -486,23 +493,26 @@ int32_t schValidateAndBuildJob(SQueryPlan *pDag, SSchJob *pJob) {
       SCH_SET_JOB_TYPE(pJob, plan->subplanType);
 
       SSchTask  task = {0};
-      SSchTask *pTask = &task;
-
       SCH_ERR_JRET(schInitTask(pJob, &task, plan, pLevel));
 
-      void *p = taosArrayPush(pLevel->subTasks, &task);
+      SSchTask *pTask = taosArrayPush(pLevel->subTasks, &task);
-      if (NULL == p) {
+      if (NULL == pTask) {
         SCH_TASK_ELOG("taosArrayPush task to level failed, level:%d, taskIdx:%d", pLevel->level, n);
         SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
       }
 
-      SCH_ERR_JRET(schRecordQueryDataSrc(pJob, p));
+      SCH_ERR_JRET(schRecordQueryDataSrc(pJob, pTask));
 
-      if (0 != taosHashPut(planToTask, &plan, POINTER_BYTES, &p, POINTER_BYTES)) {
+      if (0 != taosHashPut(planToTask, &plan, POINTER_BYTES, &pTask, POINTER_BYTES)) {
         SCH_TASK_ELOG("taosHashPut to planToTaks failed, taskIdx:%d", n);
         SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
       }
 
+      if (0 != taosHashPut(pJob->taskList, &pTask->taskId, sizeof(pTask->taskId), &pTask, POINTER_BYTES)) {
+        SCH_TASK_ELOG("taosHashPut to taskList failed, taskIdx:%d", n);
+        SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
+      }
+
       ++pJob->taskNum;
     }
 
@@ -1276,15 +1286,11 @@ int32_t schGetTaskFromList(SHashObj *pTaskList, uint64_t taskId, SSchTask **pTas
 }
 
 int32_t schGetTaskInJob(SSchJob *pJob, uint64_t taskId, SSchTask **pTask) {
-  schGetTaskFromList(pJob->execTasks, taskId, pTask);
+  schGetTaskFromList(pJob->taskList, taskId, pTask);
   if (NULL == *pTask) {
-    schGetTaskFromList(pJob->succTasks, taskId, pTask);
+    SCH_JOB_ELOG("task not found in job task list, taskId:%" PRIx64, taskId);
-
-    if (NULL == *pTask) {
-      SCH_JOB_ELOG("task not found in execList & succList, taskId:%" PRIx64, taskId);
     SCH_ERR_RET(TSDB_CODE_SCH_INTERNAL_ERROR);
   }
-  }
 
   return TSDB_CODE_SUCCESS;
 }
@@ -1445,6 +1451,7 @@ void schFreeJobImpl(void *job) {
   taosHashCleanup(pJob->execTasks);
   taosHashCleanup(pJob->failTasks);
   taosHashCleanup(pJob->succTasks);
+  taosHashCleanup(pJob->taskList);
   
   taosArrayDestroy(pJob->levels);
   taosArrayDestroy(pJob->nodeList);

source/libs/stream/inc/streamInc.h

@@ -24,10 +24,9 @@ extern "C" {
 #endif
 
 int32_t streamExec(SStreamTask* pTask, SMsgCb* pMsgCb);
-int32_t streamSink1(SStreamTask* pTask, SMsgCb* pMsgCb);
+int32_t streamDispatch(SStreamTask* pTask, SMsgCb* pMsgCb);
-int32_t streamDispatch(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDataBlock* data);
-
 int32_t streamDispatchReqToData(const SStreamDispatchReq* pReq, SStreamDataBlock* pData);
+int32_t streamBuildDispatchMsg(SStreamTask* pTask, SStreamDataBlock* data, SRpcMsg* pMsg, SEpSet** ppEpSet);
 
 #ifdef __cplusplus
 }

source/libs/stream/src/stream.c

@@ -26,7 +26,7 @@ int32_t streamTriggerByWrite(SStreamTask* pTask, int32_t vgId, SMsgCb* pMsgCb) {
     pRunReq->streamId = pTask->streamId;
     pRunReq->taskId = pTask->taskId;
     SRpcMsg msg = {
-        .msgType = TDMT_VND_TASK_RUN,
+        .msgType = TDMT_STREAM_TASK_RUN,
         .pCont = pRunReq,
         .contLen = sizeof(SStreamTaskRunReq),
     };
@@ -83,7 +83,9 @@ int32_t streamProcessDispatchReq(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDisp
   // 3. handle output
   // 3.1 check and set status
   // 3.2 dispatch / sink
-  streamSink1(pTask, pMsgCb);
+  if (pTask->dispatchType != TASK_DISPATCH__NONE) {
+    streamDispatch(pTask, pMsgCb);
+  }
 
   return 0;
 }
@@ -97,13 +99,17 @@ int32_t streamProcessDispatchRsp(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDisp
     return 0;
   }
   // continue dispatch
-  streamSink1(pTask, pMsgCb);
+  if (pTask->dispatchType != TASK_DISPATCH__NONE) {
+    streamDispatch(pTask, pMsgCb);
+  }
   return 0;
 }
 
 int32_t streamTaskProcessRunReq(SStreamTask* pTask, SMsgCb* pMsgCb) {
   streamExec(pTask, pMsgCb);
-  streamSink1(pTask, pMsgCb);
+  if (pTask->dispatchType != TASK_DISPATCH__NONE) {
+    streamDispatch(pTask, pMsgCb);
+  }
   return 0;
 }
 

source/libs/stream/src/streamData.c

@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tstream.h"
+#include "streamInc.h"
 
 #if 0
 int32_t streamDataBlockEncode(void** buf, const SStreamDataBlock* pOutput) {
@@ -74,7 +74,6 @@ FAIL:
 }
 
 static FORCE_INLINE void streamDataSubmitRefInc(SStreamDataSubmit* pDataSubmit) {
-  //
   atomic_add_fetch_32(pDataSubmit->dataRef, 1);
 }
 
@@ -87,22 +86,3 @@ SStreamDataSubmit* streamSubmitRefClone(SStreamDataSubmit* pSubmit) {
   memcpy(pSubmitClone, pSubmit, sizeof(SStreamDataSubmit));
   return pSubmitClone;
 }
-
-#if 0
-int32_t tEncodeSStreamTaskExecReq(void** buf, const SStreamTaskExecReq* pReq) {
-  int32_t tlen = 0;
-  tlen += taosEncodeFixedI64(buf, pReq->streamId);
-  tlen += taosEncodeFixedI32(buf, pReq->taskId);
-  tlen += tEncodeDataBlocks(buf, pReq->data);
-  return tlen;
-}
-
-void* tDecodeSStreamTaskExecReq(const void* buf, SStreamTaskExecReq* pReq) {
-  buf = taosDecodeFixedI64(buf, &pReq->streamId);
-  buf = taosDecodeFixedI32(buf, &pReq->taskId);
-  buf = tDecodeDataBlocks(buf, &pReq->data);
-  return (void*)buf;
-}
-
-void tFreeSStreamTaskExecReq(SStreamTaskExecReq* pReq) { taosArrayDestroy(pReq->data); }
-#endif

source/libs/stream/src/streamDispatch.c

@@ -116,11 +116,9 @@ int32_t streamBuildDispatchMsg(SStreamTask* pTask, SStreamDataBlock* data, SRpcM
     *ppEpSet = &pTask->fixedEpDispatcher.epSet;
     downstreamTaskId = pTask->fixedEpDispatcher.taskId;
   } else if (pTask->dispatchType == TASK_DISPATCH__SHUFFLE) {
-    // TODO get ctbName
+    // TODO get ctbName for each block
-    char         ctbName[TSDB_TABLE_FNAME_LEN + 22] = {0};
     SSDataBlock* pBlock = taosArrayGet(data->blocks, 0);
-    sprintf(ctbName, "%s:%ld", pTask->shuffleDispatcher.stbFullName, pBlock->info.groupId);
+    char*        ctbName = buildCtbNameByGroupId(pTask->shuffleDispatcher.stbFullName, pBlock->info.groupId);
-    // get vg and ep
     // TODO: get hash function by hashMethod
 
     // get groupId, compute hash value
@@ -176,131 +174,26 @@ FAIL:
   return code;
 }
 
-int32_t streamDispatch(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDataBlock* data) {
+int32_t streamDispatch(SStreamTask* pTask, SMsgCb* pMsgCb) {
-#if 0
+#if 1
   int8_t old =
       atomic_val_compare_exchange_8(&pTask->outputStatus, TASK_OUTPUT_STATUS__NORMAL, TASK_OUTPUT_STATUS__WAIT);
   if (old != TASK_OUTPUT_STATUS__NORMAL) {
     return 0;
   }
 #endif
-  if (pTask->dispatchType == TASK_DISPATCH__INPLACE) {
-    SRpcMsg dispatchMsg = {0};
-    if (streamBuildDispatchMsg(pTask, data, &dispatchMsg, NULL) < 0) {
-      ASSERT(0);
-      return -1;
-    }
 
-    int32_t qType;
+  SStreamDataBlock* pBlock = streamQueueNextItem(pTask->outputQueue);
-    if (pTask->dispatchMsgType == TDMT_VND_TASK_DISPATCH || pTask->dispatchMsgType == TDMT_SND_TASK_DISPATCH) {
+  if (pBlock == NULL) return 0;
-      qType = FETCH_QUEUE;
+  ASSERT(pBlock->type == STREAM_DATA_TYPE_SSDATA_BLOCK);
-    } else if (pTask->dispatchMsgType == TDMT_VND_TASK_DISPATCH_WRITE) {
+
-      qType = WRITE_QUEUE;
-    } else {
-      ASSERT(0);
-    }
-    tmsgPutToQueue(pMsgCb, qType, &dispatchMsg);
-  } else if (pTask->dispatchType == TASK_DISPATCH__FIXED) {
   SRpcMsg dispatchMsg = {0};
   SEpSet* pEpSet = NULL;
-    if (streamBuildDispatchMsg(pTask, data, &dispatchMsg, &pEpSet) < 0) {
+  if (streamBuildDispatchMsg(pTask, pBlock, &dispatchMsg, &pEpSet) < 0) {
     ASSERT(0);
     return -1;
   }
 
   tmsgSendReq(pEpSet, &dispatchMsg);
-  } else if (pTask->dispatchType == TASK_DISPATCH__SHUFFLE) {
-    SRpcMsg dispatchMsg = {0};
-    SEpSet* pEpSet = NULL;
-    if (streamBuildDispatchMsg(pTask, data, &dispatchMsg, &pEpSet) < 0) {
-      ASSERT(0);
-      return -1;
-    }
-
-    tmsgSendReq(pEpSet, &dispatchMsg);
-  }
   return 0;
 }
-
-#if 0
-static int32_t streamBuildExecMsg(SStreamTask* pTask, SArray* data, SRpcMsg* pMsg, SEpSet** ppEpSet) {
-  SStreamTaskExecReq req = {
-      .streamId = pTask->streamId,
-      .data = data,
-  };
-
-  int32_t tlen = sizeof(SMsgHead) + tEncodeSStreamTaskExecReq(NULL, &req);
-  void*   buf = rpcMallocCont(tlen);
-
-  if (buf == NULL) {
-    return -1;
-  }
-
-  if (pTask->dispatchType == TASK_DISPATCH__INPLACE) {
-    ((SMsgHead*)buf)->vgId = 0;
-    req.taskId = pTask->inplaceDispatcher.taskId;
-
-  } else if (pTask->dispatchType == TASK_DISPATCH__FIXED) {
-    ((SMsgHead*)buf)->vgId = htonl(pTask->fixedEpDispatcher.nodeId);
-    *ppEpSet = &pTask->fixedEpDispatcher.epSet;
-    req.taskId = pTask->fixedEpDispatcher.taskId;
-
-  } else if (pTask->dispatchType == TASK_DISPATCH__SHUFFLE) {
-    // TODO use general name rule of schemaless
-    char ctbName[TSDB_TABLE_FNAME_LEN + 22] = {0};
-    // all groupId must be the same in an array
-    SSDataBlock* pBlock = taosArrayGet(data, 0);
-    sprintf(ctbName, "%s:%ld", pTask->shuffleDispatcher.stbFullName, pBlock->info.groupId);
-
-    // TODO: get hash function by hashMethod
-
-    // get groupId, compute hash value
-    uint32_t hashValue = MurmurHash3_32(ctbName, strlen(ctbName));
-
-    // get node
-    // TODO: optimize search process
-    SArray* vgInfo = pTask->shuffleDispatcher.dbInfo.pVgroupInfos;
-    int32_t sz = taosArrayGetSize(vgInfo);
-    int32_t nodeId = 0;
-    for (int32_t i = 0; i < sz; i++) {
-      SVgroupInfo* pVgInfo = taosArrayGet(vgInfo, i);
-      if (hashValue >= pVgInfo->hashBegin && hashValue <= pVgInfo->hashEnd) {
-        nodeId = pVgInfo->vgId;
-        req.taskId = pVgInfo->taskId;
-        *ppEpSet = &pVgInfo->epSet;
-        break;
-      }
-    }
-    ASSERT(nodeId != 0);
-    ((SMsgHead*)buf)->vgId = htonl(nodeId);
-  }
-
-  void* abuf = POINTER_SHIFT(buf, sizeof(SMsgHead));
-  tEncodeSStreamTaskExecReq(&abuf, &req);
-
-  pMsg->pCont = buf;
-  pMsg->contLen = tlen;
-  pMsg->code = 0;
-  pMsg->msgType = pTask->dispatchMsgType;
-  pMsg->info.noResp = 1;
-
-  return 0;
-}
-
-static int32_t streamShuffleDispatch(SStreamTask* pTask, SMsgCb* pMsgCb, SHashObj* data) {
-  void* pIter = NULL;
-  while (1) {
-    pIter = taosHashIterate(data, pIter);
-    if (pIter == NULL) return 0;
-    SArray* pData = *(SArray**)pIter;
-    SRpcMsg dispatchMsg = {0};
-    SEpSet* pEpSet;
-    if (streamBuildExecMsg(pTask, pData, &dispatchMsg, &pEpSet) < 0) {
-      ASSERT(0);
-      return -1;
-    }
-    tmsgSendReq(pEpSet, &dispatchMsg);
-  }
-  return 0;
-}
-#endif

source/libs/stream/src/streamQueue.c

@@ -41,3 +41,12 @@ void streamQueueClose(SStreamQueue* queue) {
       return;
   }
 }
+
+void streamDataSubmitRefDec(SStreamDataSubmit* pDataSubmit) {
+  int32_t ref = atomic_sub_fetch_32(pDataSubmit->dataRef, 1);
+  ASSERT(ref >= 0);
+  if (ref == 0) {
+    taosMemoryFree(pDataSubmit->data);
+    taosMemoryFree(pDataSubmit->dataRef);
+  }
+}

source/libs/stream/src/streamSink.c

@@ -1,159 +0,0 @@
-/*
- * 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 "streamInc.h"
-
-int32_t streamSink1(SStreamTask* pTask, SMsgCb* pMsgCb) {
-  SStreamQueue* queue;
-  if (pTask->execType == TASK_EXEC__NONE) {
-    queue = pTask->inputQueue;
-  } else {
-    queue = pTask->outputQueue;
-  }
-
-  /*if (streamDequeueBegin(queue) == true) {*/
-  /*return -1;*/
-  /*}*/
-
-  if (pTask->sinkType == TASK_SINK__TABLE || pTask->sinkType == TASK_SINK__SMA ||
-      pTask->dispatchType != TASK_DISPATCH__NONE) {
-    while (1) {
-      SStreamDataBlock* pBlock = streamQueueNextItem(queue);
-      if (pBlock == NULL) break;
-      ASSERT(pBlock->type == STREAM_DATA_TYPE_SSDATA_BLOCK);
-
-      // local sink
-      if (pTask->sinkType == TASK_SINK__TABLE) {
-        ASSERT(pTask->dispatchType == TASK_DISPATCH__NONE);
-        pTask->tbSink.tbSinkFunc(pTask, pTask->tbSink.vnode, 0, pBlock->blocks);
-      } else if (pTask->sinkType == TASK_SINK__SMA) {
-        ASSERT(pTask->dispatchType == TASK_DISPATCH__NONE);
-        pTask->smaSink.smaSink(pTask->ahandle, pTask->smaSink.smaId, pBlock->blocks);
-      }
-
-      // TODO: sink and dispatch should be only one
-      if (pTask->dispatchType != TASK_DISPATCH__NONE) {
-        ASSERT(queue == pTask->outputQueue);
-        ASSERT(pTask->sinkType == TASK_SINK__NONE);
-
-        streamDispatch(pTask, pMsgCb, pBlock);
-      }
-
-      streamQueueProcessSuccess(queue);
-    }
-  }
-
-  return 0;
-}
-
-#if 0
-int32_t streamSink(SStreamTask* pTask, SMsgCb* pMsgCb) {
-  bool firstRun = 1;
-  while (1) {
-    SStreamDataBlock* pBlock = NULL;
-    if (!firstRun) {
-      taosReadAllQitems(pTask->outputQ, pTask->outputQAll);
-    }
-    taosGetQitem(pTask->outputQAll, (void**)&pBlock);
-    if (pBlock == NULL) {
-      if (firstRun) {
-        firstRun = 0;
-        continue;
-      } else {
-        break;
-      }
-    }
-
-    SArray* pRes = pBlock->blocks;
-
-    // sink
-    if (pTask->sinkType == TASK_SINK__TABLE) {
-      // blockDebugShowData(pRes);
-      pTask->tbSink.tbSinkFunc(pTask, pTask->tbSink.vnode, 0, pRes);
-    } else if (pTask->sinkType == TASK_SINK__SMA) {
-      pTask->smaSink.smaSink(pTask->ahandle, pTask->smaSink.smaId, pRes);
-      //
-    } else if (pTask->sinkType == TASK_SINK__FETCH) {
-      //
-    } else {
-      ASSERT(pTask->sinkType == TASK_SINK__NONE);
-    }
-
-    // dispatch
-    // TODO dispatch guard
-    int8_t outputStatus = atomic_load_8(&pTask->outputStatus);
-    if (outputStatus == TASK_OUTPUT_STATUS__NORMAL) {
-      if (pTask->dispatchType == TASK_DISPATCH__INPLACE) {
-        SRpcMsg dispatchMsg = {0};
-        if (streamBuildExecMsg(pTask, pRes, &dispatchMsg, NULL) < 0) {
-          ASSERT(0);
-          return -1;
-        }
-
-        int32_t qType;
-        if (pTask->dispatchMsgType == TDMT_VND_TASK_DISPATCH || pTask->dispatchMsgType == TDMT_SND_TASK_DISPATCH) {
-          qType = FETCH_QUEUE;
-          /*} else if (pTask->dispatchMsgType == TDMT_VND_TASK_MERGE_EXEC ||*/
-          /*pTask->dispatchMsgType == TDMT_SND_TASK_MERGE_EXEC) {*/
-          /*qType = MERGE_QUEUE;*/
-          /*} else if (pTask->dispatchMsgType == TDMT_VND_TASK_WRITE_EXEC) {*/
-          /*qType = WRITE_QUEUE;*/
-        } else {
-          ASSERT(0);
-        }
-        tmsgPutToQueue(pMsgCb, qType, &dispatchMsg);
-
-      } else if (pTask->dispatchType == TASK_DISPATCH__FIXED) {
-        SRpcMsg dispatchMsg = {0};
-        SEpSet* pEpSet = NULL;
-        if (streamBuildExecMsg(pTask, pRes, &dispatchMsg, &pEpSet) < 0) {
-          ASSERT(0);
-          return -1;
-        }
-
-        tmsgSendReq(pEpSet, &dispatchMsg);
-
-      } else if (pTask->dispatchType == TASK_DISPATCH__SHUFFLE) {
-        SHashObj* pShuffleRes = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
-        if (pShuffleRes == NULL) {
-          return -1;
-        }
-
-        int32_t sz = taosArrayGetSize(pRes);
-        for (int32_t i = 0; i < sz; i++) {
-          SSDataBlock* pDataBlock = taosArrayGet(pRes, i);
-          SArray*      pArray = taosHashGet(pShuffleRes, &pDataBlock->info.groupId, sizeof(int64_t));
-          if (pArray == NULL) {
-            pArray = taosArrayInit(0, sizeof(SSDataBlock));
-            if (pArray == NULL) {
-              return -1;
-            }
-            taosHashPut(pShuffleRes, &pDataBlock->info.groupId, sizeof(int64_t), &pArray, sizeof(void*));
-          }
-          taosArrayPush(pArray, pDataBlock);
-        }
-
-        if (streamShuffleDispatch(pTask, pMsgCb, pShuffleRes) < 0) {
-          return -1;
-        }
-
-      } else {
-        ASSERT(pTask->dispatchType == TASK_DISPATCH__NONE);
-      }
-    }
-  }
-  return 0;
-}
-#endif

source/util/src/terror.c

@@ -451,9 +451,89 @@ TAOS_DEFINE_ERROR(TSDB_CODE_SCH_TIMEOUT_ERROR,            "Task timeout")
 TAOS_DEFINE_ERROR(TSDB_CODE_QW_MSG_ERROR,                 "Invalid msg order")
 
 // parser
-TAOS_DEFINE_ERROR(TSDB_CODE_PAR_TABLE_NOT_EXIST,          "Table does not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_PERMISSION_DENIED,         "Permission denied")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTERNAL_ERROR,            "Parser internal error")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_SYNTAX_ERROR,              "syntax error near")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INCOMPLETE_SQL,            "Incomplete SQL statement")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_COLUMN,            "Invalid column name")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_TABLE_NOT_EXIST,           "Table does not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_AMBIGUOUS_COLUMN,          "Column ambiguously defined")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_WRONG_VALUE_TYPE,          "Invalid value type")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_ILLEGAL_USE_AGG_FUNCTION,  "There mustn't be aggregation")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_WRONG_NUMBER_OF_SELECT,    "ORDER BY item must be the number of a SELECT-list expression")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION,   "Not a GROUP BY expression")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_NOT_SELECTED_EXPRESSION,   "Not SELECTed expression")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_NOT_SINGLE_GROUP,          "Not a single-group group function")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_TAGS_NOT_MATCHED,          "Tags number not matched")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TAG_NAME,          "Invalid tag name")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_NAME_OR_PASSWD_TOO_LONG,   "Name or password too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_PASSWD_EMPTY,              "Password can not be empty")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_PORT,              "Port should be an integer that is less than 65535 and greater than 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ENDPOINT,          "Endpoint should be in the format of 'fqdn:port'")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_EXPRIE_STATEMENT,          "This statement is no longer supported")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL,     "Interval too small")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_DB_NOT_SPECIFIED,          "Database not specified")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME,   "Invalid identifier name")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_CORRESPONDING_STABLE_ERR,  "Corresponding super table not in this db")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_RANGE_OPTION,      "Invalid option")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_STR_OPTION,        "Invalid option")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ENUM_OPTION,       "Invalid option")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_KEEP_NUM,          "Invalid number of keep options")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_KEEP_ORDER,        "Invalid keep value, should be keep0 <= keep1 <= keep2")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_KEEP_VALUE,        "Invalid option keep")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_COMMENT_OPTION,    "Invalid option comment")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_F_RANGE_OPTION,    "Invalid option")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ROLLUP_OPTION,     "Invalid option rollup: only one function is allowed")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_RETENTIONS_OPTION, "Invalid option retentions")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_GROUPBY_WINDOW_COEXIST,    "GROUP BY and WINDOW-clause can't be used together")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_OPTION_UNIT,       "Invalid option unit: only m, h, d allowed")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_KEEP_UNIT,         "Invalid option keep unit: only m, h, d allowed")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_AGG_FUNC_NESTING,          "Aggregate functions do not support nesting")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_STATE_WIN_TYPE,    "Only support STATE_WINDOW on integer/bool/varchar column")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_STATE_WIN_COL,     "Not support STATE_WINDOW on tag column")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_STATE_WIN_TABLE,   "STATE_WINDOW not support for super table query")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_SESSION_GAP,         "SESSION gap should be fixed time window, and greater than 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_SESSION_COL,         "Only support SESSION on primary timestamp column")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_OFFSET_NEGATIVE,     "Interval offset cannot be negative")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_OFFSET_UNIT,         "Cannot use 'year' as offset when interval is 'month'")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_OFFSET_TOO_BIG,      "Interval offset should be shorter than interval")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_SLIDING_UNIT,        "Does not support sliding when interval is natural month/year")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_SLIDING_TOO_BIG,     "sliding value no larger than the interval value")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_SLIDING_TOO_SMALL,   "sliding value can not less than 1% of interval value")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_ONLY_ONE_JSON_TAG,         "Only one tag if there is a json tag")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INCORRECT_NUM_OF_COL,      "Query block has incorrect number of result columns")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INCORRECT_TIMESTAMP_VAL,   "Incorrect TIMESTAMP value")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_DAYS_VALUE,        "Invalid days value, should be keep2 >= keep1 >= keep0 >= days")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_OFFSET_LESS_ZERO,          "soffset/offset can not be less than 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_SLIMIT_LEAK_PARTITION_BY,  "slimit/soffset only available for PARTITION BY query")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TOPIC_QUERY,        "Invalid topic query")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_DROP_STABLE,        "Cannot drop super table in batch")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_FILL_TIME_RANGE,    "Start(end) time of query range required or time range too large")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_DUPLICATED_COLUMN,          "Duplicated column names")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TAGS_LENGTH,        "Tags length exceeds max length")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ROW_LENGTH,         "Row length exceeds max length")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_COLUMNS_NUM,        "Illegal number of columns")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_TOO_MANY_COLUMNS,           "Too many columns")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_FIRST_COLUMN,       "First column must be timestamp")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_VAR_COLUMN_LEN,     "Invalid binary/nchar column length")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TAGS_NUM,           "Invalid number of tag columns")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_INTERNAL_PK,        "Invalid _c0 or _rowts expression")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TIMELINE_FUNC,      "Invalid timeline function")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_PASSWD,             "Invalid password")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ALTER_TABLE,        "Invalid alter table statement")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_CANNOT_DROP_PRIMARY_KEY,    "Primary timestamp column cannot be dropped")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_MODIFY_COL,         "Only binary/nchar column length could be modified")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TBNAME,             "Invalid tbname pseudo column")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_FUNCTION_NAME,      "Invalid function name")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_COMMENT_TOO_LONG,           "Comment too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_NOT_ALLOWED_FUNC,           "Some functions are allowed only in the SELECT list of a query. "
+                                                            "And, cannot be mixed with other non scalar functions or columns.")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_NOT_ALLOWED_WIN_QUERY,      "Window query not supported, since the result of subquery not include valid timestamp column")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_DROP_COL,           "No columns can be dropped")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_COL_JSON,           "Only tag can be json type")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_VALUE_TOO_LONG,             "Value too long for column/tag")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_DELETE_WHERE,       "The DELETE statement must have a definite time window range")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_REDISTRIBUTE_VG,    "The REDISTRIBUTE VGROUP statement only support 1 to 3 dnodes")
 
 //planner
 TAOS_DEFINE_ERROR(TSDB_CODE_PLAN_INTERNAL_ERROR,          "Planner internal error")

tests/pytest/test.py

@@ -131,7 +131,7 @@ if __name__ == "__main__":
             is_test_framework = 0
             key_word = 'tdCases.addWindows'
             try:
-                if key_word in open(fileName).read():
+                if key_word in open(fileName, encoding='UTF-8').read():
                     is_test_framework = 1
             except:
                 pass

tests/pytest/util/dnodes.py

@@ -416,7 +416,7 @@ class TDDnode:
                     psCmd, shell=True).decode("utf-8")
             if not platform.system().lower() == 'windows':
                 for port in range(6030, 6041):
-                    fuserCmd = "fuser -k -n tcp %d" % port
+                    fuserCmd = "fuser -k -n tcp %d > /dev/null" % port
                     os.system(fuserCmd)
             if self.valgrind:
                 time.sleep(2)

tests/script/jenkins/basic.txt

@@ -22,6 +22,7 @@
 
 # ---- dnode
 ./test.sh -f tsim/dnode/create_dnode.sim
+./test.sh -f tsim/dnode/drop_dnode_mnode.sim
 
 # ---- insert
 ./test.sh -f tsim/insert/basic0.sim

tests/script/tsim/dnode/drop_dnode_mnode.sim

@@ -0,0 +1,52 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sql connect
+
+print =============== step1 create dnode2
+sql create dnode $hostname port 7200
+
+$x = 0
+step1:
+	$ = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi
+if $data(2)[4] != ready then
+  goto step1
+endi
+
+sql create dnode $hostname port 7300
+sql drop dnode 3
+sql_error drop dnode 1
+
+print =============== step2: create mnode
+sql create mnode on dnode 2
+
+print =============== step3: drop dnode 3
+sql drop dnode 2
+sql show dnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+return 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT

tests/script/tsim/mnode/basic3.sim

@@ -39,10 +39,8 @@ endi
 print =============== step2: create mnode 2
 sql create mnode on dnode 2
 sql create mnode on dnode 3
-system sh/exec.sh -n dnode1 -s stop -x SIGKILL
 sql_error create mnode on dnode 4
 
-return
 $x = 0
 step2: 
 	$x = $x + 1

tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim

@@ -31,7 +31,7 @@ if $data[0][4] != ready then
   goto check_dnode_ready
 endi
 
-#sql connect
+sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
@@ -71,7 +71,7 @@ sql create database db replica $replica vgroups $vgroups
 $loop_cnt = 0
 check_db_ready:
 $loop_cnt = $loop_cnt + 1
-sleep 200
+sleep 20
 if $loop_cnt == 10 then
   print ====> db not ready!
 	return -1
@@ -93,13 +93,12 @@ $loop_cnt = 0
 check_vg_ready:
 $loop_cnt = $loop_cnt + 1
 sleep 200
-if $loop_cnt == 10 then
+if $loop_cnt == 300 then
   print ====> vgroups not ready!
 	return -1
 endi
 sql show vgroups
 print ===> rows: $rows
-print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
 print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] $data[0][7] $data[0][8] $data[0][9] $data[10][6] $data[0][11] $data[0][12] $data[0][13]
 if $rows != $vgroups then
   return -1
@@ -133,9 +132,11 @@ if $data[0][8] == leader then
    endi    
    print ---- vgroup $data[0][0] leader locate on dnode $data[0][7] 
    goto vg_ready
+else
+   goto check_vg_ready
 endi
-vg_ready:
 
+vg_ready:
 print ====>  create stable/child table
 sql create table stb (ts timestamp, c1 int, c2 float, c3 binary(10)) tags (t1 int)
 
@@ -156,27 +157,13 @@ while $i < $tbNum
   sql create table $ctb using stb tags( $i )
   $ntb = $ntbPrefix . $i
   sql create table $ntb (ts timestamp, c1 int, c2 float, c3 binary(10))
-  
-#  $x = 0
-#  while $x < $rowNum
-#    $binary = ' . binary
-#    $binary = $binary . $i
-#    $binary = $binary . '
-#
-#    sql insert into $ctb values ($tstart , $i , $x , $binary )
-#    sql insert into $ntb values ($tstart , 999 , 999 , 'binary-ntb' )
-#    $tstart = $tstart + 1
-#    $x = $x + 1
-#  endw
-  
-#  print ====> insert rows: $rowNum into $ctb and $ntb
-
   $i = $i + 1
-#  $tstart = 1640966400000
 endw
 
 $totalTblNum = $tbNum * 2
+sleep 1000
 sql show tables
+print ====> expect $totalTblNum and infinsert $rows  in fact 
 if $rows != $totalTblNum then 
   return -1
 endi
@@ -185,7 +172,7 @@ print ====>  create a normal table for interaction between main and back threads
 sql create table interaction (ts timestamp, flag binary(10), childrows int, stbrows int)
 
 print ====> start to run_back to insert data
-run_back tsim/tmq/insertDataByRunBack.sim
+run_back tsim/sync/insertDataByRunBack.sim
 
 
 print ====> waiting insert thread starting insert data
@@ -222,12 +209,15 @@ endi
 $dnodeId = dnode . $dnodeId
 print ====> stop $dnodeId
 system sh/exec.sh -n $dnodeId -s stop -x SIGINT
+sleep 1000
+print ====> start $dnodeId
+system sh/exec.sh -n $dnodeId -s start
 
 $loop_cnt = 0
 check_vg_ready_2:
 $loop_cnt = $loop_cnt + 1
 sleep 200
-if $loop_cnt == 10 then
+if $loop_cnt == 300 then
   print ====> vgroups switch fail!!!
 	return -1
 endi
@@ -242,38 +232,38 @@ if $data[0][4] == leader then
    if $data[0][6] != NULL then
      goto check_vg_ready_2
    endi
-   if $data[0][8] != NULL then
+   if $data[0][8] != FOLLOWER then
      goto check_vg_ready_2
    endi
-   print ---- vgroup $data[0][0] leader switch to dnode $data[0][3] 
+   print ---- vgroup $dnodeId leader switch to dnode $data[0][3] 
   goto vg_ready_2
 endi
 if $data[0][6] == leader then
    if $data[0][4] != NULL then
      goto check_vg_ready_2
    endi
-   if $data[0][8] != NULL then
+   if $data[0][8] != FOLLOWER then
      goto check_vg_ready_2
    endi    
-   print ---- vgroup $data[0][0] leader switch to dnode $data[0][5] 
+   print ---- vgroup $dnodeId leader switch to dnode $data[0][5] 
   goto vg_ready_2
 endi
 if $data[0][8] == leader then
    if $data[0][4] != NULL then
      goto check_vg_ready_2
    endi
-   if $data[0][6] != NULL then
+   if $data[0][6] != FOLLOWER then
      goto check_vg_ready_2
    endi    
-   print ---- vgroup $data[0][0] leader switch to dnode $data[0][7] 
+   print ---- vgroup $dnodeId leader switch to dnode $data[0][7] 
   goto vg_ready_2
+else 
+  goto check_vg_ready_2
 endi
 vg_ready_2:
 
 $switch_loop_cnt = $switch_loop_cnt + 1
 if $switch_loop_cnt < 3 then
-  print ====> start $dnodeId
-  system sh/exec.sh -n $dnodeId -s start
   goto switch_leader_loop
 endi
 
@@ -347,7 +337,7 @@ if $data[0][4] == leader then
    if $data[0][6] != NULL then
      goto check_vg_ready_1
    endi
-   if $data[0][8] != NULL then
+   if $data[0][8] != FOLLOWER then
      goto check_vg_ready_1
    endi    
   goto vg_ready_1
@@ -356,7 +346,7 @@ if $data[0][6] == leader then
    if $data[0][4] != NULL then
      goto check_vg_ready_1
    endi
-   if $data[0][8] != NULL then
+   if $data[0][8] != FOLLOWER then
      goto check_vg_ready_1
    endi    
   goto vg_ready_1
@@ -365,7 +355,7 @@ if $data[0][8] == leader then
    if $data[0][4] != NULL then
      goto check_vg_ready_1
    endi
-   if $data[0][6] != NULL then
+   if $data[0][6] != FOLLOWER then
      goto check_vg_ready_1
    endi    
   goto vg_ready_1
@@ -394,6 +384,73 @@ if $data[0][0] != $totalRowsOfStb then
   return -1
 endi
 
+print ====> once stop one dnode by loop, and do query every time
+$i = 2
+loop_stop_dnode:
+$dnodeId = dnode . $i
+print ====> stop $dnodeId
+system sh/exec.sh -n $dnodeId -s stop -x SIGINT
+
+check_vg_ready_3:
+sql show vgroups
+print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
+if $data[0][4] == LEADER then
+  if $data[0][6] == LEADER then
+    goto check_vg_ready_3
+  endi
+  if $data[0][8] == LEADER then
+    goto check_vg_ready_3
+  endi
+  print ---- vgroup $data[0][0] leader locating dnode $data[0][5]
+elif $data[0][6] == LEADER then
+  if $data[0][4] == LEADER then
+    goto check_vg_ready_3
+  endi
+  if $data[0][8] == LEADER then
+    goto check_vg_ready_3
+  endi
+  print ---- vgroup $data[0][0] leader locating dnode $data[0][7]
+elif $data[0][8] == LEADER then
+  if $data[0][4] == LEADER then
+    goto check_vg_ready_3
+  endi
+  if $data[0][6] == LEADER then
+    goto check_vg_ready_3
+  endi
+  print ---- vgroup $data[0][0] leader locating dnode $data[0][9]
+else 
+   print ====> no leader vnode!!!
+  return -1 
+endi
+
+sql select count(*) from ntb0
+print rows: $rows 
+print $data[0][0]  $data[0][1]
+if $data[0][0] != $totalRowsOfCtb then 
+  return -1
+endi
+
+sql select count(*) from ctb0
+print rows: $rows 
+print $data[0][0]  $data[0][1]
+if $data[0][0] != $totalRowsOfCtb then 
+  return -1
+endi
+
+sql select count(*) from stb
+print rows: $rows 
+print $data[0][0]  $data[0][1]
+if $data[0][0] != $totalRowsOfStb then 
+  return -1
+endi
+
+$i = $i + 1
+if $i <= 4 then 
+  print ====> start $dnodeId
+  system sh/exec.sh -n $dnodeId -s start
+  goto loop_stop_dnode
+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

tests/system-test/1-insert/test_stmt_insert_query_ex.py

@@ -81,92 +81,8 @@ class TDTestCase:
         print(con)
         return con
         
-    def test_stmt_insert_multi(self,conn):
-        # type: (TaosConnection) -> None
-
-        dbname = "pytest_taos_stmt_multi"
-        try:
-            conn.execute("drop database if exists %s" % dbname)
-            conn.execute("create database if not exists %s" % dbname)
-            conn.select_db(dbname)
-
-            conn.execute(
-                "create table if not exists log(ts timestamp, bo bool, nil tinyint, ti tinyint, si smallint, ii int,\
-                bi bigint, tu tinyint unsigned, su smallint unsigned, iu int unsigned, bu bigint unsigned, \
-                ff float, dd double, bb binary(100), nn nchar(100), tt timestamp)",
-            )
-            # conn.load_table_info("log")
-
-            start = datetime.now()
-            stmt = conn.statement("insert into log values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
-
-            params = new_multi_binds(16)
-            params[0].timestamp((1626861392589, 1626861392590, 1626861392591))
-            params[1].bool((True, None, False))
-            params[2].tinyint([-128, -128, None]) # -128 is tinyint null
-            params[3].tinyint([0, 127, None])
-            params[4].smallint([3, None, 2])
-            params[5].int([3, 4, None])
-            params[6].bigint([3, 4, None])
-            params[7].tinyint_unsigned([3, 4, None])
-            params[8].smallint_unsigned([3, 4, None])
-            params[9].int_unsigned([3, 4, None])
-            params[10].bigint_unsigned([3, 4, None])
-            params[11].float([3, None, 1])
-            params[12].double([3, None, 1.2])
-            params[13].binary(["abc", "dddafadfadfadfadfa", None])
-            params[14].nchar(["涛思数据", None, "a long string with 中文字符"])
-            params[15].timestamp([None, None, 1626861392591])
-            # print(type(stmt))
-            stmt.bind_param_batch(params)
-            stmt.execute()
-            end = datetime.now()
-            print("elapsed time: ", end - start)
-            assert stmt.affected_rows == 3
-            
-            #query
-            querystmt=conn.statement("select ?,bu from log")
-            queryparam=new_bind_params(1)
-            print(type(queryparam))
-            queryparam[0].binary("ts")
-            querystmt.bind_param(queryparam)
-            querystmt.execute() 
-            result=querystmt.use_result()
-            # rows=result.fetch_all()
-            # print( querystmt.use_result())
-
-            # result = conn.query("select * from log")
-            rows=result.fetch_all()
-            # rows=result.fetch_all()
-            print(rows)
-            assert rows[1][0] == "ts"
-            assert rows[0][1] == 3
-
-            #query
-            querystmt1=conn.statement("select * from log where bu < ?")
-            queryparam1=new_bind_params(1)
-            print(type(queryparam1))
-            queryparam1[0].int(4)
-            querystmt1.bind_param(queryparam1)
-            querystmt1.execute() 
-            result1=querystmt1.use_result()
-            rows1=result1.fetch_all()
-            assert str(rows1[0][0]) == "2021-07-21 17:56:32.589000"
-            assert rows1[0][10] == 3
-
-
-            stmt.close()
-
-            # conn.execute("drop database if exists %s" % dbname)
-            conn.close()
-
-        except Exception as err:
-            # conn.execute("drop database if exists %s" % dbname)
-            conn.close()
-            raise err
-        
     def test_stmt_set_tbname_tag(self,conn):
-        dbname = "pytest_taos_stmt_set_tbname_tag"
+        dbname = "stmt_set_tbname_tag"
         
         try:
             conn.execute("drop database if exists %s" % dbname)
@@ -174,16 +90,16 @@ class TDTestCase:
             conn.select_db(dbname)
             conn.execute("create table if not exists log(ts timestamp, bo bool, nil tinyint, ti tinyint, si smallint, ii int,\
                 bi bigint, tu tinyint unsigned, su smallint unsigned, iu int unsigned, bu bigint unsigned, \
-                ff float, dd double, bb binary(100), nn nchar(100), tt timestamp) tags (t1 timestamp, t2 bool,\
+                ff float, dd double, bb binary(100), nn nchar(100), tt timestamp , vc varchar(100)) tags (t1 timestamp, t2 bool,\
                 t3 tinyint, t4 tinyint, t5 smallint, t6 int, t7 bigint, t8 tinyint unsigned, t9 smallint unsigned, \
                 t10 int unsigned, t11 bigint unsigned, t12 float, t13 double, t14 binary(100), t15 nchar(100), t16 timestamp)")
             
             stmt = conn.statement("insert into ? using log tags (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) \
-                values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+                values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
             tags = new_bind_params(16)
             tags[0].timestamp(1626861392589123, PrecisionEnum.Microseconds)
             tags[1].bool(True)
-            tags[2].null()
+            tags[2].bool(False)
             tags[3].tinyint(2)
             tags[4].smallint(3)
             tags[5].int(4)
@@ -198,7 +114,7 @@ class TDTestCase:
             tags[14].nchar("stmt")
             tags[15].timestamp(1626861392589, PrecisionEnum.Milliseconds)
             stmt.set_tbname_tags("tb1", tags)
-            params = new_multi_binds(16)
+            params = new_multi_binds(17)
             params[0].timestamp((1626861392589111,  1626861392590111, 1626861392591111))
             params[1].bool((True, None, False))
             params[2].tinyint([-128, -128, None]) # -128 is tinyint null
@@ -213,25 +129,32 @@ class TDTestCase:
             params[11].float([3, None, 1])
             params[12].double([3, None, 1.2])
             params[13].binary(["abc", "dddafadfadfadfadfa", None])
-            params[14].nchar(["涛思数据", None, "a? long string with 中文字符"])
+            params[14].nchar(["涛思数据", None, "a long string with 中文字符"])
             params[15].timestamp([None, None, 1626861392591])
+            params[16].binary(["涛思数据16", None, "a long string with 中文-字符"])
                      
             stmt.bind_param_batch(params)
             stmt.execute()
 
             assert stmt.affected_rows == 3
 
-            #query
+            #query all 
             querystmt1=conn.statement("select * from log where bu < ?")
             queryparam1=new_bind_params(1)
             print(type(queryparam1))
-            queryparam1[0].int(5)
+            queryparam1[0].int(10)
             querystmt1.bind_param(queryparam1)
             querystmt1.execute() 
             result1=querystmt1.use_result()
             rows1=result1.fetch_all()
-            print("1",rows1)
+            print(rows1[0])
+            print(rows1[1])
+            print(rows1[2])
+            assert str(rows1[0][0]) == "2021-07-21 17:56:32.589111"
+            assert rows1[0][10] == 3
+            assert rows1[1][10] == 4
 
+            #query: Numeric Functions
             querystmt2=conn.statement("select abs(?) from log where bu < ?")
             queryparam2=new_bind_params(2)
             print(type(queryparam2))
@@ -242,6 +165,11 @@ class TDTestCase:
             result2=querystmt2.use_result()
             rows2=result2.fetch_all()
             print("2",rows2)
+            assert rows2[0][0] == 5
+            assert rows2[1][0] == 5
+
+
+            #query: Numeric Functions and escapes
 
             querystmt3=conn.statement("select abs(?) from log where  nn= 'a? long string with 中文字符' ")
             queryparam3=new_bind_params(1)
@@ -252,9 +180,63 @@ class TDTestCase:
             result3=querystmt3.use_result()
             rows3=result3.fetch_all()
             print("3",rows3)
-            # assert str(rows1[0][0]) == "2021-07-21 17:56:32.589111"
+            assert rows3 == []
-            # assert rows1[0][10] == 3
+
-            # assert rows1[1][10] == 4
+            #query: string Functions
+
+            querystmt3=conn.statement("select CHAR_LENGTH(?) from log  ")
+            queryparam3=new_bind_params(1)
+            print(type(queryparam3))
+            queryparam3[0].binary('中文字符')
+            querystmt3.bind_param(queryparam3)
+            querystmt3.execute() 
+            result3=querystmt3.use_result()
+            rows3=result3.fetch_all()
+            print("4",rows3)
+            assert rows3[0][0] == 12, 'fourth case is failed'
+            assert rows3[1][0] == 12, 'fourth case is failed'
+
+            # #query: conversion Functions
+
+            # querystmt4=conn.statement("select cast( ? as bigint) from log  ")
+            # queryparam4=new_bind_params(1)
+            # print(type(queryparam4))
+            # queryparam4[0].binary('1232a')
+            # querystmt4.bind_param(queryparam4)
+            # querystmt4.execute() 
+            # result4=querystmt4.use_result()
+            # rows4=result4.fetch_all()
+            # print("5",rows4)
+            # assert rows4[0][0] == 1232
+            # assert rows4[1][0] == 1232
+
+            # querystmt4=conn.statement("select cast( ? as binary(10)) from log  ")
+            # queryparam4=new_bind_params(1)
+            # print(type(queryparam4))
+            # queryparam4[0].int(123)
+            # querystmt4.bind_param(queryparam4)
+            # querystmt4.execute() 
+            # result4=querystmt4.use_result()
+            # rows4=result4.fetch_all()
+            # print("6",rows4)
+            # assert rows4[0][0] == '123'
+            # assert rows4[1][0] == '123'
+
+            # #query: datatime Functions
+
+            # querystmt4=conn.statement(" select timediff('2021-07-21 17:56:32.590111',?,1s)  from log  ")
+            # queryparam4=new_bind_params(1)
+            # print(type(queryparam4))
+            # queryparam4[0].timestamp(1626861392591111)
+            # querystmt4.bind_param(queryparam4)
+            # querystmt4.execute() 
+            # result4=querystmt4.use_result()
+            # rows4=result4.fetch_all()
+            # print("7",rows4)
+            # assert rows4[0][0] == 1, 'seventh case is failed'
+            # assert rows4[1][0] == 1, 'seventh case is failed'
+            
+            
 
             # conn.execute("drop database if exists %s" % dbname)
             conn.close()
@@ -269,8 +251,6 @@ class TDTestCase:
         config = buildPath+ "../sim/dnode1/cfg/"
         host="localhost"
         connectstmt=self.newcon(host,config)
-        self.test_stmt_insert_multi(connectstmt)
-        connectstmt=self.newcon(host,config)
         self.test_stmt_set_tbname_tag(connectstmt)
 
         return 

tests/system-test/1-insert/test_stmt_muti_insert_query.py

@@ -124,7 +124,7 @@ class TDTestCase:
             print("elapsed time: ", end - start)
             assert stmt.affected_rows == 3
             
-            #query
+            #query 1
             querystmt=conn.statement("select ?,bu from log")
             queryparam=new_bind_params(1)
             print(type(queryparam))
@@ -141,8 +141,9 @@ class TDTestCase:
             print(rows)
             assert rows[1][0] == "ts"
             assert rows[0][1] == 3
+            assert rows[2][1] == None
 
-            #query
+            #query 2
             querystmt1=conn.statement("select * from log where bu < ?")
             queryparam1=new_bind_params(1)
             print(type(queryparam1))

tests/system-test/1-insert/test_stmt_set_tbname_tag.py

@@ -82,7 +82,7 @@ class TDTestCase:
         return con
         
     def test_stmt_set_tbname_tag(self,conn):
-        dbname = "pytest_taos_stmt_set_tbname_tag"
+        dbname = "stmt_set_tbname_tag"
         
         try:
             conn.execute("drop database if exists %s" % dbname)
@@ -99,7 +99,7 @@ class TDTestCase:
             tags = new_bind_params(16)
             tags[0].timestamp(1626861392589123, PrecisionEnum.Microseconds)
             tags[1].bool(True)
-            tags[2].null()
+            tags[2].bool(False)
             tags[3].tinyint(2)
             tags[4].smallint(3)
             tags[5].int(4)
@@ -114,7 +114,7 @@ class TDTestCase:
             tags[14].nchar("stmt")
             tags[15].timestamp(1626861392589, PrecisionEnum.Milliseconds)
             stmt.set_tbname_tags("tb1", tags)
-            params = new_multi_binds(16)
+            params = new_multi_binds(17)
             params[0].timestamp((1626861392589111,  1626861392590111, 1626861392591111))
             params[1].bool((True, None, False))
             params[2].tinyint([-128, -128, None]) # -128 is tinyint null
@@ -129,28 +129,153 @@ class TDTestCase:
             params[11].float([3, None, 1])
             params[12].double([3, None, 1.2])
             params[13].binary(["abc", "dddafadfadfadfadfa", None])
-            params[14].nchar(["涛思数据", None, "a long string with 中文字符"])
+            params[14].nchar(["涛思数据", None, "a long string with 中文?字符"])
             params[15].timestamp([None, None, 1626861392591])
-            params[16].binary(["涛思数据16", None, "a long string with 中文-字符"])
+            params[16].binary(["涛思数据16", None, None])
                      
             stmt.bind_param_batch(params)
             stmt.execute()
 
             assert stmt.affected_rows == 3
 
-            #query
+            #query all 
             querystmt1=conn.statement("select * from log where bu < ?")
             queryparam1=new_bind_params(1)
             print(type(queryparam1))
-            queryparam1[0].int(5)
+            queryparam1[0].int(10)
             querystmt1.bind_param(queryparam1)
             querystmt1.execute() 
             result1=querystmt1.use_result()
             rows1=result1.fetch_all()
-            print(rows1)
+            print(rows1[0])
-            # assert str(rows1[0][0]) == "2021-07-21 17:56:32.589111"
+            print(rows1[1])
-            # assert rows1[0][10] == 3
+            print(rows1[2])
-            # assert rows1[1][10] == 4
+            assert str(rows1[0][0]) == "2021-07-21 17:56:32.589111"
+            assert rows1[0][10] == 3
+            assert rows1[1][10] == 4
+
+            #query: Numeric Functions
+            querystmt2=conn.statement("select abs(?) from log where bu < ?")
+            queryparam2=new_bind_params(2)
+            print(type(queryparam2))
+            queryparam2[0].int(5)
+            queryparam2[1].int(5)
+            querystmt2.bind_param(queryparam2)
+            querystmt2.execute() 
+            result2=querystmt2.use_result()
+            rows2=result2.fetch_all()
+            print("2",rows2)
+            assert rows2[0][0] == 5
+            assert rows2[1][0] == 5
+
+
+            #query: Numeric Functions and escapes
+
+            querystmt3=conn.statement("select abs(?) from log where  nn= 'a? long string with 中文字符' ")
+            queryparam3=new_bind_params(1)
+            print(type(queryparam3))
+            queryparam3[0].int(5)
+            querystmt3.bind_param(queryparam3)
+            querystmt3.execute() 
+            result3=querystmt3.use_result()
+            rows3=result3.fetch_all()
+            print("3",rows3)
+            assert rows3 == []
+
+            # #query: string Functions
+
+            # querystmt3=conn.statement("select CHAR_LENGTH(?) from log  ")
+            # queryparam3=new_bind_params(1)
+            # print(type(queryparam3))
+            # queryparam3[0].binary('中文字符')
+            # querystmt3.bind_param(queryparam3)
+            # querystmt3.execute() 
+            # result3=querystmt3.use_result()
+            # rows3=result3.fetch_all()
+            # print("4",rows3)
+            # assert rows3[0][0] == 12, 'fourth case is failed'
+            # assert rows3[1][0] == 12, 'fourth case is failed'
+
+            # #query: conversion Functions
+
+            # querystmt4=conn.statement("select cast( ? as bigint) from log  ")
+            # queryparam4=new_bind_params(1)
+            # print(type(queryparam4))
+            # queryparam4[0].binary('1232a')
+            # querystmt4.bind_param(queryparam4)
+            # querystmt4.execute() 
+            # result4=querystmt4.use_result()
+            # rows4=result4.fetch_all()
+            # print("5",rows4)
+            # assert rows4[0][0] == 1232
+            # assert rows4[1][0] == 1232
+
+            # querystmt4=conn.statement("select cast( ? as binary(10)) from log  ")
+            # queryparam4=new_bind_params(1)
+            # print(type(queryparam4))
+            # queryparam4[0].int(123)
+            # querystmt4.bind_param(queryparam4)
+            # querystmt4.execute() 
+            # result4=querystmt4.use_result()
+            # rows4=result4.fetch_all()
+            # print("6",rows4)
+            # assert rows4[0][0] == '123'
+            # assert rows4[1][0] == '123'
+
+            # #query: datatime Functions
+
+            # querystmt4=conn.statement(" select timediff('2021-07-21 17:56:32.590111',?,1s)  from log  ")
+            # queryparam4=new_bind_params(1)
+            # print(type(queryparam4))
+            # queryparam4[0].timestamp(1626861392591111)
+            # querystmt4.bind_param(queryparam4)
+            # querystmt4.execute() 
+            # result4=querystmt4.use_result()
+            # rows4=result4.fetch_all()
+            # print("7",rows4)
+            # assert rows4[0][0] == 1, 'seventh case is failed'
+            # assert rows4[1][0] == 1, 'seventh case is failed'
+            
+            #query: aggregate Functions
+
+            querystmt4=conn.statement(" select count(?)  from log  ")
+            queryparam4=new_bind_params(1)
+            print(type(queryparam4))
+            queryparam4[0].int(123)
+            querystmt4.bind_param(queryparam4)
+            querystmt4.execute() 
+            result4=querystmt4.use_result()
+            rows4=result4.fetch_all()
+            print("8",rows4)
+            assert rows4[0][0] == 3, ' 8 case is failed'
+
+            #query: selector Functions 9
+
+            querystmt4=conn.statement("  select bottom(bu,?)  from log group by bu ;  ")
+            queryparam4=new_bind_params(1)
+            print(type(queryparam4))
+            queryparam4[0].int(2)
+            querystmt4.bind_param(queryparam4)
+            querystmt4.execute() 
+            result4=querystmt4.use_result()
+            rows4=result4.fetch_all()
+            print("9",rows4)
+            assert rows4[0][0] == 4, ' 9 case is failed'
+            assert rows4[1][0] == 3, ' 9 case is failed'
+
+            # #query: time-series specific Functions 10
+
+            querystmt4=conn.statement("  select twa(?)  from log;  ")
+            queryparam4=new_bind_params(1)
+            print(type(queryparam4))
+            queryparam4[0].int(15)
+            querystmt4.bind_param(queryparam4)
+            querystmt4.execute() 
+            result4=querystmt4.use_result()
+            rows4=result4.fetch_all()
+            print("10",rows4)
+            assert rows4[0][0] == 15, ' 10 case is failed'
+
 
             # conn.execute("drop database if exists %s" % dbname)
             conn.close()

tests/system-test/2-query/between.py

@@ -143,7 +143,7 @@ class TDTestCase:
         tdSql.checkRows(9)
         tdSql.query("select * from t1 where c5 between 136 and 127")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c5 between '~' and 'ˆ'")
+        tdSql.query("select * from t1 where c5 between '~' and '^'")
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c5 not between 1 and 2")
         # tdSql.checkRows(0)

tests/system-test/2-query/cast.py

@@ -565,7 +565,7 @@ class TDTestCase:
             if data_ct4_c10[i] is None:
                 tdSql.checkData( i, 0, None )
             else:
-                time2str = str(int(datetime.datetime.timestamp(data_ct4_c10[i])*1000))
+                time2str = str(int((data_ct4_c10[i]-datetime.datetime.fromtimestamp(0)).total_seconds()*1000))
                 tdSql.checkData( i, 0, time2str )
         tdSql.query("select cast(c10 as nchar(32)) as b from t1")
         for i in range(len(data_t1_c10)):
@@ -574,7 +574,7 @@ class TDTestCase:
             elif i == 10:
                 continue
             else:
-                time2str = str(int(datetime.datetime.timestamp(data_t1_c10[i])*1000))
+                time2str = str(int((data_t1_c10[i]-datetime.datetime.fromtimestamp(0)).total_seconds()*1000))
                 tdSql.checkData( i, 0, time2str )
 
         tdLog.printNoPrefix("==========step38: cast timestamp to binary, expect no changes ")
@@ -583,7 +583,7 @@ class TDTestCase:
             if data_ct4_c10[i] is None:
                 tdSql.checkData( i, 0, None )
             else:
-                time2str = str(int(datetime.datetime.timestamp(data_ct4_c10[i])*1000))
+                time2str = str(int((data_ct4_c10[i]-datetime.datetime.fromtimestamp(0)).total_seconds()*1000))
                 tdSql.checkData( i, 0, time2str )
         tdSql.query("select cast(c10 as binary(32)) as b from t1")
         for i in range(len(data_t1_c10)):
@@ -592,7 +592,7 @@ class TDTestCase:
             elif i == 10:
                 continue
             else:
-                time2str = str(int(datetime.datetime.timestamp(data_t1_c10[i])*1000))
+                time2str = str(int((data_t1_c10[i]-datetime.datetime.fromtimestamp(0)).total_seconds()*1000))
                 tdSql.checkData( i, 0, time2str )
 
         tdLog.printNoPrefix("==========step39: cast constant operation to bigint, expect change to int ")

tests/system-test/2-query/json_tag.py

@@ -109,9 +109,6 @@ class TDTestCase:
         # print("============== STEP 3 ===== query table")
         # # test error syntax
         tdSql.error("select * from jsons1 where jtag->tag1='beijing'")
-        #tdSql.error("select * from jsons1 where jtag->'location'")
-        #tdSql.error("select * from jsons1 where jtag->''")
-        #tdSql.error("select * from jsons1 where jtag->''=9")
         tdSql.error("select -> from jsons1")
         tdSql.error("select * from jsons1 where contains")
         tdSql.error("select * from jsons1 where jtag->")
@@ -341,6 +338,13 @@ class TDTestCase:
         # tdSql.checkRows(3)
         # tdSql.query("select * from jsons1 where jtag->'tag1' between 'femail' and 'beijing'")
         # tdSql.checkRows(2)
+
+        # test is true
+        tdSql.query("select * from jsons1 where jtag->'location'")
+        tdSql.checkRows(0)
+        tdSql.query("select * from jsons1 where jtag->'tag1'")
+        tdSql.checkRows(3)
+
         #
         # # test with tbname/normal column
         tdSql.query("select * from jsons1 where tbname = 'jsons1_1'")

tests/system-test/test-all.bat

@@ -13,6 +13,9 @@ echo Linux Taosd Test
 for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
     for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
         echo Processing %%i
+        call :GetTimeSeconds %time%
+        set time1=!_timeTemp!
+        echo Start at %time%
         set /a a+=1
         call %%i ARG1 -m %1 > result_!a!.txt 2>error_!a!.txt
         if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) 
@@ -21,7 +24,33 @@ for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
 exit
 
 :colorEcho
+call :GetTimeSeconds %time%
+set time2=%_timeTemp%
+set /a interTime=%time2% - %time1%
+echo End at %time% , cast %interTime%s
 echo off
 <nul set /p ".=%DEL%" > "%~2"
 findstr /v /a:%1 /R "^$" "%~2" nul
 del "%~2" > nul 2>&1i
+goto :eof
+
+:GetTimeSeconds
+set tt=%1
+set tt=%tt:.= %
+set tt=%tt::= %
+set index=1
+for %%a in (%tt%) do (
+    if !index! EQU 1 (
+        set hh=%%a
+    )^
+    else if  !index! EQU 2 (
+        set mm=%%a
+ 
+    )^
+    else if  !index! EQU 3 (
+        set ss=%%a
+    )
+   set /a index=index+1
+)
+set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
+goto :eof

tests/system-test/test.py

@@ -168,7 +168,7 @@ if __name__ == "__main__":
         key_word = 'tdCases.addWindows'
         is_test_framework = 0
         try:
-            if key_word in open(fileName).read():
+            if key_word in open(fileName, encoding='UTF-8').read():
                 is_test_framework = 1
         except:
             pass