Merge branch '3.0' into cpwu/3.0

include/common/tmsg.h

@@ -70,7 +70,7 @@ typedef uint16_t tmsg_t;
 #define TSDB_IE_TYPE_DNODE_EXT   6
 #define TSDB_IE_TYPE_DNODE_STATE 7
 
-enum { CONN_TYPE__QUERY = 1, CONN_TYPE__TMQ, CONN_TYPE__MAX };
+enum { CONN_TYPE__QUERY = 1, CONN_TYPE__TMQ, CONN_TYPE__UDFD, CONN_TYPE__MAX };
 
 enum {
   HEARTBEAT_KEY_USER_AUTHINFO = 1,
@@ -2097,6 +2097,18 @@ enum {
   TOPIC_SUB_TYPE__TABLE,
 };
 
+typedef struct {
+  SMsgHead head;
+  int64_t  leftForVer;
+  int32_t  vgId;
+  int64_t  consumerId;
+  char     subKey[TSDB_SUBSCRIBE_KEY_LEN];
+} SMqVDeleteReq;
+
+typedef struct {
+  int8_t reserved;
+} SMqVDeleteRsp;
+
 typedef struct {
   int64_t leftForVer;
   int32_t vgId;
@@ -2255,20 +2267,22 @@ static FORCE_INLINE void tdDestroyTSma(STSma* pSma) {
   }
 }
 
-static FORCE_INLINE void tdDestroyTSmaWrapper(STSmaWrapper* pSW) {
+static FORCE_INLINE void tdDestroyTSmaWrapper(STSmaWrapper* pSW, bool deepCopy) {
   if (pSW) {
     if (pSW->tSma) {
+      if (deepCopy) {
         for (uint32_t i = 0; i < pSW->number; ++i) {
           tdDestroyTSma(pSW->tSma + i);
         }
+      }
       taosMemoryFreeClear(pSW->tSma);
     }
   }
 }
 
-static FORCE_INLINE void* tdFreeTSmaWrapper(STSmaWrapper* pSW) {
-  tdDestroyTSmaWrapper(pSW);
-  taosMemoryFree(pSW);
+static FORCE_INLINE void* tdFreeTSmaWrapper(STSmaWrapper* pSW, bool deepCopy) {
+  tdDestroyTSmaWrapper(pSW, deepCopy);
+  taosMemoryFreeClear(pSW);
   return NULL;
 }
 
@@ -2532,11 +2546,15 @@ static FORCE_INLINE void tDeleteSMqAskEpRsp(SMqAskEpRsp* pRsp) {
 }
 
 typedef struct {
-  void* data;
+  int64_t streamId;
+  int32_t taskId;
+  int32_t sourceVg;
+  int64_t sourceVer;
+  SArray* data;  // SArray<SSDataBlock>
 } SStreamDispatchReq;
 
 typedef struct {
-  int8_t status;
+  int8_t inputStatus;
 } SStreamDispatchRsp;
 
 #define TD_AUTO_CREATE_TABLE 0x1

include/common/tmsgdef.h

@@ -178,6 +178,7 @@ enum {
   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_RES_READY, "vnode-res-ready", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_TASKS_STATUS, "vnode-tasks-status", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_TASK, "vnode-cancel-task", NULL, NULL)

include/util/taoserror.h

@@ -281,6 +281,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_SUBSCRIBE_NOT_EXIST       TAOS_DEF_ERROR_CODE(0, 0x03E8)
 #define TSDB_CODE_MND_OFFSET_NOT_EXIST          TAOS_DEF_ERROR_CODE(0, 0x03E9)
 #define TSDB_CODE_MND_CONSUMER_NOT_READY        TAOS_DEF_ERROR_CODE(0, 0x03EA)
+#define TSDB_CODE_MND_TOPIC_SUBSCRIBED          TAOS_DEF_ERROR_CODE(0, 0x03EB)
 
 // mnode-stream
 #define TSDB_CODE_MND_STREAM_ALREADY_EXIST      TAOS_DEF_ERROR_CODE(0, 0x03F0)

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

@@ -216,6 +216,7 @@ SArray *mmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_MND_MQ_COMMIT_OFFSET, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_MQ_ASK_EP, mmPutNodeMsgToReadQueue, 0) == NULL) goto _OVER;
   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_MND_CREATE_STREAM, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_DEPLOY_RSP, mmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_GET_DB_CFG, mmPutNodeMsgToReadQueue, 0) == NULL) goto _OVER;

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

@@ -308,6 +308,7 @@ SArray *vmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_VND_DROP_SMA, vmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_SUBMIT_RSMA, vmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_VG_CHANGE, vmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_VND_MQ_VG_DELETE, vmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_CONSUME, vmPutNodeMsgToFetchQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_TASK_DEPLOY, vmPutNodeMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_VND_QUERY_HEARTBEAT, vmPutNodeMsgToFetchQueue, 0) == NULL) goto _OVER;

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

@@ -459,6 +459,7 @@ typedef struct {
   char*          ast;
   char*          physicalPlan;
   SSchemaWrapper schema;
+  int32_t        refConsumerCnt;
 } SMqTopicObj;
 
 typedef struct {

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

@@ -38,6 +38,9 @@ static FORCE_INLINE int32_t mndMakePartitionKey(char *key, const char *cgroup, c
 }
 
 int32_t mndDropOffsetByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb);
+int32_t mndDropOffsetByTopic(SMnode *pMnode, STrans *pTrans, const char *topic);
+
+bool mndOffsetFromTopic(SMqOffsetObj *pOffset, const char *topic);
 
 #ifdef __cplusplus
 }

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

@@ -32,6 +32,7 @@ void             mndReleaseSubscribe(SMnode *pMnode, SMqSubscribeObj *pSub);
 int32_t mndMakeSubscribeKey(char *key, const char *cgroup, const char *topicName);
 
 int32_t mndDropSubByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb);
+int32_t mndDropSubByTopic(SMnode *pMnode, STrans *pTrans, const char *topic);
 
 #ifdef __cplusplus
 }

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

@@ -35,6 +35,8 @@ int32_t mndDropTopicByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb);
 
 const char *mndTopicGetShowName(const char topic[TSDB_TOPIC_FNAME_LEN]);
 
+int32_t mndSetTopicRedoLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -399,6 +399,9 @@ static int32_t mndProcessSubscribeReq(SNodeMsg *pMsg) {
 
   int32_t newTopicNum = taosArrayGetSize(newSub);
   // check topic existance
+  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_SUBSCRIBE, &pMsg->rpcMsg);
+  if (pTrans == NULL) goto SUBSCRIBE_OVER;
+
   for (int32_t i = 0; i < newTopicNum; i++) {
     char        *topic = taosArrayGetP(newSub, i);
     SMqTopicObj *pTopic = mndAcquireTopic(pMnode, topic);
@@ -406,7 +409,14 @@ static int32_t mndProcessSubscribeReq(SNodeMsg *pMsg) {
       terrno = TSDB_CODE_MND_TOPIC_NOT_EXIST;
       goto SUBSCRIBE_OVER;
     }
-    // TODO lock topic to prevent drop
+
+    // ref topic to prevent drop
+    // TODO make topic complete
+    SMqTopicObj topicObj = {0};
+    memcpy(&topicObj, pTopic, sizeof(SMqTopicObj));
+    topicObj.refConsumerCnt = pTopic->refConsumerCnt + 1;
+    if (mndSetTopicRedoLogs(pMnode, pTrans, &topicObj) != 0) goto SUBSCRIBE_OVER;
+
     mndReleaseTopic(pMnode, pTopic);
   }
 
@@ -422,8 +432,6 @@ static int32_t mndProcessSubscribeReq(SNodeMsg *pMsg) {
       taosArrayPush(pConsumerNew->assignedTopics, &newTopicCopy);
     }
 
-    STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_SUBSCRIBE, &pMsg->rpcMsg);
-    if (pTrans == NULL) goto SUBSCRIBE_OVER;
     if (mndSetConsumerCommitLogs(pMnode, pTrans, pConsumerNew) != 0) goto SUBSCRIBE_OVER;
     if (mndTransPrepare(pMnode, pTrans) != 0) goto SUBSCRIBE_OVER;
 
@@ -494,8 +502,6 @@ static int32_t mndProcessSubscribeReq(SNodeMsg *pMsg) {
       goto SUBSCRIBE_OVER;
     }
 
-    STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_SUBSCRIBE, &pMsg->rpcMsg);
-    if (pTrans == NULL) goto SUBSCRIBE_OVER;
     if (mndSetConsumerCommitLogs(pMnode, pTrans, pConsumerNew) != 0) goto SUBSCRIBE_OVER;
     if (mndTransPrepare(pMnode, pTrans) != 0) goto SUBSCRIBE_OVER;
   }
@@ -503,6 +509,8 @@ static int32_t mndProcessSubscribeReq(SNodeMsg *pMsg) {
   code = TSDB_CODE_MND_ACTION_IN_PROGRESS;
 
 SUBSCRIBE_OVER:
+  mndTransDrop(pTrans);
+
   if (pConsumerOld) {
     /*taosRUnLockLatch(&pConsumerOld->lock);*/
     mndReleaseConsumer(pMnode, pConsumerOld);

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

@@ -50,6 +50,14 @@ int32_t mndInitOffset(SMnode *pMnode) {
 
 void mndCleanupOffset(SMnode *pMnode) {}
 
+bool mndOffsetFromTopic(SMqOffsetObj *pOffset, const char *topic) {
+  int32_t i = 0;
+  while (pOffset->key[i] != ':') i++;
+  while (pOffset->key[i] != ':') i++;
+  if (strcmp(&pOffset->key[i + 1], topic) == 0) return true;
+  return false;
+}
+
 SSdbRaw *mndOffsetActionEncode(SMqOffsetObj *pOffset) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
   void   *buf = NULL;
@@ -134,10 +142,11 @@ int32_t mndCreateOffsets(STrans *pTrans, const char *cgroup, const char *topicNa
   int32_t sz = taosArrayGetSize(vgs);
   for (int32_t i = 0; i < sz; i++) {
     int32_t      vgId = *(int32_t *)taosArrayGet(vgs, i);
-    SMqOffsetObj offsetObj;
+    SMqOffsetObj offsetObj = {0};
     if (mndMakePartitionKey(offsetObj.key, cgroup, topicName, vgId) < 0) {
       return -1;
     }
+    // TODO assign db
     offsetObj.offset = -1;
     SSdbRaw *pOffsetRaw = mndOffsetActionEncode(&offsetObj);
     if (pOffsetRaw == NULL) {
@@ -240,6 +249,14 @@ static int32_t mndSetDropOffsetCommitLogs(SMnode *pMnode, STrans *pTrans, SMqOff
   return 0;
 }
 
+static int32_t mndSetDropOffsetRedoLogs(SMnode *pMnode, STrans *pTrans, SMqOffsetObj *pOffset) {
+  SSdbRaw *pRedoRaw = mndOffsetActionEncode(pOffset);
+  if (pRedoRaw == NULL) return -1;
+  if (mndTransAppendRedolog(pTrans, pRedoRaw) != 0) return -1;
+  if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPED) != 0) return -1;
+  return 0;
+}
+
 int32_t mndDropOffsetByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
   int32_t code = -1;
   SSdb   *pSdb = pMnode->pSdb;
@@ -247,7 +264,7 @@ int32_t mndDropOffsetByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
   void         *pIter = NULL;
   SMqOffsetObj *pOffset = NULL;
   while (1) {
-    pIter = sdbFetch(pSdb, SDB_SUBSCRIBE, pIter, (void **)&pOffset);
+    pIter = sdbFetch(pSdb, SDB_OFFSET, pIter, (void **)&pOffset);
     if (pIter == NULL) break;
 
     if (pOffset->dbUid != pDb->uid) {
@@ -256,8 +273,39 @@ int32_t mndDropOffsetByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
     }
 
     if (mndSetDropOffsetCommitLogs(pMnode, pTrans, pOffset) < 0) {
+      sdbRelease(pSdb, pOffset);
+      goto END;
+    }
+
+    sdbRelease(pSdb, pOffset);
+  }
+
+  code = 0;
+END:
+  return code;
+}
+
+int32_t mndDropOffsetByTopic(SMnode *pMnode, STrans *pTrans, const char *topic) {
+  int32_t code = -1;
+  SSdb   *pSdb = pMnode->pSdb;
+
+  void         *pIter = NULL;
+  SMqOffsetObj *pOffset = NULL;
+  while (1) {
+    pIter = sdbFetch(pSdb, SDB_OFFSET, pIter, (void **)&pOffset);
+    if (pIter == NULL) break;
+
+    if (!mndOffsetFromTopic(pOffset, topic)) {
+      sdbRelease(pSdb, pOffset);
+      continue;
+    }
+
+    if (mndSetDropOffsetRedoLogs(pMnode, pTrans, pOffset) < 0) {
+      sdbRelease(pSdb, pOffset);
       goto END;
     }
+
+    sdbRelease(pSdb, pOffset);
   }
 
   code = 0;

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

@@ -530,6 +530,7 @@ static int32_t mndProcessMCreateSmaReq(SNodeMsg *pReq) {
   pStream = mndAcquireStream(pMnode, createReq.name);
   if (pStream != NULL) {
     mError("sma:%s, failed to create since stream:%s already exist", createReq.name, createReq.name);
+    terrno = TSDB_CODE_MND_STREAM_ALREADY_EXIST;
     goto _OVER;
   }
 
@@ -565,7 +566,7 @@ static int32_t mndProcessMCreateSmaReq(SNodeMsg *pReq) {
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
-    mError("sma:%s, failed to create since %s", createReq.name, terrstr());
+    mError("sma:%s, failed to create since %s", createReq.name, terrstr(terrno));
   }
 
   mndReleaseStb(pMnode, pStb);

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

@@ -73,6 +73,7 @@ int32_t mndInitSubscribe(SMnode *pMnode) {
                      .deleteFp = (SdbDeleteFp)mndSubActionDelete};
 
   mndSetMsgHandle(pMnode, TDMT_VND_MQ_VG_CHANGE_RSP, mndProcessSubscribeInternalRsp);
+  mndSetMsgHandle(pMnode, TDMT_VND_MQ_VG_DELETE_RSP, mndProcessSubscribeInternalRsp);
   mndSetMsgHandle(pMnode, TDMT_MND_MQ_DO_REBALANCE, mndProcessRebalanceReq);
 
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_SUBSCRIPTIONS, mndRetrieveSubscribe);
@@ -389,7 +390,7 @@ static int32_t mndDoRebalance(SMnode *pMnode, const SMqRebInputObj *pInput, SMqR
 }
 
 static int32_t mndPersistRebResult(SMnode *pMnode, SNodeMsg *pMsg, const SMqRebOutputObj *pOutput) {
-  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_REBALANCE, &pMsg->rpcMsg);
+  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_REBALANCE, &pMsg->rpcMsg);
   if (pTrans == NULL) {
     return -1;
   }
@@ -458,6 +459,20 @@ static int32_t mndPersistRebResult(SMnode *pMnode, SNodeMsg *pMsg, const SMqRebO
       goto REB_FAIL;
     }
   }
+  if (consumerNum) {
+    char topic[TSDB_TOPIC_FNAME_LEN];
+    char cgroup[TSDB_CGROUP_LEN];
+    mndSplitSubscribeKey(pOutput->pSub->key, topic, cgroup, true);
+    SMqTopicObj *pTopic = mndAcquireTopic(pMnode, topic);
+    if (pTopic) {
+      // TODO make topic complete
+      SMqTopicObj topicObj = {0};
+      memcpy(&topicObj, pTopic, sizeof(SMqTopicObj));
+      topicObj.refConsumerCnt = pTopic->refConsumerCnt - consumerNum;
+      if (mndSetTopicRedoLogs(pMnode, pTrans, &topicObj) != 0) goto REB_FAIL;
+    }
+  }
+
   // 4. TODO commit log: modification log
 
   // 5. set cb
@@ -688,6 +703,14 @@ static int32_t mndProcessSubscribeInternalRsp(SNodeMsg *pRsp) {
   return 0;
 }
 
+static int32_t mndSetDropSubRedoLogs(SMnode *pMnode, STrans *pTrans, SMqSubscribeObj *pSub) {
+  SSdbRaw *pRedoRaw = mndSubActionEncode(pSub);
+  if (pRedoRaw == NULL) return -1;
+  if (mndTransAppendRedolog(pTrans, pRedoRaw) != 0) return -1;
+  if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPED) != 0) return -1;
+  return 0;
+}
+
 static int32_t mndSetDropSubCommitLogs(SMnode *pMnode, STrans *pTrans, SMqSubscribeObj *pSub) {
   SSdbRaw *pCommitRaw = mndSubActionEncode(pSub);
   if (pCommitRaw == NULL) return -1;
@@ -712,6 +735,57 @@ int32_t mndDropSubByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
     }
 
     if (mndSetDropSubCommitLogs(pMnode, pTrans, pSub) < 0) {
+      sdbRelease(pSdb, pSub);
+      goto END;
+    }
+  }
+
+  code = 0;
+END:
+  return code;
+}
+
+int32_t mndDropSubByTopic(SMnode *pMnode, STrans *pTrans, const char *topicName) {
+  int32_t code = -1;
+  SSdb   *pSdb = pMnode->pSdb;
+
+  void            *pIter = NULL;
+  SMqSubscribeObj *pSub = NULL;
+  while (1) {
+    pIter = sdbFetch(pSdb, SDB_SUBSCRIBE, pIter, (void **)&pSub);
+    if (pIter == NULL) break;
+
+    char topic[TSDB_TOPIC_FNAME_LEN];
+    char cgroup[TSDB_CGROUP_LEN];
+    mndSplitSubscribeKey(pSub->key, topic, cgroup, true);
+    if (strcmp(topic, topicName) != 0) {
+      sdbRelease(pSdb, pSub);
+      continue;
+    }
+
+    // iter all vnode to delete handle
+    ASSERT(taosHashGetSize(pSub->consumerHash) == 0);
+    int32_t sz = taosArrayGetSize(pSub->unassignedVgs);
+    for (int32_t i = 0; i < sz; i++) {
+      SMqVgEp       *pVgEp = taosArrayGetP(pSub->unassignedVgs, i);
+      SMqVDeleteReq *pReq = taosMemoryCalloc(1, sizeof(SMqVDeleteReq));
+      pReq->head.vgId = htonl(pVgEp->vgId);
+      pReq->vgId = pVgEp->vgId;
+      pReq->consumerId = -1;
+      memcpy(pReq->subKey, pSub->key, TSDB_SUBSCRIBE_KEY_LEN);
+      STransAction action = {0};
+      action.epSet = pVgEp->epSet;
+      action.pCont = pReq;
+      action.contLen = sizeof(SMqVDeleteReq);
+      action.msgType = TDMT_VND_MQ_VG_DELETE;
+      if (mndTransAppendRedoAction(pTrans, &action) != 0) {
+        taosMemoryFree(pReq);
+        return -1;
+      }
+    }
+
+    if (mndSetDropSubRedoLogs(pMnode, pTrans, pSub) < 0) {
+      sdbRelease(pSdb, pSub);
       goto END;
     }
   }

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

@@ -18,8 +18,10 @@
 #include "mndDb.h"
 #include "mndDnode.h"
 #include "mndMnode.h"
+#include "mndOffset.h"
 #include "mndShow.h"
 #include "mndStb.h"
+#include "mndSubscribe.h"
 #include "mndTrans.h"
 #include "mndUser.h"
 #include "mndVgroup.h"
@@ -106,6 +108,7 @@ SSdbRaw *mndTopicActionEncode(SMqTopicObj *pTopic) {
   taosEncodeSSchemaWrapper(&aswBuf, &pTopic->schema);
   SDB_SET_INT32(pRaw, dataPos, schemaLen, TOPIC_ENCODE_OVER);
   SDB_SET_BINARY(pRaw, dataPos, swBuf, schemaLen, TOPIC_ENCODE_OVER);
+  SDB_SET_INT32(pRaw, dataPos, pTopic->refConsumerCnt, TOPIC_ENCODE_OVER);
 
   SDB_SET_RESERVE(pRaw, dataPos, MND_TOPIC_RESERVE_SIZE, TOPIC_ENCODE_OVER);
   SDB_SET_DATALEN(pRaw, dataPos, TOPIC_ENCODE_OVER);
@@ -190,6 +193,8 @@ SSdbRow *mndTopicActionDecode(SSdbRaw *pRaw) {
     goto TOPIC_DECODE_OVER;
   }
 
+  SDB_GET_INT32(pRaw, dataPos, &pTopic->refConsumerCnt, TOPIC_DECODE_OVER);
+
   SDB_GET_RESERVE(pRaw, dataPos, MND_TOPIC_RESERVE_SIZE, TOPIC_DECODE_OVER);
 
   terrno = TSDB_CODE_SUCCESS;
@@ -220,11 +225,13 @@ static int32_t mndTopicActionUpdate(SSdb *pSdb, SMqTopicObj *pOldTopic, SMqTopic
   atomic_exchange_64(&pOldTopic->updateTime, pNewTopic->updateTime);
   atomic_exchange_32(&pOldTopic->version, pNewTopic->version);
 
-  taosWLockLatch(&pOldTopic->lock);
+  atomic_store_32(&pOldTopic->refConsumerCnt, pNewTopic->refConsumerCnt);
+
+  /*taosWLockLatch(&pOldTopic->lock);*/
 
   // TODO handle update
 
-  taosWUnLockLatch(&pOldTopic->lock);
+  /*taosWUnLockLatch(&pOldTopic->lock);*/
   return 0;
 }
 
@@ -292,6 +299,7 @@ static int32_t mndCreateTopic(SMnode *pMnode, SNodeMsg *pReq, SCMCreateTopicReq
   topicObj.version = 1;
   topicObj.sql = strdup(pCreate->sql);
   topicObj.sqlLen = strlen(pCreate->sql) + 1;
+  topicObj.refConsumerCnt = 0;
 
   if (pCreate->ast && pCreate->ast[0]) {
     topicObj.ast = strdup(pCreate->ast);
@@ -436,15 +444,7 @@ CREATE_TOPIC_OVER:
   return code;
 }
 
-static int32_t mndDropTopic(SMnode *pMnode, SNodeMsg *pReq, SMqTopicObj *pTopic) {
-  // TODO: cannot drop when subscribed
-  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_DROP_TOPIC, &pReq->rpcMsg);
-  if (pTrans == NULL) {
-    mError("topic:%s, failed to drop since %s", pTopic->name, terrstr());
-    return -1;
-  }
-  mDebug("trans:%d, used to drop topic:%s", pTrans->id, pTopic->name);
-
+static int32_t mndDropTopic(SMnode *pMnode, STrans *pTrans, SNodeMsg *pReq, SMqTopicObj *pTopic) {
   SSdbRaw *pRedoRaw = mndTopicActionEncode(pTopic);
   if (pRedoRaw == NULL || mndTransAppendRedolog(pTrans, pRedoRaw) != 0) {
     mError("trans:%d, failed to append redo log since %s", pTrans->id, terrstr());
@@ -465,6 +465,7 @@ static int32_t mndDropTopic(SMnode *pMnode, SNodeMsg *pReq, SMqTopicObj *pTopic)
 
 static int32_t mndProcessDropTopicReq(SNodeMsg *pReq) {
   SMnode        *pMnode = pReq->pNode;
+  SSdb          *pSdb = pMnode->pSdb;
   SMDropTopicReq dropReq = {0};
 
   if (tDeserializeSMDropTopicReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) {
@@ -485,10 +486,35 @@ static int32_t mndProcessDropTopicReq(SNodeMsg *pReq) {
       return -1;
     }
   }
-  // TODO: check ref
 
-  int32_t code = mndDropTopic(pMnode, pReq, pTopic);
-  // TODO: iterate and drop related subscriptions and offsets
+  // check ref
+  if (pTopic->refConsumerCnt != 0) {
+    terrno = TSDB_CODE_MND_TOPIC_SUBSCRIBED;
+    mError("topic:%s, failed to drop since %s", dropReq.name, terrstr());
+    return -1;
+  }
+
+  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_DROP_TOPIC, &pReq->rpcMsg);
+  if (pTrans == NULL) {
+    mError("topic:%s, failed to drop since %s", pTopic->name, terrstr());
+    return -1;
+  }
+
+  mDebug("trans:%d, used to drop topic:%s", pTrans->id, pTopic->name);
+
+#if 1
+  if (mndDropOffsetByTopic(pMnode, pTrans, dropReq.name) < 0) {
+    ASSERT(0);
+    return -1;
+  }
+#endif
+
+  if (mndDropSubByTopic(pMnode, pTrans, dropReq.name) < 0) {
+    ASSERT(0);
+    return -1;
+  }
+
+  int32_t code = mndDropTopic(pMnode, pTrans, pReq, pTopic);
   mndReleaseTopic(pMnode, pTopic);
 
   if (code != 0) {
@@ -577,6 +603,15 @@ static int32_t mndRetrieveTopic(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pB
   return numOfRows;
 }
 
+int32_t mndSetTopicRedoLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic) {
+  SSdbRaw *pRedoRaw = mndTopicActionEncode(pTopic);
+  if (pRedoRaw == NULL) return -1;
+  if (mndTransAppendCommitlog(pTrans, pRedoRaw) != 0) return -1;
+  if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_READY) != 0) return -1;
+
+  return 0;
+}
+
 static int32_t mndSetDropTopicCommitLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic) {
   SSdbRaw *pCommitRaw = mndTopicActionEncode(pTopic);
   if (pCommitRaw == NULL) return -1;

source/dnode/vnode/inc/vnode.h

@@ -196,6 +196,8 @@ struct SMetaEntry {
       STSma *tsma;
     } smaEntry;
   };
+
+  uint8_t *pBuf;
 };
 
 struct SMetaReader {

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

@@ -24,7 +24,6 @@ extern "C" {
 
 typedef struct SMetaIdx    SMetaIdx;
 typedef struct SMetaDB     SMetaDB;
-typedef struct SMSmaCursor SMSmaCursor;
 
 // metaDebug ==================
 // clang-format off
@@ -114,22 +113,12 @@ typedef struct {
   int64_t  smaUid;
 } SSmaIdxKey;
 
-#if 1
-
-SMSmaCursor* metaOpenSmaCursor(SMeta* pMeta, tb_uid_t uid);
-void         metaCloseSmaCursor(SMSmaCursor* pSmaCur);
-int64_t      metaSmaCursorNext(SMSmaCursor* pSmaCur);
-
 #ifndef META_REFACT
 // SMetaDB
 int  metaOpenDB(SMeta* pMeta);
 void metaCloseDB(SMeta* pMeta);
 int  metaSaveTableToDB(SMeta* pMeta, STbCfg* pTbCfg, STbDdlH* pHandle);
 int metaRemoveTableFromDb(SMeta* pMeta, tb_uid_t uid);
-int metaSaveSmaToDB(SMeta* pMeta, STSma* pTbCfg);
-int metaRemoveSmaFromDb(SMeta* pMeta, int64_t indexUid);
-#endif
-
 #endif
 
 #ifdef __cplusplus

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

@@ -218,6 +218,11 @@ static int32_t  tdInitSmaEnv(SSma *pSma, int8_t smaType, const char *path, SDisk
 
 void *tdFreeRSmaInfo(SRSmaInfo *pInfo);
 
+int32_t tdProcessTSmaCreateImpl(SSma *pSma, int64_t version, const char *pMsg);
+int32_t tdUpdateExpiredWindowImpl(SSma *pSma, SSubmitReq *pMsg, int64_t version);
+// TODO: This is the basic params, and should wrap the params to a queryHandle.
+int32_t tdGetTSmaDataImpl(SSma *pSma, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -89,11 +89,13 @@ STSchema*       metaGetTbTSchema(SMeta* pMeta, tb_uid_t uid, int32_t sver);
 int             metaGetTableEntryByName(SMetaReader* pReader, const char* name);
 int             metaGetTbNum(SMeta* pMeta);
 SMCtbCursor*    metaOpenCtbCursor(SMeta* pMeta, tb_uid_t uid);
-void            metaCloseCtbCurosr(SMCtbCursor* pCtbCur);
+void            metaCloseCtbCursor(SMCtbCursor* pCtbCur);
 tb_uid_t        metaCtbCursorNext(SMCtbCursor* pCtbCur);
-SArray*         metaGetSmaTbUids(SMeta* pMeta, bool isDup);
-void*           metaGetSmaInfoByIndex(SMeta* pMeta, int64_t indexUid, bool isDecode);
-STSmaWrapper*   metaGetSmaInfoByTable(SMeta* pMeta, tb_uid_t uid);
+STSma*          metaGetSmaInfoByIndex(SMeta* pMeta, int64_t indexUid);
+STSmaWrapper*   metaGetSmaInfoByTable(SMeta* pMeta, tb_uid_t uid, bool deepCopy);
+SArray*         metaGetSmaIdsByTable(SMeta* pMeta, tb_uid_t uid);
+SArray*         metaGetSmaTbUids(SMeta* pMeta);
+
 int32_t         metaCreateTSma(SMeta* pMeta, int64_t version, SSmaCfg* pCfg);
 int32_t         metaDropTSma(SMeta* pMeta, int64_t indexUid);
 
@@ -116,6 +118,7 @@ void    tqClose(STQ*);
 int     tqPushMsg(STQ*, void* msg, int32_t msgLen, tmsg_t msgType, int64_t ver);
 int     tqCommit(STQ*);
 int32_t tqProcessVgChangeReq(STQ* pTq, char* msg, int32_t msgLen);
+int32_t tqProcessVgDeleteReq(STQ* pTq, char* msg, int32_t msgLen);
 int32_t tqProcessTaskExec(STQ* pTq, char* msg, int32_t msgLen, int32_t workerId);
 int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen);
 int32_t tqProcessStreamTrigger(STQ* pTq, void* data, int32_t dataLen, int32_t workerId);
@@ -126,7 +129,7 @@ int32_t smaOpen(SVnode* pVnode);
 int32_t smaClose(SSma* pSma);
 
 int32_t tdUpdateExpireWindow(SSma* pSma, SSubmitReq* pMsg, int64_t version);
-int32_t tdProcessTSmaCreate(SSma* pSma, char* pMsg);
+int32_t tdProcessTSmaCreate(SSma* pSma, int64_t version, const char* msg);
 int32_t tdProcessTSmaInsert(SSma* pSma, int64_t indexUid, const char* msg);
 
 int32_t tdProcessRSmaCreate(SSma* pSma, SMeta* pMeta, SVCreateStbReq* pReq, SMsgCb* pMsgCb);

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

@@ -69,6 +69,11 @@ int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) {
     if (tDecodeI32v(pCoder, &pME->ntbEntry.ncid) < 0) return -1;
     if (tDecodeSSchemaWrapper(pCoder, &pME->ntbEntry.schema) < 0) return -1;
   } else if (pME->type == TSDB_TSMA_TABLE) {
+    pME->smaEntry.tsma = taosMemoryCalloc(1, sizeof(STSma));
+    if(!pME->smaEntry.tsma) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      return -1;
+    }
     if (tDecodeTSma(pCoder, pME->smaEntry.tsma) < 0) return -1;
   } else {
     ASSERT(0);

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

@@ -225,7 +225,7 @@ SMCtbCursor *metaOpenCtbCursor(SMeta *pMeta, tb_uid_t uid) {
   return pCtbCur;
 }
 
-void metaCloseCtbCurosr(SMCtbCursor *pCtbCur) {
+void metaCloseCtbCursor(SMCtbCursor *pCtbCur) {
   if (pCtbCur) {
     if (pCtbCur->pMeta) metaULock(pCtbCur->pMeta);
     if (pCtbCur->pCur) {
@@ -291,178 +291,268 @@ STSchema *metaGetTbTSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver) {
   return pTSchema;
 }
 
-STSmaWrapper *metaGetSmaInfoByTable(SMeta *pMeta, tb_uid_t uid) {
-#if 0
-#ifdef META_TDB_SMA_TEST
-  STSmaWrapper *pSW = NULL;
+int metaGetTbNum(SMeta *pMeta) {
+  // TODO
+  // ASSERT(0);
+  return 0;
+}
 
-  pSW = taosMemoryCalloc(1, sizeof(*pSW));
-  if (pSW == NULL) {
+typedef struct {
+  SMeta   *pMeta;
+  TDBC    *pCur;
+  tb_uid_t uid;
+  void    *pKey;
+  void    *pVal;
+  int      kLen;
+  int      vLen;
+} SMSmaCursor;
+
+SMSmaCursor *metaOpenSmaCursor(SMeta *pMeta, tb_uid_t uid) {
+  SMSmaCursor *pSmaCur = NULL;
+  SSmaIdxKey   smaIdxKey;
+  int          ret;
+  int          c;
+
+  pSmaCur = (SMSmaCursor *)taosMemoryCalloc(1, sizeof(*pSmaCur));
+  if (pSmaCur == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
     return NULL;
   }
 
-  SMSmaCursor *pCur = metaOpenSmaCursor(pMeta, uid);
-  if (pCur == NULL) {
-    taosMemoryFree(pSW);
+  pSmaCur->pMeta = pMeta;
+  pSmaCur->uid = uid;
+  metaRLock(pMeta);
+
+  ret = tdbDbcOpen(pMeta->pSmaIdx, &pSmaCur->pCur, NULL);
+  if (ret < 0) {
+    metaULock(pMeta);
+    taosMemoryFree(pSmaCur);
     return NULL;
   }
 
-  void       *pBuf = NULL;
-  SSmaIdxKey *pSmaIdxKey = NULL;
+  // move to the suid
+  smaIdxKey.uid = uid;
+  smaIdxKey.smaUid = INT64_MIN;
+  tdbDbcMoveTo(pSmaCur->pCur, &smaIdxKey, sizeof(smaIdxKey), &c);
+  if (c > 0) {
+    tdbDbcMoveToNext(pSmaCur->pCur);
+  }
 
-  while (true) {
-    // TODO: lock during iterate?
-    if (tdbDbcNext(pCur->pCur, &pCur->pKey, &pCur->kLen, NULL, &pCur->vLen) == 0) {
-      pSmaIdxKey = pCur->pKey;
-      ASSERT(pSmaIdxKey != NULL);
+  return pSmaCur;
+}
 
-      void *pSmaVal = metaGetSmaInfoByIndex(pMeta, pSmaIdxKey->smaUid, false);
+void metaCloseSmaCursor(SMSmaCursor *pSmaCur) {
+  if (pSmaCur) {
+    if (pSmaCur->pMeta) metaULock(pSmaCur->pMeta);
+    if (pSmaCur->pCur) {
+      tdbDbcClose(pSmaCur->pCur);
 
-      if (pSmaVal == NULL) {
-        tsdbWarn("no tsma exists for indexUid: %" PRIi64, pSmaIdxKey->smaUid);
-        continue;
+      tdbFree(pSmaCur->pKey);
+      tdbFree(pSmaCur->pVal);
     }
 
-      ++pSW->number;
-      STSma *tptr = (STSma *)taosMemoryRealloc(pSW->tSma, pSW->number * sizeof(STSma));
-      if (tptr == NULL) {
-        tdbFree(pSmaVal);
-        metaCloseSmaCursor(pCur);
-        tdDestroyTSmaWrapper(pSW);
-        taosMemoryFreeClear(pSW);
-        return NULL;
+    taosMemoryFree(pSmaCur);
   }
-      pSW->tSma = tptr;
-      pBuf = pSmaVal;
-      if (tDecodeTSma(pBuf, pSW->tSma + pSW->number - 1) == NULL) {
-        tdbFree(pSmaVal);
-        metaCloseSmaCursor(pCur);
-        tdDestroyTSmaWrapper(pSW);
-        taosMemoryFreeClear(pSW);
+}
+
+tb_uid_t metaSmaCursorNext(SMSmaCursor *pSmaCur) {
+  int         ret;
+  SSmaIdxKey *pSmaIdxKey;
+
+  ret = tdbDbcNext(pSmaCur->pCur, &pSmaCur->pKey, &pSmaCur->kLen, &pSmaCur->pVal, &pSmaCur->vLen);
+  if (ret < 0) {
+    return 0;
+  }
+
+  pSmaIdxKey = pSmaCur->pKey;
+  if (pSmaIdxKey->uid > pSmaCur->uid) {
+    return 0;
+  }
+
+  return pSmaIdxKey->uid;
+}
+
+STSmaWrapper *metaGetSmaInfoByTable(SMeta *pMeta, tb_uid_t uid, bool deepCopy) {
+  STSmaWrapper *pSW = NULL;
+  SArray       *pSmaIds = NULL;
+
+  if (!(pSmaIds = metaGetSmaIdsByTable(pMeta, uid))) {
     return NULL;
   }
-      tdbFree(pSmaVal);
+
+  pSW = taosMemoryCalloc(1, sizeof(*pSW));
+  if (!pSW) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pSW->number = taosArrayGetSize(pSmaIds);
+  pSW->tSma = taosMemoryCalloc(pSW->number, sizeof(STSma));
+
+  if (!pSW->tSma) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  SMSmaCursor *pCur = metaOpenSmaCursor(pMeta, uid);
+  if (pCur == NULL) {
+    goto _err;
+  }
+
+  SMetaReader mr = {0};
+  metaReaderInit(&mr, pMeta, 0);
+  int64_t smaId;
+  int     smaIdx = 0;
+  STSma  *pTSma = NULL;
+  for (int i = 0; i < pSW->number; ++i) {
+    smaId = *(tb_uid_t *)taosArrayGet(pSmaIds, i);
+    if (metaGetTableEntryByUid(&mr, smaId) < 0) {
+      metaWarn("vgId:%d no entry for tbId: %" PRIi64 ", smaId: %" PRIi64, TD_VID(pMeta->pVnode), uid, smaId);
       continue;
     }
-    break;
+    pTSma = pSW->tSma + smaIdx;
+    memcpy(pTSma, mr.me.smaEntry.tsma, sizeof(STSma));
+    if (deepCopy) {
+      if (pTSma->exprLen > 0) {
+        if (!(pTSma->expr = taosMemoryCalloc(1, pTSma->exprLen))) {
+          terrno = TSDB_CODE_OUT_OF_MEMORY;
+          goto _err;
+        }
+        memcpy((void*)pTSma->expr, mr.me.smaEntry.tsma->expr, pTSma->exprLen);
+      }
+      if (pTSma->tagsFilterLen > 0) {
+        if (!(pTSma->tagsFilter = taosMemoryCalloc(1, pTSma->tagsFilterLen))) {
+          terrno = TSDB_CODE_OUT_OF_MEMORY;
+          goto _err;
+        }
+      }
+      memcpy((void*)pTSma->tagsFilter, mr.me.smaEntry.tsma->tagsFilter, pTSma->tagsFilterLen);
+    } else {
+      pTSma->exprLen = 0;
+      pTSma->expr = NULL;
+      pTSma->tagsFilterLen = 0;
+      pTSma->tagsFilter = NULL;
     }
     
-  metaCloseSmaCursor(pCur);
+    ++smaIdx;
+  }
 
-  return pSW;
+  if (smaIdx <= 0) goto _err;
+  pSW->number = smaIdx;
 
-#endif
-#endif
+  metaReaderClear(&mr);
+  taosArrayDestroy(pSmaIds);
+  metaCloseSmaCursor(pCur);
+  return pSW;
+_err:
+  metaReaderClear(&mr);
+  taosArrayDestroy(pSmaIds);
+  metaCloseSmaCursor(pCur);
+  tdFreeTSmaWrapper(pSW, deepCopy);
   return NULL;
 }
 
-int metaGetTbNum(SMeta *pMeta) {
-  // TODO
-  // ASSERT(0);
-  return 0;
+STSma *metaGetSmaInfoByIndex(SMeta *pMeta, int64_t indexUid) {
+  STSma      *pTSma = NULL;
+  SMetaReader mr = {0};
+  metaReaderInit(&mr, pMeta, 0);
+  if (metaGetTableEntryByUid(&mr, indexUid) < 0) {
+    metaWarn("vgId:%d failed to get table entry for smaId: %" PRIi64, TD_VID(pMeta->pVnode), indexUid);
+    metaReaderClear(&mr);
+    return NULL;
+  }
+  pTSma = (STSma *)taosMemoryMalloc(sizeof(STSma));
+  if (!pTSma) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    metaReaderClear(&mr);
+    return NULL;
+  }
+
+  memcpy(pTSma, mr.me.smaEntry.tsma, sizeof(STSma));
+
+  metaReaderClear(&mr);
+  return pTSma;
 }
 
-SArray *metaGetSmaTbUids(SMeta *pMeta, bool isDup) {
-#if 0
-  // TODO
-  // ASSERT(0); // comment this line to pass CI
-  // return NULL:
-#ifdef META_TDB_SMA_TEST
+SArray *metaGetSmaIdsByTable(SMeta *pMeta, tb_uid_t uid) {
   SArray     *pUids = NULL;
-  SMetaDB *pDB = pMeta->pDB;
-  void    *pKey;
+  SSmaIdxKey *pSmaIdxKey = NULL;
 
-  // TODO: lock?
-  SMSmaCursor *pCur = metaOpenSmaCursor(pMeta, 0);
-  if (pCur == NULL) {
+  SMSmaCursor *pCur = metaOpenSmaCursor(pMeta, uid);
+  if (!pCur) {
     return NULL;
   }
-  // TODO: lock?
 
-  SSmaIdxKey *pSmaIdxKey = NULL;
-  tb_uid_t    uid = 0;
-  while (true) {
-    // TODO: lock during iterate?
-    if (tdbDbcNext(pCur->pCur, &pCur->pKey, &pCur->kLen, NULL, &pCur->vLen) == 0) {
-      ASSERT(pSmaIdxKey != NULL);
-      pSmaIdxKey = pCur->pKey;
-
-      if (pSmaIdxKey->uid == 0 || pSmaIdxKey->uid == uid) {
-        continue;
+  while (1) {
+    tb_uid_t id = metaSmaCursorNext(pCur);
+    if (id == 0) {
+      break;
     }
-      uid = pSmaIdxKey->uid;
 
     if (!pUids) {
       pUids = taosArrayInit(16, sizeof(tb_uid_t));
       if (!pUids) {
+        terrno = TSDB_CODE_OUT_OF_MEMORY;
         metaCloseSmaCursor(pCur);
         return NULL;
       }
     }
 
-      taosArrayPush(pUids, &uid);
+    pSmaIdxKey = (SSmaIdxKey *)pCur->pKey;
 
-      continue;
+    if (taosArrayPush(pUids, &pSmaIdxKey->smaUid) < 0) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      metaCloseSmaCursor(pCur);
+      taosArrayDestroy(pUids);
+      return NULL;
     }
-    break;
   }
 
   metaCloseSmaCursor(pCur);
-
   return pUids;
-#endif
-#endif
-  return NULL;
 }
 
-void *metaGetSmaInfoByIndex(SMeta *pMeta, int64_t indexUid, bool isDecode) {
-#if 0
-  // TODO
-  // ASSERT(0);
-  // return NULL;
-#ifdef META_TDB_SMA_TEST
-  SMetaDB *pDB = pMeta->pDB;
-  void    *pKey = NULL;
-  void    *pVal = NULL;
-  int      kLen = 0;
-  int      vLen = 0;
-  int      ret = -1;
-
-  // Set key
-  pKey = (void *)&indexUid;
-  kLen = sizeof(indexUid);
+SArray *metaGetSmaTbUids(SMeta *pMeta) {
+  SArray     *pUids = NULL;
+  SSmaIdxKey *pSmaIdxKey = NULL;
+  tb_uid_t    lastUid = 0;
 
-  // Query
-  ret = tdbDbGet(pDB->pSmaDB, pKey, kLen, &pVal, &vLen);
-  if (ret != 0 || !pVal) {
+  SMSmaCursor *pCur = metaOpenSmaCursor(pMeta, 0);
+  if (!pCur) {
     return NULL;
   }
 
-  if (!isDecode) {
-    // return raw value
-    return pVal;
+  while (1) {
+    tb_uid_t uid = metaSmaCursorNext(pCur);
+    if (uid == 0) {
+      break;
+    }
+
+    if (lastUid == uid) {
+      continue;
     }
 
-  // Decode
-  STSma *pCfg = (STSma *)taosMemoryCalloc(1, sizeof(STSma));
-  if (pCfg == NULL) {
-    taosMemoryFree(pVal);
+    lastUid = uid;
+
+    if (!pUids) {
+      pUids = taosArrayInit(16, sizeof(tb_uid_t));
+      if (!pUids) {
+        terrno = TSDB_CODE_OUT_OF_MEMORY;
+        metaCloseSmaCursor(pCur);
         return NULL;
       }
+    }
 
-  void *pBuf = pVal;
-  if (tDecodeTSma(pBuf, pCfg) == NULL) {
-    tdDestroyTSma(pCfg);
-    taosMemoryFree(pCfg);
-    tdbFree(pVal);
+    if (taosArrayPush(pUids, &uid) < 0) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      metaCloseSmaCursor(pCur);
+      taosArrayDestroy(pUids);
       return NULL;
     }
+  }
 
-  tdbFree(pVal);
-  return pCfg;
-#endif
-#endif
-  return NULL;
+  metaCloseSmaCursor(pCur);
+  return pUids;
 }
 
 #endif

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

@@ -81,55 +81,6 @@ int32_t metaDropTSma(SMeta *pMeta, int64_t indexUid) {
   return TSDB_CODE_SUCCESS;
 }
 
-// static int metaSaveSmaToDB(SMeta *pMeta, STSma *pSmaCfg) {
-//   int32_t ret = 0;
-//   void   *pBuf = NULL, *qBuf = NULL;
-//   void   *key = {0}, *val = {0};
-
-//   // save sma info
-//   int32_t len = tEncodeTSma(NULL, pSmaCfg);
-//   pBuf = taosMemoryCalloc(1, len);
-//   if (pBuf == NULL) {
-//     terrno = TSDB_CODE_OUT_OF_MEMORY;
-//     return -1;
-//   }
-
-//   key = (void *)&pSmaCfg->indexUid;
-//   qBuf = pBuf;
-//   tEncodeTSma(&qBuf, pSmaCfg);
-//   val = pBuf;
-
-//   int32_t kLen = sizeof(pSmaCfg->indexUid);
-//   int32_t vLen = POINTER_DISTANCE(qBuf, pBuf);
-
-//   ret = tdbDbInsert(pMeta->pTbDb, key, kLen, val, vLen, &pMeta->txn);
-//   if (ret < 0) {
-//     taosMemoryFreeClear(pBuf);
-//     return -1;
-//   }
-
-//   // add sma idx
-//   SSmaIdxKey smaIdxKey;
-//   smaIdxKey.uid = pSmaCfg->tableUid;
-//   smaIdxKey.smaUid = pSmaCfg->indexUid;
-//   key = &smaIdxKey;
-//   kLen = sizeof(smaIdxKey);
-//   val = NULL;
-//   vLen = 0;
-
-//   ret = tdbDbInsert(pMeta->pSmaIdx, key, kLen, val, vLen, &pMeta->txn);
-//   if (ret < 0) {
-//     taosMemoryFreeClear(pBuf);
-//     return -1;
-//   }
-
-//   // release
-//   taosMemoryFreeClear(pBuf);
-
-//   return 0;
-// }
-
-
 static int metaSaveSmaToDB(SMeta *pMeta, const SMetaEntry *pME) {
   STbDbKey tbDbKey;
   void    *pKey = NULL;
@@ -182,6 +133,10 @@ static int metaUpdateUidIdx(SMeta *pMeta, const SMetaEntry *pME) {
   return tdbDbInsert(pMeta->pUidIdx, &pME->uid, sizeof(tb_uid_t), &pME->version, sizeof(int64_t), &pMeta->txn);
 }
 
+static int metaUpdateNameIdx(SMeta *pMeta, const SMetaEntry *pME) {
+  return tdbDbInsert(pMeta->pNameIdx, pME->name, strlen(pME->name) + 1, &pME->uid, sizeof(tb_uid_t), &pMeta->txn);
+}
+
 static int metaUpdateSmaIdx(SMeta *pMeta, const SMetaEntry *pME) {
   SSmaIdxKey smaIdxKey = {.uid = pME->smaEntry.tsma->tableUid, .smaUid = pME->smaEntry.tsma->indexUid};
 
@@ -194,9 +149,13 @@ static int metaHandleSmaEntry(SMeta *pMeta, const SMetaEntry *pME) {
   // save to table.db
   if (metaSaveSmaToDB(pMeta, pME) < 0) goto _err;
 
-  // // update uid.idx
+  // update uid.idx
   if (metaUpdateUidIdx(pMeta, pME) < 0) goto _err;
 
+  // update name.idx
+  if (metaUpdateNameIdx(pMeta, pME) < 0) goto _err;
+
+  // update sma.idx
   if (metaUpdateSmaIdx(pMeta, pME) < 0) goto _err;
 
   metaULock(pMeta);

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

@@ -498,6 +498,18 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
 
   entry.version = version;
 
+  // do actual write
+  metaWLock(pMeta);
+
+  // save to table db
+  metaSaveToTbDb(pMeta, &entry);
+
+  tdbDbcUpsert(pUidIdxc, &entry.uid, sizeof(tb_uid_t), &version, sizeof(version), 0);
+
+  metaSaveToSkmDb(pMeta, &entry);
+
+  metaULock(pMeta);
+
   tDecoderClear(&dc);
   tdbDbcClose(pTbDbc);
   tdbDbcClose(pUidIdxc);
@@ -511,8 +523,97 @@ _err:
 }
 
 static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {
-  // TODO
+  SMetaEntry  ctbEntry = {0};
+  SMetaEntry  stbEntry = {0};
+  void       *pVal = NULL;
+  int         nVal = 0;
+  int         ret;
+  int         c;
+  tb_uid_t    uid;
+  int64_t     oversion;
+  const void *pData = NULL;
+  int         nData = 0;
+
+  // search name index
+  ret = tdbDbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
+  if (ret < 0) {
+    terrno = TSDB_CODE_VND_TABLE_NOT_EXIST;
+    return -1;
+  }
+
+  uid = *(tb_uid_t *)pVal;
+  tdbFree(pVal);
+  pVal = NULL;
+
+  // search uid index
+  TDBC *pUidIdxc = NULL;
+
+  tdbDbcOpen(pMeta->pUidIdx, &pUidIdxc, &pMeta->txn);
+  tdbDbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
+  ASSERT(c == 0);
+
+  tdbDbcGet(pUidIdxc, NULL, NULL, &pData, &nData);
+  oversion = *(int64_t *)pData;
+
+  // search table.db
+  TDBC    *pTbDbc = NULL;
+  SDecoder dc = {0};
+
+  /* get ctbEntry */
+  tdbDbcOpen(pMeta->pTbDb, &pTbDbc, &pMeta->txn);
+  tdbDbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
+  ASSERT(c == 0);
+  tdbDbcGet(pTbDbc, NULL, NULL, &pData, &nData);
+
+  ctbEntry.pBuf = taosMemoryMalloc(nData);
+  memcpy(ctbEntry.pBuf, pData, nData);
+  tDecoderInit(&dc, ctbEntry.pBuf, nData);
+  metaDecodeEntry(&dc, &ctbEntry);
+  tDecoderClear(&dc);
+
+  /* get stbEntry*/
+  tdbDbGet(pMeta->pUidIdx, &ctbEntry.ctbEntry.suid, sizeof(tb_uid_t), &pVal, &nVal);
+  tdbDbGet(pMeta->pTbDb, &((STbDbKey){.uid = ctbEntry.ctbEntry.suid, .version = *(int64_t *)pVal}), sizeof(STbDbKey),
+           (void **)&stbEntry.pBuf, &nVal);
+  tdbFree(pVal);
+  tDecoderInit(&dc, stbEntry.pBuf, nVal);
+  metaDecodeEntry(&dc, &stbEntry);
+  tDecoderClear(&dc);
+
+  SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
+  SSchema        *pColumn = NULL;
+  int32_t         iCol = 0;
+  for (;;) {
+    pColumn = NULL;
+
+    if (iCol >= pTagSchema->nCols) break;
+    pColumn = &pTagSchema->pSchema[iCol];
+
+    if (strcmp(pColumn->name, pAlterTbReq->tagName) == 0) break;
+    iCol++;
+  }
+
+  if (pColumn == NULL) {
+    terrno = TSDB_CODE_VND_TABLE_COL_NOT_EXISTS;
+    goto _err;
+  }
+
+  {
+    // TODO:
+  }
+
+  if (ctbEntry.pBuf) taosMemoryFree(ctbEntry.pBuf);
+  if (stbEntry.pBuf) tdbFree(stbEntry.pBuf);
+  tdbDbcClose(pTbDbc);
+  tdbDbcClose(pUidIdxc);
   return 0;
+
+_err:
+  if (ctbEntry.pBuf) taosMemoryFree(ctbEntry.pBuf);
+  if (stbEntry.pBuf) tdbFree(stbEntry.pBuf);
+  tdbDbcClose(pTbDbc);
+  tdbDbcClose(pUidIdxc);
+  return -1;
 }
 
 static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {

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

@@ -27,4 +27,28 @@ int32_t tdProcessTSmaInsert(SSma* pSma, int64_t indexUid, const char* msg) {
   return code;
 }
 
+int32_t tdProcessTSmaCreate(SSma* pSma, int64_t version, const char* msg) {
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  if ((code = tdProcessTSmaCreateImpl(pSma, version, msg)) < 0) {
+    smaWarn("vgId:%d create tsma failed since %s", SMA_VID(pSma), tstrerror(terrno));
+  }
+  // TODO: destroy SSDataBlocks(msg)
+  return code;
+}
 
+int32_t tdUpdateExpireWindow(SSma* pSma, SSubmitReq* pMsg, int64_t version) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  if ((code = tdUpdateExpiredWindowImpl(pSma, pMsg, version)) < 0) {
+    smaWarn("vgId:%d update expired sma window failed since %s", SMA_VID(pSma), tstrerror(terrno));
+  }
+  return code;
+}
+
+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));
+  }
+  return code;
+}

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

@@ -122,12 +122,10 @@ static void poolFree(void *arg, void *ptr) {
 }
 
 int32_t tdInitSma(SSma *pSma) {
-  // tSma
-  int32_t numOfTSma = taosArrayGetSize(metaGetSmaTbUids(SMA_META(pSma), false));
+  int32_t numOfTSma = taosArrayGetSize(metaGetSmaTbUids(SMA_META(pSma)));
   if (numOfTSma > 0) {
     atomic_store_16(&SMA_TSMA_NUM(pSma), (int16_t)numOfTSma);
   }
-  // TODO: rSma
   return TSDB_CODE_SUCCESS;
 }
 

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

@@ -443,7 +443,7 @@ static int32_t tdExecuteRSma(SSma *pSma, const void *pMsg, int32_t inputType, tb
 
   if (inputType == STREAM_DATA_TYPE_SUBMIT_BLOCK) {
     // TODO: use the proper schema instead of 0, and cache STSchema in cache
-    STSchema *pTSchema = metaGetTbTSchema(SMA_META(pSma), suid, 0);
+    STSchema *pTSchema = metaGetTbTSchema(SMA_META(pSma), suid, 1);
     if (!pTSchema) {
       terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION;
       return TSDB_CODE_FAILED;

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

@@ -70,15 +70,15 @@ static bool    tdSetAndOpenTSmaFile(STSmaReadH *pReadH, TSKEY *queryKey);
 static int32_t tdInsertTSmaBlocks(STSmaWriteH *pSmaH, void *smaKey, int32_t keyLen, void *pData, int32_t dataLen,
                                     TXN *txn);
 // expired window
-static int32_t  tdUpdateExpiredWindowImpl(SSma *pSma, SSubmitReq *pMsg, int64_t version);
+
+
 static int32_t  tdSetExpiredWindow(SSma *pSma, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey,
                                      int64_t version);
 static int32_t tdResetExpiredWindow(SSma *pSma, SSmaStat *pStat, int64_t indexUid, TSKEY skey);
 static int32_t tdDropTSmaDataImpl(SSma *pSma, int64_t indexUid);
 
 // read data
-// TODO: This is the basic params, and should wrap the params to a queryHandle.
-static int32_t tdGetTSmaDataImpl(SSma *pSma, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult);
+
 
 // implementation
 
@@ -713,7 +713,7 @@ static int32_t tdDropTSmaDataImpl(SSma *pSma, int64_t indexUid) {
  * @param nMaxResult The query invoker should control the nMaxResult need to return to avoid OOM.
  * @return int32_t
  */
-static int32_t tdGetTSmaDataImpl(SSma *pSma, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult) {
+int32_t tdGetTSmaDataImpl(SSma *pSma, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult) {
   SSmaEnv  *pEnv = atomic_load_ptr(&SMA_TSMA_ENV(pSma));
   SSmaStat *pStat = NULL;
 
@@ -834,35 +834,15 @@ static int32_t tdGetTSmaDataImpl(SSma *pSma, char *pData, int64_t indexUid, TSKE
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tdProcessTSmaCreate(SSma *pSma, char *pMsg) {
-  #if 0
-  SSmaCfg vCreateSmaReq = {0};
-  if (!tDeserializeSVCreateTSmaReq(pMsg, &vCreateSmaReq)) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    smaWarn("vgId:%d tsma create msg received but deserialize failed since %s", SMA_VID(pSma), terrstr(terrno));
-    return -1;
-  }
-
-  smaDebug("vgId:%d tsma create msg %s:%" PRIi64 " for table %" PRIi64 " received", SMA_VID(pSma),
-            vCreateSmaReq.tSma.indexName, vCreateSmaReq.tSma.indexUid, vCreateSmaReq.tSma.tableUid);
+int32_t tdProcessTSmaCreateImpl(SSma *pSma, int64_t version, const char *pMsg) {
+  SSmaCfg *pCfg = (SSmaCfg *)pMsg;
 
-  // record current timezone of server side
-  vCreateSmaReq.tSma.timezoneInt = tsTimezone;
-
-  if (metaCreateTSma(SMA_META(pSma), &vCreateSmaReq) < 0) {
-    // TODO: handle error
-    smaWarn("vgId:%d tsma %s:%" PRIi64 " create failed for table %" PRIi64 " since %s", SMA_VID(pSma),
-             vCreateSmaReq.tSma.indexName, vCreateSmaReq.tSma.indexUid, vCreateSmaReq.tSma.tableUid, terrstr(terrno));
-    tdDestroyTSma(&vCreateSmaReq.tSma);
+  if (metaCreateTSma(SMA_META(pSma), version, pCfg) < 0) {
     return -1;
   }
 
   tdTSmaAdd(pSma, 1);
-
-  tdDestroyTSma(&vCreateSmaReq.tSma);
-  // TODO: return directly or go on follow steps?
-#endif
-  return TSDB_CODE_SUCCESS;
+  return 0;
 }
 
 int32_t tdDropTSma(SSma *pSma, char *pMsg) {
@@ -930,7 +910,7 @@ static int32_t tdSetExpiredWindow(SSma *pSma, SHashObj *pItemsHash, int64_t inde
     }
 
     // cache smaMeta
-    STSma *pTSma = metaGetSmaInfoByIndex(SMA_META(pSma), indexUid, true);
+    STSma *pTSma = metaGetSmaInfoByIndex(SMA_META(pSma), indexUid);
     if (!pTSma) {
       terrno = TSDB_CODE_TDB_NO_SMA_INDEX_IN_META;
       taosHashCleanup(pItem->expiredWindows);
@@ -1031,25 +1011,25 @@ int32_t tdUpdateExpiredWindowImpl(SSma *pSma, SSubmitReq *pMsg, int64_t version)
 
     SSubmitBlkIter blkIter = {0};
     if (tInitSubmitBlkIter(&msgIter, pBlock, &blkIter) < 0) {
-      pSW = tdFreeTSmaWrapper(pSW);
+      pSW = tdFreeTSmaWrapper(pSW, false);
       break;
     }
 
     while (true) {
       STSRow *row = tGetSubmitBlkNext(&blkIter);
       if (!row) {
-        tdFreeTSmaWrapper(pSW);
+        pSW = tdFreeTSmaWrapper(pSW, false);
         break;
       }
-      if (!pSW || (pTSma->tableUid != pBlock->suid)) {
+      if (!pSW || (pTSma->tableUid != msgIter.suid)) {
         if (pSW) {
-          pSW = tdFreeTSmaWrapper(pSW);
+          pSW = tdFreeTSmaWrapper(pSW, false);
         }
-        if (!(pSW = metaGetSmaInfoByTable(SMA_META(pSma), pBlock->suid))) {
+        if (!(pSW = metaGetSmaInfoByTable(SMA_META(pSma), msgIter.suid, false))) {
           break;
         }
         if ((pSW->number) <= 0 || !pSW->tSma) {
-          pSW = tdFreeTSmaWrapper(pSW);
+          pSW = tdFreeTSmaWrapper(pSW, false);
           break;
         }
 
@@ -1068,6 +1048,7 @@ int32_t tdUpdateExpiredWindowImpl(SSma *pSma, SSubmitReq *pMsg, int64_t version)
       if (lastWinSKey != winSKey) {
         lastWinSKey = winSKey;
         if (tdSetExpiredWindow(pSma, pItemsHash, pTSma->indexUid, winSKey, version) < 0) {
+          pSW = tdFreeTSmaWrapper(pSW, false);
           tdUnRefSmaStat(pSma, pStat);
           return TSDB_CODE_FAILED;
         }
@@ -1083,21 +1064,3 @@ int32_t tdUpdateExpiredWindowImpl(SSma *pSma, SSubmitReq *pMsg, int64_t version)
   return TSDB_CODE_SUCCESS;
 }
 
-
-int32_t tdUpdateExpireWindow(SSma *pSma, SSubmitReq *pMsg, int64_t version) {
-  int32_t code = TSDB_CODE_SUCCESS;
-  if ((code = tdUpdateExpiredWindowImpl(pSma, pMsg, version)) < 0) {
-    smaWarn("vgId:%d update expired sma window failed since %s", SMA_VID(pSma), tstrerror(terrno));
-  }
-  return code;
-}
-
-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));
-  }
-  return code;
-}
-
-

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

@@ -861,6 +861,14 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
 }
 #endif
 
+int32_t tqProcessVgDeleteReq(STQ* pTq, char* msg, int32_t msgLen) {
+  SMqVDeleteReq* pReq = (SMqVDeleteReq*)msg;
+
+  int32_t code = taosHashRemove(pTq->execs, pReq->subKey, strlen(pReq->subKey));
+  ASSERT(code == 0);
+  return 0;
+}
+
 // TODO: persist meta into tdb
 int32_t tqProcessVgChangeReq(STQ* pTq, char* msg, int32_t msgLen) {
   SMqRebVgReq req = {0};
@@ -1087,35 +1095,6 @@ int32_t tqProcessStreamTrigger2(STQ* pTq, SSubmitReq* pReq, int64_t ver) {
 }
 
 int32_t tqProcessTaskExec2(STQ* pTq, char* msg, int32_t msgLen) {
-  SStreamTaskExecReq req = {0};
-  tDecodeSStreamTaskExecReq(msg, &req);
-  int32_t taskId = req.taskId;
-
-  SStreamTask* pTask = taosHashGet(pTq->pStreamTasks, &taskId, sizeof(int32_t));
-  ASSERT(pTask);
-  ASSERT(pTask->inputType == TASK_INPUT_TYPE__DATA_BLOCK);
-
-  // enqueue
-  int32_t inputStatus = streamEnqueueDataBlk(pTask, (SStreamDataBlock*)req.data);
-  if (inputStatus == TASK_INPUT_STATUS__BLOCKED) {
-    // TODO rsp blocked
-    return 0;
-  }
-
-  // try exec
-  int8_t execStatus = atomic_val_compare_exchange_8(&pTask->status, TASK_STATUS__IDLE, TASK_STATUS__EXECUTING);
-  if (execStatus == TASK_STATUS__IDLE) {
-    if (streamTaskRun(pTask) < 0) {
-      atomic_store_8(&pTask->status, TASK_STATUS__CLOSING);
-
-      goto FAIL;
-    }
-  } else if (execStatus == TASK_STATUS__EXECUTING) {
-    return 0;
-  }
-
-  // TODO rsp success
+  //
   return 0;
-FAIL:
-  return -1;
 }

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

@@ -2760,7 +2760,7 @@ static int32_t getAllTableList(SMeta* pMeta, uint64_t uid, SArray* list) {
     taosArrayPush(list, &info);
   }
 
-  metaCloseCtbCurosr(pCur);
+  metaCloseCtbCursor(pCur);
   return TSDB_CODE_SUCCESS;
 }
 

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

@@ -101,6 +101,11 @@ int vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRpcMsg
         // TODO: handle error
       }
       break;
+    case TDMT_VND_MQ_VG_DELETE:
+      if (tqProcessVgDeleteReq(pVnode->pTq, pMsg->pCont, pMsg->contLen) < 0) {
+        // TODO: handle error
+      }
+      break;
     case TDMT_VND_TASK_DEPLOY: {
       if (tqProcessTaskDeploy(pVnode->pTq, POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead)),
                               pMsg->contLen - sizeof(SMsgHead)) < 0) {
@@ -462,7 +467,11 @@ _exit:
 
 static int vnodeProcessAlterTbReq(SVnode *pVnode, int64_t version, void *pReq, int32_t len, SRpcMsg *pRsp) {
   SVAlterTbReq vAlterTbReq = {0};
+  SVAlterTbRsp vAlterTbRsp = {0};
   SDecoder     dc = {0};
+  int          rcode = 0;
+  int          ret;
+  SEncoder     ec = {0};
 
   pRsp->msgType = TDMT_VND_ALTER_TABLE_RSP;
   pRsp->pCont = NULL;
@@ -473,19 +482,27 @@ static int vnodeProcessAlterTbReq(SVnode *pVnode, int64_t version, void *pReq, i
 
   // decode
   if (tDecodeSVAlterTbReq(&dc, &vAlterTbReq) < 0) {
-    pRsp->code = TSDB_CODE_INVALID_MSG;
+    vAlterTbRsp.code = TSDB_CODE_INVALID_MSG;
     tDecoderClear(&dc);
-    return -1;
+    rcode = -1;
+    goto _exit;
   }
 
   // process
   if (metaAlterTable(pVnode->pMeta, version, &vAlterTbReq) < 0) {
-    pRsp->code = terrno;
+    vAlterTbRsp.code = TSDB_CODE_INVALID_MSG;
     tDecoderClear(&dc);
-    return -1;
+    rcode = -1;
+    goto _exit;
   }
-
   tDecoderClear(&dc);
+
+_exit:
+  tEncodeSize(tEncodeSVAlterTbRsp, &vAlterTbRsp, pRsp->contLen, ret);
+  pRsp->pCont = rpcMallocCont(pRsp->contLen);
+  tEncoderInit(&ec, pRsp->pCont, pRsp->contLen);
+  tEncodeSVAlterTbRsp(&ec, &vAlterTbRsp);
+  tEncoderClear(&ec);
   return 0;
 }
 
@@ -711,15 +728,22 @@ static int vnodeProcessCreateTSmaReq(SVnode *pVnode, int64_t version, void *pReq
     goto _err;
   }
 
-  if (metaCreateTSma(pVnode->pMeta, version, &req) < 0) {
+  // record current timezone of server side
+  req.timezoneInt = tsTimezone;
+
+  if (tdProcessTSmaCreate(pVnode->pSma, version, (const char *)&req) < 0) {
     pRsp->code = terrno;
     goto _err;
   }
 
   tDecoderClear(&coder);
+  vDebug("vgId:%d success to create tsma %s:%" PRIi64 " for table %" PRIi64, TD_VID(pVnode), req.indexName,
+         req.indexUid, req.tableUid);
   return 0;
 
 _err:
   tDecoderClear(&coder);
+  vError("vgId:%d failed to create tsma %s:%" PRIi64 " for table %" PRIi64 " since %s", TD_VID(pVnode), req.indexName,
+         req.indexUid, req.tableUid, terrstr(terrno));
   return -1;
 }

source/libs/function/inc/builtinsimpl.h

@@ -105,7 +105,12 @@ int32_t mavgFunction(SqlFunctionCtx* pCtx);
 bool getSampleFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
 bool sampleFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t sampleFunction(SqlFunctionCtx* pCtx);
-int32_t sampleFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
+//int32_t sampleFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
+
+bool getTailFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
+bool tailFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t tailFunction(SqlFunctionCtx* pCtx);
+int32_t tailFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 
 bool getSelectivityFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv);
 

source/libs/function/src/builtins.c

@@ -386,6 +386,35 @@ static int32_t translateSample(SFunctionNode* pFunc, char* pErrBuf, int32_t len)
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t translateTail(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
+  int32_t numOfParams = LIST_LENGTH(pFunc->pParameterList);
+  if (2 != numOfParams && 3 != numOfParams) {
+    return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+
+  SNode* pPara = nodesListGetNode(pFunc->pParameterList, 0);
+  if (QUERY_NODE_COLUMN != nodeType(pPara)) {
+    return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+                           "The input parameter of TAIL function can only be column");
+  }
+
+  for (int32_t i = 1; i < numOfParams; ++i) {
+    uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, i))->resType.type;
+    if (!IS_INTEGER_TYPE(paraType)) {
+      return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
+    }
+  }
+
+  SExprNode* pCol = (SExprNode*)nodesListGetNode(pFunc->pParameterList, 0);
+  uint8_t colType = pCol->resType.type;
+  if (IS_VAR_DATA_TYPE(colType)) {
+    pFunc->node.resType = (SDataType){.bytes = pCol->resType.bytes, .type = colType};
+  } else {
+    pFunc->node.resType = (SDataType){.bytes = tDataTypes[colType].bytes, .type = colType};
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t translateLastRow(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
   // todo
   return TSDB_CODE_SUCCESS;
@@ -850,6 +879,16 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .processFunc  = sampleFunction,
     .finalizeFunc = NULL
   },
+  {
+    .name = "tail",
+    .type = FUNCTION_TYPE_TAIL,
+    .classification = FUNC_MGT_NONSTANDARD_SQL_FUNC | FUNC_MGT_TIMELINE_FUNC,
+    .translateFunc = translateTail,
+    .getEnvFunc   = getTailFuncEnv,
+    .initFunc     = tailFunctionSetup,
+    .processFunc  = tailFunction,
+    .finalizeFunc = tailFinalize
+  },
   {
     .name = "abs",
     .type = FUNCTION_TYPE_ABS,

source/libs/function/src/builtinsimpl.c

@@ -18,12 +18,15 @@
 #include "function.h"
 #include "querynodes.h"
 #include "taggfunction.h"
+#include "tcompare.h"
 #include "tdatablock.h"
 #include "tpercentile.h"
 
 #define HISTOGRAM_MAX_BINS_NUM   1000
 #define MAVG_MAX_POINTS_NUM      1000
 #define SAMPLE_MAX_POINTS_NUM    1000
+#define TAIL_MAX_POINTS_NUM      100
+#define TAIL_MAX_OFFSET          100
 
 typedef struct SSumRes {
   union {
@@ -161,6 +164,21 @@ typedef struct SSampleInfo {
   int64_t *timestamp;
 } SSampleInfo;
 
+typedef struct STailItem {
+  int64_t timestamp;
+  bool    isNull;
+  char    data[];
+} STailItem;
+
+typedef struct STailInfo {
+  int32_t   numOfPoints;
+  int32_t   numAdded;
+  int32_t   offset;
+  uint8_t   colType;
+  int16_t   colBytes;
+  STailItem **pItems;
+} STailInfo;
+
 #define SET_VAL(_info, numOfElem, res) \
   do {                                 \
     if ((numOfElem) <= 0) {            \
@@ -3107,7 +3125,7 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) {
 
   int32_t startOffset = pCtx->offset;
   for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; i += 1) {
-    if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
+    if (colDataIsNull_s(pInputCol, i)) {
       //colDataAppendNULL(pOutput, i);
       continue;
     }
@@ -3141,3 +3159,132 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) {
 //
 //  return pResInfo->numOfRes;
 //}
+
+
+bool getTailFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
+  SColumnNode* pCol = (SColumnNode*)nodesListGetNode(pFunc->pParameterList, 0);
+  SValueNode*  pVal = (SValueNode*)nodesListGetNode(pFunc->pParameterList, 1);
+  int32_t numOfPoints = pVal->datum.i;
+  pEnv->calcMemSize = sizeof(STailInfo) + numOfPoints * (POINTER_BYTES + sizeof(STailItem) + pCol->node.resType.bytes);
+  return true;
+}
+
+bool tailFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo *pResultInfo) {
+  if (!functionSetup(pCtx, pResultInfo)) {
+    return false;
+  }
+
+  STailInfo *pInfo = GET_ROWCELL_INTERBUF(pResultInfo);
+  pInfo->numAdded = 0;
+  pInfo->numOfPoints = pCtx->param[1].param.i;
+  if (pCtx->numOfParams == 4) {
+    pInfo->offset = pCtx->param[2].param.i;
+  } else {
+    pInfo->offset = 0;
+  }
+  pInfo->colType = pCtx->resDataInfo.type;
+  pInfo->colBytes = pCtx->resDataInfo.bytes;
+  if ((pInfo->numOfPoints < 1 || pInfo->numOfPoints > TAIL_MAX_POINTS_NUM) ||
+      (pInfo->numOfPoints < 0 || pInfo->numOfPoints > TAIL_MAX_OFFSET)) {
+    return false;
+  }
+
+  pInfo->pItems = (STailItem **)((char *)pInfo + sizeof(STailInfo));
+  char *pItem = (char *)pInfo->pItems + pInfo->numOfPoints * POINTER_BYTES;
+
+  size_t unitSize = sizeof(STailItem) + pInfo->colBytes;
+  for (int32_t i = 0; i < pInfo->numOfPoints; ++i) {
+    pInfo->pItems[i] = (STailItem *)(pItem + i * unitSize);
+    pInfo->pItems[i]->isNull = false;
+  }
+
+  return true;
+}
+
+static void tailAssignResult(STailItem* pItem, char *data, int32_t colBytes, TSKEY ts, bool isNull) {
+  pItem->timestamp = ts;
+  if (isNull) {
+    pItem->isNull = true;
+  } else {
+    memcpy(pItem->data, data, colBytes);
+  }
+}
+
+static int32_t tailCompFn(const void *p1, const void *p2, const void *param) {
+  STailItem *d1 = *(STailItem **)p1;
+  STailItem *d2 = *(STailItem **)p2;
+  return compareInt64Val(&d1->timestamp, &d2->timestamp);
+}
+
+static void doTailAdd(STailInfo* pInfo, char *data, TSKEY ts, bool isNull) {
+  STailItem **pList = pInfo->pItems;
+  if (pInfo->numAdded < pInfo->numOfPoints) {
+    tailAssignResult(pList[pInfo->numAdded], data, pInfo->colBytes, ts, isNull);
+    taosheapsort((void *)pList, sizeof(STailItem **), pInfo->numAdded + 1, NULL, tailCompFn, 0);
+    pInfo->numAdded++;
+  } else if (pList[0]->timestamp < ts) {
+    tailAssignResult(pList[0], data, pInfo->colBytes, ts, isNull);
+    taosheapadjust((void *)pList, sizeof(STailItem **), 0, pInfo->numOfPoints - 1, NULL, tailCompFn, NULL, 0);
+  }
+}
+
+int32_t tailFunction(SqlFunctionCtx* pCtx) {
+  SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
+  STailInfo*         pInfo = GET_ROWCELL_INTERBUF(pResInfo);
+
+  SInputColumnInfoData* pInput = &pCtx->input;
+  TSKEY* tsList = (int64_t*)pInput->pPTS->pData;
+
+  SColumnInfoData* pInputCol = pInput->pData[0];
+  SColumnInfoData* pTsOutput = pCtx->pTsOutput;
+  SColumnInfoData* pOutput = (SColumnInfoData*)pCtx->pOutput;
+
+  int32_t startOffset = pCtx->offset;
+  if (pInfo->offset >= pInput->numOfRows) {
+    return 0;
+  } else {
+    pInfo->numOfPoints = MIN(pInfo->numOfPoints, pInput->numOfRows - pInfo->offset);
+  }
+  for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex - pInfo->offset; i += 1) {
+
+    char* data = colDataGetData(pInputCol, i);
+    doTailAdd(pInfo, data, tsList[i], colDataIsNull_s(pInputCol, i));
+  }
+
+  taosqsort(pInfo->pItems, pInfo->numOfPoints, POINTER_BYTES, NULL, tailCompFn);
+
+  for (int32_t i = 0; i < pInfo->numOfPoints; ++i) {
+    int32_t pos = startOffset + i;
+    STailItem *pItem = pInfo->pItems[i];
+    if (pItem->isNull) {
+      colDataAppendNULL(pOutput, pos);
+    } else {
+      colDataAppend(pOutput, pos, pItem->data, false);
+    }
+  }
+
+  return pInfo->numOfPoints;
+}
+
+int32_t tailFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+  SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
+  STailInfo*                pInfo = GET_ROWCELL_INTERBUF(pEntryInfo);
+  pEntryInfo->complete = true;
+
+  int32_t type = pCtx->input.pData[0]->info.type;
+  int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
+
+  SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
+
+  // todo assign the tag value and the corresponding row data
+  int32_t currentRow = pBlock->info.rows;
+  for (int32_t i = 0; i < pEntryInfo->numOfRes; ++i) {
+    STailItem *pItem = pInfo->pItems[i];
+    colDataAppend(pCol, currentRow, pItem->data, false);
+
+    //setSelectivityValue(pCtx, pBlock, &pInfo->pItems[i].tuplePos, currentRow);
+    currentRow += 1;
+  }
+
+  return pEntryInfo->numOfRes;
+}

source/libs/function/src/tudf.c

@@ -312,6 +312,7 @@ typedef struct SUdfcFuncStub {
   char udfName[TSDB_FUNC_NAME_LEN];
   UdfcFuncHandle handle;
   int32_t refCount;
+  int64_t lastRefTime;
 } SUdfcFuncStub;
 
 typedef struct SUdfcProxy {
@@ -1446,6 +1447,7 @@ int32_t accquireUdfFuncHandle(char* udfName, UdfcFuncHandle* pHandle) {
     uv_mutex_unlock(&gUdfdProxy.udfStubsMutex);
     *pHandle = foundStub->handle;
     ++foundStub->refCount;
+    foundStub->lastRefTime = taosGetTimestampUs();
     return 0;
   }
   *pHandle = NULL;
@@ -1455,6 +1457,7 @@ int32_t accquireUdfFuncHandle(char* udfName, UdfcFuncHandle* pHandle) {
     strcpy(stub.udfName, udfName);
     stub.handle = *pHandle;
     ++stub.refCount;
+    stub.lastRefTime = taosGetTimestampUs();
     taosArrayPush(gUdfdProxy.udfStubs, &stub);
     taosArraySort(gUdfdProxy.udfStubs, compareUdfcFuncSub);
   } else {
@@ -1662,7 +1665,8 @@ int32_t cleanUpUdfs() {
       fnInfo("tear down udf. udf name: %s, handle: %p", stub->udfName, stub->handle);
       doTeardownUdf(stub->handle);
     } else {
-      fnInfo("udf still in use. udf name: %s, ref count: %d, handle: %p", stub->udfName, stub->refCount, stub->handle);
+      fnInfo("udf still in use. udf name: %s, ref count: %d, last ref time: %"PRId64", handle: %p",
+             stub->udfName, stub->refCount, stub->lastRefTime, stub->handle);
       taosArrayPush(udfStubs, stub);
     }
     ++i;

source/libs/function/src/udfd.c

@@ -485,7 +485,146 @@ void udfdIntrSignalHandler(uv_signal_t *handle, int signum) {
   uv_stop(global.loop);
 }
 
-void udfdProcessRpcRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) { return; }
+typedef enum EUdfdRpcReqRspType {
+  UDFD_RPC_MNODE_CONNECT = 0,
+  UDFD_RPC_RETRIVE_FUNC,
+} EUdfdRpcReqRspType;
+
+typedef struct SUdfdRpcSendRecvInfo {
+  EUdfdRpcReqRspType rpcType;
+  int32_t code;
+  void* param;
+  uv_sem_t resultSem;
+} SUdfdRpcSendRecvInfo;
+
+
+void udfdProcessRpcRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
+  SUdfdRpcSendRecvInfo *msgInfo = (SUdfdRpcSendRecvInfo *)pMsg->ahandle;
+  ASSERT(pMsg->ahandle != NULL);
+
+  if (pEpSet) {
+    if (!isEpsetEqual(&global.mgmtEp.epSet, pEpSet)) {
+      updateEpSet_s(&global.mgmtEp, pEpSet);
+    }
+  }
+
+  if (pMsg->code != TSDB_CODE_SUCCESS) {
+    fnError("udfd rpc error. code: %s", tstrerror(pMsg->code));
+    msgInfo->code = pMsg->code;
+    goto _return;
+  }
+
+  if (msgInfo->rpcType == UDFD_RPC_MNODE_CONNECT) {
+    SConnectRsp connectRsp = {0};
+    tDeserializeSConnectRsp(pMsg->pCont, pMsg->contLen, &connectRsp);
+    if (connectRsp.epSet.numOfEps == 0) {
+      msgInfo->code = TSDB_CODE_MND_APP_ERROR;
+      goto _return;
+    }
+
+    if (connectRsp.dnodeNum > 1 && !isEpsetEqual(&global.mgmtEp.epSet, &connectRsp.epSet)) {
+      updateEpSet_s(&global.mgmtEp, &connectRsp.epSet);
+    }
+    msgInfo->code = 0;
+  } else if (msgInfo->rpcType == UDFD_RPC_RETRIVE_FUNC) {
+    SRetrieveFuncRsp retrieveRsp = {0};
+    tDeserializeSRetrieveFuncRsp(pMsg->pCont, pMsg->contLen, &retrieveRsp);
+
+    SFuncInfo *pFuncInfo = (SFuncInfo *)taosArrayGet(retrieveRsp.pFuncInfos, 0);
+    SUdf* udf = msgInfo->param;
+    udf->funcType = pFuncInfo->funcType;
+    udf->scriptType = pFuncInfo->scriptType;
+    udf->outputType = pFuncInfo->funcType;
+    udf->outputLen = pFuncInfo->outputLen;
+    udf->bufSize = pFuncInfo->bufSize;
+
+    char path[PATH_MAX] = {0};
+    snprintf(path, sizeof(path), "%s/lib%s.so", "/tmp", pFuncInfo->name);
+    TdFilePtr file = taosOpenFile(path, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL);
+    // TODO check for failure of flush to disk
+    taosWriteFile(file, pFuncInfo->pCode, pFuncInfo->codeSize);
+    taosCloseFile(&file);
+    strncpy(udf->path, path, strlen(path));
+    taosArrayDestroy(retrieveRsp.pFuncInfos);
+    msgInfo->code = 0;
+  }
+
+_return:
+  rpcFreeCont(pMsg->pCont);
+  uv_sem_post(&msgInfo->resultSem);
+  return;
+}
+
+int32_t udfdConnectToMNode() {
+  SConnectReq connReq = {0};
+  connReq.connType = CONN_TYPE__UDFD;
+  tstrncpy(connReq.app, "udfd",sizeof(connReq.app));
+  tstrncpy(connReq.user, TSDB_DEFAULT_USER, sizeof(connReq.user));
+  char pass[TSDB_PASSWORD_LEN + 1] = {0};
+  taosEncryptPass_c((uint8_t *)(TSDB_DEFAULT_PASS), strlen(TSDB_DEFAULT_PASS), pass);
+  tstrncpy(connReq.passwd, pass, sizeof(connReq.passwd));
+  connReq.pid = htonl(taosGetPId());
+  connReq.startTime = htobe64(taosGetTimestampMs());
+
+  int32_t contLen = tSerializeSConnectReq(NULL, 0, &connReq);
+  void*   pReq = rpcMallocCont(contLen);
+  tSerializeSConnectReq(pReq, contLen, &connReq);
+
+  SUdfdRpcSendRecvInfo *msgInfo = taosMemoryCalloc(1, sizeof(SUdfdRpcSendRecvInfo));
+  msgInfo->rpcType = UDFD_RPC_MNODE_CONNECT;
+  uv_sem_init(&msgInfo->resultSem, 0);
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.msgType = TDMT_MND_CONNECT;
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = contLen;
+  rpcMsg.ahandle = msgInfo;
+  rpcSendRequest(global.clientRpc, &global.mgmtEp.epSet, &rpcMsg, NULL);
+
+  uv_sem_wait(&msgInfo->resultSem);
+  int32_t code = msgInfo->code;
+  uv_sem_destroy(&msgInfo->resultSem);
+  taosMemoryFree(msgInfo);
+  return code;
+}
+
+int32_t udfdFillUdfInfoFromMNode(void *clientRpc, char *udfName, SUdf *udf) {
+  SRetrieveFuncReq retrieveReq = {0};
+  retrieveReq.numOfFuncs = 1;
+  retrieveReq.pFuncNames = taosArrayInit(1, TSDB_FUNC_NAME_LEN);
+  taosArrayPush(retrieveReq.pFuncNames, udfName);
+
+  int32_t contLen = tSerializeSRetrieveFuncReq(NULL, 0, &retrieveReq);
+  void   *pReq = rpcMallocCont(contLen);
+  tSerializeSRetrieveFuncReq(pReq, contLen, &retrieveReq);
+  taosArrayDestroy(retrieveReq.pFuncNames);
+
+  SUdfdRpcSendRecvInfo* msgInfo = taosMemoryCalloc(1, sizeof(SUdfdRpcSendRecvInfo));
+  msgInfo->rpcType = UDFD_RPC_RETRIVE_FUNC;
+  msgInfo->param = udf;
+  uv_sem_init(&msgInfo->resultSem, 0);
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = contLen;
+  rpcMsg.msgType = TDMT_MND_RETRIEVE_FUNC;
+  rpcMsg.ahandle = msgInfo;
+  rpcSendRequest(clientRpc, &global.mgmtEp.epSet, &rpcMsg, NULL);
+
+  uv_sem_wait(&msgInfo->resultSem);
+  uv_sem_destroy(&msgInfo->resultSem);
+  int32_t code = msgInfo->code;
+  taosMemoryFree(msgInfo);
+  return code;
+}
+
+static bool udfdRpcRfp(int32_t code) {
+  if (code == TSDB_CODE_RPC_REDIRECT) {
+    return true;
+  } else {
+    return false;
+  }
+}
 
 int initEpSetFromCfg(const char* firstEp, const char* secondEp, SCorEpSet* pEpSet) {
   pEpSet->version = 0;
@@ -528,69 +667,30 @@ int initEpSetFromCfg(const char* firstEp, const char* secondEp, SCorEpSet* pEpSe
   return 0;
 }
 
-int32_t udfdFillUdfInfoFromMNode(void *clientRpc, char *udfName, SUdf *udf) {
-  SRetrieveFuncReq retrieveReq = {0};
-  retrieveReq.numOfFuncs = 1;
-  retrieveReq.pFuncNames = taosArrayInit(1, TSDB_FUNC_NAME_LEN);
-  taosArrayPush(retrieveReq.pFuncNames, udfName);
-
-  int32_t contLen = tSerializeSRetrieveFuncReq(NULL, 0, &retrieveReq);
-  void   *pReq = rpcMallocCont(contLen);
-  tSerializeSRetrieveFuncReq(pReq, contLen, &retrieveReq);
-  taosArrayDestroy(retrieveReq.pFuncNames);
-
-  SRpcMsg rpcMsg = {0};
-  rpcMsg.pCont = pReq;
-  rpcMsg.contLen = contLen;
-  rpcMsg.msgType = TDMT_MND_RETRIEVE_FUNC;
-
-  SRpcMsg rpcRsp = {0};
-  rpcSendRecv(clientRpc, &global.mgmtEp.epSet, &rpcMsg, &rpcRsp);
-  SRetrieveFuncRsp retrieveRsp = {0};
-  tDeserializeSRetrieveFuncRsp(rpcRsp.pCont, rpcRsp.contLen, &retrieveRsp);
-
-  SFuncInfo *pFuncInfo = (SFuncInfo *)taosArrayGet(retrieveRsp.pFuncInfos, 0);
-
-  udf->funcType = pFuncInfo->funcType;
-  udf->scriptType = pFuncInfo->scriptType;
-  udf->outputType = pFuncInfo->funcType;
-  udf->outputLen = pFuncInfo->outputLen;
-  udf->bufSize = pFuncInfo->bufSize;
-
-  char path[PATH_MAX] = {0};
-  snprintf(path, sizeof(path), "%s/lib%s.so", "/tmp", udfName);
-  TdFilePtr file = taosOpenFile(path, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL);
-  // TODO check for failure of flush to disk
-  taosWriteFile(file, pFuncInfo->pCode, pFuncInfo->codeSize);
-  taosCloseFile(&file);
-  strncpy(udf->path, path, strlen(path));
-  taosArrayDestroy(retrieveRsp.pFuncInfos);
-
-  rpcFreeCont(rpcRsp.pCont);
-  return 0;
-}
 
 int32_t udfdOpenClientRpc() {
-  char *pass = "taosdata";
-  char *user = "root";
-  char  secretEncrypt[TSDB_PASSWORD_LEN + 1] = {0};
-  taosEncryptPass_c((uint8_t *)pass, strlen(pass), secretEncrypt);
   SRpcInit rpcInit = {0};
-  rpcInit.label = (char *)"UDFD";
+  rpcInit.label = "UDFD";
   rpcInit.numOfThreads = 1;
-  rpcInit.cfp = udfdProcessRpcRsp;
+  rpcInit.cfp = (RpcCfp)udfdProcessRpcRsp;
   rpcInit.sessions = 1024;
   rpcInit.connType = TAOS_CONN_CLIENT;
-  rpcInit.idleTime = 30 * 1000;
+  rpcInit.idleTime = tsShellActivityTimer * 1000;
+  rpcInit.user = TSDB_DEFAULT_USER;
+  rpcInit.ckey = "key";
+  rpcInit.spi = 1;
   rpcInit.parent = &global;
+  rpcInit.rfp = udfdRpcRfp;
 
-  rpcInit.user = (char *)user;
-  rpcInit.ckey = (char *)"key";
-  rpcInit.secret = (char *)secretEncrypt;
-  rpcInit.spi = 1;
+  char pass[TSDB_PASSWORD_LEN + 1] = {0};
+  taosEncryptPass_c((uint8_t *)(TSDB_DEFAULT_PASS), strlen(TSDB_DEFAULT_PASS), pass);
+  rpcInit.secret = pass;
 
   global.clientRpc = rpcOpen(&rpcInit);
-
+  if (global.clientRpc == NULL) {
+    fnError("failed to init dnode rpc client");
+    return -1;
+  }
   return 0;
 }
 
@@ -700,12 +800,6 @@ static int32_t udfdRun() {
   global.udfsHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
   uv_mutex_init(&global.udfsMutex);
 
-  // TOOD: client rpc to fetch udf function info from mnode
-  if (udfdOpenClientRpc() != 0) {
-    fnError("open rpc connection to mnode failure");
-    return -1;
-  }
-
   if (udfdUvInit() != 0) {
     fnError("uv init failure");
     return -2;
@@ -717,7 +811,6 @@ static int32_t udfdRun() {
   int codeClose = uv_loop_close(global.loop);
   fnDebug("uv loop close. result: %s", uv_err_name(codeClose));
   removeListeningPipe();
-  udfdCloseClientRpc();
   uv_mutex_destroy(&global.udfsMutex);
   taosHashCleanup(global.udfsHash);
   return 0;
@@ -746,9 +839,22 @@ int main(int argc, char *argv[]) {
 
   if (taosInitCfg(configDir, NULL, NULL, NULL, NULL, 0) != 0) {
     fnError("failed to start since read config error");
-    return -1;
+    return -2;
   }
 
   initEpSetFromCfg(tsFirst, tsSecond, &global.mgmtEp);
-  return udfdRun();
+  if (udfdOpenClientRpc() != 0) {
+    fnError("open rpc connection to mnode failure");
+    return -3;
+  }
+
+  if (udfdConnectToMNode() != 0) {
+    fnError("failed to start since can not connect to mnode");
+    return -4;
+  }
+
+  udfdRun();
+
+  udfdCloseClientRpc();
+
 }

source/libs/index/inc/indexComm.h

@@ -33,11 +33,17 @@ typedef enum { MATCH, CONTINUE, BREAK } TExeCond;
 
 typedef TExeCond (*_cache_range_compare)(void* a, void* b, int8_t type);
 
-TExeCond tDoCommpare(__compar_fn_t func, int8_t comType, void* a, void* b);
+TExeCond tCompare(__compar_fn_t func, int8_t cmpType, void* a, void* b, int8_t dType);
+TExeCond tDoCompare(__compar_fn_t func, int8_t cmpType, void* a, void* b);
 
 _cache_range_compare indexGetCompare(RangeType ty);
 
 int32_t indexConvertData(void* src, int8_t type, void** dst);
+int32_t indexConvertDataToStr(void* src, int8_t type, void** dst);
+
+int32_t indexGetDataByteLen(int8_t type);
+
+char* indexInt2str(int64_t val, char* dst, int radix);
 
 #ifdef __cplusplus
 }

source/libs/index/src/index.c

@@ -109,17 +109,15 @@ int indexOpen(SIndexOpts* opts, const char* path, SIndex** index) {
   taosThreadMutexInit(&sIdx->mtx, NULL);
 
   sIdx->refId = indexAddRef(sIdx);
-  taosAcquireRef(indexRefMgt, sIdx->refId);
+  indexAcquireRef(sIdx->refId);
 
   *index = sIdx;
-
   return 0;
 
 END:
   if (sIdx != NULL) {
     indexClose(sIdx);
   }
-
   *index = NULL;
   return -1;
 }
@@ -273,7 +271,7 @@ SIndexTerm* indexTermCreate(int64_t suid, SIndexOperOnColumn oper, uint8_t colTy
   tm->nColName = nColName;
 
   char*   buf = NULL;
-  int32_t len = indexConvertData((void*)colVal, INDEX_TYPE_GET_TYPE(colType), (void**)&buf);
+  int32_t len = indexConvertDataToStr((void*)colVal, INDEX_TYPE_GET_TYPE(colType), (void**)&buf);
   assert(len != -1);
 
   tm->colVal = buf;

source/libs/index/src/indexCache.c

@@ -282,8 +282,10 @@ static int32_t cacheSearchCompareFunc_JSON(void* cache, SIndexTerm* term, SIdxTe
     if (0 != strncmp(c->colVal, pCt->colVal, skip)) {
       break;
     }
+    char* p = taosMemoryCalloc(1, strlen(c->colVal) + 1);
+    memcpy(p, c->colVal, strlen(c->colVal));
 
-    TExeCond cond = cmpFn(c->colVal + skip, term->colVal, dType);
+    TExeCond cond = cmpFn(p + skip, term->colVal, dType);
     if (cond == MATCH) {
       if (c->operaType == ADD_VALUE) {
         INDEX_MERGE_ADD_DEL(tr->deled, tr->added, c->uid)
@@ -297,6 +299,7 @@ static int32_t cacheSearchCompareFunc_JSON(void* cache, SIndexTerm* term, SIdxTe
     } else if (cond == BREAK) {
       break;
     }
+    taosMemoryFree(p);
   }
 
   taosMemoryFree(pCt);
@@ -463,7 +466,6 @@ int indexCacheSchedToMerge(IndexCache* pCache) {
   // schedMsg.thandle = taosMemoryCalloc(1, sizeof(int64_t));
   // memcpy((char*)(schedMsg.thandle), (char*)&(pCache->index->refId), sizeof(int64_t));
   schedMsg.msg = NULL;
-
   indexAcquireRef(pCache->index->refId);
   taosScheduleTask(indexQhandle, &schedMsg);
 

source/libs/index/src/indexComm.c

@@ -19,10 +19,38 @@
 #include "tcoding.h"
 #include "tcompare.h"
 #include "tdataformat.h"
+#include "ttypes.h"
 
 char JSON_COLUMN[] = "JSON";
 char JSON_VALUE_DELIM = '&';
 
+char* indexInt2str(int64_t val, char* dst, int radix) {
+  char     buffer[65];
+  char*    p;
+  int64_t  new_val;
+  uint64_t uval = (uint64_t)val;
+
+  if (radix < 0) {
+    if (val < 0) {
+      *dst++ = '-';
+      uval = (uint64_t)0 - uval; /* Avoid integer overflow in (-val) for LLONG_MIN (BUG#31799). */
+    }
+  }
+  p = &buffer[sizeof(buffer) - 1];
+  *p = '\0';
+  new_val = (int64_t)(uval / 10);
+  *--p = '0' + (char)(uval - (uint64_t)new_val * 10);
+  val = new_val;
+
+  while (val != 0) {
+    new_val = val / 10;
+    *--p = '0' + (char)(val - new_val * 10);
+    val = new_val;
+  }
+  while ((*dst++ = *p++) != 0)
+    ;
+  return dst - 1;
+}
 static __compar_fn_t indexGetCompar(int8_t type) {
   if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
     return (__compar_fn_t)strcmp;
@@ -31,25 +59,49 @@ static __compar_fn_t indexGetCompar(int8_t type) {
 }
 static TExeCond tCompareLessThan(void* a, void* b, int8_t type) {
   __compar_fn_t func = indexGetCompar(type);
-  return tDoCommpare(func, QUERY_LESS_THAN, a, b);
+  return tCompare(func, QUERY_LESS_THAN, a, b, type);
 }
 static TExeCond tCompareLessEqual(void* a, void* b, int8_t type) {
   __compar_fn_t func = indexGetCompar(type);
-  return tDoCommpare(func, QUERY_LESS_EQUAL, a, b);
+  return tCompare(func, QUERY_LESS_EQUAL, a, b, type);
 }
 static TExeCond tCompareGreaterThan(void* a, void* b, int8_t type) {
   __compar_fn_t func = indexGetCompar(type);
-  return tDoCommpare(func, QUERY_GREATER_THAN, a, b);
+  return tCompare(func, QUERY_GREATER_THAN, a, b, type);
 }
 static TExeCond tCompareGreaterEqual(void* a, void* b, int8_t type) {
   __compar_fn_t func = indexGetCompar(type);
-  return tDoCommpare(func, QUERY_GREATER_EQUAL, a, b);
+  return tCompare(func, QUERY_GREATER_EQUAL, a, b, type);
 }
-
-TExeCond tDoCommpare(__compar_fn_t func, int8_t comType, void* a, void* b) {
+TExeCond tCompare(__compar_fn_t func, int8_t cmptype, void* a, void* b, int8_t dtype) {
+  if (dtype == TSDB_DATA_TYPE_BINARY || dtype == TSDB_DATA_TYPE_NCHAR) {
+    return tDoCompare(func, cmptype, a, b);
+  }
+#if 1
+  int8_t bytes = tDataTypes[dtype].bytes;
+  if (bytes == 1) {
+    int8_t va = taosStr2int64(a);
+    int8_t vb = taosStr2int64(b);
+    return tDoCompare(func, cmptype, &va, &vb);
+  } else if (bytes == 2) {
+    int16_t va = taosStr2int64(a);
+    int16_t vb = taosStr2int64(b);
+    return tDoCompare(func, cmptype, &va, &vb);
+  } else if (bytes == 4) {
+    int32_t va = taosStr2int64(a);
+    int32_t vb = taosStr2int64(b);
+    return tDoCompare(func, cmptype, &va, &vb);
+  } else {
+    int64_t va = taosStr2int64(a);
+    int64_t vb = taosStr2int64(b);
+    return tDoCompare(func, cmptype, &va, &vb);
+  }
+#endif
+}
+TExeCond tDoCompare(__compar_fn_t func, int8_t comparType, void* a, void* b) {
   // optime later
   int32_t ret = func(a, b);
-  switch (comType) {
+  switch (comparType) {
     case QUERY_LESS_THAN: {
       if (ret < 0) return MATCH;
     } break;
@@ -174,9 +226,9 @@ int32_t indexConvertData(void* src, int8_t type, void** dst) {
       tlen = taosEncodeFixedU32(dst, *(uint32_t*)src);
       break;
     case TSDB_DATA_TYPE_BIGINT:
-      tlen = taosEncodeFixedI64(NULL, *(uint32_t*)src);
+      tlen = taosEncodeFixedI64(NULL, *(int64_t*)src);
       *dst = taosMemoryCalloc(1, tlen + 1);
-      tlen = taosEncodeFixedI64(dst, *(uint32_t*)src);
+      tlen = taosEncodeFixedI64(dst, *(int64_t*)src);
       break;
     case TSDB_DATA_TYPE_DOUBLE:
       tlen = taosEncodeBinary(NULL, src, sizeof(double));
@@ -184,9 +236,9 @@ int32_t indexConvertData(void* src, int8_t type, void** dst) {
       tlen = taosEncodeBinary(dst, src, sizeof(double));
       break;
     case TSDB_DATA_TYPE_UBIGINT:
-      tlen = taosEncodeFixedU64(NULL, *(uint32_t*)src);
+      tlen = taosEncodeFixedU64(NULL, *(uint64_t*)src);
       *dst = taosMemoryCalloc(1, tlen + 1);
-      tlen = taosEncodeFixedU64(dst, *(uint32_t*)src);
+      tlen = taosEncodeFixedU64(dst, *(uint64_t*)src);
       break;
     case TSDB_DATA_TYPE_NCHAR: {
       tlen = taosEncodeBinary(NULL, varDataVal(src), varDataLen(src));
@@ -215,14 +267,94 @@ int32_t indexConvertData(void* src, int8_t type, void** dst) {
       break;
   }
   *dst = *dst - tlen;
-  if (type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_NCHAR && type != TSDB_DATA_TYPE_VARBINARY &&
-      type == TSDB_DATA_TYPE_VARCHAR) {
-    uint8_t* p = *dst;
-    for (int i = 0; i < tlen; i++) {
-      if (p[i] == 0) {
-        p[i] = (uint8_t)'0';
+  // indexMayFillNumbericData(*dst, tlen);
+  return tlen;
+}
+int32_t indexConvertDataToStr(void* src, int8_t type, void** dst) {
+  int tlen = tDataTypes[type].bytes;
+
+  switch (type) {
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(int64_t*)src, *dst, -1);
+      break;
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_UTINYINT:
+      // tlen = taosEncodeFixedU8(NULL, *(uint8_t*)src);
+      //*dst = taosMemoryCalloc(1, tlen + 1);
+      // tlen = taosEncodeFixedU8(dst, *(uint8_t*)src);
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(uint8_t*)src, *dst, 1);
+      break;
+    case TSDB_DATA_TYPE_TINYINT:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(int8_t*)src, *dst, 1);
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(int16_t*)src, *dst, -1);
+      break;
+    case TSDB_DATA_TYPE_USMALLINT:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(uint16_t*)src, *dst, -1);
+      break;
+    case TSDB_DATA_TYPE_INT:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(int32_t*)src, *dst, -1);
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      tlen = taosEncodeBinary(NULL, src, sizeof(float));
+      *dst = taosMemoryCalloc(1, tlen + 1);
+      tlen = taosEncodeBinary(dst, src, sizeof(float));
+      *dst = *dst - tlen;
+      break;
+    case TSDB_DATA_TYPE_UINT:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(uint32_t*)src, *dst, 1);
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(int64_t*)src, *dst, 1);
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      tlen = taosEncodeBinary(NULL, src, sizeof(double));
+      *dst = taosMemoryCalloc(1, tlen + 1);
+      tlen = taosEncodeBinary(dst, src, sizeof(double));
+      *dst = *dst - tlen;
+      break;
+    case TSDB_DATA_TYPE_UBIGINT:
+      assert(0);
+      *dst = taosMemoryCalloc(1, sizeof(int64_t) + 1);
+      indexInt2str(*(uint64_t*)src, *dst, 1);
+      break;
+    case TSDB_DATA_TYPE_NCHAR: {
+      tlen = taosEncodeBinary(NULL, varDataVal(src), varDataLen(src));
+      *dst = taosMemoryCalloc(1, tlen + 1);
+      tlen = taosEncodeBinary(dst, varDataVal(src), varDataLen(src));
+      *dst = *dst - tlen;
+
+      break;
     }
+    case TSDB_DATA_TYPE_VARCHAR: {  // TSDB_DATA_TYPE_BINARY
+#if 1
+      tlen = taosEncodeBinary(NULL, src, strlen(src));
+      *dst = taosMemoryCalloc(1, tlen + 1);
+      tlen = taosEncodeBinary(dst, src, strlen(src));
+      *dst = *dst - tlen;
+      break;
+#endif
     }
+    case TSDB_DATA_TYPE_VARBINARY:
+#if 1
+      tlen = taosEncodeBinary(NULL, src, strlen(src));
+      *dst = taosMemoryCalloc(1, tlen + 1);
+      tlen = taosEncodeBinary(dst, src, strlen(src));
+      *dst = *dst - tlen;
+      break;
+#endif
+    default:
+      TASSERT(0);
+      break;
   }
   return tlen;
 }

source/libs/index/src/indexFst.c

@@ -1324,7 +1324,7 @@ StreamWithStateResult* streamWithStateNextWith(StreamWithState* sws, StreamCallb
       if (FST_NODE_ADDR(p->node) != fstGetRootAddr(sws->fst)) {
         taosArrayPop(sws->inp);
       }
-      streamStateDestroy(p);
+      // streamStateDestroy(p);
       continue;
     }
     FstTransition trn;

source/libs/index/src/indexTfile.c

@@ -410,8 +410,9 @@ static int32_t tfSearchTerm_JSON(void* reader, SIndexTerm* tem, SIdxTempResult*
 
     ret = tfileReaderLoadTableIds((TFileReader*)reader, offset, tr->total);
     cost = taosGetTimestampUs() - et;
-    indexInfo("index: %" PRIu64 ", col: %s, colVal: %s, load all table info, time cost: %" PRIu64 "us", tem->suid,
-              tem->colName, tem->colVal, cost);
+    indexInfo("index: %" PRIu64 ", col: %s, colVal: %s, load all table info, offset: %" PRIu64
+              ", size: %d, time cost: %" PRIu64 "us",
+              tem->suid, tem->colName, tem->colVal, offset, (int)taosArrayGetSize(tr->total), cost);
   }
   fstSliceDestroy(&key);
   return 0;
@@ -941,7 +942,7 @@ static int tfileReaderLoadTableIds(TFileReader* reader, int32_t offset, SArray*
   // TODO(yihao): opt later
   WriterCtx* ctx = reader->ctx;
   // add block cache
-  char    block[1024] = {0};
+  char    block[4096] = {0};
   int32_t nread = ctx->readFrom(ctx, block, sizeof(block), offset);
   assert(nread >= sizeof(uint32_t));
 

source/libs/index/test/jsonUT.cc

@@ -56,6 +56,29 @@ class JsonEnv : public ::testing::Test {
   SIndexJson*     index;
 };
 
+static void WriteData(SIndexJson* index, const std::string& colName, int8_t dtype, void* data, int dlen, int tableId,
+                      int8_t operType = ADD_VALUE) {
+  SIndexTerm* term =
+      indexTermCreate(1, (SIndexOperOnColumn)operType, dtype, colName.c_str(), colName.size(), (const char*)data, dlen);
+  SIndexMultiTerm* terms = indexMultiTermCreate();
+  indexMultiTermAdd(terms, term);
+  tIndexJsonPut(index, terms, (int64_t)tableId);
+
+  indexMultiTermDestroy(terms);
+}
+static void Search(SIndexJson* index, const std::string& colNam, int8_t dtype, void* data, int dlen, int8_t filterType,
+                   SArray** result) {
+  std::string colName(colNam);
+
+  SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
+  SIndexTerm* q = indexTermCreate(1, ADD_VALUE, dtype, colName.c_str(), colName.size(), (const char*)data, dlen);
+
+  SArray* res = taosArrayInit(1, sizeof(uint64_t));
+  indexMultiTermQueryAdd(mq, q, (EIndexQueryType)filterType);
+  tIndexJsonSearch(index, mq, res);
+  indexMultiTermQueryDestroy(mq);
+  *result = res;
+}
 TEST_F(JsonEnv, testWrite) {
   {
     std::string colName("test");
@@ -204,9 +227,10 @@ TEST_F(JsonEnv, testWriteMillonData) {
 TEST_F(JsonEnv, testWriteJsonNumberData) {
   {
     std::string colName("test");
-    std::string colVal("10");
+    // std::string colVal("10");
+    int         val = 10;
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
-                                       colVal.c_str(), colVal.size());
+                                       (const char*)&val, sizeof(val));
 
     SIndexMultiTerm* terms = indexMultiTermCreate();
     indexMultiTermAdd(terms, term);
@@ -217,9 +241,9 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string colName("test2");
-    std::string colVal("20");
+    int         val = 20;
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
-                                       colVal.c_str(), colVal.size());
+                                       (const char*)&val, sizeof(val));
 
     SIndexMultiTerm* terms = indexMultiTermCreate();
     indexMultiTermAdd(terms, term);
@@ -229,10 +253,10 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
     indexMultiTermDestroy(terms);
   }
   {
-    std::string colName("test2");
-    std::string colVal("15");
+    std::string colName("test");
+    int         val = 15;
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
-                                       colVal.c_str(), colVal.size());
+                                       (const char*)&val, sizeof(val));
 
     SIndexMultiTerm* terms = indexMultiTermCreate();
     indexMultiTermAdd(terms, term);
@@ -243,9 +267,9 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string colName("test2");
-    std::string colVal("15");
+    const char* val = "test";
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
-                                       colVal.c_str(), colVal.size());
+                                       (const char*)val, strlen(val));
 
     SIndexMultiTerm* terms = indexMultiTermCreate();
     indexMultiTermAdd(terms, term);
@@ -256,11 +280,10 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string           colName("test");
-    std::string colVal("10");
-
+    int                   val = 15;
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_TERM);
@@ -270,11 +293,11 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string colName("test");
-    std::string colVal("10");
+    int         val = 15;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_GREATER_THAN);
@@ -284,11 +307,12 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string colName("test");
-    std::string colVal("10");
+    int         val = 10;
+    ;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(int));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_GREATER_EQUAL);
@@ -298,11 +322,12 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string colName("test");
-    std::string colVal("10");
+    int         val = 10;
+    // std::string colVal("10");
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_LESS_THAN);
@@ -312,11 +337,12 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
   {
     std::string colName("test");
-    std::string colVal("10");
+    int         val = 10;
+    // std::string colVal("10");
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_LESS_EQUAL);
@@ -326,12 +352,12 @@ TEST_F(JsonEnv, testWriteJsonNumberData) {
   }
 }
 
-TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
+TEST_F(JsonEnv, testWriteJsonTfileAndCache_INT) {
   {
     std::string colName("test1");
-    std::string colVal("10");
+    int         val = 10;
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
-                                       colVal.c_str(), colVal.size());
+                                       (const char*)&val, sizeof(val));
 
     SIndexMultiTerm* terms = indexMultiTermCreate();
     indexMultiTermAdd(terms, term);
@@ -355,11 +381,11 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("test1");
-    std::string colVal("10");
+    int         val = 10;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_TERM);
@@ -369,11 +395,11 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("test1");
-    std::string colVal("10");
+    int         val = 10;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(int));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_GREATER_THAN);
@@ -383,11 +409,12 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("test1");
-    std::string colVal("10");
+    // std::string colVal("10");
+    int val = 10;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_GREATER_EQUAL);
@@ -397,11 +424,11 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("test1");
-    std::string colVal("10");
+    int         val = 10;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_GREATER_THAN);
@@ -411,11 +438,11 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("test1");
-    std::string colVal("10");
+    int         val = 10;
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_LESS_EQUAL);
@@ -425,9 +452,10 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("other_column");
-    std::string colVal("100");
+    int         val = 100;
+
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
-                                       colVal.c_str(), colVal.size());
+                                       (const char*)&val, sizeof(val));
 
     SIndexMultiTerm* terms = indexMultiTermCreate();
     indexMultiTermAdd(terms, term);
@@ -438,11 +466,12 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
   }
   {
     std::string colName("test1");
-    std::string colVal("10");
+    int         val = 10;
+    // std::string colVal("10");
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
-    SIndexTerm* q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(), colVal.c_str(),
-                                    colVal.size());
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
 
     SArray* result = taosArrayInit(1, sizeof(uint64_t));
     indexMultiTermQueryAdd(mq, q, QUERY_LESS_THAN);
@@ -450,4 +479,102 @@ TEST_F(JsonEnv, testWriteJsonTfileAndCache) {
     EXPECT_EQ(0, taosArrayGetSize(result));
     indexMultiTermQueryDestroy(mq);
   }
+  {
+    std::string colName("test1");
+    int         val = 15;
+    SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                       (const char*)&val, sizeof(val));
+
+    SIndexMultiTerm* terms = indexMultiTermCreate();
+    indexMultiTermAdd(terms, term);
+    for (size_t i = 0; i < 1000; i++) {
+      tIndexJsonPut(index, terms, i + 1000);
+    }
+    indexMultiTermDestroy(terms);
+  }
+  {
+    std::string colName("test1");
+    int         val = 8;
+    // std::string colVal("10");
+
+    SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
+    SIndexTerm*           q = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_INT, colName.c_str(), colName.size(),
+                                    (const char*)&val, sizeof(val));
+
+    SArray* result = taosArrayInit(1, sizeof(uint64_t));
+    indexMultiTermQueryAdd(mq, q, QUERY_GREATER_EQUAL);
+    tIndexJsonSearch(index, mq, result);
+    EXPECT_EQ(2000, taosArrayGetSize(result));
+    indexMultiTermQueryDestroy(mq);
+  }
+}
+TEST_F(JsonEnv, testWriteJsonTfileAndCache_INT2) {
+  {
+    int         val = 10;
+    std::string colName("test1");
+    for (int i = 0; i < 10000; i++) {
+      val += 1;
+      WriteData(index, colName, TSDB_DATA_TYPE_INT, &val, sizeof(val), i);
+    }
+  }
+  {
+    int         val = 10;
+    std::string colName("test2xxx");
+    std::string colVal("xxxxxxxxxxxxxxx");
+    for (int i = 0; i < 100000; i++) {
+      val += 1;
+      WriteData(index, colName, TSDB_DATA_TYPE_BINARY, (void*)(colVal.c_str()), colVal.size(), i);
+    }
+  }
+  {
+    SArray*     res = NULL;
+    std::string colName("test1");
+    int         val = 9;
+    Search(index, colName, TSDB_DATA_TYPE_INT, &val, sizeof(val), QUERY_GREATER_EQUAL, &res);
+    EXPECT_EQ(10000, taosArrayGetSize(res));
+  }
+  {
+    SArray*     res = NULL;
+    std::string colName("test2xxx");
+    std::string colVal("xxxxxxxxxxxxxxx");
+    Search(index, colName, TSDB_DATA_TYPE_BINARY, (void*)(colVal.c_str()), colVal.size(), QUERY_TERM, &res);
+    EXPECT_EQ(100000, taosArrayGetSize(res));
+  }
+}
+TEST_F(JsonEnv, testWriteJsonTfileAndCache_FLOAT) {
+  {
+    float       val = 10.0;
+    std::string colName("test1");
+    for (int i = 0; i < 1000; i++) {
+      WriteData(index, colName, TSDB_DATA_TYPE_FLOAT, &val, sizeof(val), i);
+    }
+  }
+  {
+    float       val = 2.0;
+    std::string colName("test1");
+    for (int i = 0; i < 1000; i++) {
+      WriteData(index, colName, TSDB_DATA_TYPE_FLOAT, &val, sizeof(val), i);
+    }
+  }
+  {
+    SArray*     res = NULL;
+    std::string colName("test1");
+    float       val = 1.9;
+    Search(index, colName, TSDB_DATA_TYPE_FLOAT, &val, sizeof(val), QUERY_GREATER_EQUAL, &res);
+    EXPECT_EQ(2000, taosArrayGetSize(res));
+  }
+  {
+    SArray*     res = NULL;
+    std::string colName("test1");
+    float       val = 2.1;
+    Search(index, colName, TSDB_DATA_TYPE_FLOAT, &val, sizeof(val), QUERY_GREATER_EQUAL, &res);
+    EXPECT_EQ(1000, taosArrayGetSize(res));
+  }
+  {
+    std::string colName("test1");
+    SArray*     res = NULL;
+    float       val = 2.1;
+    Search(index, colName, TSDB_DATA_TYPE_FLOAT, &val, sizeof(val), QUERY_GREATER_EQUAL, &res);
+    EXPECT_EQ(1000, taosArrayGetSize(res));
+  }
 }

source/libs/index/test/utilUT.cc

@@ -6,12 +6,14 @@
 #include <vector>
 #include "index.h"
 #include "indexCache.h"
+#include "indexComm.h"
 #include "indexFst.h"
 #include "indexFstCountingWriter.h"
 #include "indexFstUtil.h"
 #include "indexInt.h"
 #include "indexTfile.h"
 #include "indexUtil.h"
+#include "tcoding.h"
 #include "tglobal.h"
 #include "tskiplist.h"
 #include "tutil.h"
@@ -305,3 +307,17 @@ TEST_F(UtilEnv, 01Except) {
   ASSERT_EQ(*(uint64_t *)taosArrayGet(total, 0), 1);
   ASSERT_EQ(*(uint64_t *)taosArrayGet(total, 1), 100);
 }
+TEST_F(UtilEnv, testFill) {
+  for (int i = 0; i < 10000000; i++) {
+    int64_t val = i;
+    char    buf[65] = {0};
+    indexInt2str(val, buf, 1);
+    EXPECT_EQ(val, taosStr2int64(buf));
+  }
+  for (int i = 0; i < 10000000; i++) {
+    int64_t val = 0 - i;
+    char    buf[65] = {0};
+    indexInt2str(val, buf, -1);
+    EXPECT_EQ(val, taosStr2int64(buf));
+  }
+}

source/libs/stream/src/tstream.c

@@ -35,7 +35,7 @@ void* streamDataBlockDecode(const void* buf, SStreamDataBlock* pInput) {
   return (void*)buf;
 }
 
-static int32_t streamBuildDispatchMsg(SStreamTask* pTask, SArray* data, SRpcMsg* pMsg, SEpSet** ppEpSet) {
+static int32_t streamBuildExecMsg(SStreamTask* pTask, SArray* data, SRpcMsg* pMsg, SEpSet** ppEpSet) {
   SStreamTaskExecReq req = {
       .streamId = pTask->streamId,
       .data = data,
@@ -107,7 +107,7 @@ static int32_t streamShuffleDispatch(SStreamTask* pTask, SMsgCb* pMsgCb, SHashOb
     SArray* pData = *(SArray**)pIter;
     SRpcMsg dispatchMsg = {0};
     SEpSet* pEpSet;
-    if (streamBuildDispatchMsg(pTask, pData, &dispatchMsg, &pEpSet) < 0) {
+    if (streamBuildExecMsg(pTask, pData, &dispatchMsg, &pEpSet) < 0) {
       ASSERT(0);
       return -1;
     }
@@ -133,7 +133,7 @@ int32_t streamEnqueueDataBlk(SStreamTask* pTask, SStreamDataBlock* input) {
   return inputStatus;
 }
 
-int32_t streamTaskExecImpl(SStreamTask* pTask, void* data, SArray* pRes) {
+static int32_t streamTaskExecImpl(SStreamTask* pTask, void* data, SArray* pRes) {
   void* exec = pTask->exec.runners[0].executor;
 
   // set input
@@ -265,87 +265,42 @@ FAIL:
   return -1;
 }
 
-int32_t streamTaskDispatchDown(SStreamTask* pTask, SMsgCb* pMsgCb) {
-  //
-  return 0;
-}
-
-int32_t streamTaskSink(SStreamTask* pTask) {
-  //
-  return 0;
-}
-
-int32_t streamTaskProcessInputReq(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDataBlock* pBlock, SRpcMsg* pRsp) {
-  // 1. handle input
-  // 1.1 enqueue
-  taosWriteQitem(pTask->inputQ, pBlock);
-  // 1.2 calc back pressure
-  // 1.3 rsp by input status
-  int8_t              inputStatus = atomic_load_8(&pTask->inputStatus);
-  SStreamDispatchRsp* pCont = rpcMallocCont(sizeof(SStreamDispatchRsp));
-  pCont->status = inputStatus;
-  pRsp->pCont = pCont;
-  pRsp->contLen = sizeof(SStreamDispatchRsp);
-  tmsgSendRsp(pRsp);
-  // 2. try exec
-  // 2.1. idle: exec
-  // 2.2. executing: return
-  // 2.3. closing: keep trying
-  while (1) {
-    int8_t execStatus = atomic_val_compare_exchange_8(&pTask->status, TASK_STATUS__IDLE, TASK_STATUS__EXECUTING);
-    if (execStatus == TASK_STATUS__IDLE) {
-      void*         exec = pTask->exec.runners[0].executor;
-      SArray*       pRes = taosArrayInit(0, sizeof(void*));
-      const SArray* blocks = pBlock->blocks;
-      qSetMultiStreamInput(exec, blocks->pData, blocks->size, STREAM_DATA_TYPE_SSDATA_BLOCK);
+int32_t streamTaskSink(SStreamTask* pTask, SMsgCb* pMsgCb) {
+  bool firstRun = 1;
   while (1) {
-        SSDataBlock* output;
-        uint64_t     ts = 0;
-        if (qExecTask(exec, &output, &ts) < 0) {
-          ASSERT(false);
-        }
-        if (output == NULL) break;
-        taosArrayPush(pRes, &output);
-      }
-      // TODO: wrap destroy block
-      taosArrayDestroyP(pBlock->blocks, (FDelete)blockDataDestroy);
-
-      if (taosArrayGetSize(pRes) != 0) {
-        SArray** resQ = taosAllocateQitem(sizeof(void**), DEF_QITEM);
-        *resQ = pRes;
-        taosWriteQitem(pTask->outputQ, resQ);
-      }
-
-    } else if (execStatus == TASK_STATUS__CLOSING) {
+    SStreamDataBlock* pBlock = NULL;
+    if (!firstRun) {
+      taosReadAllQitems(pTask->outputQ, pTask->outputQAll);
+    }
+    taosGetQitem(pTask->outputQAll, (void**)&pBlock);
+    if (pBlock == NULL) {
+      if (firstRun) {
+        firstRun = 0;
         continue;
-    } else if (execStatus == TASK_STATUS__EXECUTING)
+      } else {
         break;
-    else {
-      ASSERT(0);
       }
     }
-  // 3. handle output
-  // 3.1 check and set status
-  // 3.2 dispatch / sink
-  STaosQall* qall = taosAllocateQall();
-  taosReadAllQitems(pTask->outputQ, qall);
-  SArray** ppRes = NULL;
-  while (1) {
-    taosGetQitem(qall, (void**)&ppRes);
-    if (ppRes == NULL) break;
 
-    SArray* pRes = *ppRes;
+    SArray* pRes = pBlock->blocks;
+
+    // sink
     if (pTask->sinkType == TASK_SINK__TABLE) {
-      pTask->tbSink.tbSinkFunc(pTask, pTask->tbSink.vnode, pBlock->sourceVer, pRes);
+      // 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
     if (pTask->dispatchType == TASK_DISPATCH__INPLACE) {
       SRpcMsg dispatchMsg = {0};
-      if (streamBuildDispatchMsg(pTask, pRes, &dispatchMsg, NULL) < 0) {
+      if (streamBuildExecMsg(pTask, pRes, &dispatchMsg, NULL) < 0) {
         ASSERT(0);
         return -1;
       }
@@ -366,7 +321,7 @@ int32_t streamTaskProcessInputReq(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDat
     } else if (pTask->dispatchType == TASK_DISPATCH__FIXED) {
       SRpcMsg dispatchMsg = {0};
       SEpSet* pEpSet = NULL;
-      if (streamBuildDispatchMsg(pTask, pRes, &dispatchMsg, &pEpSet) < 0) {
+      if (streamBuildExecMsg(pTask, pRes, &dispatchMsg, &pEpSet) < 0) {
         ASSERT(0);
         return -1;
       }
@@ -401,75 +356,58 @@ int32_t streamTaskProcessInputReq(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDat
       ASSERT(pTask->dispatchType == TASK_DISPATCH__NONE);
     }
   }
-  //
   return 0;
 }
 
-int32_t streamTaskProcessDispatchRsp(SStreamTask* pTask, char* msg, int32_t msgLen) {
-  //
-  return 0;
-}
+int32_t streamTaskEnqueue(SStreamTask* pTask, SStreamDispatchReq* pReq, SRpcMsg* pRsp) {
+  SStreamDataBlock* pBlock = taosAllocateQitem(sizeof(SStreamDataBlock), DEF_QITEM);
+  int8_t            status;
+
+  // 1.1 update status
+  // TODO cal backpressure
+  if (pBlock == NULL) {
+    atomic_store_8(&pTask->inputStatus, TASK_INPUT_STATUS__FAILED);
+    status = TASK_INPUT_STATUS__FAILED;
+  } else {
+    status = atomic_load_8(&pTask->inputStatus);
+  }
+
+  // 1.2 enqueue
+  pBlock->type = STREAM_DATA_TYPE_SSDATA_BLOCK;
+  pBlock->sourceVg = pReq->sourceVg;
+  pBlock->sourceVer = pReq->sourceVer;
+  taosWriteQitem(pTask->inputQ, pBlock);
+
+  // 1.3 rsp by input status
+  SStreamDispatchRsp* pCont = rpcMallocCont(sizeof(SStreamDispatchRsp));
+  pCont->inputStatus = status;
+  pRsp->pCont = pCont;
+  pRsp->contLen = sizeof(SStreamDispatchRsp);
+  tmsgSendRsp(pRsp);
 
-int32_t streamTaskProcessRecoverReq(SStreamTask* pTask, char* msg) {
-  //
   return 0;
 }
 
-int32_t streamTaskRun(SStreamTask* pTask) {
-  SArray* pRes = NULL;
-  if (pTask->execType == TASK_EXEC__PIPE || pTask->execType == TASK_EXEC__MERGE) {
-    // TODO remove multi runner
-    void* exec = pTask->exec.runners[0].executor;
+int32_t streamTaskProcessDispatchReq(SStreamTask* pTask, SMsgCb* pMsgCb, SStreamDispatchReq* pReq, SRpcMsg* pRsp) {
+  // 1. handle input
+  streamTaskEnqueue(pTask, pReq, pRsp);
 
-    int8_t status = atomic_val_compare_exchange_8(&pTask->status, TASK_STATUS__IDLE, TASK_STATUS__EXECUTING);
-    if (status == TASK_STATUS__IDLE) {
-      pRes = taosArrayInit(0, sizeof(void*));
-      if (pRes == NULL) {
-        return -1;
-      }
+  // 2. try exec
+  // 2.1. idle: exec
+  // 2.2. executing: return
+  // 2.3. closing: keep trying
+  streamTaskExec2(pTask, pMsgCb);
 
-      void* input = NULL;
-      taosWriteQitem(pTask->inputQ, &input);
-      if (input == NULL) return 0;
+  // 3. handle output
+  // 3.1 check and set status
+  // 3.2 dispatch / sink
+  streamTaskSink(pTask, pMsgCb);
 
-      // TODO: fix type
-      if (pTask->sourceType == TASK_SOURCE__SCAN) {
-        SStreamDataSubmit* pSubmit = (SStreamDataSubmit*)input;
-        qSetStreamInput(exec, pSubmit->data, STREAM_DATA_TYPE_SUBMIT_BLOCK);
-        while (1) {
-          SSDataBlock* output;
-          uint64_t     ts = 0;
-          if (qExecTask(exec, &output, &ts) < 0) {
-            ASSERT(false);
-          }
-          if (output == NULL) break;
-          taosArrayPush(pRes, &output);
-        }
-        streamDataSubmitRefDec(pSubmit);
-      } else {
-        SStreamDataBlock* pStreamBlock = (SStreamDataBlock*)input;
-        const SArray*     blocks = pStreamBlock->blocks;
-        qSetMultiStreamInput(exec, blocks->pData, blocks->size, STREAM_DATA_TYPE_SSDATA_BLOCK);
-        while (1) {
-          SSDataBlock* output;
-          uint64_t     ts = 0;
-          if (qExecTask(exec, &output, &ts) < 0) {
-            ASSERT(false);
-          }
-          if (output == NULL) break;
-          taosArrayPush(pRes, &output);
-        }
-        // TODO: wrap destroy block
-        taosArrayDestroyP(pStreamBlock->blocks, (FDelete)blockDataDestroy);
-      }
+  return 0;
+}
 
-      if (taosArrayGetSize(pRes) != 0) {
-        SArray** resQ = taosAllocateQitem(sizeof(void**), DEF_QITEM);
-        *resQ = pRes;
-        taosWriteQitem(pTask->outputQ, resQ);
-      }
-    }
-  }
+int32_t streamTaskProcessRecoverReq(SStreamTask* pTask, char* msg) {
+  //
   return 0;
 }
 
@@ -545,7 +483,7 @@ int32_t streamExecTask(SStreamTask* pTask, SMsgCb* pMsgCb, const void* input, in
 
   if (pTask->dispatchType == TASK_DISPATCH__INPLACE) {
     SRpcMsg dispatchMsg = {0};
-    if (streamBuildDispatchMsg(pTask, pRes, &dispatchMsg, NULL) < 0) {
+    if (streamBuildExecMsg(pTask, pRes, &dispatchMsg, NULL) < 0) {
       ASSERT(0);
       return -1;
     }
@@ -566,7 +504,7 @@ int32_t streamExecTask(SStreamTask* pTask, SMsgCb* pMsgCb, const void* input, in
   } else if (pTask->dispatchType == TASK_DISPATCH__FIXED) {
     SRpcMsg dispatchMsg = {0};
     SEpSet* pEpSet = NULL;
-    if (streamBuildDispatchMsg(pTask, pRes, &dispatchMsg, &pEpSet) < 0) {
+    if (streamBuildExecMsg(pTask, pRes, &dispatchMsg, &pEpSet) < 0) {
       ASSERT(0);
       return -1;
     }

source/util/src/terror.c

@@ -285,6 +285,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TOPIC_QUERY,      "Topic with invalid qu
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TOPIC_OPTION,     "Topic with invalid option")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_CONSUMER_NOT_EXIST,       "Consumer not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_CONSUMER_NOT_READY,       "Consumer waiting for rebalance")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOPIC_SUBSCRIBED,         "Topic subscribed cannot be dropped")
 
 // mnode-sma
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_SMA_ALREADY_EXIST,        "SMA already exists")
@@ -358,7 +359,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TABLE_RECREATED,          "Table re-created")
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TDB_ENV_OPEN_ERROR,       "TDB env open error")
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_SMA_INDEX_IN_META,     "No sma index in meta")
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_SMA_STAT,         "Invalid sma state")
-TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TSMA_ALREADY_EXIST,       "Tsma already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TSMA_ALREADY_EXIST,       "TSMA already exists")
 
 
 // query

tests/script/jenkins/basic.txt

@@ -104,7 +104,8 @@
 ./test.sh -f tsim/mnode/basic1.sim -m
 
 # --- sma
-# ./test.sh -f tsim/sma/tsmaCreateInsertData.sim
+./test.sh -f tsim/sma/tsmaCreateInsertData.sim
+./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim
 
 # --- valgrind
 ./test.sh -f tsim/valgrind/checkError.sim -v

tests/script/tsim/query/udf.sim

@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c udf -v 1
 
 print ========= start dnode1 as LEADER
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
+sleep 1000
 sql connect
 
 print ======== step1 udf 

tests/script/tsim/sma/rsmaCreateInsertQuery.sim

+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print =============== create database with retentions
+sql create database d0 retentions 15s:7d,1m:21d,15m:365d;
+sql use d0
+
+print =============== create super table and register rsma
+sql create table if not exists stb (ts timestamp, c1 int) tags (city binary(20),district binary(20)) rollup(min) file_factor 0.1 delay 2;
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== create child table
+sql create table ct1 using stb tags("BeiJing", "ChaoYang");
+
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== insert data and trigger rollup
+sql insert into ct1 values(now, 10);
+sql insert into ct1 values(now+1s, 1);
+sql insert into ct1 values(now+2s, 100);
+
+
+print =============== select * from retention level 2 from memory
+sql select * from ct1;
+print $data00 $data01
+if $rows > 2 then
+  print retention level 2 file rows $rows > 2
+  return -1
+endi
+print =============== select * from retention level 1 from memory
+sql select * from ct1 where ts > now-8d;
+print $data00 $data01
+if $rows > 2 then
+  print retention level 1 file rows $rows > 2
+  return -1
+endi
+print =============== select * from retention level 0 from memory
+sql select * from ct1 where ts > now-3d;
+print $data00 $data01
+print $data10 $data11
+print $data20 $data21
+if $rows < 1 then
+  print retention level 0 file rows $rows < 1
+  return -1
+endi
+#===================================================================
+
+
+#==================== reboot to trigger commit data to file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+
+print =============== select * from retention level 2 from file
+sql select * from ct1;
+print $data00 $data01
+if $rows > 2 then
+  print retention level 2 file rows $rows > 2
+  return -1
+endi
+
+print =============== select * from retention level 1 from file
+sql select * from ct1 where ts > now-8d;
+print $data00 $data01
+if $rows > 2 then
+  print retention level 1 file rows $rows > 2
+  return -1
+endi
+
+print =============== select * from retention level 0 from file
+sql select * from ct1 where ts > now-3d;
+print $data00 $data01 
+print $data10 $data11
+print $data20 $data21
+if $rows < 1 then
+  print retention level 0 file rows $rows < 1
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/tsim/sync/threeReplica1VgElect.sim

@@ -220,7 +220,6 @@ if $data[0][4] == LEADER then
   print ---- vgroup $data[0][0] leader switch to dnode $data[0][3]
 elif $data[0][6] == LEADER then
   print ---- vgroup $data[0][0] leader switch to dnode $data[0][5]
-endi
 elif $data[0][8] == LEADER then
   print ---- vgroup $data[0][0] leader switch to dnode $data[0][7]
 else 
@@ -342,7 +341,6 @@ elif $data[0][6] == LEADER then
     goto check_vg_ready_3
   endi
   print ---- vgroup $data[0][0] leader locating dnode $data[0][7]
-endi
 elif $data[0][8] == LEADER then
   if $data[0][4] == LEADER then
     goto check_vg_ready_3

tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim

@@ -420,7 +420,6 @@ elif $data[0][6] == LEADER then
     goto check_vg_ready_3
   endi
   print ---- vgroup $data[0][0] leader locating dnode $data[0][7]
-endi
 elif $data[0][8] == LEADER then
   if $data[0][4] == LEADER then
     goto check_vg_ready_3

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

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import random
+import os
+import time
+import taos
+from faker import Faker
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.dnodes import tdDnodes
+from util.dnodes import *
+
+class TDTestCase:
+    updatecfgDict = {'maxSQLLength':1048576,'debugFlag': 143 ,"cDebugFlag":143,"uDebugFlag":143 ,"rpcDebugFlag":143 , "tmrDebugFlag":143 , 
+    "jniDebugFlag":143 ,"simDebugFlag":143,"dDebugFlag":143, "dDebugFlag":143,"vDebugFlag":143,"mDebugFlag":143,"qDebugFlag":143,
+    "wDebugFlag":143,"sDebugFlag":143,"tsdbDebugFlag":143,"tqDebugFlag":143 ,"fsDebugFlag":143 ,"fnDebugFlag":143}
+    
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        testcasePath = os.path.split(__file__)[0]
+        testcaseFilename = os.path.split(__file__)[-1]
+        os.system("rm -rf %s/%s.sql" % (testcasePath,testcaseFilename))
+        
+        now = time.time()
+        self.ts = int(round(now * 1000))
+        self.num = 10
+        self.fornum = 5
+
+    # def case_common(self):
+    #     db = "nested"         
+    #     self.dropandcreateDB("%s" % db, 1) 
+
+    #     conn1 = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos/")
+    #     cur1 = conn1.cursor()        
+    #     cur1.execute('use "%s";' %self.db)
+    #     sql = 'select * from stable_1 limit 5;'
+    #     cur1.execute(sql)
+
+    #     return(conn1,cur1)  
+    
+    def restartDnodes(self):
+        pass
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+
+    def dropandcreateDB_random(self,database,n):
+        ts = 1630000000000
+        num_random = 100
+        fake = Faker('zh_CN')
+        tdSql.execute('''drop database if exists %s ;''' %database)
+        tdSql.execute('''create database %s keep 36500;'''%database)
+        tdSql.execute('''use %s;'''%database)
+
+        tdSql.execute('''create stable stable_1 (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
+                tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
+        tdSql.execute('''create stable stable_2 (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
+                tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
+        
+        tdSql.execute('''create stable stable_null_data (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
+                tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
+
+        tdSql.execute('''create stable stable_null_childtable (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
+                tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
+        
+        #tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '0' , '0' , '0' , '0' , 0 , 'binary1' , 'nchar1' , '0' , '0' ,'0') ;''')
+        tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '%d' , '%d', '%d' , '%d' , 0 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))  
+        tdSql.execute('''create table stable_1_2 using stable_1 tags('stable_1_2', '2147483647' , '9223372036854775807' , '32767' , '127' , 1 , 'binary2' , 'nchar2' , '2' , '22' , \'1999-09-09 09:09:09.090\') ;''')
+        tdSql.execute('''create table stable_1_3 using stable_1 tags('stable_1_3', '-2147483647' , '-9223372036854775807' , '-32767' , '-127' , false , 'binary3' , 'nchar3nchar3' , '-3.3' , '-33.33' , \'2099-09-09 09:09:09.090\') ;''')
+        #tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0') ;''')
+        tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+
+        # tdSql.execute('''create table stable_2_1 using stable_2 tags('stable_2_1' , '0' , '0' , '0' , '0' , 0 , 'binary21' , 'nchar21' , '0' , '0' ,'0') ;''')
+        # tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0') ;''')
+
+        # tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0') ;''')
+        
+        tdSql.execute('''create table stable_2_1 using stable_2 tags('stable_2_1' , '0' , '0' , '0' , '0' , 0 , 'binary21' , 'nchar21' , '0' , '0' ,\'2099-09-09 09:09:09.090\') ;''')
+        tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '%d' , '%d', '%d' , '%d' , 0 , 'binary2.%s' , 'nchar2.%s' , '%f', '%f' ,'%d') ;''' 
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+
+        tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+
+        #regular table
+        tdSql.execute('''create table regular_table_1 \
+                    (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                    q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) ;''')
+        tdSql.execute('''create table regular_table_2 \
+                    (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                    q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) ;''')
+        tdSql.execute('''create table regular_table_3 \
+                    (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                    q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) ;''')
+
+        tdSql.execute('''create table regular_table_null \
+                    (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
+                    q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) ;''')
+
+
+        for i in range(num_random*n):        
+            tdSql.execute('''insert into stable_1_1  (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double , q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1), 
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i))
+            tdSql.execute('''insert into  regular_table_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1) , 
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1) , 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i))
+
+            tdSql.execute('''insert into stable_1_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1), 
+                        fake.random_int(min=0, max=9223372036854775807, step=1), 
+                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i))
+            tdSql.execute('''insert into regular_table_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1), 
+                        fake.random_int(min=0, max=9223372036854775807, step=1), 
+                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i))
+            
+            tdSql.execute('''insert into stable_1_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1), 
+                        fake.random_int(min=-9223372036854775807, max=0, step=1), 
+                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i +1))
+            tdSql.execute('''insert into regular_table_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1), 
+                        fake.random_int(min=-9223372036854775807, max=0, step=1), 
+                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i +1))
+
+            tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d) ;''' 
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1), 
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i))
+
+            # tdSql.execute('''insert into regular_table_3 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts) values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d)''' 
+            #             % (ts + i*1000, fake.random_int(min=-2147483647, max=0, step=1), 
+            #             fake.random_int(min=-9223372036854775807, max=0, step=1), 
+            #             fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
+            #             fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.address() , ts + i))
+
+        tdSql.query("select count(*) from stable_1;")
+        tdSql.checkData(0,0,3*num_random*n)
+        tdSql.query("select count(*) from regular_table_1;")
+        tdSql.checkData(0,0,num_random*n)
+
+
+    def run(self):
+        tdSql.prepare()
+        os.system("rm -rf nestedQuery3.py.sql")
+        
+        startTime = time.time() 
+        
+        db = "nest"
+        self.dropandcreateDB_random("%s" %db, 1)
+
+        # regular column select
+        q_select= ['ts' , '*' , 'q_int', 'q_bigint' , 'q_bigint' , 'q_smallint' , 'q_tinyint' , 'q_bool' , 'q_binary' , 'q_nchar' ,'q_float' , 'q_double' ,'q_ts ']
+        q_select= ['ts' , 'q_int', 'q_bigint' , 'q_bigint' , 'q_smallint' , 'q_tinyint' , 'q_bool' , 'q_binary' , 'q_nchar' ,'q_float' , 'q_double' ,'q_ts ', 'q_int_null ', 'q_bigint_null ' , 'q_bigint_null ' , 'q_smallint_null ' , 'q_tinyint_null ' , 'q_bool_null ' , 'q_binary_null ' , 'q_nchar_null ' ,'q_float_null ' , 'q_double_null ' ,'q_ts_null ']
+
+        # tag column select
+        t_select= ['*' , 'loc' ,'t_int', 't_bigint' , 't_bigint' , 't_smallint' , 't_tinyint' , 't_bool' , 't_binary' , 't_nchar' ,'t_float' , 't_double' ,'t_ts ']
+        t_select= ['loc' ,'tbname','t_int', 't_bigint' , 't_bigint' , 't_smallint' , 't_tinyint' , 't_bool' , 't_binary' , 't_nchar' ,'t_float' , 't_double' ,'t_ts ']
+
+        # regular and tag column select
+        qt_select=  q_select + t_select
+
+        # distinct regular column select
+        dq_select= ['distinct q_int', 'distinct q_bigint' , 'distinct q_smallint' , 'distinct q_tinyint' , 
+                'distinct q_bool' , 'distinct q_binary' , 'distinct q_nchar' ,'distinct q_float' , 'distinct q_double' ,'distinct q_ts ']
+
+        # distinct tag column select
+        dt_select= ['distinct loc', 'distinct t_int', 'distinct t_bigint'  , 'distinct t_smallint' , 'distinct t_tinyint' , 
+                'distinct t_bool' , 'distinct t_binary' , 'distinct t_nchar' ,'distinct t_float' , 'distinct t_double' ,'distinct t_ts ']
+
+        # distinct regular and tag column select
+        dqt_select= dq_select + dt_select
+
+        # special column select
+        s_r_select= ['_c0', '_rowts' , '_C0' ]
+        s_s_select= ['tbname' , '_rowts' , '_c0', '_C0' ]
+        unionall_or_union= [ ' union ' , ' union all ' ]
+
+        # regular column where 
+        q_where = ['ts < now +1s','q_bigint >= -9223372036854775807 and q_bigint <= 9223372036854775807', 'q_int <= 2147483647 and q_int >= -2147483647',
+        'q_smallint >= -32767 and q_smallint <= 32767','q_tinyint >= -127 and q_tinyint <= 127','q_float >= -1.7E308 and q_float <= 1.7E308', 
+        'q_double >= -1.7E308 and q_double <= 1.7E308', 'q_binary like \'binary%\'  or q_binary = \'0\' ' , 'q_nchar like \'nchar%\' or q_nchar = \'0\' ' , 
+        'q_bool = true or  q_bool = false' , 'q_bool in (0 , 1)' , 'q_bool in ( true , false)' , 'q_bool = 0 or q_bool = 1',
+        'q_bigint between  -9223372036854775807 and 9223372036854775807',' q_int between -2147483647 and 2147483647','q_smallint between -32767 and 32767', 
+        'q_tinyint between -127 and 127 ','q_float >= -3.4E38  ','q_float <= 3.4E38  ','q_double >= -1.7E308  ',
+        'q_double <= 1.7E308  ','q_float between -3.4E38 and 3.4E38  ','q_double between -1.7E308 and 1.7E308  ' ,
+        'q_float is not null  ' ,'q_double is not null  ' ,]
+        #TD-6201 ,'q_bool between 0 and 1'
+
+        # regular column where for test union,join
+        q_u_where = ['t1.ts < now +1s' , 't2.ts < now +1s','t1.q_bigint >= -9223372036854775807 and t1.q_bigint <= 9223372036854775807 and t2.q_bigint >= -9223372036854775807 and t2.q_bigint <= 9223372036854775807',
+        't1.q_int <= 2147483647 and t1.q_int >= -2147483647 and t2.q_int <= 2147483647 and t2.q_int >= -2147483647',
+        't1.q_smallint >= -32767 and t1.q_smallint <= 32767 and t2.q_smallint >= -32767 and t2.q_smallint <= 32767',
+        't1.q_tinyint >= -127 and t1.q_tinyint <= 127 and t2.q_tinyint >= -127 and t2.q_tinyint <= 127',
+        't1.q_float >= - 1.7E308 and t1.q_float <=  1.7E308 and t2.q_float >= - 1.7E308 and t2.q_float <=  1.7E308',
+        't1.q_double >= - 1.7E308 and t1.q_double <=  1.7E308 and t2.q_double >= - 1.7E308 and t2.q_double <=  1.7E308', 
+        't1.q_binary like \'binary%\'  and t2.q_binary like \'binary%\'  ' , 
+        't1.q_nchar like \'nchar%\' and t2.q_nchar like \'nchar%\' ' , 
+        't1.q_bool in (0 , 1) and t2.q_bool in (0 , 1)' , 't1.q_bool in ( true , false) and t2.q_bool in ( true , false)' , 
+        't1.q_bigint between  -9223372036854775807 and 9223372036854775807 and t2.q_bigint between  -9223372036854775807 and 9223372036854775807',
+        't1.q_int between -2147483647 and 2147483647 and t2.q_int between -2147483647 and 2147483647',
+        't1.q_smallint between -32767 and 32767 and t2.q_smallint between -32767 and 32767', 
+        't1.q_tinyint between -127 and 127 and t2.q_tinyint between -127 and 127 ','t1.q_float between -1.7E308 and  1.7E308 and t2.q_float between -1.7E308 and  1.7E308',
+        't1.q_double between -1.7E308 and  1.7E308 and t2.q_double between -1.7E308 and  1.7E308']
+        #TD-6201 ,'t1.q_bool between 0 and 1 or t2.q_bool between 0 and 1']
+        #'t1.q_bool = true and  t1.q_bool = false and t2.q_bool = true and  t2.q_bool = false' , 't1.q_bool = 0 and t1.q_bool = 1 and t2.q_bool = 0 and t2.q_bool = 1' ,
+
+        q_u_or_where = ['(t1.q_binary like \'binary%\'  or t1.q_binary = \'0\'  or t2.q_binary like \'binary%\'  or t2.q_binary = \'0\' )' , 
+        '(t1.q_nchar like \'nchar%\' or t1.q_nchar = \'0\' or t2.q_nchar like \'nchar%\' or t2.q_nchar = \'0\' )' , '(t1.q_bool = true or  t1.q_bool = false or t2.q_bool = true or  t2.q_bool = false)' , 
+        '(t1.q_bool in (0 , 1) or t2.q_bool in (0 , 1)' , 't1.q_bool in ( true , false) or t2.q_bool in ( true , false))' , '(t1.q_bool = 0 or t1.q_bool = 1 or t2.q_bool = 0 or t2.q_bool = 1)' ,
+        '(t1.q_bigint between  -9223372036854775807 and 9223372036854775807 or t2.q_bigint between  -9223372036854775807 and 9223372036854775807)',
+        '(t1.q_int between -2147483647 and 2147483647 or t2.q_int between -2147483647 and 2147483647)',
+        '(t1.q_smallint between -32767 and 32767 or t2.q_smallint between -32767 and 32767)', 
+        '(t1.q_tinyint between -127 and 127 or t2.q_tinyint between -127 and 127 )','(t1.q_float between -1.7E308 and 1.7E308 or t2.q_float between -1.7E308 and 1.7E308)',
+        '(t1.q_double between -1.7E308 and 1.7E308 or t2.q_double between -1.7E308 and 1.7E308)']
+
+        # tag column where
+        t_where = ['ts < now +1s','t_bigint >= -9223372036854775807 and t_bigint <= 9223372036854775807','t_int <= 2147483647 and t_int >= -2147483647',
+        't_smallint >= -32767 and t_smallint <= 32767','q_tinyint >= -127 and t_tinyint <= 127','t_float >= -1.7E308 and t_float <= 1.7E308',
+        't_double >= -1.7E308 and t_double <= 1.7E308', 't_binary like \'binary%\'   or t_binary = \'0\' ' , 't_nchar like \'nchar%\' or t_nchar = \'0\'' , 
+        't_bool = true or  t_bool = false' , 't_bool in (0 , 1)' , 't_bool in ( true , false)' , 't_bool = 0 or t_bool = 1',
+        't_bigint between  -9223372036854775807 and 9223372036854775807',' t_int between -2147483647 and 2147483647','t_smallint between -32767 and 32767', 
+        't_tinyint between -127 and 127 ','t_float between -1.7E308 and 1.7E308','t_double between -1.7E308 and 1.7E308']
+        #TD-6201,'t_bool between 0 and 1'
+
+        # tag column where for test  union,join | this is not support
+        t_u_where = ['t1.ts < now +1s' , 't2.ts < now +1s','t1.t_bigint >= -9223372036854775807 and t1.t_bigint <= 9223372036854775807 and t2.t_bigint >= -9223372036854775807 and t2.t_bigint <= 9223372036854775807',
+        't1.t_int <= 2147483647 and t1.t_int >= -2147483647 and t2.t_int <= 2147483647 and t2.t_int >= -2147483647',
+        't1.t_smallint >= -32767 and t1.t_smallint <= 32767 and t2.t_smallint >= -32767 and t2.t_smallint <= 32767',
+        't1.t_tinyint >= -127 and t1.t_tinyint <= 127 and t2.t_tinyint >= -127 and t2.t_tinyint <= 127',
+        't1.t_float >= -1.7E308 and t1.t_float <= 1.7E308 and t2.t_float >= -1.7E308 and t2.t_float <= 1.7E308',
+        't1.t_double >= -1.7E308 and t1.t_double <= 1.7E308 and t2.t_double >= -1.7E308 and t2.t_double <= 1.7E308', 
+        '(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\') ' , 
+        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' , 
+        't1.t_bool in (0 , 1) and t2.t_bool in (0 , 1)' , 't1.t_bool in ( true , false) and t2.t_bool in ( true , false)' , '(t1.t_bool = 0 or t1.t_bool = 1 or t2.t_bool = 0 or t2.t_bool = 1)',
+        't1.t_bigint between  -9223372036854775807 and 9223372036854775807 and t2.t_bigint between  -9223372036854775807 and 9223372036854775807',
+        't1.t_int between -2147483647 and 2147483647 and t2.t_int between -2147483647 and 2147483647',
+        't1.t_smallint between -32767 and 32767 and t2.t_smallint between -32767 and 32767', 
+        '(t1.t_tinyint between -127 and 127 and t2.t_tinyint between -127 and 127) ','t1.t_float between -1.7E308 and 1.7E308 and t2.t_float between -1.7E308 and 1.7E308',
+        '(t1.t_double between -1.7E308 and 1.7E308 and t2.t_double between -1.7E308 and 1.7E308)']
+        #TD-6201,'t1.t_bool between 0 and 1 or t2.q_bool between 0 and 1']
+
+        t_u_or_where = ['(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\' )' , 
+        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' , 
+        '(t1.t_bool in (0 , 1) or t2.t_bool in (0 , 1))' , '(t1.t_bool in ( true , false) or t2.t_bool in ( true , false))' , '(t1.t_bool = 0 or t1.t_bool = 1 or t2.t_bool = 0 or t2.t_bool = 1)',
+        '(t1.t_bigint between  -9223372036854775807 and 9223372036854775807 or t2.t_bigint between  -9223372036854775807 and 9223372036854775807)',
+        '(t1.t_int between -2147483647 and 2147483647 or t2.t_int between -2147483647 and 2147483647)',
+        '(t1.t_smallint between -32767 and 32767 or t2.t_smallint between -32767 and 32767)', 
+        '(t1.t_tinyint between -127 and 127 or t2.t_tinyint between -127 and 127 )','(t1.t_float between -1.7E308 and 1.7E308 or t2.t_float between -1.7E308 and 1.7E308)',
+        '(t1.t_double between -1.7E308 and 1.7E308 or t2.t_double between -1.7E308 and 1.7E308)']
+
+        # regular and tag column where 
+        qt_where = q_where + t_where
+        qt_u_where = q_u_where + t_u_where
+        # now,qt_u_or_where is not support
+        qt_u_or_where = q_u_or_where + t_u_or_where
+
+        # tag column where for test super join | this is  support  , 't1.t_bool = t2.t_bool ' ？？？
+        t_join_where = ['t1.t_bigint = t2.t_bigint ', 't1.t_int = t2.t_int ', 't1.t_smallint = t2.t_smallint ', 't1.t_tinyint = t2.t_tinyint ',
+                    't1.t_float = t2.t_float ', 't1.t_double = t2.t_double ', 't1.t_binary = t2.t_binary ' , 't1.t_nchar = t2.t_nchar  ' ]
+
+        # session && fill
+        session_where = ['session(ts,10a)' , 'session(ts,10s)', 'session(ts,10m)' , 'session(ts,10h)','session(ts,10d)' , 'session(ts,10w)']
+        session_u_where = ['session(t1.ts,10a)' , 'session(t1.ts,10s)', 'session(t1.ts,10m)' , 'session(t1.ts,10h)','session(t1.ts,10d)' , 'session(t1.ts,10w)',
+                    'session(t2.ts,10a)' , 'session(t2.ts,10s)', 'session(t2.ts,10m)' , 'session(t2.ts,10h)','session(t2.ts,10d)' , 'session(t2.ts,10w)']
+        
+        fill_where = ['FILL(NONE)','FILL(PREV)','FILL(NULL)','FILL(LINEAR)','FILL(NEXT)','FILL(VALUE, 1.23)']
+        
+        state_window = ['STATE_WINDOW(q_tinyint)','STATE_WINDOW(q_bigint)','STATE_WINDOW(q_int)','STATE_WINDOW(q_bool)','STATE_WINDOW(q_smallint)']
+        state_u_window = ['STATE_WINDOW(t1.q_tinyint)','STATE_WINDOW(t1.q_bigint)','STATE_WINDOW(t1.q_int)','STATE_WINDOW(t1.q_bool)','STATE_WINDOW(t1.q_smallint)',
+                    'STATE_WINDOW(t2.q_tinyint)','STATE_WINDOW(t2.q_bigint)','STATE_WINDOW(t2.q_int)','STATE_WINDOW(t2.q_bool)','STATE_WINDOW(t2.q_smallint)']
+
+        # order by where 
+        order_where = ['order by ts' , 'order by ts asc']
+        order_u_where = ['order by t1.ts' , 'order by t1.ts asc' , 'order by t2.ts' , 'order by t2.ts asc']
+        order_desc_where = ['order by ts' , 'order by ts asc' , 'order by ts desc' ]
+        orders_desc_where = ['order by ts' , 'order by ts asc' , 'order by ts desc' , 'order by loc' , 'order by loc asc' , 'order by loc desc']
+ 
+        group_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint', 
+                    'group by tbname,t_float', 'group by tbname,t_double' , 'group by tbname,t_binary', 'group by tbname,t_nchar', 'group by tbname,t_bool' ,'group by tbname ,loc ,t_bigint',
+                    'group by tbname,t_binary ,t_nchar ,t_bool' , 'group by tbname,t_int ,t_smallint ,t_tinyint' , 'group by tbname,t_float ,t_double ' ]
+        having_support = ['having count(q_int) > 0','having count(q_bigint) > 0','having count(q_smallint) > 0','having count(q_tinyint) > 0','having count(q_float) > 0','having count(q_double) > 0','having count(q_bool) > 0',
+                    'having avg(q_int) > 0','having avg(q_bigint) > 0','having avg(q_smallint) > 0','having avg(q_tinyint) > 0','having avg(q_float) > 0','having avg(q_double) > 0',
+                    'having sum(q_int) > 0','having sum(q_bigint) > 0','having sum(q_smallint) > 0','having sum(q_tinyint) > 0','having sum(q_float) > 0','having sum(q_double) > 0',
+                    'having STDDEV(q_int) > 0','having STDDEV(q_bigint) > 0','having STDDEV(q_smallint) > 0','having STDDEV(q_tinyint) > 0','having STDDEV(q_float) > 0','having STDDEV(q_double) > 0',
+                    'having TWA(q_int) > 0','having  TWA(q_bigint) > 0','having  TWA(q_smallint) > 0','having  TWA(q_tinyint) > 0','having  TWA(q_float) > 0','having  TWA(q_double) > 0',
+                    'having IRATE(q_int) > 0','having IRATE(q_bigint) > 0','having IRATE(q_smallint) > 0','having IRATE(q_tinyint) > 0','having IRATE(q_float) > 0','having IRATE(q_double) > 0',
+                    'having MIN(q_int) > 0','having MIN(q_bigint) > 0','having MIN(q_smallint) > 0','having MIN(q_tinyint) > 0','having MIN(q_float) > 0','having MIN(q_double) > 0',
+                    'having MAX(q_int) > 0','having MAX(q_bigint) > 0','having MAX(q_smallint) > 0','having MAX(q_tinyint) > 0','having MAX(q_float) > 0','having MAX(q_double) > 0',
+                    'having FIRST(q_int) > 0','having FIRST(q_bigint) > 0','having FIRST(q_smallint) > 0','having FIRST(q_tinyint) > 0','having FIRST(q_float) > 0','having FIRST(q_double) > 0',
+                    'having LAST(q_int) > 0','having LAST(q_bigint) > 0','having LAST(q_smallint) > 0','having LAST(q_tinyint) > 0','having LAST(q_float) > 0','having LAST(q_double) > 0',
+                    'having APERCENTILE(q_int,10) > 0','having APERCENTILE(q_bigint,10) > 0','having APERCENTILE(q_smallint,10) > 0','having APERCENTILE(q_tinyint,10) > 0','having APERCENTILE(q_float,10) > 0','having APERCENTILE(q_double,10) > 0']
+        having_not_support = ['having TOP(q_int,10) > 0','having TOP(q_bigint,10) > 0','having TOP(q_smallint,10) > 0','having TOP(q_tinyint,10) > 0','having TOP(q_float,10) > 0','having TOP(q_double,10) > 0','having TOP(q_bool,10) > 0',
+                    'having BOTTOM(q_int,10) > 0','having BOTTOM(q_bigint,10) > 0','having BOTTOM(q_smallint,10) > 0','having BOTTOM(q_tinyint,10) > 0','having BOTTOM(q_float,10) > 0','having BOTTOM(q_double,10) > 0','having BOTTOM(q_bool,10) > 0',
+                    'having LEASTSQUARES(q_int) > 0','having  LEASTSQUARES(q_bigint) > 0','having  LEASTSQUARES(q_smallint) > 0','having  LEASTSQUARES(q_tinyint) > 0','having  LEASTSQUARES(q_float) > 0','having  LEASTSQUARES(q_double) > 0','having  LEASTSQUARES(q_bool) > 0',
+                    'having FIRST(q_bool) > 0','having IRATE(q_bool) > 0','having PERCENTILE(q_bool,10) > 0','having avg(q_bool) > 0','having LAST_ROW(q_bool) > 0','having sum(q_bool) > 0','having STDDEV(q_bool) > 0','having APERCENTILE(q_bool,10) > 0','having  TWA(q_bool) > 0','having LAST(q_bool) > 0',                    
+                    'having PERCENTILE(q_int,10) > 0','having PERCENTILE(q_bigint,10) > 0','having PERCENTILE(q_smallint,10) > 0','having PERCENTILE(q_tinyint,10) > 0','having PERCENTILE(q_float,10) > 0','having PERCENTILE(q_double,10) > 0']
+        having_tagnot_support = ['having LAST_ROW(q_int) > 0','having LAST_ROW(q_bigint) > 0','having LAST_ROW(q_smallint) > 0','having LAST_ROW(q_tinyint) > 0','having LAST_ROW(q_float) > 0','having LAST_ROW(q_double) > 0']    
+
+        # limit offset where
+        limit_where = ['limit 1 offset 1' , 'limit 1' , 'limit 2 offset 1' , 'limit 2', 'limit 12 offset 1' , 'limit 20', 'limit 20 offset 10' , 'limit 200']
+        limit1_where = ['limit 1 offset 1' , 'limit 1' ]
+        limit_u_where = ['limit 100 offset 10' , 'limit 50' , 'limit 100' , 'limit 10' ]
+
+        # slimit soffset where
+        slimit_where = ['slimit 1 soffset 1' , 'slimit 1' , 'slimit 2 soffset 1' , 'slimit 2']
+        slimit1_where = ['slimit 2 soffset 1' , 'slimit 1' ]
+        
+        # aggregate function include [all:count(*)\avg\sum\stddev ||regualr:twa\irate\leastsquares ||group by tbname:twa\irate\]       
+        # select function include [all: min\max\first(*)\last(*)\top\bottom\apercentile\last_row(*)(not with interval)\interp(*)(FILL) ||regualr: percentile]
+        # calculation function include [all:spread\+-*/ ||regualr:diff\derivative ||group by tbname:diff\derivative\]
+        # **_ns_**  express is not support stable, therefore, separated from regular tables
+        # calc_select_all   calc_select_regular  calc_select_in_ts  calc_select_fill  calc_select_not_interval
+        # calc_aggregate_all   calc_aggregate_regular   calc_aggregate_groupbytbname
+        # calc_calculate_all   calc_calculate_regular   calc_calculate_groupbytbname
+
+        # calc_select_all   calc_select_regular  calc_select_in_ts  calc_select_fill  calc_select_not_interval
+        # select function include [all: min\max\first(*)\last(*)\top\bottom\apercentile\last_row(*)(not with interval)\interp(*)(FILL) ||regualr: percentile]
+        
+        calc_select_all = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
+                    'top(q_int,20)' , 'top(q_bigint,20)' , 'top(q_smallint,20)' ,'top(q_tinyint,20)' ,'top(q_float,20)' ,'top(q_double,20)' ,
+                    'first(q_int)' , 'first(q_bigint)' , 'first(q_smallint)' , 'first(q_tinyint)' , 'first(q_float)' ,'first(q_double)' ,'first(q_binary)' ,'first(q_nchar)' ,'first(q_bool)' ,'first(q_ts)' ,
+                    'last(q_int)' ,  'last(q_bigint)' , 'last(q_smallint)'  , 'last(q_tinyint)' , 'last(q_float)'  ,'last(q_double)' , 'last(q_binary)' ,'last(q_nchar)' ,'last(q_bool)' ,'last(q_ts)' ,
+                    'min(q_int)' , 'min(q_bigint)' , 'min(q_smallint)' , 'min(q_tinyint)' , 'min(q_float)' ,'min(q_double)' ,
+                    'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)' ,
+                    'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)' ,
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)']
+
+        calc_select_in_ts = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
+                    'top(q_int,20)' , 'top(q_bigint,20)' , 'top(q_smallint,20)' ,'top(q_tinyint,20)' ,'top(q_float,20)' ,'top(q_double,20)' ,
+                    'first(q_int)' , 'first(q_bigint)' , 'first(q_smallint)' , 'first(q_tinyint)' , 'first(q_float)' ,'first(q_double)' ,'first(q_binary)' ,'first(q_nchar)' ,'first(q_bool)' ,'first(q_ts)' ,
+                    'last(q_int)' ,  'last(q_bigint)' , 'last(q_smallint)'  , 'last(q_tinyint)' , 'last(q_float)'  ,'last(q_double)' , 'last(q_binary)' ,'last(q_nchar)' ,'last(q_bool)' ,'last(q_ts)' ]
+
+        calc_select_in = ['min(q_int)' , 'min(q_bigint)' , 'min(q_smallint)' , 'min(q_tinyint)' , 'min(q_float)' ,'min(q_double)' ,
+                    'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)' ,
+                    'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)' ,
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)']
+        
+
+        calc_select_regular = [ 'PERCENTILE(q_int,10)' ,'PERCENTILE(q_bigint,20)' , 'PERCENTILE(q_smallint,30)' ,'PERCENTILE(q_tinyint,40)' ,'PERCENTILE(q_float,50)' ,'PERCENTILE(q_double,60)']
+
+                    
+        calc_select_fill = ['INTERP(q_int)' ,'INTERP(q_bigint)' ,'INTERP(q_smallint)' ,'INTERP(q_tinyint)', 'INTERP(q_float)' ,'INTERP(q_double)']
+        interp_where = ['ts = now' , 'ts = \'2020-09-13 20:26:40.000\'' , 'ts = \'2020-09-13 20:26:40.009\'' ,'tbname in (\'table_1\') and ts = now' ,'tbname in (\'table_0\' ,\'table_1\',\'table_2\',\'table_3\',\'table_4\',\'table_5\') and ts =  \'2020-09-13 20:26:40.000\'','tbname like \'table%\'  and ts =  \'2020-09-13 20:26:40.002\'']
+
+        #two table join
+        calc_select_in_ts_j = ['bottom(t1.q_int,20)' , 'bottom(t1.q_bigint,20)' , 'bottom(t1.q_smallint,20)' , 'bottom(t1.q_tinyint,20)' ,'bottom(t1.q_float,20)' , 'bottom(t1.q_double,20)' ,
+                    'top(t1.q_int,20)' , 'top(t1.q_bigint,20)' , 'top(t1.q_smallint,20)' ,'top(t1.q_tinyint,20)' ,'top(t1.q_float,20)' ,'top(t1.q_double,20)' ,
+                    'first(t1.q_int)' , 'first(t1.q_bigint)' , 'first(t1.q_smallint)' , 'first(t1.q_tinyint)' , 'first(t1.q_float)' ,'first(t1.q_double)' ,'first(t1.q_binary)' ,'first(t1.q_nchar)' ,'first(t1.q_bool)' ,'first(t1.q_ts)' ,
+                    'last(t1.q_int)' ,  'last(t1.q_bigint)' , 'last(t1.q_smallint)'  , 'last(t1.q_tinyint)' , 'last(t1.q_float)'  ,'last(t1.q_double)' , 'last(t1.q_binary)' ,'last(t1.q_nchar)' ,'last(t1.q_bool)' ,'last(t1.q_ts)' ,
+                    'bottom(t2.q_int,20)' , 'bottom(t2.q_bigint,20)' , 'bottom(t2.q_smallint,20)' , 'bottom(t2.q_tinyint,20)' ,'bottom(t2.q_float,20)' , 'bottom(t2.q_double,20)' ,
+                    'top(t2.q_int,20)' , 'top(t2.q_bigint,20)' , 'top(t2.q_smallint,20)' ,'top(t2.q_tinyint,20)' ,'top(t2.q_float,20)' ,'top(t2.q_double,20)' ,
+                    'first(t2.q_int)' , 'first(t2.q_bigint)' , 'first(t2.q_smallint)' , 'first(t2.q_tinyint)' , 'first(t2.q_float)' ,'first(t2.q_double)' ,'first(t2.q_binary)' ,'first(t2.q_nchar)' ,'first(t2.q_bool)' ,'first(t2.q_ts)' ,
+                    'last(t2.q_int)' ,  'last(t2.q_bigint)' , 'last(t2.q_smallint)'  , 'last(t2.q_tinyint)' , 'last(t2.q_float)'  ,'last(t2.q_double)' , 'last(t2.q_binary)' ,'last(t2.q_nchar)' ,'last(t2.q_bool)' ,'last(t2.q_ts)']
+
+        calc_select_in_j = ['min(t1.q_int)' , 'min(t1.q_bigint)' , 'min(t1.q_smallint)' , 'min(t1.q_tinyint)' , 'min(t1.q_float)' ,'min(t1.q_double)' ,
+                    'max(t1.q_int)' ,  'max(t1.q_bigint)' , 'max(t1.q_smallint)' , 'max(t1.q_tinyint)' ,'max(t1.q_float)' ,'max(t1.q_double)' ,
+                    'apercentile(t1.q_int,20)' ,  'apercentile(t1.q_bigint,20)'  ,'apercentile(t1.q_smallint,20)'  ,'apercentile(t1.q_tinyint,20)' ,'apercentile(t1.q_float,20)'  ,'apercentile(t1.q_double,20)' ,
+                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' , 
+                    'last_row(t1.q_double)' , 'last_row(t1.q_bool)' ,'last_row(t1.q_binary)' ,'last_row(t1.q_nchar)' ,'last_row(t1.q_ts)' ,
+                    'min(t2.q_int)' , 'min(t2.q_bigint)' , 'min(t2.q_smallint)' , 'min(t2.q_tinyint)' , 'min(t2.q_float)' ,'min(t2.q_double)' ,
+                    'max(t2.q_int)' ,  'max(t2.q_bigint)' , 'max(t2.q_smallint)' , 'max(t2.q_tinyint)' ,'max(t2.q_float)' ,'max(t2.q_double)' ,
+                    'apercentile(t2.q_int,20)' ,  'apercentile(t2.q_bigint,20)'  ,'apercentile(t2.q_smallint,20)'  ,'apercentile(t2.q_tinyint,20)' ,'apercentile(t2.q_float,20)'  ,'apercentile(t2.q_double,20)' ,
+                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' , 
+                    'last_row(t2.q_double)' , 'last_row(t2.q_bool)' ,'last_row(t2.q_binary)' ,'last_row(t2.q_nchar)' ,'last_row(t2.q_ts)']
+        
+        calc_select_all_j = calc_select_in_ts_j + calc_select_in_j
+
+        calc_select_regular_j = [ 'PERCENTILE(t1.q_int,10)' ,'PERCENTILE(t1.q_bigint,20)' , 'PERCENTILE(t1.q_smallint,30)' ,'PERCENTILE(t1.q_tinyint,40)' ,'PERCENTILE(t1.q_float,50)' ,'PERCENTILE(t1.q_double,60)' ,
+                    'PERCENTILE(t2.q_int,10)' ,'PERCENTILE(t2.q_bigint,20)' , 'PERCENTILE(t2.q_smallint,30)' ,'PERCENTILE(t2.q_tinyint,40)' ,'PERCENTILE(t2.q_float,50)' ,'PERCENTILE(t2.q_double,60)']
+
+                    
+        calc_select_fill_j = ['INTERP(t1.q_int)' ,'INTERP(t1.q_bigint)' ,'INTERP(t1.q_smallint)' ,'INTERP(t1.q_tinyint)', 'INTERP(t1.q_float)' ,'INTERP(t1.q_double)' ,
+                    'INTERP(t2.q_int)' ,'INTERP(t2.q_bigint)' ,'INTERP(t2.q_smallint)' ,'INTERP(t2.q_tinyint)', 'INTERP(t2.q_float)' ,'INTERP(t2.q_double)']
+        interp_where_j = ['t1.ts = now' , 't1.ts = \'2020-09-13 20:26:40.000\'' , 't1.ts = \'2020-09-13 20:26:40.009\'' ,'t2.ts = now' , 't2.ts = \'2020-09-13 20:26:40.000\'' , 't2.ts = \'2020-09-13 20:26:40.009\'' ,
+                    't1.tbname in (\'table_1\') and t1.ts = now' ,'t1.tbname in (\'table_0\' ,\'table_1\',\'table_2\',\'table_3\',\'table_4\',\'table_5\') and t1.ts =  \'2020-09-13 20:26:40.000\'','t1.tbname like \'table%\'  and t1.ts =  \'2020-09-13 20:26:40.002\'',
+                    't2.tbname in (\'table_1\') and t2.ts = now' ,'t2.tbname in (\'table_0\' ,\'table_1\',\'table_2\',\'table_3\',\'table_4\',\'table_5\') and t2.ts =  \'2020-09-13 20:26:40.000\'','t2.tbname like \'table%\'  and t2.ts =  \'2020-09-13 20:26:40.002\'']
+
+        # calc_aggregate_all   calc_aggregate_regular   calc_aggregate_groupbytbname  APERCENTILE\PERCENTILE
+        # aggregate function include [all:count(*)\avg\sum\stddev ||regualr:twa\irate\leastsquares ||group by tbname:twa\irate\]
+        calc_aggregate_all = ['count(*)' , 'count(q_int)' ,'count(q_bigint)' , 'count(q_smallint)' ,'count(q_tinyint)' ,'count(q_float)' ,
+                    'count(q_double)' ,'count(q_binary)' ,'count(q_nchar)' ,'count(q_bool)' ,'count(q_ts)' ,
+                    'avg(q_int)' ,'avg(q_bigint)' , 'avg(q_smallint)' ,'avg(q_tinyint)' ,'avg(q_float)' ,'avg(q_double)' ,
+                    'sum(q_int)' ,'sum(q_bigint)' , 'sum(q_smallint)' ,'sum(q_tinyint)' ,'sum(q_float)' ,'sum(q_double)' ,
+                    'STDDEV(q_int)' ,'STDDEV(q_bigint)' , 'STDDEV(q_smallint)' ,'STDDEV(q_tinyint)' ,'STDDEV(q_float)' ,'STDDEV(q_double)',
+                    'APERCENTILE(q_int,10)' ,'APERCENTILE(q_bigint,20)' , 'APERCENTILE(q_smallint,30)' ,'APERCENTILE(q_tinyint,40)' ,'APERCENTILE(q_float,50)' ,'APERCENTILE(q_double,60)']
+
+        calc_aggregate_regular = ['twa(q_int)' ,'twa(q_bigint)' , 'twa(q_smallint)' ,'twa(q_tinyint)' ,'twa (q_float)' ,'twa(q_double)' ,
+                    'IRATE(q_int)' ,'IRATE(q_bigint)' , 'IRATE(q_smallint)' ,'IRATE(q_tinyint)' ,'IRATE (q_float)' ,'IRATE(q_double)' ,
+                    'LEASTSQUARES(q_int,15,3)' , 'LEASTSQUARES(q_bigint,10,1)' , 'LEASTSQUARES(q_smallint,20,3)' ,'LEASTSQUARES(q_tinyint,10,4)' ,'LEASTSQUARES(q_float,6,4)' ,'LEASTSQUARES(q_double,3,1)' ,
+                    'PERCENTILE(q_int,10)' ,'PERCENTILE(q_bigint,20)' , 'PERCENTILE(q_smallint,30)' ,'PERCENTILE(q_tinyint,40)' ,'PERCENTILE(q_float,50)' ,'PERCENTILE(q_double,60)']
+
+        calc_aggregate_groupbytbname = ['twa(q_int)' ,'twa(q_bigint)' , 'twa(q_smallint)' ,'twa(q_tinyint)' ,'twa (q_float)' ,'twa(q_double)' ,
+                    'IRATE(q_int)' ,'IRATE(q_bigint)' , 'IRATE(q_smallint)' ,'IRATE(q_tinyint)' ,'IRATE (q_float)' ,'IRATE(q_double)' ] 
+
+        #two table join
+        calc_aggregate_all_j = ['count(t1.*)' , 'count(t1.q_int)' ,'count(t1.q_bigint)' , 'count(t1.q_smallint)' ,'count(t1.q_tinyint)' ,'count(t1.q_float)' ,
+                    'count(t1.q_double)' ,'count(t1.q_binary)' ,'count(t1.q_nchar)' ,'count(t1.q_bool)' ,'count(t1.q_ts)' ,
+                    'avg(t1.q_int)' ,'avg(t1.q_bigint)' , 'avg(t1.q_smallint)' ,'avg(t1.q_tinyint)' ,'avg(t1.q_float)' ,'avg(t1.q_double)' ,
+                    'sum(t1.q_int)' ,'sum(t1.q_bigint)' , 'sum(t1.q_smallint)' ,'sum(t1.q_tinyint)' ,'sum(t1.q_float)' ,'sum(t1.q_double)' ,
+                    'STDDEV(t1.q_int)' ,'STDDEV(t1.q_bigint)' , 'STDDEV(t1.q_smallint)' ,'STDDEV(t1.q_tinyint)' ,'STDDEV(t1.q_float)' ,'STDDEV(t1.q_double)',
+                    'APERCENTILE(t1.q_int,10)' ,'APERCENTILE(t1.q_bigint,20)' , 'APERCENTILE(t1.q_smallint,30)' ,'APERCENTILE(t1.q_tinyint,40)' ,'APERCENTILE(t1.q_float,50)' ,'APERCENTILE(t1.q_double,60)' ,
+                    'count(t2.*)' , 'count(t2.q_int)' ,'count(t2.q_bigint)' , 'count(t2.q_smallint)' ,'count(t2.q_tinyint)' ,'count(t2.q_float)' ,
+                    'count(t2.q_double)' ,'count(t2.q_binary)' ,'count(t2.q_nchar)' ,'count(t2.q_bool)' ,'count(t2.q_ts)' ,
+                    'avg(t2.q_int)' ,'avg(t2.q_bigint)' , 'avg(t2.q_smallint)' ,'avg(t2.q_tinyint)' ,'avg(t2.q_float)' ,'avg(t2.q_double)' ,
+                    'sum(t2.q_int)' ,'sum(t2.q_bigint)' , 'sum(t2.q_smallint)' ,'sum(t2.q_tinyint)' ,'sum(t2.q_float)' ,'sum(t2.q_double)' ,
+                    'STDDEV(t2.q_int)' ,'STDDEV(t2.q_bigint)' , 'STDDEV(t2.q_smallint)' ,'STDDEV(t2.q_tinyint)' ,'STDDEV(t2.q_float)' ,'STDDEV(t2.q_double)',
+                    'APERCENTILE(t2.q_int,10)' ,'APERCENTILE(t2.q_bigint,20)' , 'APERCENTILE(t2.q_smallint,30)' ,'APERCENTILE(t2.q_tinyint,40)' ,'APERCENTILE(t2.q_float,50)' ,'APERCENTILE(t2.q_double,60)']
+
+        calc_aggregate_regular_j = ['twa(t1.q_int)' ,'twa(t1.q_bigint)' , 'twa(t1.q_smallint)' ,'twa(t1.q_tinyint)' ,'twa (t1.q_float)' ,'twa(t1.q_double)' ,
+                    'IRATE(t1.q_int)' ,'IRATE(t1.q_bigint)' , 'IRATE(t1.q_smallint)' ,'IRATE(t1.q_tinyint)' ,'IRATE (t1.q_float)' ,'IRATE(t1.q_double)' ,
+                    'LEASTSQUARES(t1.q_int,15,3)' , 'LEASTSQUARES(t1.q_bigint,10,1)' , 'LEASTSQUARES(t1.q_smallint,20,3)' ,'LEASTSQUARES(t1.q_tinyint,10,4)' ,'LEASTSQUARES(t1.q_float,6,4)' ,'LEASTSQUARES(t1.q_double,3,1)' ,
+                    'PERCENTILE(t1.q_int,10)' ,'PERCENTILE(t1.q_bigint,20)' , 'PERCENTILE(t1.q_smallint,30)' ,'PERCENTILE(t1.q_tinyint,40)' ,'PERCENTILE(t1.q_float,50)' ,'PERCENTILE(t1.q_double,60)' ,
+                    'twa(t2.q_int)' ,'twa(t2.q_bigint)' , 'twa(t2.q_smallint)' ,'twa(t2.q_tinyint)' ,'twa (t2.q_float)' ,'twa(t2.q_double)' ,
+                    'IRATE(t2.q_int)' ,'IRATE(t2.q_bigint)' , 'IRATE(t2.q_smallint)' ,'IRATE(t2.q_tinyint)' ,'IRATE (t2.q_float)' ,'IRATE(t2.q_double)',
+                    'LEASTSQUARES(t2.q_int,15,3)' , 'LEASTSQUARES(t2.q_bigint,10,1)' , 'LEASTSQUARES(t2.q_smallint,20,3)' ,'LEASTSQUARES(t2.q_tinyint,10,4)' ,'LEASTSQUARES(t2.q_float,6,4)' ,'LEASTSQUARES(t2.q_double,3,1)' ,
+                    'PERCENTILE(t2.q_int,10)' ,'PERCENTILE(t2.q_bigint,20)' , 'PERCENTILE(t2.q_smallint,30)' ,'PERCENTILE(t2.q_tinyint,40)' ,'PERCENTILE(t2.q_float,50)' ,'PERCENTILE(t2.q_double,60)']
+
+        calc_aggregate_groupbytbname_j = ['twa(t1.q_int)' ,'twa(t1.q_bigint)' , 'twa(t1.q_smallint)' ,'twa(t1.q_tinyint)' ,'twa (t1.q_float)' ,'twa(t1.q_double)' ,
+                    'IRATE(t1.q_int)' ,'IRATE(t1.q_bigint)' , 'IRATE(t1.q_smallint)' ,'IRATE(t1.q_tinyint)' ,'IRATE (t1.q_float)' ,'IRATE(t1.q_double)' ,
+                    'twa(t2.q_int)' ,'twa(t2.q_bigint)' , 'twa(t2.q_smallint)' ,'twa(t2.q_tinyint)' ,'twa (t2.q_float)' ,'twa(t2.q_double)' ,
+                    'IRATE(t2.q_int)' ,'IRATE(t2.q_bigint)' , 'IRATE(t2.q_smallint)' ,'IRATE(t2.q_tinyint)' ,'IRATE (t2.q_float)' ,'IRATE(t2.q_double)' ] 
+        
+        # calc_calculate_all   calc_calculate_regular   calc_calculate_groupbytbname
+        # calculation function include [all:spread\+-*/ ||regualr:diff\derivative ||group by tbname:diff\derivative\]
+        calc_calculate_all = ['SPREAD(ts)'  , 'SPREAD(q_ts)'  , 'SPREAD(q_int)' ,'SPREAD(q_bigint)' , 'SPREAD(q_smallint)' ,'SPREAD(q_tinyint)' ,'SPREAD(q_float)' ,'SPREAD(q_double)' , 
+                     '(SPREAD(q_int) + SPREAD(q_bigint))' , '(SPREAD(q_smallint) - SPREAD(q_float))', '(SPREAD(q_double) * SPREAD(q_tinyint))' , '(SPREAD(q_double) / SPREAD(q_float))']
+        calc_calculate_regular = ['DIFF(q_int)' ,'DIFF(q_bigint)' , 'DIFF(q_smallint)' ,'DIFF(q_tinyint)' ,'DIFF(q_float)' ,'DIFF(q_double)' ,
+                    'DERIVATIVE(q_int,15s,0)' , 'DERIVATIVE(q_bigint,10s,1)' , 'DERIVATIVE(q_smallint,20s,0)' ,'DERIVATIVE(q_tinyint,10s,1)' ,'DERIVATIVE(q_float,6s,0)' ,'DERIVATIVE(q_double,3s,1)' ]
+        calc_calculate_groupbytbname = calc_calculate_regular
+        
+        #two table join
+        calc_calculate_all_j = ['SPREAD(t1.ts)'  , 'SPREAD(t1.q_ts)'  , 'SPREAD(t1.q_int)' ,'SPREAD(t1.q_bigint)' , 'SPREAD(t1.q_smallint)' ,'SPREAD(t1.q_tinyint)' ,'SPREAD(t1.q_float)' ,'SPREAD(t1.q_double)' ,
+                    'SPREAD(t2.ts)'  , 'SPREAD(t2.q_ts)'  , 'SPREAD(t2.q_int)' ,'SPREAD(t2.q_bigint)' , 'SPREAD(t2.q_smallint)' ,'SPREAD(t2.q_tinyint)' ,'SPREAD(t2.q_float)' ,'SPREAD(t2.q_double)' ,
+                    '(SPREAD(t1.q_int) + SPREAD(t1.q_bigint))' , '(SPREAD(t1.q_tinyint) - SPREAD(t1.q_float))', '(SPREAD(t1.q_double) * SPREAD(t1.q_tinyint))' , '(SPREAD(t1.q_double) / SPREAD(t1.q_tinyint))',
+                    '(SPREAD(t2.q_int) + SPREAD(t2.q_bigint))' , '(SPREAD(t2.q_smallint) - SPREAD(t2.q_float))', '(SPREAD(t2.q_double) * SPREAD(t2.q_tinyint))' , '(SPREAD(t2.q_double) / SPREAD(t2.q_tinyint))',
+                    '(SPREAD(t1.q_int) + SPREAD(t1.q_smallint))' , '(SPREAD(t2.q_smallint) - SPREAD(t2.q_float))', '(SPREAD(t1.q_double) * SPREAD(t1.q_tinyint))' , '(SPREAD(t1.q_double) / SPREAD(t1.q_float))']
+        calc_calculate_regular_j = ['DIFF(t1.q_int)' ,'DIFF(t1.q_bigint)' , 'DIFF(t1.q_smallint)' ,'DIFF(t1.q_tinyint)' ,'DIFF(t1.q_float)' ,'DIFF(t1.q_double)' ,
+                    'DERIVATIVE(t1.q_int,15s,0)' , 'DERIVATIVE(t1.q_bigint,10s,1)' , 'DERIVATIVE(t1.q_smallint,20s,0)' ,'DERIVATIVE(t1.q_tinyint,10s,1)' ,'DERIVATIVE(t1.q_float,6s,0)' ,'DERIVATIVE(t1.q_double,3s,1)' ,
+                    'DIFF(t2.q_int)' ,'DIFF(t2.q_bigint)' , 'DIFF(t2.q_smallint)' ,'DIFF(t2.q_tinyint)' ,'DIFF(t2.q_float)' ,'DIFF(t2.q_double)' ,
+                    'DERIVATIVE(t2.q_int,15s,0)' , 'DERIVATIVE(t2.q_bigint,10s,1)' , 'DERIVATIVE(t2.q_smallint,20s,0)' ,'DERIVATIVE(t2.q_tinyint,10s,1)' ,'DERIVATIVE(t2.q_float,6s,0)' ,'DERIVATIVE(t2.q_double,3s,1)' ]
+        calc_calculate_groupbytbname_j = calc_calculate_regular_j
+
+        #inter  && calc_aggregate_all\calc_aggregate_regular\calc_select_all
+        interval_sliding = ['interval(4w) sliding(1w) ','interval(1w) sliding(1d) ','interval(1d) sliding(1h) ' ,
+                    'interval(1h) sliding(1m) ','interval(1m) sliding(1s) ','interval(1s) sliding(10a) ',
+                    'interval(1y) ','interval(1n) ','interval(1w) ','interval(1d) ','interval(1h) ','interval(1m) ','interval(1s) ' ,'interval(10a)',
+                    'interval(1y,1n) ','interval(1n,1w) ','interval(1w,1d) ','interval(1d,1h) ','interval(1h,1m) ','interval(1m,1s) ','interval(1s,10a) ' ,'interval(100a,30a)']
+
+        #1 select * from (select column form regular_table where <\>\in\and\or order by)
+        tdSql.query("select 1-1 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  "   ===暂时不支持select * ,用下面这一行
+            sql = "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_s_select)
+            sql += "%s, " % random.choice(q_select) 
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ");"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+            tdSql.checkRows(100)
+            
+        #1 outer union not support        
+        self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 1-2 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  "
+            sql = "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            #sql += "%s, " % q_select[len(q_select) -i-1]
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ") union "
+            #sql += "select  ts , * from  ( select  "
+            sql += "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+            tdSql.checkRows(100)
+                   
+        self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 1-2 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  "
+            sql = "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            #sql += "%s, " % q_select[len(q_select) -i-1]
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ") union all "
+            #sql += "select  ts , * from  ( select  "
+            sql += "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+            tdSql.checkRows(200)
+            
+        #1 inter union not support
+        tdSql.query("select 1-3 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  "
+            sql = "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += ""  
+            sql += " union select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from regular_table_2 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15606 tdSql.query(sql)
+            # tdSql.checkRows(200)
+        tdSql.query("select 1-3 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  "
+            sql = "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "  union all select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from regular_table_2 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15607 tdSql.query(sql)
+            # tdSql.checkRows(300)
+            
+        #join:TD-6020\TD-6149 select * from (select column form regular_table1，regular_table2 where  t1.ts=t2.ts and <\>\in\and\or order by)       
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 1-4 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  t1.ts ,"
+            sql = "select  *  from  ( select  t1.ts ,"
+            sql += "t1.%s, " % random.choice(q_select)            
+            sql += "t1.%s, " % random.choice(q_select) 
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += ");"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+            tdSql.checkRows(100)
+
+        tdSql.query("select 1-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts , * from  ( select  t1.ts ,"
+            sql += "t1.%s, " % random.choice(q_select)            
+            sql += "t1.%s, " % random.choice(q_select) 
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += ");"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+            # TD-15587 tdSql.query(sql)
+            # tdSql.checkRows(100)
+
+        #2 select column from (select * form regular_table ) where <\>\in\and\or order by        
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 2-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts ,"
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s  " % random.choice(q_select) 
+            sql += " from  ( select  * from regular_table_1 ) where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += " ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+            tdSql.checkRows(100)
+
+        #join: select column from (select column form regular_table1，regular_table2 )where  t1.ts=t2.ts and <\>\in\and\or order by
+        #cross join not supported yet
+        tdSql.query("select 2-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts , * from  ( select  t1.ts ,"
+            sql += "t1.%s, " % random.choice(q_select)            
+            sql += "t1.%s, " % random.choice(q_select) 
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.ts from regular_table_1 t1 , regular_table_2 t2 ) where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            #sql += ");"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql) 
+
+        #3 select * from (select column\tag form stable  where <\>\in\and\or order by )        
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 3-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   *  from  ( select  "
+            sql += "%s, " % random.choice(s_s_select)
+            sql += "%s, " % random.choice(q_select) 
+            sql += "%s, " % random.choice(t_select) 
+            sql += "ts from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))
+            tdSql.query(sql)
+            tdSql.checkRows(300)
+        tdSql.query("select 3-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts, "
+            sql += "%s  " % random.choice(s_r_select)
+            sql += "from  ( select  "
+            sql += "%s, " % random.choice(s_s_select)
+            sql += "%s, " % random.choice(q_select) 
+            sql += "%s, " % random.choice(t_select) 
+            sql += "ts from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))
+            tdSql.query(sql)
+            tdSql.checkRows(300)
+
+        # select ts,* from (select column\tag form stable1,stable2  where t1.ts = t2.ts and <\>\in\and\or order by )        
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 3-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts , *  from  ( select  t1.ts , "
+            sql += "t1.%s, " % random.choice(s_s_select)            
+            sql += "t1.%s, " % random.choice(q_select) 
+            sql += "t2.%s, " % random.choice(s_s_select)            
+            sql += "t2.%s, " % random.choice(q_select) 
+            sql += "t2.ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # TD-15609 tdSql.query(sql)
+            # tdSql.checkRows(100)
+    
+        #3 outer union not support
+        rsDn = self.restartDnodes()
+        tdSql.query("select 3-3 from stable_1;")
+        for i in range(self.fornum):
+            #sql = "select  ts , * from  ( select  "
+            sql = "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            sql += " %s "  % random.choice(unionall_or_union)
+            sql += "select  ts  from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from stable_2 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+            #TD-15610 tdSql.query(sql)
+            # tdSql.checkRows(100)
+
+        #3 inter union not support
+        tdSql.query("select 3-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts , * from  ( select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += " %s "  % random.choice(unionall_or_union)
+            sql += " select  "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select)
+            sql += "ts from stable_2 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ")"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+
+        #join:TD-6020\TD-6155 select * from (select column form stable1，stable2 where  t1.ts=t2.ts and <\>\in\and\or order by)
+        tdSql.query("select 3-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  t1.ts ,"
+            sql += "t1.%s, " % random.choice(q_select)            
+            sql += "t1.%s, " % random.choice(q_select) 
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(t_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += ");"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))  
+            # TD-15609 tdSql.query(sql)
+            # tdSql.checkRows(100)
+
+        tdSql.query("select 3-6 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  * from  ( select  t1.ts ,"
+            sql += "t1.%s, " % random.choice(q_select)            
+            sql += "t1.%s, " % random.choice(q_select) 
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.%s, " % random.choice(q_select)            
+            sql += "t2.ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(t_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += ");"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+             # TD-15609 同上 tdSql.query(sql)
+            # tdSql.checkRows(100)
+
+        #4 select column from (select * form stable  where <\>\in\and\or order by )        
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 4-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  ts , "
+            sql += "%s, " % random.choice(s_r_select)
+            sql += "%s, " % random.choice(q_select) 
+            sql += "%s  " % random.choice(t_select) 
+            sql += " from  ( select  * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15616 tdSql.query(sql)
+            # tdSql.checkRows(300)
+
+        #5 select distinct column\tag from (select * form stable  where <\>\in\and\or order by limit offset )
+        tdSql.query("select 5-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   "
+            sql += "%s " % random.choice(dqt_select)
+            sql += " from  ( select  * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15500 tdSql.query(sql)
+
+        #5-1 select distinct column\tag from (select calc form stable  where <\>\in\and\or order by limit offset )
+        tdSql.query("select 5-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  distinct  c5_1 "
+            sql += " from  ( select   "
+            sql += "%s " % random.choice(calc_select_in_ts) 
+            sql += " as c5_1 from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            #sql += "%s " % random.choice(order_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+            #tdSql.checkRows(1)有的函数还没有提交，会不返回结果，先忽略
+
+        #6-error select * from (select distinct(tag) form stable  where <\>\in\and\or order by limit  )
+        tdSql.query("select 6-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  * from  ( select  "
+            sql += "%s " % random.choice(dt_select)
+            sql += "  from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+        tdSql.query("select 6-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  * from  ( select  "
+            sql += "%s " % random.choice(dt_select)
+            sql += "  from stable_1 where "
+            sql += "%s ) ;" % random.choice(qt_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))   
+            tdSql.query(sql)
+            #tdSql.checkRows(1)#数量不一致，不在校验
+
+        #7-error select * from (select distinct(tag) form stable  where <\>\in\and\or order by limit  )
+        tdSql.query("select 7-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  * from  ( select  "
+            sql += "%s " % random.choice(dq_select)
+            sql += "  from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice([limit_where[0] , limit_where[1]] )
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+
+        #calc_select,TWA/Diff/Derivative/Irate are not allowed to apply to super table directly
+        #8 select * from (select ts,calc form ragular_table  where <\>\in\and\or order by   )
+        
+        # dcDB = self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 8-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  ts ,"
+            sql += "%s " % random.choice(calc_select_in_ts) 
+            sql += "from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 8-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  "
+            sql += "%s " % random.choice(calc_select_in_ts_j) 
+            sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+        
+        tdSql.query("select 8-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  "
+            sql += "%s " % random.choice(calc_select_in_ts_j) 
+            sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+            #tdSql.query(sql)
+
+        #9 select * from (select ts,calc form stable  where <\>\in\and\or order by   )      
+        # self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 9-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  ts ,"
+            sql += "%s " % random.choice(calc_select_in_ts) 
+            sql += "from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 9-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  "
+            sql += "%s " % random.choice(calc_select_in_ts_j) 
+            sql += "from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 9-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  "
+            sql += "%s " % random.choice(calc_select_in_ts_j) 
+            sql += "from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+
+            #functions or others can not be mixed up ,calc out select not use with ts
+        
+        #10 select calc from (select * form regualr_table  where <\>\in\and\or order by   )       
+        tdSql.query("select 10-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  " 
+            sql += "%s " % random.choice(calc_select_in_ts) 
+            sql += "as calc10_1 from ( select * from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # TD-15503 tdSql.query(sql)
+            # tdSql.checkRows(1)
+        
+        #10-1 select calc from (select * form regualr_table  where <\>\in\and\or order by   )
+        # rsDn = self.restartDnodes()        
+        # self.dropandcreateDB_random("%s" %db, 1)
+        # rsDn = self.restartDnodes()
+        tdSql.query("select 10-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  " 
+            sql += "%s " % random.choice(calc_select_all) 
+            sql += "as calc10_1 from ( select * from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        #10-2 select calc from (select * form regualr_tables  where <\>\in\and\or order by   )        
+        tdSql.query("select 10-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  " 
+            sql += "%s as calc10_1 " % random.choice(calc_select_all) 
+            sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 10-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  " 
+            sql += "%s as calc10_1 " % random.choice(calc_select_all) 
+            sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+
+        #11 select calc from (select * form stable  where <\>\in\and\or order by limit  )        
+        tdSql.query("select 11-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   "
+            sql += "%s " % random.choice(calc_select_in_ts) 
+            sql += "as calc11_1 from ( select * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        #11-1 select calc from (select * form stable  where <\>\in\and\or order by limit  )        
+        tdSql.query("select 11-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   "
+            sql += "%s " % random.choice(calc_select_all) 
+            sql += "as calc11_1 from ( select * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+ 
+        #11-2 select calc from (select * form stables  where <\>\in\and\or order by limit  )
+        tdSql.query("select 11-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   "
+            sql += "%s " % random.choice(calc_select_all) 
+            sql += "as calc11_1 from ( select * from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15493 tdSql.query(sql)
+
+        tdSql.query("select 11-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   "
+            sql += "%s " % random.choice(calc_select_all) 
+            sql += "as calc11_1 from ( select * from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+
+        #12 select calc-diff from (select * form regualr_table  where <\>\in\and\or order by limit  )        
+        ##self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 12-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  "
+            sql += "%s " % random.choice(calc_calculate_regular) 
+            sql += " from ( select * from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        tdSql.query("select 12-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  "
+            sql += "%s " % random.choice(calc_calculate_regular) 
+            sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+            #tdSql.checkRows(1)
+
+        tdSql.query("select 12-2.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  "
+            sql += "%s " % random.choice(calc_calculate_regular) 
+            sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+
+        #12-1 select calc-diff from (select * form stable  where <\>\in\and\or order by limit  )
+        tdSql.query("select 12-3 from stable_1;")
+        rsDn = self.restartDnodes()
+        for i in range(self.fornum):
+            sql = "select  * from ( select "
+            sql += "%s " % random.choice(calc_calculate_regular) 
+            sql += "  from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(group_where)
+            sql += ") "
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += " ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 12-4 from stable_1;")
+        #join query does not support group by
+        for i in range(self.fornum):
+            sql = "select  * from ( select "
+            sql += "%s " % random.choice(calc_calculate_regular_j) 
+            sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(group_where)
+            sql += ") "
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += " ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+
+        tdSql.query("select 12-5 from stable_1;")
+        #join query does not support group by
+        for i in range(self.fornum):
+            sql = "select  * from ( select "
+            sql += "%s " % random.choice(calc_calculate_regular_j) 
+            sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(group_where)
+            sql += ") "
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += " ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+        
+
+        #13 select calc-diff as diffns from (select * form stable  where <\>\in\and\or order by limit  )
+        tdSql.query("select 13-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   "
+            sql += "%s " % random.choice(calc_calculate_regular) 
+            sql += " as calc13_1 from ( select * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += "%s " % random.choice([limit_where[2] , limit_where[3]] )
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+
+        #14 select * from (select calc_aggregate_alls as agg from stable  where <\>\in\and\or group by order by slimit soffset )
+        # TD-5955 select   * from  ( select count (q_double)  from stable_1 where t_bool = true or  t_bool = false group by loc order by ts asc slimit 1 ) ;       
+        tdSql.query("select 14-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc14_1, " % random.choice(calc_aggregate_all) 
+            sql += "%s as calc14_2, " % random.choice(calc_aggregate_all) 
+            sql += "%s " % random.choice(calc_aggregate_all) 
+            sql += " as calc14_3 from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice(slimit1_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+            #tdSql.checkRows(1)
+
+        # error group by in out query
+        tdSql.query("select 14-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc14_1, " % random.choice(calc_aggregate_all) 
+            sql += "%s as calc14_2, " % random.choice(calc_aggregate_all) 
+            sql += "%s " % random.choice(calc_aggregate_all) 
+            sql += " as calc14_3 from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += "%s " % random.choice(slimit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(group_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)   
+
+        #14-2 TD-6426 select * from (select calc_aggregate_all_js as agg from stables  where <\>\in\and\or group by order by slimit soffset )
+        tdSql.query("select 14-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc14_1, " % random.choice(calc_aggregate_all_j) 
+            sql += "%s as calc14_2, " % random.choice(calc_aggregate_all_j) 
+            sql += "%s " % random.choice(calc_aggregate_all_j) 
+            sql += " as calc14_3 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(slimit1_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 14-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc14_1, " % random.choice(calc_aggregate_all_j) 
+            sql += "%s as calc14_2, " % random.choice(calc_aggregate_all_j) 
+            sql += "%s " % random.choice(calc_aggregate_all_j) 
+            sql += " as calc14_3 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(slimit1_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+
+        #15 TD-6320 select * from (select calc_aggregate_regulars as agg from regular_table  where <\>\in\and\or  order by slimit soffset )
+        tdSql.query("select 15-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_regular) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_regular) 
+            sql += "%s " % random.choice(calc_aggregate_regular) 
+            sql += " as calc15_3 from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+                
+        tdSql.query("select 15-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_regular_j) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_regular_j) 
+            sql += "%s " % random.choice(calc_aggregate_regular_j) 
+            sql += " as calc15_3 from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(order_u_where)            
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 15-2.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_regular_j) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_regular_j) 
+            sql += "%s " % random.choice(calc_aggregate_regular_j) 
+            sql += " as calc15_3 from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(order_u_where)            
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s ;" % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.error(sql)
+
+        rsDn = self.restartDnodes()
+        tdSql.query("select 15-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_groupbytbname) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_groupbytbname) 
+            sql += "%s " % random.choice(calc_aggregate_groupbytbname) 
+            sql += " as calc15_3 from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += ") "
+            sql += "order by  calc15_1  " 
+            sql += "%s " % random.choice(limit_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 15-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_groupbytbname_j) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_groupbytbname_j) 
+            sql += "%s " % random.choice(calc_aggregate_groupbytbname_j) 
+            sql += " as calc15_3 from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += ") "
+            sql += "order by  calc15_1  " 
+            sql += "%s " % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+
+        tdSql.query("select 15-4.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_groupbytbname_j) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_groupbytbname_j) 
+            sql += "%s " % random.choice(calc_aggregate_groupbytbname_j) 
+            sql += " as calc15_3 from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += ") "
+            sql += "order by  calc15_1  " 
+            sql += "%s " % random.choice(limit_u_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+
+        tdSql.query("select 15-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select "
+            sql += "%s as calc15_1, " % random.choice(calc_aggregate_groupbytbname) 
+            sql += "%s as calc15_2, " % random.choice(calc_aggregate_groupbytbname) 
+            sql += "%s " % random.choice(calc_aggregate_groupbytbname) 
+            sql += " as calc15_3 from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += ") "
+            sql += "order by calc15_1  " 
+            sql += "%s " % random.choice(limit_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+
+        #16 select * from (select calc_aggregate_regulars as agg from regular_table  where <\>\in\and\or  order by limit offset )       
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 16-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_0 , " % random.choice(calc_calculate_all)
+            sql += "%s as calc16_1 , " % random.choice(calc_aggregate_all)  
+            sql += "%s as calc16_2 " % random.choice(calc_select_in) 
+            sql += "  from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += ") "
+            sql += "order by calc16_0  " 
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # TD-15497 tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        tdSql.query("select 16-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_0  " % random.choice(calc_calculate_all_j)
+            sql += ", %s as calc16_1  " % random.choice(calc_aggregate_all_j)  
+            #sql += ", %s as calc16_2  " % random.choice(calc_select_in_j) 
+            sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += ") "
+            sql += "order by calc16_0  " 
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15493 tdSql.query(sql)
+
+        tdSql.query("select 16-2.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_0  " % random.choice(calc_calculate_all_j)
+            sql += ", %s as calc16_1  " % random.choice(calc_aggregate_all_j) 
+            sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += ") "
+            sql += "order by calc16_0  " 
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+        
+        tdSql.query("select 16-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1  " % random.choice(calc_calculate_regular) 
+            sql += "  from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "limit 2 ) "
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        tdSql.query("select 16-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1  " % random.choice(calc_calculate_regular_j) 
+            sql += "  from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "limit 2 ) "
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        tdSql.query("select 16-4.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1  " % random.choice(calc_calculate_regular_j) 
+            sql += "  from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "limit 2 ) "
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+        
+        tdSql.query("select 16-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1 , " % random.choice(calc_calculate_all)
+            sql += "%s as calc16_1 , " % random.choice(calc_calculate_regular) 
+            sql += "%s as calc16_2 " % random.choice(calc_select_all) 
+            sql += "  from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += ") "
+            sql += "order by calc16_1  " 
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+        
+        tdSql.query("select 16-6 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1  " % random.choice(calc_calculate_groupbytbname) 
+            sql += "  from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "limit 2 ) "
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+
+        tdSql.query("select 16-7 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1  " % random.choice(calc_calculate_groupbytbname_j) 
+            sql += "  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "limit 2 ) "
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        tdSql.query("select 16-8 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s as calc16_1  " % random.choice(calc_calculate_groupbytbname_j) 
+            sql += "  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "limit 2 ) "
+            sql += "%s " % random.choice(limit1_where)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        #17 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or interval_sliding group by having order by limit offset  )interval_sliding
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 17-1 from stable_1;")
+        for i in range(self.fornum):
+            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_0 , " % random.choice(calc_calculate_all)
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_support)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+        
+        tdSql.query("select 17-2 from stable_1;")
+        for i in range(self.fornum):
+            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_0 , " % random.choice(calc_calculate_all_j)
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #Column ambiguously defined: ts tdSql.query(sql)
+
+        tdSql.query("select 17-2.2 from stable_1;")
+        for i in range(self.fornum):
+            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_0 , " % random.choice(calc_calculate_all_j)
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        rsDn = self.restartDnodes()
+        tdSql.query("select 17-3 from stable_1;")
+        for i in range(self.fornum):
+            #this is having_tagnot_support , because tag-select cannot mix with last_row...
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_tagnot_support)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 17-4 from stable_1;")
+        for i in range(self.fornum):
+            #this is having_tagnot_support , because tag-select cannot mix with last_row...
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 17-4.2 from stable_1;")
+        for i in range(self.fornum):
+            #this is having_tagnot_support , because tag-select cannot mix with last_row...
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)
+
+        tdSql.query("select 17-5 from stable_1;")
+        for i in range(self.fornum):
+            #having_not_support  
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(having_not_support)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+       
+        tdSql.query("select 17-6 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 17-7 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1_1 t1, stable_1_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 17-7.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1_1 t1, stable_1_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        self.restartDnodes()
+        tdSql.query("select 17-8 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all) 
+            sql += " from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+       
+        tdSql.query("select 17-9 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 17-10 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal17_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal17_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        #18 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or session order by  limit )interval_sliding
+        tdSql.query("select 18-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all) 
+            sql += " from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(session_where)
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+               
+        tdSql.query("select 18-2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(session_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 18-2.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(session_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        self.restartDnodes()
+        tdSql.query("select 18-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(session_where)
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 18-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)
+            sql += "%s " % random.choice(session_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.query(sql)
+
+        tdSql.query("select 18-4.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)
+            sql += "%s " % random.choice(session_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.error(sql)
+
+        tdSql.query("select 18-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += "%s " % random.choice(session_where)
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+           # tdSql.error(sql)
+
+        tdSql.query("select 18-6 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(t_join_where)
+            sql += "%s " % random.choice(session_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)
+        
+        tdSql.query("select 18-7 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal18_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal18_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(session_u_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        #19 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or session order by  limit )interval_sliding       
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 19-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all) 
+            sql += " from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)        
+            sql += "%s " % random.choice(state_window)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #TD-15545 tdSql.query(sql)
+
+        tdSql.query("select 19-2 from stable_1;")
+        #TD-6435 state_window not support join
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(q_u_where)        
+            sql += "%s " % random.choice(state_u_window)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        tdSql.query("select 19-2.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
+            sql += "%s " % random.choice(q_u_or_where)        
+            sql += "%s " % random.choice(state_u_window)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+        
+        tdSql.query("select 19-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1_1 where "
+            sql += "%s " % random.choice(q_where)        
+            sql += "%s " % random.choice(state_window)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #不支持order by tdSql.query(sql)
+
+        tdSql.query("select 19-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1_1  t1, stable_1_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_where)        
+            #sql += "%s " % random.choice(state_window)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 19-4.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1_1  t1, stable_1_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s " % random.choice(q_u_or_where)  
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)
+
+        tdSql.query("select 19-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 where "
+            sql += "%s " % random.choice(q_where)        
+            sql += "%s " % random.choice(state_window)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit1_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+        #    tdSql.error(sql)
+       
+        tdSql.query("select 19-6 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(q_u_where)        
+            #sql += "%s " % random.choice(state_window)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)
+
+        tdSql.query("select 19-7 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
+            sql += "%s as cal19_1 ," % random.choice(calc_aggregate_all_j) 
+            sql += "%s as cal19_2 " % random.choice(calc_aggregate_all_j) 
+            sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(qt_u_or_where)    
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            sql += "%s " % random.choice(interval_sliding)
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        #20 select * from (select calc_select_fills form regualr_table or stable  where <\>\in\and\or fill_where group by  order by limit offset  )        
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 20-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill)
+            sql += "%s ," % random.choice(calc_select_fill) 
+            sql += "%s  " % random.choice(calc_select_fill) 
+            sql += " from stable_1 where  "
+            sql += "%s " % random.choice(interp_where)  
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(group_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        rsDn = self.restartDnodes()
+        tdSql.query("select 20-2 from stable_1;")
+        #TD-6438
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill_j)
+            sql += "%s ," % random.choice(calc_select_fill_j) 
+            sql += "%s  " % random.choice(calc_select_fill_j) 
+            sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s and " % random.choice(t_join_where)
+            sql += "%s " % random.choice(interp_where_j)  
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 20-2.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill_j)
+            sql += "%s ," % random.choice(calc_select_fill_j) 
+            sql += "%s  " % random.choice(calc_select_fill_j) 
+            sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and  "
+            sql += "%s and " % random.choice(qt_u_or_where)
+            sql += "%s " % random.choice(interp_where_j)  
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql)
+
+        tdSql.query("select 20-3 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill)
+            sql += "%s ," % random.choice(calc_select_fill) 
+            sql += "%s  " % random.choice(calc_select_fill) 
+            sql += " from stable_1 where  "
+            sql += "%s " % interp_where[2]  
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #interp不支持 tdSql.query(sql)
+        
+        tdSql.query("select 20-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill_j)
+            sql += "%s ," % random.choice(calc_select_fill_j) 
+            sql += "%s  " % random.choice(calc_select_fill_j) 
+            sql += " from stable_1 t1, table_1 t2 where t1.ts = t2.ts and    "             
+            #sql += "%s and " % random.choice(t_join_where)
+            sql += "%s " % interp_where_j[random.randint(0,5)]
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 20-4.2 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill_j)
+            sql += "%s ," % random.choice(calc_select_fill_j) 
+            sql += "%s  " % random.choice(calc_select_fill_j) 
+            sql += " from stable_1 t1, stable_1_1 t2 where t1.ts = t2.ts and    "             
+            sql += "%s and " % random.choice(qt_u_or_where)
+            sql += "%s " % interp_where_j[random.randint(0,5)]
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)
+               
+        tdSql.query("select 20-5 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill)
+            sql += "%s ," % random.choice(calc_select_fill) 
+            sql += "%s  " % random.choice(calc_select_fill) 
+            sql += " from regular_table_1 where  "
+            sql += "%s " % interp_where[1]  
+            sql += "%s " % random.choice(fill_where)
+            sql += "%s " % random.choice(order_where)
+            sql += "%s " % random.choice(limit_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        tdSql.query("select 20-6 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   * from  ( select  " 
+            sql += "%s , " % random.choice(calc_select_fill_j)
+            sql += "%s ," % random.choice(calc_select_fill_j) 
+            sql += "%s  " % random.choice(calc_select_fill_j) 
+            sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
+            #sql += "%s " % random.choice(interp_where_j) 
+            sql += "%s " % interp_where_j[random.randint(0,5)] 
+            sql += "%s " % random.choice(order_u_where)
+            sql += "%s " % random.choice(limit_u_where)
+            sql += ") "
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+
+        # error
+        #1 select * from (select * from (select * form regular_table  where <\>\in\and\or order by limit  ))
+        tdSql.query("select 1-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  * , ts from  ( select * from ( select  "
+            sql += "%s, " % random.choice(s_r_select) 
+            sql += "%s, " % random.choice(q_select)  
+            sql += "ts from regular_table_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += ")) ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)  
+
+        #2 select * from (select * from (select * form stable  where <\>\in\and\or order by limit  ))
+        tdSql.query("select 2-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  * , ts from  ( select * from ( select  "
+            sql += "%s, " % random.choice(s_s_select) 
+            sql += "%s, " % random.choice(qt_select) 
+            sql += "ts from stable_1 where "
+            sql += "%s " % random.choice(q_where)
+            sql += ")) ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+          #  tdSql.error(sql) 
+             
+        #3 select ts ,calc from  (select * form stable  where <\>\in\and\or order by limit  )       
+        #self.dropandcreateDB_random("%s" %db, 1)
+        tdSql.query("select 3-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   ts , "
+            sql += "%s " % random.choice(calc_calculate_regular) 
+            sql += " from ( select * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += "%s " % random.choice(limit_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)   
+
+        #4 select * from  (select calc form stable  where <\>\in\and\or order by limit  )
+        tdSql.query("select 4-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  "
+            sql += "%s " % random.choice(calc_select_in_ts) 
+            sql += "from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(order_desc_where)
+            sql += "%s " % random.choice(limit_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            #tdSql.query(sql)
+            
+        #5 select ts ,tbname from  (select * form stable  where <\>\in\and\or order by limit  )
+        tdSql.query("select 5-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select   ts , tbname , "
+            sql += "%s ," % random.choice(calc_calculate_regular) 
+            sql += "%s ," % random.choice(dqt_select)
+            sql += "%s " % random.choice(qt_select)
+            sql += " from ( select * from stable_1 where "
+            sql += "%s " % random.choice(qt_where)
+            sql += "%s " % random.choice(orders_desc_where)
+            sql += "%s " % random.choice(limit_where)
+            sql += ") ;"
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+         #   tdSql.error(sql)  
+
+        #special sql
+        tdSql.query("select 6-1 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select * from ( select _block_dist() from stable_1);"
+            # tdSql.query(sql)
+            # tdSql.checkRows(1)
+            sql = "select _block_dist() from (select * from stable_1);"
+            tdSql.error(sql)
+            sql = "select * from (select database());"
+            tdSql.error(sql)
+            sql = "select * from (select client_version());"
+            tdSql.error(sql)
+            sql = "select * from (select client_version() as version);"
+            tdSql.error(sql)
+            sql = "select * from (select server_version());"
+            tdSql.error(sql)
+            sql = "select * from (select server_version() as version);"
+            tdSql.error(sql)
+            sql = "select * from (select server_status());"
+            tdSql.error(sql)
+            sql = "select * from (select server_status() as status);"
+            tdSql.error(sql)
+
+
+        endTime = time.time()
+        print("total time %ds" % (endTime - startTime))
+
+        
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/system-test/7-tmq/basic5.py

@@ -360,7 +360,7 @@ class TDTestCase:
         # wait db ready
         while 1:
             tdSql.query("show databases")
-            if tdSql.getRows() == 4: 
+            if tdSql.getRows() == 5: 
                 print (tdSql.getData(0,0), tdSql.getData(1,0),tdSql.getData(2,0),)           
                 break
             else:

tests/system-test/7-tmq/subscribeDb.py

@@ -49,7 +49,38 @@ class TDTestCase:
         print(cur)
         return cur
 
-    def startTmqSimProcess(self,buildPath,cfgPath,pollDelay,dbName,showMsg,showRow,cdbName,valgrind=0):
+    def initConsumerTable(self,cdbName='cdb'):        
+        tdLog.info("create consume database, and consume info table, and consume result table")
+        tdSql.query("create database if not exists %s vgroups 1"%(cdbName))
+        tdSql.query("drop table if exists %s.consumeinfo "%(cdbName))
+        tdSql.query("drop table if exists %s.consumeresult "%(cdbName))
+
+        tdSql.query("create table %s.consumeinfo (ts timestamp, consumerid int, topiclist binary(1024), keylist binary(1024), expectmsgcnt bigint, ifcheckdata int, ifmanualcommit int)"%cdbName)
+        tdSql.query("create table %s.consumeresult (ts timestamp, consumerid int, consummsgcnt bigint, consumrowcnt bigint, checkresult int)"%cdbName)
+
+    def insertConsumerInfo(self,consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifmanualcommit,cdbName='cdb'):    
+        sql = "insert into %s.consumeinfo values "%cdbName
+        sql += "(now, %d, '%s', '%s', %d, %d, %d)"%(consumerId, topicList, keyList, expectrowcnt, ifcheckdata, ifmanualcommit)
+        tdLog.info("consume info sql: %s"%sql)
+        tdSql.query(sql)
+
+    def selectConsumeResult(self,expectRows,cdbName='cdb'):
+        resultList=[]
+        while 1:
+            tdSql.query("select * from %s.consumeresult"%cdbName)
+            #tdLog.info("row: %d, %l64d, %l64d"%(tdSql.getData(0, 1),tdSql.getData(0, 2),tdSql.getData(0, 3))
+            if tdSql.getRows() == expectRows:
+                break
+            else:
+                time.sleep(5)
+        
+        for i in range(expectRows):
+            tdLog.info ("consume id: %d, consume msgs: %d, consume rows: %d"%(tdSql.getData(i , 1), tdSql.getData(i , 2), tdSql.getData(i , 3)))
+            resultList.append(tdSql.getData(i , 3))
+        
+        return resultList
+
+    def startTmqSimProcess(self,buildPath,cfgPath,pollDelay,dbName,showMsg=1,showRow=1,cdbName='cdb',valgrind=0):
         shellCmd = 'nohup '
         if valgrind == 1:
             logFile = cfgPath + '/../log/valgrind-tmq.log'
@@ -87,6 +118,8 @@ class TDTestCase:
         pre_insert = "insert into "
         sql = pre_insert
 
+        t = time.time()
+        startTs = int(round(t * 1000))
         #tdLog.debug("doing insert data into stable:%s rows:%d ..."%(stbName, allRows))
         for i in range(ctbNum):
             sql += " %s_%d values "%(stbName,i)
@@ -127,7 +160,7 @@ class TDTestCase:
         return
 
     def tmqCase1(self, cfgPath, buildPath):
-        tdLog.printNoPrefix("======== test case 1: Produce while one consume to subscribe one db")
+        tdLog.printNoPrefix("======== test case 1: Produce while one consume to subscribe one db, inclue 1 stb")
         tdLog.info("step 1: create database, stb, ctb and insert data")
         # create and start thread
         parameterDict = {'cfg':        '',       \
@@ -135,11 +168,13 @@ class TDTestCase:
                          'vgroups':    4,        \
                          'stbName':    'stb',    \
                          'ctbNum':     10,       \
-                         'rowsPerTbl': 100000,    \
-                         'batchNum':   200,      \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
                          'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
         parameterDict['cfg'] = cfgPath
 
+        self.initConsumerTable()
+
         tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
 
         prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
@@ -149,23 +184,16 @@ class TDTestCase:
         topicName1 = 'topic_db1'
         
         tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))
-        
-        tdLog.info("create consume info table and consume result table")
-        cdbName = parameterDict["dbName"]
-        tdSql.query("create table %s.consumeinfo (ts timestamp, consumerid int, topiclist binary(1024), keylist binary(1024), expectmsgcnt bigint, ifcheckdata int)"%cdbName)
-        tdSql.query("create table %s.consumeresult (ts timestamp, consumerid int, consummsgcnt bigint, consumrowcnt bigint, checkresult int)"%cdbName)
-
         consumerId   = 0
         expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"]
         topicList    = topicName1
         ifcheckdata  = 0
+        ifManualCommit = 0
         keyList      = 'group.id:cgrp1,\
                         enable.auto.commit:false,\
                         auto.commit.interval.ms:6000,\
                         auto.offset.reset:earliest'
-        sql = "insert into %s.consumeinfo values "%cdbName
-        sql += "(now, %d, '%s', '%s', %d, %d)"%(consumerId, topicList, keyList, expectrowcnt, ifcheckdata)
-        tdSql.query(sql)
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
         
         event.wait()
 
@@ -173,32 +201,28 @@ class TDTestCase:
         pollDelay = 5
         showMsg   = 1
         showRow   = 1
-        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow, cdbName)
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
 
         # wait for data ready
         prepareEnvThread.join()
         
         tdLog.info("insert process end, and start to check consume result")
-        while 1:
-            tdSql.query("select * from %s.consumeresult"%cdbName)
-            #tdLog.info("row: %d, %l64d, %l64d"%(tdSql.getData(0, 1),tdSql.getData(0, 2),tdSql.getData(0, 3))
-            if tdSql.getRows() == 1:
-                break
-            else:
-                time.sleep(5)
-
-        tdLog.info("consumer result: %d, %d"%(tdSql.getData(0 , 2), tdSql.getData(0 , 3)))
-        tdSql.checkData(0 , 1, consumerId)
-         # mulit rows and mulit tables in one sql, this num of msg is not sure
-        #tdSql.checkData(0 , 2, expectmsgcnt)
-        tdSql.checkData(0 , 3, expectrowcnt+1)
+        expectRows = 1
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
+            tdLog.exit("tmq consume rows error!")
 
         tdSql.query("drop topic %s"%topicName1)
 
         tdLog.printNoPrefix("======== test case 1 end ...... ")
 
     def tmqCase2(self, cfgPath, buildPath):
-        tdLog.printNoPrefix("======== test case 2: Produce while two consumers to subscribe one db")
+        tdLog.printNoPrefix("======== test case 2: Produce while two consumers to subscribe one db, inclue 1 stb")
         tdLog.info("step 1: create database, stb, ctb and insert data")
         # create and start thread
         parameterDict = {'cfg':        '',       \
@@ -206,11 +230,13 @@ class TDTestCase:
                          'vgroups':    4,        \
                          'stbName':    'stb',    \
                          'ctbNum':     10,       \
-                         'rowsPerTbl': 100000,    \
+                         'rowsPerTbl': 10000,    \
                          'batchNum':   100,      \
                          'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
         parameterDict['cfg'] = cfgPath
 
+        self.initConsumerTable()
+
         tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
 
         prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
@@ -221,27 +247,19 @@ class TDTestCase:
         
         tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))
         
-        tdLog.info("create consume info table and consume result table")
-        cdbName = parameterDict["dbName"]
-        tdSql.query("create table %s.consumeinfo (ts timestamp, consumerid int, topiclist binary(1024), keylist binary(1024), expectmsgcnt bigint, ifcheckdata int)"%cdbName)
-        tdSql.query("create table %s.consumeresult (ts timestamp, consumerid int, consummsgcnt bigint, consumrowcnt bigint, checkresult int)"%cdbName)
-
         consumerId   = 0
         expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"]
         topicList    = topicName1
         ifcheckdata  = 0
+        ifManualCommit = 1
         keyList      = 'group.id:cgrp1,\
                         enable.auto.commit:false,\
                         auto.commit.interval.ms:6000,\
                         auto.offset.reset:earliest'
-        sql = "insert into %s.consumeinfo values "%cdbName
-        sql += "(now, %d, '%s', '%s', %d, %d)"%(consumerId, topicList, keyList, expectrowcnt, ifcheckdata)
-        tdSql.query(sql)
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
 
         consumerId   = 1
-        sql = "insert into %s.consumeinfo values "%cdbName
-        sql += "(now, %d, '%s', '%s', %d, %d)"%(consumerId, topicList, keyList, expectrowcnt, ifcheckdata)
-        tdSql.query(sql)
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
         
         event.wait()
 
@@ -249,30 +267,20 @@ class TDTestCase:
         pollDelay = 5
         showMsg   = 1
         showRow   = 1        
-        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow, cdbName)
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
 
         # wait for data ready
         prepareEnvThread.join()
         
         tdLog.info("insert process end, and start to check consume result")
-        while 1:
-            tdSql.query("select * from %s.consumeresult"%cdbName)
-            #tdLog.info("row: %d, %l64d, %l64d"%(tdSql.getData(0, 1),tdSql.getData(0, 2),tdSql.getData(0, 3))
-            if tdSql.getRows() == 2:
-                break
-            else:
-                time.sleep(5)
-
-        consumerId0     = tdSql.getData(0 , 1)
-        consumerId1     = tdSql.getData(1 , 1)
-        actConsumeRows0 = tdSql.getData(0 , 3)
-        actConsumeRows1 = tdSql.getData(1 , 3)
-
-        tdLog.info("consumer %d rows: %d"%(consumerId0, actConsumeRows0))
-        tdLog.info("consumer %d rows: %d"%(consumerId1, actConsumeRows1))
-
-        totalConsumeRows = actConsumeRows0 + actConsumeRows1
-        if totalConsumeRows != expectrowcnt + 2:
+        expectRows = 2
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
             tdLog.exit("tmq consume rows error!")
 
         tdSql.query("drop topic %s"%topicName1)
@@ -288,11 +296,13 @@ class TDTestCase:
                          'vgroups':    4,        \
                          'stbName':    'stb',    \
                          'ctbNum':     10,       \
-                         'rowsPerTbl': 100000,    \
+                         'rowsPerTbl': 10000,    \
                          'batchNum':   100,      \
                          'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
         parameterDict['cfg'] = cfgPath
 
+        self.initConsumerTable()
+
         tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
 
         prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
@@ -303,7 +313,7 @@ class TDTestCase:
                          'vgroups':    4,        \
                          'stbName':    'stb2',    \
                          'ctbNum':     10,       \
-                         'rowsPerTbl': 100000,    \
+                         'rowsPerTbl': 10000,    \
                          'batchNum':   100,      \
                          'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
         parameterDict['cfg'] = cfgPath
@@ -316,27 +326,19 @@ class TDTestCase:
         
         tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))
         
-        tdLog.info("create consume info table and consume result table")
-        cdbName = parameterDict["dbName"]
-        tdSql.query("create table %s.consumeinfo (ts timestamp, consumerid int, topiclist binary(1024), keylist binary(1024), expectmsgcnt bigint, ifcheckdata int)"%cdbName)
-        tdSql.query("create table %s.consumeresult (ts timestamp, consumerid int, consummsgcnt bigint, consumrowcnt bigint, checkresult int)"%cdbName)
-
         consumerId   = 0
         expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"] +  parameterDict2["rowsPerTbl"] * parameterDict2["ctbNum"]
         topicList    = topicName1
         ifcheckdata  = 0
+        ifManualCommit = 0
         keyList      = 'group.id:cgrp1,\
                         enable.auto.commit:false,\
                         auto.commit.interval.ms:6000,\
                         auto.offset.reset:earliest'
-        sql = "insert into %s.consumeinfo values "%cdbName
-        sql += "(now, %d, '%s', '%s', %d, %d)"%(consumerId, topicList, keyList, expectrowcnt, ifcheckdata)
-        tdSql.query(sql)
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
         
         # consumerId   = 1
-        # sql = "insert into %s.consumeinfo values "%cdbName
-        # sql += "(now, %d, '%s', '%s', %d, %d)"%(consumerId, topicList, keyList, expectrowcnt, ifcheckdata)
-        # tdSql.query(sql)
+        # self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
         
         event.wait()
 
@@ -344,36 +346,356 @@ class TDTestCase:
         pollDelay = 5
         showMsg   = 1
         showRow   = 1
-        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow, cdbName)
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
 
         # wait for data ready
         prepareEnvThread.join()        
         prepareEnvThread2.join()
         
         tdLog.info("insert process end, and start to check consume result")
-        while 1:
-            tdSql.query("select * from %s.consumeresult"%cdbName)
-            #tdLog.info("row: %d, %l64d, %l64d"%(tdSql.getData(0, 1),tdSql.getData(0, 2),tdSql.getData(0, 3))
-            if tdSql.getRows() == 1:
-                break
-            else:
-                time.sleep(5)
+        expectRows = 1
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
+            tdLog.exit("tmq consume rows error!")
+
+        tdSql.query("drop topic %s"%topicName1)
+
+        tdLog.printNoPrefix("======== test case 3 end ...... ")
+
+    def tmqCase4(self, cfgPath, buildPath):
+        tdLog.printNoPrefix("======== test case 4: Produce while two consumers to subscribe one db, include 2 stb")
+        tdLog.info("step 1: create database, stb, ctb and insert data")
+        # create and start thread
+        parameterDict = {'cfg':        '',       \
+                         'dbName':     'db4',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
 
-        consumerId0     = tdSql.getData(0 , 1)
-        #consumerId1     = tdSql.getData(1 , 1)
-        actConsumeRows0 = tdSql.getData(0 , 3)
-        #actConsumeRows1 = tdSql.getData(1 , 3)
+        self.initConsumerTable()
 
-        tdLog.info("consumer %d rows: %d"%(consumerId0, actConsumeRows0))
-        #tdLog.info("consumer %d rows: %d"%(consumerId1, actConsumeRows1))
+        tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
 
-        #totalConsumeRows = actConsumeRows0 + actConsumeRows1
-        if actConsumeRows0 != expectrowcnt + 1:
+        prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
+        prepareEnvThread.start()
+
+        parameterDict2 = {'cfg':        '',       \
+                         'dbName':     'db4',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb2',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        prepareEnvThread2 = threading.Thread(target=self.prepareEnv, kwargs=parameterDict2)
+        prepareEnvThread2.start()
+
+        tdLog.info("create topics from db")
+        topicName1 = 'topic_db1'
+        
+        tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))
+        
+        consumerId   = 0
+        expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"] +  parameterDict2["rowsPerTbl"] * parameterDict2["ctbNum"]
+        topicList    = topicName1
+        ifcheckdata  = 0
+        ifManualCommit = 1
+        keyList      = 'group.id:cgrp1,\
+                        enable.auto.commit:false,\
+                        auto.commit.interval.ms:6000,\
+                        auto.offset.reset:earliest'
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        consumerId   = 1
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        event.wait()
+
+        tdLog.info("start consume processor")
+        pollDelay = 5
+        showMsg   = 1
+        showRow   = 1
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
+
+        # wait for data ready
+        prepareEnvThread.join()        
+        prepareEnvThread2.join()
+        
+        tdLog.info("insert process end, and start to check consume result")
+        expectRows = 2
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
             tdLog.exit("tmq consume rows error!")
 
         tdSql.query("drop topic %s"%topicName1)
 
-        tdLog.printNoPrefix("======== test case 3 end ...... ")
+        tdLog.printNoPrefix("======== test case 4 end ...... ")
+
+    def tmqCase5(self, cfgPath, buildPath):
+        tdLog.printNoPrefix("======== test case 5: Produce while two consumers to subscribe one db, firstly create one stb, after start consume create other stb")
+        tdLog.info("step 1: create database, stb, ctb and insert data")
+        # create and start thread
+        parameterDict = {'cfg':        '',       \
+                         'dbName':     'db5',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        self.initConsumerTable()
+
+        tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
+
+        prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
+        prepareEnvThread.start()
+
+        parameterDict2 = {'cfg':        '',       \
+                         'dbName':     'db5',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb2',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        tdLog.info("create topics from db")
+        topicName1 = 'topic_db1'
+        
+        tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))
+        
+        consumerId   = 0
+        expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"] +  parameterDict2["rowsPerTbl"] * parameterDict2["ctbNum"]
+        topicList    = topicName1
+        ifcheckdata  = 0
+        ifManualCommit = 1
+        keyList      = 'group.id:cgrp1,\
+                        enable.auto.commit:false,\
+                        auto.commit.interval.ms:6000,\
+                        auto.offset.reset:earliest'
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        consumerId   = 1
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        event.wait()
+
+        tdLog.info("start consume processor")
+        pollDelay = 5
+        showMsg   = 1
+        showRow   = 1
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
+
+        prepareEnvThread2 = threading.Thread(target=self.prepareEnv, kwargs=parameterDict2)
+        prepareEnvThread2.start()
+
+        # wait for data ready
+        prepareEnvThread.join()        
+        prepareEnvThread2.join()
+        
+        tdLog.info("insert process end, and start to check consume result")
+        expectRows = 2
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
+            tdLog.exit("tmq consume rows error!")
+
+        tdSql.query("drop topic %s"%topicName1)
+
+        tdLog.printNoPrefix("======== test case 5 end ...... ")
+
+    def tmqCase6(self, cfgPath, buildPath):
+        tdLog.printNoPrefix("======== test case 6: Produce while one consumers to subscribe tow topic, Each contains one db")
+        tdLog.info("step 1: create database, stb, ctb and insert data")
+        # create and start thread
+        parameterDict = {'cfg':        '',       \
+                         'dbName':     'db60',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        self.initConsumerTable()
+
+        tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
+
+        prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
+        prepareEnvThread.start()
+
+        parameterDict2 = {'cfg':        '',       \
+                         'dbName':     'db61',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb2',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict2['dbName'], parameterDict2['vgroups']))
+
+        prepareEnvThread2 = threading.Thread(target=self.prepareEnv, kwargs=parameterDict2)
+        prepareEnvThread2.start()
+
+        tdLog.info("create topics from db")
+        topicName1 = 'topic_db60'
+        topicName2 = 'topic_db61'
+        
+        tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))        
+        tdSql.execute("create topic %s as %s" %(topicName2, parameterDict2['dbName']))
+        
+        consumerId   = 0
+        expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"] +  parameterDict2["rowsPerTbl"] * parameterDict2["ctbNum"]
+        topicList    = topicName1 + ',' + topicName2
+        ifcheckdata  = 0
+        ifManualCommit = 0
+        keyList      = 'group.id:cgrp1,\
+                        enable.auto.commit:false,\
+                        auto.commit.interval.ms:6000,\
+                        auto.offset.reset:earliest'
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        #consumerId   = 1
+        #self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        event.wait()
+
+        tdLog.info("start consume processor")
+        pollDelay = 5
+        showMsg   = 1
+        showRow   = 1
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
+
+        # wait for data ready
+        prepareEnvThread.join()        
+        prepareEnvThread2.join()
+        
+        tdLog.info("insert process end, and start to check consume result")
+        expectRows = 1
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
+            tdLog.exit("tmq consume rows error!")
+
+        tdSql.query("drop topic %s"%topicName1)
+        tdSql.query("drop topic %s"%topicName2)
+
+        tdLog.printNoPrefix("======== test case 6 end ...... ")
+
+    def tmqCase7(self, cfgPath, buildPath):
+        tdLog.printNoPrefix("======== test case 7: Produce while two consumers to subscribe tow topic, Each contains one db")
+        tdLog.info("step 1: create database, stb, ctb and insert data")
+        # create and start thread
+        parameterDict = {'cfg':        '',       \
+                         'dbName':     'db70',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        self.initConsumerTable()
+
+        tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict['dbName'], parameterDict['vgroups']))
+
+        prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
+        prepareEnvThread.start()
+
+        parameterDict2 = {'cfg':        '',       \
+                         'dbName':     'db71',    \
+                         'vgroups':    4,        \
+                         'stbName':    'stb2',    \
+                         'ctbNum':     10,       \
+                         'rowsPerTbl': 10000,    \
+                         'batchNum':   100,      \
+                         'startTs':    1640966400000}  # 2022-01-01 00:00:00.000
+        parameterDict['cfg'] = cfgPath
+
+        tdSql.execute("create database if not exists %s vgroups %d" %(parameterDict2['dbName'], parameterDict2['vgroups']))
+
+        prepareEnvThread2 = threading.Thread(target=self.prepareEnv, kwargs=parameterDict2)
+        prepareEnvThread2.start()
+
+        tdLog.info("create topics from db")
+        topicName1 = 'topic_db60'
+        topicName2 = 'topic_db61'
+        
+        tdSql.execute("create topic %s as %s" %(topicName1, parameterDict['dbName']))        
+        tdSql.execute("create topic %s as %s" %(topicName2, parameterDict2['dbName']))
+        
+        consumerId   = 0
+        expectrowcnt = parameterDict["rowsPerTbl"] * parameterDict["ctbNum"] +  parameterDict2["rowsPerTbl"] * parameterDict2["ctbNum"]
+        topicList    = topicName1 + ',' + topicName2
+        ifcheckdata  = 0
+        ifManualCommit = 1
+        keyList      = 'group.id:cgrp1,\
+                        enable.auto.commit:false,\
+                        auto.commit.interval.ms:6000,\
+                        auto.offset.reset:earliest'
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        consumerId   = 1
+        self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+        
+        event.wait()
+
+        tdLog.info("start consume processor")
+        pollDelay = 5
+        showMsg   = 1
+        showRow   = 1
+        self.startTmqSimProcess(buildPath,cfgPath,pollDelay,parameterDict["dbName"],showMsg, showRow)
+
+        # wait for data ready
+        prepareEnvThread.join()        
+        prepareEnvThread2.join()
+        
+        tdLog.info("insert process end, and start to check consume result")
+        expectRows = 2
+        resultList = self.selectConsumeResult(expectRows)
+        totalConsumeRows = 0
+        for i in range(expectRows):
+            totalConsumeRows += resultList[i]
+        
+        if totalConsumeRows != expectrowcnt:
+            tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
+            tdLog.exit("tmq consume rows error!")
+
+        tdSql.query("drop topic %s"%topicName1)
+        tdSql.query("drop topic %s"%topicName2)
+
+        tdLog.printNoPrefix("======== test case 7 end ...... ")
 
     def run(self):
         tdSql.prepare()
@@ -386,9 +708,14 @@ class TDTestCase:
         cfgPath = buildPath + "/../sim/psim/cfg"
         tdLog.info("cfgPath: %s" % cfgPath)
 
-        #self.tmqCase1(cfgPath, buildPath)
+        self.tmqCase1(cfgPath, buildPath)
         self.tmqCase2(cfgPath, buildPath) 
-        #self.tmqCase3(cfgPath, buildPath)
+        self.tmqCase3(cfgPath, buildPath)
+        self.tmqCase4(cfgPath, buildPath)
+        self.tmqCase5(cfgPath, buildPath)
+        self.tmqCase6(cfgPath, buildPath)
+        self.tmqCase7(cfgPath, buildPath)
+
 
     def stop(self):
         tdSql.close()

tests/system-test/fulltest.sh

@@ -55,5 +55,8 @@ python3 ./test.py -f 2-query/arcsin.py
 python3 ./test.py -f 2-query/arccos.py
 python3 ./test.py -f 2-query/arctan.py
 python3 ./test.py -f 2-query/query_cols_tags_and_or.py
+python3 ./test.py -f 2-query/nestedQuery.py
 
 python3 ./test.py -f 7-tmq/basic5.py
+python3 ./test.py -f 7-tmq/subscribeDb.py
+