Merge from master into develop (#6709)

* [TD-4132]<test>: add taosdump-testcase of boundary value testing

* [TD-3952]<test>: add taodemo-testcase that query with restful connector

* merge master

* modify taosdemo-testcase

* add testcase of async subscirbe  and max sql num

* testcase-subscribe of super table

* testcase-modify sub

* modify subscribe testcase

* [TD-4238]<test>: add taodemo-testcase that  records of number in request sql less than 32767

* add taosdemo-subscribe-testcase

* update taosdemo testcase

* temp commit

* temp commit

* temp commit

* temp1

* temp

* [TD-4369]<test>: add testcase of resubscibe

* [TD-4826]<fix>: new error code 0x0406 (Dnode is exiting) for tsc

* [TD-4369]<test>: add testcase of resubscibe and json file

* temp

* update master to develop's version

* Update boundary2.py

* [TD-4912]<hotfix>: fix coredump when drop vnode

* Hotfix/sangshuduo/td 3801 taosdump coverity scan issue (#6642)

* [TD-3801]<fix>: taosdump coverity scan issue.

* merge from commit: 069169e7 and fix coverity scan issue.
Co-authored-by: NShuduo Sang <sdsang@taosdata.com>

* [TD-4932]fix jenkins errors on master branch (#6645)

* [TD-4932]fix jenkins errors on master branch

* fix

* fix

* fix

* fix

* [TD-4132]<test>:modify taosdump-testcase of column length

* [TD-4918]<fix>: taosdemo subscribe endAfterResume. (#6653)

* [TD-4915]<fix> fix show-create-database except

* Hotfix/sangshuduo/td 4892 taosdemo sub fetch (#6669)

* [TD-4892]<fix>: taosdemo subscribe fetch result.

* fix stbname length.

* restrict prefix length.

* submit empty

* fix minor code.

* fix crash if no result file.

* decrease few debug print level.

* fix offset issue

* [TD-4987]<fix>: issues memory sanitizier detected. (#6675)

* [TD-4826]<fix>: no extra sleep if no message in vwqueue

* [TD-4593]<fix>: fix vnode cannnot close while syncing

* Hotfix/sangshuduo/td 4918 taosdemo sub afterconsume (#6685)

* [TD-4918]<fix>: taosdemo subscribe endAfterResume.

* fix mask length.

* fix heap use-after-free.

* Hotfix/sangshuduo/td 4987 detected by mem sanitizer (#6684)

* [TD-4987]<fix>: issues memory sanitizier detected.

* fix mask width issue.

* [TD-4828]<fix> handle dnode exit code

* Hotfix/sangshuduo/td 3973 use jemalloc for master (#6702)

* [TD-3973]<feature>: add jemalloc as submodule.

* [TD-3973]<feature>: add jemalloc as submodule.

* [TD-3973]<feature>: use jemalloc.

build works as following instructions:

cmake .. -DJEMALLOC_ENABLED=true

make

* fix jemalloc at tag 5.2.1

* fix conflicts

* make install works.

* fix conflicts.

* release script works.

* fix typo
Co-authored-by: NShuduo Sang <sdsang@taosdata.com>

* fix retentionpolicy bug
Co-authored-by: tomchon <haoran920c@163.com>
Co-authored-by: NMinglei Jin <mljin@taosdata.com>
Co-authored-by: NBaosheng Chang <changb9@mcmaster.ca>
Co-authored-by: NHongze Cheng <hzcheng@taosdata.com>
Co-authored-by: Shuduo Sang <sangshuduo@gmail.com>
Co-authored-by: NShuduo Sang <sdsang@taosdata.com>
Co-authored-by: NYiqing Liu <yqliu@taosdata.com>
Co-authored-by: NHui Li <52318143+plum-lihui@users.noreply.github.com>
Co-authored-by: NyihaoDeng <yhdeng@taosdata.com>
Co-authored-by: Nwpan <wpan@taosdata.com>
Co-authored-by: NHaojun Liao <hjxilinx@users.noreply.github.com>

Jenkinsfile

@@ -119,16 +119,32 @@ pipeline {
               abortPreviousBuilds()
             }
           sh'''
+          rm -rf ${WORKSPACE}.tes
           cp -r ${WORKSPACE} ${WORKSPACE}.tes
           cd ${WORKSPACE}.tes
-          git checkout develop
-          git pull
+          
+          '''
+          script {
+            if (env.CHANGE_TARGET == 'master') {
+              sh '''
+              git checkout master
+              git pull origin master
+              '''
+              }
+            else {
+              sh '''
+              git checkout develop
+              git pull origin develop
+              '''
+            } 
+          }
+          sh'''
           git fetch origin +refs/pull/${CHANGE_ID}/merge
           git checkout -qf FETCH_HEAD
           '''     
           
           script{
-            env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
+            env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
           }
           println env.skipstage
           sh'''

src/dnode/src/dnodeShell.c

@@ -117,7 +117,14 @@ static void dnodeProcessMsgFromShell(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
 
   if (pMsg->pCont == NULL) return;
 
-  if (dnodeGetRunStatus() != TSDB_RUN_STATUS_RUNING) {
+  SRunStatus dnodeStatus = dnodeGetRunStatus();
+  if (dnodeStatus == TSDB_RUN_STATUS_STOPPED) {
+    dError("RPC %p, shell msg:%s is ignored since dnode exiting", pMsg->handle, taosMsg[pMsg->msgType]);
+    rpcMsg.code = TSDB_CODE_DND_EXITING;
+    rpcSendResponse(&rpcMsg);
+    rpcFreeCont(pMsg->pCont);
+    return;
+  } else if (dnodeStatus != TSDB_RUN_STATUS_RUNING) {
     dError("RPC %p, shell msg:%s is ignored since dnode not running", pMsg->handle, taosMsg[pMsg->msgType]);
     rpcMsg.code = TSDB_CODE_APP_NOT_READY;
     rpcSendResponse(&rpcMsg);

src/dnode/src/dnodeVMgmt.c

@@ -170,7 +170,7 @@ static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
 static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *rpcMsg) {
   SAlterVnodeMsg *pAlter = dnodeParseVnodeMsg(rpcMsg);
 
-  void *pVnode = vnodeAcquire(pAlter->cfg.vgId);
+  void *pVnode = vnodeAcquireNotClose(pAlter->cfg.vgId);
   if (pVnode != NULL) {
     dDebug("vgId:%d, alter vnode msg is received", pAlter->cfg.vgId);
     int32_t code = vnodeAlter(pVnode, pAlter);

src/dnode/src/dnodeVRead.c

@@ -63,7 +63,7 @@ void dnodeDispatchToVReadQueue(SRpcMsg *pMsg) {
     pHead->contLen = htonl(pHead->contLen);
 
     assert(pHead->contLen > 0);
-    void *pVnode = vnodeAcquire(pHead->vgId);
+    void *pVnode = vnodeAcquireNotClose(pHead->vgId);
     if (pVnode != NULL) {
       code = vnodeWriteToRQueue(pVnode, pCont, pHead->contLen, TAOS_QTYPE_RPC, pMsg);
       if (code == TSDB_CODE_SUCCESS) queuedMsgNum++;

src/dnode/src/dnodeVWrite.c

@@ -85,7 +85,7 @@ void dnodeDispatchToVWriteQueue(SRpcMsg *pRpcMsg) {
   pMsg->vgId = htonl(pMsg->vgId);
   pMsg->contLen = htonl(pMsg->contLen);
 
-  void *pVnode = vnodeAcquire(pMsg->vgId);
+  void *pVnode = vnodeAcquireNotClose(pMsg->vgId);
   if (pVnode == NULL) {
     code = TSDB_CODE_VND_INVALID_VGROUP_ID;
   } else {

src/inc/taoserror.h

@@ -198,6 +198,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_DND_INVALID_MSG_LEN           TAOS_DEF_ERROR_CODE(0, 0x0403)  //"Invalid message length")
 #define TSDB_CODE_DND_ACTION_IN_PROGRESS        TAOS_DEF_ERROR_CODE(0, 0x0404)  //"Action in progress")
 #define TSDB_CODE_DND_TOO_MANY_VNODES           TAOS_DEF_ERROR_CODE(0, 0x0405)  //"Too many vnode directories")
+#define TSDB_CODE_DND_EXITING                   TAOS_DEF_ERROR_CODE(0, 0x0406)  //"Dnode is exiting"
 
 // vnode
 #define TSDB_CODE_VND_ACTION_IN_PROGRESS        TAOS_DEF_ERROR_CODE(0, 0x0500)  //"Action in progress")

src/inc/vnode.h

@@ -69,6 +69,7 @@ int32_t vnodeInitMgmt();
 void    vnodeCleanupMgmt();
 void*   vnodeAcquire(int32_t vgId);
 void    vnodeRelease(void *pVnode);
+void*   vnodeAcquireNotClose(int32_t vgId);
 void*   vnodeGetWal(void *pVnode);
 int32_t vnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes);
 void    vnodeBuildStatusMsg(void *pStatus);

src/kit/taosdemo/taosdemo.c

@@ -7304,7 +7304,6 @@ static void *superSubscribe(void *sarg) {
     TAOS_RES* res = NULL;
 
     uint64_t st = 0, et = 0;
-
     while ((g_queryInfo.superQueryInfo.endAfterConsume == -1)
             || (g_queryInfo.superQueryInfo.endAfterConsume >
                 consumed[pThreadInfo->end_table_to

src/query/src/qExecutor.c

@@ -1777,9 +1777,9 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
   pRuntimeEnv->pResultRowHashTable = taosHashInit(numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
   pRuntimeEnv->keyBuf  = malloc(pQueryAttr->maxTableColumnWidth + sizeof(int64_t));
   pRuntimeEnv->pool    = initResultRowPool(getResultRowSize(pRuntimeEnv));
+
   pRuntimeEnv->prevRow = malloc(POINTER_BYTES * pQueryAttr->numOfCols + pQueryAttr->srcRowSize);
   pRuntimeEnv->tagVal  = malloc(pQueryAttr->tagLen);
-  pRuntimeEnv->currentOffset = pQueryAttr->limit.offset;
 
   // NOTE: pTableCheckInfo need to update the query time range and the lastKey info
   pRuntimeEnv->pTableRetrieveTsMap = taosHashInit(numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
@@ -7566,6 +7566,7 @@ int32_t initQInfo(STsBufInfo* pTsBufInfo, void* tsdb, void* sourceOptr, SQInfo*
     pRuntimeEnv->prevResult = prevResult;
   }
 
+  pRuntimeEnv->currentOffset = pQueryAttr->limit.offset;
   if (tsdb != NULL) {
     pQueryAttr->precision = tsdbGetCfg(tsdb)->precision;
   }

src/rpc/src/rpcMain.c

@@ -1189,7 +1189,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead, SRpcReqConte
       }
       rpcSendReqToServer(pRpc, pContext);
       rpcFreeCont(rpcMsg.pCont);
-    } else if (pHead->code == TSDB_CODE_RPC_NOT_READY || pHead->code == TSDB_CODE_APP_NOT_READY) {
+    } else if (pHead->code == TSDB_CODE_RPC_NOT_READY || pHead->code == TSDB_CODE_APP_NOT_READY || pHead->code == TSDB_CODE_DND_EXITING) {
       pContext->code = pHead->code;
       rpcProcessConnError(pContext, NULL);
       rpcFreeCont(rpcMsg.pCont);

src/tsdb/src/tsdbMain.c

@@ -128,6 +128,8 @@ int tsdbCloseRepo(STsdbRepo *repo, int toCommit) {
     tsdbSyncCommit(repo);
   }
 
+  tsem_wait(&(pRepo->readyToCommit));
+
   tsdbUnRefMemTable(pRepo, pRepo->mem);
   tsdbUnRefMemTable(pRepo, pRepo->imem);
   pRepo->mem = NULL;

src/util/src/terror.c

@@ -207,6 +207,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_DND_NO_WRITE_ACCESS,          "No permission for dis
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_INVALID_MSG_LEN,          "Invalid message length")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_ACTION_IN_PROGRESS,       "Action in progress")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_TOO_MANY_VNODES,          "Too many vnode directories")
+TAOS_DEFINE_ERROR(TSDB_CODE_DND_EXITING,                  "Dnode is exiting")
 
 // vnode
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_ACTION_IN_PROGRESS,       "Action in progress")

src/vnode/inc/vnodeInt.h

@@ -41,6 +41,8 @@ typedef struct {
   int32_t  queuedWMsg;
   int32_t  queuedRMsg;
   int32_t  flowctrlLevel;
+  int8_t   preClose;  // drop and close switch
+  int8_t   reserved[3];
   int64_t  sequence;  // for topic
   int8_t   status;
   int8_t   role;

src/vnode/src/vnodeMain.c

@@ -93,7 +93,7 @@ int32_t vnodeCreate(SCreateVnodeMsg *pVnodeCfg) {
 }
 
 int32_t vnodeSync(int32_t vgId) {
-  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  SVnodeObj *pVnode = vnodeAcquireNotClose(vgId);
   if (pVnode == NULL) {
     vDebug("vgId:%d, failed to sync, vnode not find", vgId);
     return TSDB_CODE_VND_INVALID_VGROUP_ID;
@@ -116,7 +116,7 @@ int32_t vnodeSync(int32_t vgId) {
 
 
 int32_t vnodeDrop(int32_t vgId) {
-  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  SVnodeObj *pVnode = vnodeAcquireNotClose(vgId);
   if (pVnode == NULL) {
     vDebug("vgId:%d, failed to drop, vnode not find", vgId);
     return TSDB_CODE_VND_INVALID_VGROUP_ID;
@@ -439,15 +439,16 @@ int32_t vnodeOpen(int32_t vgId) {
 }
 
 int32_t vnodeClose(int32_t vgId) {
-  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  SVnodeObj *pVnode = vnodeAcquireNotClose(vgId);
   if (pVnode == NULL) return 0;
   if (pVnode->dropped) {
     vnodeRelease(pVnode);
     return 0;
   }
 
+  pVnode->preClose = 1;
+
   vDebug("vgId:%d, vnode will be closed, pVnode:%p", pVnode->vgId, pVnode);
-  vnodeRemoveFromHash(pVnode);
   vnodeRelease(pVnode);
   vnodeCleanUp(pVnode);
 

src/vnode/src/vnodeMgmt.c

@@ -125,6 +125,18 @@ void vnodeRelease(void *vparam) {
   }
 }
 
+void *vnodeAcquireNotClose(int32_t vgId) {
+  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  if (pVnode != NULL  && pVnode->preClose == 1) {
+    vnodeRelease(pVnode);
+    terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
+    vDebug("vgId:%d, not exist, pre closing", vgId);
+    return NULL;
+  }
+
+  return pVnode;
+}
+
 static void vnodeBuildVloadMsg(SVnodeObj *pVnode, SStatusMsg *pStatus) {
   int64_t totalStorage = 0;
   int64_t compStorage = 0;
@@ -188,7 +200,7 @@ void vnodeBuildStatusMsg(void *param) {
 void vnodeSetAccess(SVgroupAccess *pAccess, int32_t numOfVnodes) {
   for (int32_t i = 0; i < numOfVnodes; ++i) {
     pAccess[i].vgId = htonl(pAccess[i].vgId);
-    SVnodeObj *pVnode = vnodeAcquire(pAccess[i].vgId);
+    SVnodeObj *pVnode = vnodeAcquireNotClose(pAccess[i].vgId);
     if (pVnode != NULL) {
       pVnode->accessState = pAccess[i].accessState;
       if (pVnode->accessState != TSDB_VN_ALL_ACCCESS) {

src/vnode/src/vnodeWrite.c

@@ -396,10 +396,13 @@ static int32_t vnodePerformFlowCtrl(SVWriteMsg *pWrite) {
 }
 
 void vnodeWaitWriteCompleted(SVnodeObj *pVnode) {
+  int32_t extraSleep = 0;
   while (pVnode->queuedWMsg > 0) {
     vTrace("vgId:%d, queued wmsg num:%d", pVnode->vgId, pVnode->queuedWMsg);
     taosMsleep(10);
+    extraSleep = 1;
   }
 
-  taosMsleep(900);
+  if (extraSleep)
+    taosMsleep(900);
 }

tests/pytest/insert/retentionpolicy.py

@@ -117,6 +117,7 @@ class TDTestRetetion:
         self.checkRows(4,cmd)
         while datetime.datetime.now() <= (ttime + datetime.timedelta(hours=72)):
             time.sleep(0.001)
+        time.sleep(0.01)
         cmd = 'select * from test'
         self.queryRows=tdSql.query(cmd)
         print(tdSql.queryResult)

tests/pytest/tools/taosdemoAllTest/sub.json → tests/pytest/tools/taosdemoAllTest/Resubjson/subSyncResubAC1endAfter1.json

@@ -9,29 +9,33 @@
     "confirm_parameter_prompt": "no",
     "specified_table_query":
       {
-       "concurrent":1, 
+       "concurrent":2, 
        "mode":"sync", 
        "interval":0, 
-       "restart":"yes", 
+       "resubAfterConsume":1,
+       "endAfterConsume":1,
        "keepProgress":"yes",
+       "restart":"no",
        "sqls": [
         {
-          "sql": "select * from stb00_0 ;", 
+          "sql": "select * from stb00_0", 
           "result": "./subscribe_res0.txt"
         }]
       },
     "super_table_query": 
       {
        "stblname": "stb0",
-       "threads":1, 
+       "threads":2, 
        "mode":"sync", 
-       "interval":10000, 
-       "restart":"yes", 
+       "interval":1000, 
+       "resubAfterConsume":1,
+       "endAfterConsume":1,
        "keepProgress":"yes",
+       "restart":"no",
        "sqls": [
         {
-          "sql": "select * from xxxx where ts > '2021-02-25 11:35:00.000' ;", 
-          "result": "./subscribe_res1.txt"
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
         }]
       }
   }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/Resubjson/subSyncResubAC1endAfterMin1.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "resubAfterConsume":1,
+       "endAfterConsume":-1,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":1000, 
+       "resubAfterConsume":1,
+       "endAfterConsume":-1,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":-1,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":1000, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":-1,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1endAfter0.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":0,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":0,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1endAfterNo0.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":1,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":1000, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":2,
+       "keepProgress":"no",
+       "restart":"yes",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.py

@@ -78,7 +78,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, "%d" % suc_kill)
         os.system("rm -rf querySystemInfo*")
         os.system("rm -rf insert_res.txt")
-        os.system("rm -rf insert_res.txt")
+        os.system("rm -rf query_res.txt")
 
     def stop(self):
         tdSql.close()

tests/pytest/tools/taosdemoAllTest/TD-3453/queryall.json

@@ -13,7 +13,7 @@
     "sqls":[
       {
         "sql": "select * from stb0",
-        "result": ""
+        "result": "./query_res.txt"
       }
     ]
   }

tests/pytest/tools/taosdemoAllTest/convertResFile.py

@@ -2,6 +2,14 @@ from datetime import datetime
 import time
 import os
 
+# class  FileSeparaSpaceConvertcomma:
+#     def __init__(self):
+#         self.inputfile = ""
+#         self.oputfile = ""
+#         self.affectedRows = 0
+   
+#     def ConvertFile(self, inputfile,):
+
 os.system("awk -v  OFS=','  '{$1=$1;print$0}' ./all_query_res0.txt  > ./new_query_res0.txt")
 with open('./new_query_res0.txt','r+') as f0:
     contents = f0.readlines()

tests/pytest/tools/taosdemoAllTest/insert-disorder.json

@@ -8,7 +8,7 @@
     "thread_count": 4,
     "thread_count_create_tbl": 4,
     "result_file":"./insert_res.txt",
-    "confirm_parameter_prompt": "no",   
+    "confirm_parameter_prompt": "no", 
     "insert_interval": 0,
     "interlace_rows": 10,
     "num_of_records_per_req": 1000,

tests/pytest/tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar16384.json

@@ -71,7 +71,7 @@
             "childtable_limit": 0,
             "childtable_offset":0,
             "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 1000000,
+            "interlace_rows": 0,
             "insert_interval":0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
@@ -97,7 +97,7 @@
             "childtable_limit": 0,
             "childtable_offset":0,
             "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 1000000,
+            "interlace_rows": 0,
             "insert_interval":0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
@@ -123,7 +123,7 @@
             "childtable_limit": 0,
             "childtable_offset":0,
             "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 1000000,
+            "interlace_rows": 100,
             "insert_interval":0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,

tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 0,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 10240000000, 
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 10,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 1000,
+            "childtable_limit": 0,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 1000,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1004}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":7}]
+        }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/insertMaxNumPerReq.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 50000,
+    "num_of_records_per_req": 50000,
+    "max_sql_len": 1025000, 
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 3650,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 100,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 100,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows":50000,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1025000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2012-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "TINYINT", "count":1}],
+            "tags": [{"type": "TINYINT", "count":1}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count": 100,
+            "childtable_prefix": "stb01_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 100,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows":50000,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "interlace_rows": 32767,
+            "insert_interval":0,
+            "max_sql_len": 1025000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2012-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "TINYINT", "count":1}],
+            "tags": [{"type": "TINYINT", "count":1}]
+        }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/insertRestful.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 100,
+    "num_of_records_per_req": 100,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 10,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "rest",
+            "insert_rows": 10,
+            "childtable_limit": 0,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":1}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count": 10,
+            "childtable_prefix": "stb01_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 20,
+            "childtable_limit": 0,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":1}]
+        }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/insertTagsNumLarge128.json

@@ -11,8 +11,8 @@
     "confirm_parameter_prompt": "no",
     "insert_interval": 0,
     "interlace_rows": 10,
-    "num_of_records_per_req": 100,
-    "max_sql_len": 10240000000, 
+    "num_of_records_per_req": 1000000,
+    "max_sql_len": 1024000000, 
     "databases": [{
         "dbinfo": {
             "name": "db1",
@@ -45,7 +45,7 @@
             "childtable_limit": 0,
             "childtable_offset":0,
             "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 0,
+            "interlace_rows": 10000,
             "insert_interval":0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,

tests/pytest/tools/taosdemoAllTest/moredemo-insert-offset.py

@@ -60,7 +60,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, 1000000) 
 
         os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/taosdemoTestWithJson-1.py.sql")        
+        os.system("rm -rf tools/taosdemoAllTest/moredemo-insert-offset.py.sql")        
         
     
     def stop(self):

tests/pytest/tools/taosdemoAllTest/querrThreads0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 0,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/querrThreadsless0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": -1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/queryConcurrent0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 0,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/queryConcurrentless0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": -1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/speciQueryInsertdata.json → tests/pytest/tools/taosdemoAllTest/queryInsertdata.json

@@ -35,7 +35,7 @@
         "super_tables": [{
             "name": "stb0",
             "child_table_exists":"no",
-            "childtable_count": 100,
+            "childtable_count": 10,
             "childtable_prefix": "stb00_",
             "auto_create_table": "no",
             "batch_create_tbl_num": 10,
@@ -54,13 +54,13 @@
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
-            "columns": [{"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
         },
         {
             "name": "stb1",
             "child_table_exists":"no",
-            "childtable_count": 100,
+            "childtable_count": 10,
             "childtable_prefix": "stb01_",
             "auto_create_table": "no",
             "batch_create_tbl_num": 10,
@@ -79,7 +79,7 @@
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
-            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":6}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":6}, {"type": "BINARY", "len": 1, "count":3}, {"type": "BINARY", "len": 2, "count":6}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
         }]
     }]

tests/pytest/tools/taosdemoAllTest/queryInsertrestdata.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 0,
+    "num_of_records_per_req": 3000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 2,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": 0,
+            "childtable_offset": 0,
+            "interlace_rows": 0,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-11-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count": 2,
+            "childtable_prefix": "stb01_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 5,
+            "childtable_limit": 0,
+            "childtable_offset": 0,
+            "interlace_rows": 0 ,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-11-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":6}, {"type": "BINARY", "len": 1, "count":3}, {"type": "BINARY", "len": 2, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/queryQps.json

@@ -9,8 +9,8 @@
     "databases": "db",
     "query_times": 1,
     "specified_table_query": {
-        "query_interval": 0,
-        "concurrent": 1,
+        "query_interval": 10000,
+        "concurrent": 4,
         "sqls": [
           {    
               "sql": "select last_row(*) from stb00_0",
@@ -24,8 +24,8 @@
       },
       "super_table_query": {
           "stblname": "stb1",
-          "query_interval":0,
-          "threads": 1,
+          "query_interval":20000,
+          "threads": 4,
           "sqls": [
             {
               "sql": "select last_row(ts) from xxxx",

tests/pytest/tools/taosdemoAllTest/queryTimes0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times": 0,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/queryTimesless0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times": -1,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subAsync.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"async", 
+       "interval":0, 
+       "restart":"yes", 
+       "keepProgress":"yes",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        },
+        {
+          "sql": "select ts from stb00_1", 
+          "result": "./subscribe_res1.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"async", 
+       "interval":0, 
+       "restart":"yes", 
+       "keepProgress":"yes",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts > '2021-02-25 10:00:04.000' ", 
+          "result": "./subscribe_res3.txt"
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subInsertdata.json

@@ -35,26 +35,26 @@
         "super_tables": [{
             "name": "stb0",
             "child_table_exists":"no",
-            "childtable_count": 1,
+            "childtable_count": 2,
             "childtable_prefix": "stb00_",
             "auto_create_table": "no",
             "batch_create_tbl_num": 10,
             "data_source": "rand",
             "insert_mode": "taosc",
-            "insert_rows": 1,
+            "insert_rows": 10,
             "childtable_limit": 0,
             "childtable_offset": 0,
             "interlace_rows": 0,
             "insert_interval": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
-            "disorder_range": 0,
+            "disorder_range": 1000,
             "timestamp_step": 1000,
             "start_timestamp": "2021-02-25 10:00:00.000",
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
-            "columns": [{"type": "BINARY", "len":50, "count":1}, {"type": "BINARY", "len": 16, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
         }]
     }]

tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 0,
+    "num_of_records_per_req": 3000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 200,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 1000,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": 0,
+            "childtable_offset": 0,
+            "interlace_rows": 0,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1000,
+            "start_timestamp": "2021-02-25 10:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count": 20,
+            "childtable_prefix": "stb01_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 1000,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": 0,
+            "childtable_offset": 0,
+            "interlace_rows": 0,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1000,
+            "start_timestamp": "2021-02-25 10:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subSync.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        },
+        {
+          "sql": "select ts from stb00_1", 
+          "result": "./subscribe_res1.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":10000, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts > '2021-02-25 10:00:04.000' ", 
+          "result": "./subscribe_res3.txt"
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subSyncResFileNull.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "resubAfterConsume":-1,
+       "endAfterConsume":1,
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": ""
+        },
+        {
+          "sql": "select ts from stb00_1", 
+          "result": ""
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":10000, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "resubAfterConsume":-1,
+       "endAfterConsume":1,
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": ""
+        },
+        {
+          "sql": "select * from xxxx where ts > '2021-02-25 10:00:04.000' ", 
+          "result": ""
+        }]
+      }
+  }
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subSyncSpecMaxsql100.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":1, 
+       "mode":"sync", 
+       "interval":0, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res1.txt"
+        },
+        {
+            "sql": "select * from stb00_1",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_2",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_3",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_4",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_5",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_6",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_7",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_8",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_9",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_10 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_11 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_12 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_13 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_14 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_15 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_16 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_17 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_18 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_19 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_20 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_21 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_22 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_23 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_24 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_25 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_26 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_27 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_28 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_29 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_30 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_31 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_32 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_33 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_34 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_35 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_36 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_37 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_38 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_39 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_40 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_41 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_42 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_43 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_44 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_45 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_46 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_47 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_48 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_49 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_50 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_51 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_52 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_53 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_54 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_55 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_56 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_57 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_58 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_59 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_60",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_61",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_62",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_63",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_64",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_65",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_66",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_67",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_68",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_69",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_70 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_71 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_72 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_73 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_74 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_75 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_76 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_77 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_78 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_79 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_80 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_81 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_82 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_83 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_84 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_85 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_86 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_87 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_88 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_89 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_90 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_91 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_92 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_93 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_94 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_95 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_96 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_97 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_98 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_99 ",
+            "result": "./subscribe_res0.txt"
+
+        },
+        {
+            "sql": "select * from stb00_99 ",
+            "result": "./subscribe_res0.txt"
+
+        }]
+      },
+      "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        }]
+      }
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subSyncSpecMaxsql100Async.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":1, 
+       "mode":"async", 
+       "interval":0, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res1.txt"
+        },
+        {
+            "sql": "select * from stb00_1",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_2",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_3",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_4",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_5",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_6",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_7",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_8",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_9",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_10 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_11 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_12 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_13 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_14 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_15 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_16 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_17 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_18 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_19 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_20 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_21 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_22 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_23 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_24 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_25 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_26 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_27 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_28 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_29 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_30 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_31 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_32 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_33 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_34 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_35 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_36 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_37 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_38 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_39 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_40 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_41 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_42 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_43 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_44 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_45 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_46 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_47 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_48 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_49 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_50 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_51 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_52 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_53 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_54 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_55 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_56 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_57 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_58 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_59 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_60",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_61",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_62",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_63",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_64",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_65",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_66",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_67",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_68",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_69",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_70 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_71 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_72 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_73 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_74 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_75 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_76 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_77 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_78 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_79 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_80 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_81 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_82 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_83 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_84 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_85 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_86 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_87 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_88 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_89 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_90 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_91 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_92 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_93 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_94 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_95 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_96 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_97 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_98 ",
+            "result": "./subscribe_res0.txt"
+        },
+        {
+            "sql": "select * from stb00_99 ",
+            "result": "./subscribe_res0.txt"
+
+        },
+        {
+            "sql": "select * from stb00_99 ",
+            "result": "./subscribe_res0.txt"
+
+        }]
+      },
+      "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "restart":"no", 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
+          "result": "./subscribe_res2.txt"
+        }]
+      }
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subSyncSuperMaxsql100.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+      "super_table_query": 
+      {
+       "stblname": "stb1",
+       "threads":4, 
+       "mode":"sync", 
+       "interval":0, 
+       "restart":"no", 
+       "resubAfterConsume":-1,
+       "endAfterConsume":1, 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res2.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        }]
+      }
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/subSyncSuperMaxsql100Async.json

+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+      "super_table_query": 
+      {
+       "stblname": "stb1",
+       "threads":4, 
+       "mode":"async", 
+       "interval":0, 
+       "restart":"no", 
+       "resubAfterConsume":-1,
+       "endAfterConsume":1, 
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res2.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        },
+        {
+          "sql": "select * from xxxx where ts >= '2021-02-25 10:00:00.000' ", 
+          "result": "./subscribe_res3.txt"
+        }]
+      }
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py

@@ -64,6 +64,22 @@ class TDTestCase:
         tdSql.query("select count(*) from stb1")
         tdSql.checkData(0, 0, 200000)        
 
+        # restful connector insert data
+        os.system("%staosdemo -f tools/taosdemoAllTest/insertRestful.json -y " % binPath)
+        tdSql.execute("use db")
+        tdSql.query("select count (tbname) from stb0")
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count (tbname) from stb1")
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(*) from stb00_0")
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(*) from stb0")
+        tdSql.checkData(0, 0, 100)
+        tdSql.query("select count(*) from stb01_1")
+        tdSql.checkData(0, 0, 20)
+        tdSql.query("select count(*) from stb1")
+        tdSql.checkData(0, 0, 200)
+
 
         # insert: create  mutiple tables per sql and insert one rows per sql . 
         os.system("%staosdemo -f tools/taosdemoAllTest/insert-1s1tntmr.json -y " % binPath)
@@ -165,6 +181,10 @@ class TDTestCase:
         tdSql.query("select count(*) from db.stb0")
         tdSql.checkData(0, 0, 10000) 
         tdSql.execute("drop database if exists db") 
+        os.system("%staosdemo -f tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json -y " % binPath)
+        tdSql.query("select count(*) from db.stb0")
+        tdSql.checkRows(0)
+        tdSql.execute("drop database if exists db") 
         os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsNum0.json -y " % binPath)
         tdSql.execute("use db") 
         tdSql.query("show stables like 'stb0%' ")
@@ -201,6 +221,12 @@ class TDTestCase:
         tdSql.checkData(0, 0, "2019-10-01 00:00:00")
         tdSql.query("select last(ts) from blf.p_0_topics_6 ")        
         tdSql.checkData(0, 0, "2020-09-29 23:59:00")
+        os.system("%staosdemo -f tools/taosdemoAllTest/insertMaxNumPerReq.json -y " % binPath)   
+        tdSql.execute("use db") 
+        tdSql.query("select count(*) from stb0")
+        tdSql.checkData(0, 0, 5000000)
+        tdSql.query("select count(*) from stb1")
+        tdSql.checkData(0, 0, 5000000)
 
 
 

tests/pytest/tools/taosdemoAllTest/taosdemoTestQueryWithJson.py

@@ -19,6 +19,9 @@ from util.sql import *
 from util.dnodes import *
 import time
 from datetime import datetime
+import ast
+# from assertpy import assert_that
+import subprocess
 
 class TDTestCase:
     def init(self, conn, logSql):
@@ -40,85 +43,145 @@ class TDTestCase:
                     buildPath = root[:len(root)-len("/build/bin")]
                     break
         return buildPath
-        
+
+    # 获取taosc接口查询的结果文件中的内容,返回每行数据,并断言数据的第一列内容。
+    def assertfileDataTaosc(self,filename,expectResult):
+        self.filename = filename
+        self.expectResult = expectResult
+        with open("%s" % filename, 'r+') as f1:  
+            for line in f1.readlines():
+                queryResult = line.strip().split()[0]
+                self.assertCheck(filename,queryResult,expectResult)
+
+    # 获取restful接口查询的结果文件中的关键内容,目前的关键内容找到第一个key就跳出循，所以就只有一个数据。后续再修改多个结果文件。
+    def getfileDataRestful(self,filename):
+        self.filename = filename
+        with open("%s" % filename, 'r+') as f1:  
+            for line in f1.readlines():
+                contents = line.strip()
+                if contents.find("data") != -1:
+                    contentsDict = ast.literal_eval(contents)   # 字符串转换为字典
+                    queryResult = contentsDict['data'][0][0]
+                    break
+        return queryResult
+
+    # 获取taosc接口查询次数
+    def queryTimesTaosc(self,filename):
+        self.filename = filename
+        command = 'cat %s |wc -l'% filename
+        times = int(subprocess.getstatusoutput(command)[1]) 
+        return times
+
+    # 获取restful接口查询次数
+    def queryTimesRestful(self,filename):
+        self.filename = filename
+        command = 'cat %s |grep "200 OK" |wc -l'% filename
+        times = int(subprocess.getstatusoutput(command)[1]) 
+        return times
+
+   # 定义断言结果是否正确。不正确返回错误结果，正确即通过。
+    def assertCheck(self,filename,queryResult,expectResult):
+        self.filename = filename
+        self.queryResult = queryResult
+        self.expectResult = expectResult
+        args0 = (filename, queryResult, expectResult)
+        assert queryResult == expectResult , "Queryfile:%s ,result is %s != expect: %s" % args0 
+
     def run(self):
         buildPath = self.getBuildPath()
         if (buildPath == ""):
             tdLog.exit("taosd not found!")
         else:
             tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"      
+        binPath = buildPath+ "/build/bin/"  
+          
+        # delete useless files
+        os.system("rm -rf ./query_res*")   
+        os.system("rm -rf ./all_query*")
+        
+        # taosc query: query specified  table  and query  super table 
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryTaosc.json" % binPath)
+        os.system("cat query_res0.txt* > all_query_res0_taosc.txt")
+        os.system("cat query_res1.txt* > all_query_res1_taosc.txt")
+        os.system("cat query_res2.txt* > all_query_res2_taosc.txt")
+        
+        # correct Times testcases 
+        queryTimes0Taosc = self.queryTimesTaosc("all_query_res0_taosc.txt")
+        self.assertCheck("all_query_res0_taosc.txt",queryTimes0Taosc,6)
+
+        queryTimes1Taosc = self.queryTimesTaosc("all_query_res1_taosc.txt")
+        self.assertCheck("all_query_res1_taosc.txt",queryTimes1Taosc,6)
+
+        queryTimes2Taosc = self.queryTimesTaosc("all_query_res2_taosc.txt")
+        self.assertCheck("all_query_res2_taosc.txt",queryTimes2Taosc,20)
+        
+        # correct data testcase
+        self.assertfileDataTaosc("all_query_res0_taosc.txt","1604160000099")
+        self.assertfileDataTaosc("all_query_res1_taosc.txt","100")
+        self.assertfileDataTaosc("all_query_res2_taosc.txt","1604160000199")
         
-        # query: query specified  table  and query  super table 
-        os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryInsertdata.json" % binPath)
-        os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryTaosc.json" % binPath)
-        os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
-        os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
-        os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
-        tdSql.execute("use db")
-        tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
-        os.system("python3 tools/taosdemoAllTest/convertResFile.py")
-        tdSql.execute("insert into result0 file './test_query_res0.txt'")   
-        tdSql.query("select ts from result0")
-        tdSql.checkData(0, 0, "2020-11-01 00:00:00.099000") 
-        tdSql.query("select count(*) from result0")
-        tdSql.checkData(0, 0, 1) 
-        with open('./all_query_res1.txt','r+') as f1:    
-            result1 = int(f1.readline())
-            tdSql.query("select count(*) from stb00_1")
-            tdSql.checkData(0, 0, "%d" % result1)
-
-        with open('./all_query_res2.txt','r+') as f2:
-            result2 = int(f2.readline())
-            d2 = datetime.fromtimestamp(result2/1000)
-            timest = d2.strftime("%Y-%m-%d %H:%M:%S.%f")
-            tdSql.query("select last_row(ts) from stb1")
-            tdSql.checkData(0, 0, "%s" % timest)
+        # delete useless files
+        os.system("rm -rf ./query_res*")   
+        os.system("rm -rf ./all_query*")
+
+
+        # use restful api to query
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertrestdata.json" % binPath)
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryRestful.json" % binPath)
+        os.system("cat query_res0.txt*  > all_query_res0_rest.txt")
+        os.system("cat query_res1.txt*  > all_query_res1_rest.txt")
+        os.system("cat query_res2.txt*  > all_query_res2_rest.txt")
         
-        # # delete useless files
-        # os.system("rm -rf ./insert_res.txt")
-        # os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        # os.system("rm -rf ./querySystemInfo*")  
-        # os.system("rm -rf ./query_res*")   
-        # os.system("rm -rf ./all_query*")
-        # os.system("rm -rf ./test_query_res0.txt")
-
-
-        # # use restful api to query
-        # os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryInsertdata.json" % binPath)
-        # os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryRestful.json" % binPath)
-        # os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
-        # os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
-        # # os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
-        # tdSql.execute("use db")
-        # tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
-        # os.system("python3 tools/taosdemoAllTest/convertResFile.py")
-        # tdSql.execute("insert into result0 file './test_query_res0.txt'")   
-        # tdSql.query("select ts from result0")
-        # tdSql.checkData(0, 0, "2020-11-01 00:00:00.099000") 
-        # tdSql.query("select count(*) from result0")
-        # tdSql.checkData(0, 0, 1) 
-        # with open('./all_query_res1.txt','r+') as f1:    
-        #     result1 = int(f1.readline())
-        #     tdSql.query("select count(*) from stb00_1")
-        #     tdSql.checkData(0, 0, "%d" % result1)
-
-        # with open('./all_query_res2.txt','r+') as f2:
-        #     result2 = int(f2.readline())
-        #     d2 = datetime.fromtimestamp(result2/1000)
-        #     timest = d2.strftime("%Y-%m-%d %H:%M:%S.%f")
-        #     tdSql.query("select last_row(ts) from stb1")
-        #     tdSql.checkData(0, 0, "%s" % timest)
+        # correct Times testcases 
+        queryTimes0Restful = self.queryTimesRestful("all_query_res0_rest.txt")
+        self.assertCheck("all_query_res0_rest.txt",queryTimes0Restful,6)
+
+        queryTimes1Restful = self.queryTimesRestful("all_query_res1_rest.txt")
+        self.assertCheck("all_query_res1_rest.txt",queryTimes1Restful,6)
         
+        queryTimes2Restful = self.queryTimesRestful("all_query_res2_rest.txt")
+        self.assertCheck("all_query_res2_rest.txt",queryTimes2Restful,4)
+
+        # correct data testcase
+        data0 = self.getfileDataRestful("all_query_res0_rest.txt")
+        self.assertCheck('all_query_res0_rest.txt',data0,"2020-11-01 00:00:00.009")
+
+        data1 = self.getfileDataRestful("all_query_res1_rest.txt")
+        self.assertCheck('all_query_res1_rest.txt',data1,10) 
 
+        data2 = self.getfileDataRestful("all_query_res2_rest.txt")
+        self.assertCheck('all_query_res2_rest.txt',data2,"2020-11-01 00:00:00.004")  
+        
         
         # query times less than or equal to 100
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
         os.system("%staosdemo -f tools/taosdemoAllTest/querySpeciMutisql100.json" % binPath)
         os.system("%staosdemo -f tools/taosdemoAllTest/querySuperMutisql100.json" % binPath)
 
-        # query result print QPS
+        #query result print QPS
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
         os.system("%staosdemo -f tools/taosdemoAllTest/queryQps.json" % binPath)
+        
+        # use illegal or out of range parameters query json file
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
+        exceptcode = os.system("%staosdemo -f tools/taosdemoAllTest/queryTimes0.json" % binPath)
+        assert exceptcode != 0
+
+        exceptcode0 = os.system("%staosdemo -f tools/taosdemoAllTest/queryTimesless0.json" % binPath)
+        assert exceptcode0 != 0
+
+        exceptcode1 = os.system("%staosdemo -f tools/taosdemoAllTest/queryConcurrentless0.json" % binPath)
+        assert exceptcode1 != 0
 
+        exceptcode2 = os.system("%staosdemo -f tools/taosdemoAllTest/queryConcurrent0.json" % binPath)
+        assert exceptcode2 != 0
+
+        exceptcode3 = os.system("%staosdemo -f tools/taosdemoAllTest/querrThreadsless0.json" % binPath)
+        assert exceptcode3 != 0
+
+        exceptcode4 = os.system("%staosdemo -f tools/taosdemoAllTest/querrThreads0.json" % binPath)
+        assert exceptcode4 != 0
 
         # delete useless files
         os.system("rm -rf ./insert_res.txt")
@@ -127,6 +190,8 @@ class TDTestCase:
         os.system("rm -rf ./query_res*")   
         os.system("rm -rf ./all_query*")
         os.system("rm -rf ./test_query_res0.txt")
+
+
          
     def stop(self):
         tdSql.close()

tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py

@@ -19,6 +19,8 @@ from util.sql import *
 from util.dnodes import *
 import time
 from datetime import datetime
+import subprocess
+
 
 class TDTestCase:
     def init(self, conn, logSql):
@@ -40,7 +42,22 @@ class TDTestCase:
                     buildPath = root[:len(root)-len("/build/bin")]
                     break
         return buildPath
-        
+
+    # get the number of subscriptions
+    def subTimes(self,filename):
+        self.filename = filename
+        command = 'cat %s |wc -l'% filename
+        times = int(subprocess.getstatusoutput(command)[1]) 
+        return times
+    
+    # assert results
+    def assertCheck(self,filename,subResult,expectResult):
+        self.filename = filename
+        self.subResult = subResult
+        self.expectResult = expectResult
+        args0 = (filename, subResult, expectResult)
+        assert subResult == expectResult , "Queryfile:%s ,result is %s != expect: %s" % args0    
+
     def run(self):
         buildPath = self.getBuildPath()
         if (buildPath == ""):
@@ -48,48 +65,136 @@ class TDTestCase:
         else:
             tdLog.info("taosd found in %s" % buildPath)
         binPath = buildPath+ "/build/bin/"      
+
+        # clear env
+        os.system("ps -ef |grep 'taosdemoAllTest/subSync.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
+        os.system("ps -ef |grep 'taosdemoAllTest/subSyncKeepStart.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
+        sleep(1)
+        os.system("rm -rf ./subscribe_res*")  
+        os.system("rm -rf ./all_subscribe_res*") 
+        sleep(2)
+        # subscribe: sync 
+        os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
+        os.system("nohup %staosdemo -f tools/taosdemoAllTest/subSync.json &" % binPath)
+        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/subSync.json" |grep -v "grep"|awk \'{print $2}\'')[1])
+
+        # insert extral data     
+        tdSql.execute("use db")
+        tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)")   
+        tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)")   
+        sleep(5)
+
+        # merge result files
+        os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
+        os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
+        os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
+        os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt")
+
         
-        # query: query specified  table  and query  super table 
-        # os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
-        # os.system("%staosdemo -f tools/taosdemoAllTest/sub.json" % binPath)
-        # os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
-        # os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
-        # os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
-        # tdSql.execute("use db")
-        # tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
-        # os.system("python3 tools/taosdemoAllTest/convertResFile.py")
-        # tdSql.execute("insert into result0 file './test_query_res0.txt'")   
-        # tdSql.query("select ts from result0")
-        # tdSql.checkData(0, 0, "2020-11-01 00:00:00.099000") 
-        # tdSql.query("select count(*) from result0")
-        # tdSql.checkData(0, 0, 1) 
-        # with open('./all_query_res1.txt','r+') as f1:    
-        #     result1 = int(f1.readline())
-        #     tdSql.query("select count(*) from stb00_1")
-        #     tdSql.checkData(0, 0, "%d" % result1)
-
-        # with open('./all_query_res2.txt','r+') as f2:
-        #     result2 = int(f2.readline())
-        #     d2 = datetime.fromtimestamp(result2/1000)
-        #     timest = d2.strftime("%Y-%m-%d %H:%M:%S.%f")
-        #     tdSql.query("select last_row(ts) from stb1")
-        #     tdSql.checkData(0, 0, "%s" % timest)        
+        # correct subscribeTimes testcase
+        subTimes0 = self.subTimes("all_subscribe_res0.txt")
+        self.assertCheck("all_subscribe_res0.txt",subTimes0 ,22)
+
+        subTimes1 = self.subTimes("all_subscribe_res1.txt")
+        self.assertCheck("all_subscribe_res1.txt",subTimes1 ,24)
+
+        subTimes2 = self.subTimes("all_subscribe_res2.txt")
+        self.assertCheck("all_subscribe_res2.txt",subTimes2 ,21)
 
+        subTimes3 = self.subTimes("all_subscribe_res3.txt")
+        self.assertCheck("all_subscribe_res3.txt",subTimes3 ,13)
         
-        # # query times less than or equal to 100
-        # os.system("%staosdemo -f tools/taosdemoAllTest/QuerySpeciMutisql100.json" % binPath)
-        # os.system("%staosdemo -f tools/taosdemoAllTest/QuerySuperMutisql100.json" % binPath)
+
+        # correct data testcase
+        os.system("kill -9 %d" % query_pid)
+        sleep(3)
+        os.system("rm -rf ./subscribe_res*")   
+        os.system("rm -rf ./all_subscribe*")
+  
+        # # sql number lager  100
+        os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
+        assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0
+        assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0
+
+        # # result files is null
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subSyncResFileNull.json" % binPath)
+        # # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncResFileNull.json" % binPath) != 0
+
+
+
+
+        # resubAfterConsume= -1 endAfter=-1 ;
+        os.system('kill -9 `ps aux|grep "subSyncResubACMinus1.json" |grep -v "grep"|awk \'{print $2}\'` ')
+        os.system("nohup %staosdemo -f tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1.json & " % binPath)
+        sleep(2)
+        query_pid1 = int(subprocess.getstatusoutput('ps aux|grep "subSyncResubACMinus1.json" |grep -v "grep"|awk \'{print $2}\'')[1])
+        print("get sub1 process'pid")
+        subres0Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
+        subres2Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res2*  |wc -l' )[1])
+        assert 0==subres0Number1 , "subres0Number1 error"
+        assert 0==subres2Number1 , "subres2Number1 error"
+        tdSql.execute("insert into db.stb00_0 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") 
+        sleep(4)
+        subres2Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
+        subres0Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
+        assert 0!=subres2Number2 , "subres2Number2 error"
+        assert 0!=subres0Number2 , "subres0Number2 error"
+        os.system("kill -9 %d" % query_pid1)
+        os.system("rm -rf ./subscribe_res*")   
+
+        # # resubAfterConsume= -1 endAfter=0 ;
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
+        # os.system('kill -9 `ps aux|grep "subSyncResubACMinus1endAfter0.json" |grep -v "grep"|awk \'{print $2}\'` ')
+        # os.system("nohup %staosdemo -f tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1endAfter0.json & " % binPath)
+        # sleep(2)
+        # query_pid1 = int(subprocess.getstatusoutput('ps aux|grep "subSyncResubACMinus1endAfter0.json" |grep -v "grep"|awk \'{print $2}\'')[1])
+        # print("get sub2 process'pid")
+        # subres0Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
+        # subres2Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res2*  |wc -l' )[1])
+        # assert 0==subres0Number1 , "subres0Number1 error"
+        # assert 0==subres2Number1 , "subres2Number1 error"
+        # tdSql.execute("insert into db.stb00_0 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") 
+        # sleep(4)
+        # subres2Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
+        # subres0Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
+        # assert 0!=subres2Number2 , "subres2Number2 error"
+        # assert 0!=subres0Number2 , "subres0Number2 error"
+        # os.system("kill -9 %d" % query_pid1)
+        # os.system("rm -rf ./subscribe_res*")   
         
 
 
 
+        # # # merge result files
+        # os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
+        # os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
+        # os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
+        # # os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt")
+
+        # sleep(3)
+
+        # # correct subscribeTimes testcase
+        # subTimes0 = self.subTimes("all_subscribe_res0.txt")
+        # self.assertCheck("all_subscribe_res0.txt",subTimes0 ,3960)
+
+        # subTimes1 = self.subTimes("all_subscribe_res1.txt")
+        # self.assertCheck("all_subscribe_res1.txt",subTimes1 ,40)
+
+        # subTimes2 = self.subTimes("all_subscribe_res2.txt")
+        # self.assertCheck("all_subscribe_res2.txt",subTimes2 ,1900)
+
+
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath)
+
+
+        
         # delete useless files
-        # os.system("rm -rf ./insert_res.txt")
-        # os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        # os.system("rm -rf ./querySystemInfo*")  
-        # os.system("rm -rf ./query_res*")   
-        # os.system("rm -rf ./all_query*")
-        # os.system("rm -rf ./test_query_res0.txt")
+        os.system("rm -rf ./insert_res.txt")
+        os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
+        os.system("rm -rf ./subscribe_res*")   
+        os.system("rm -rf ./all_subscribe*")
          
     def stop(self):
         tdSql.close()

tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJsonAsync.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 sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import time
+from datetime import datetime
+import subprocess
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    # 获取订阅次数
+    def subTimes(self,filename):
+        self.filename = filename
+        command = 'cat %s |wc -l'% filename
+        times = int(subprocess.getstatusoutput(command)[1]) 
+        return times
+
+    def assertCheck(self,filename,queryResult,expectResult):
+        self.filename = filename
+        self.queryResult = queryResult
+        self.expectResult = expectResult
+        args0 = (filename, queryResult, expectResult)
+        assert queryResult == expectResult , "Queryfile:%s ,result is %s != expect: %s" % args0    
+
+    def run(self):
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        binPath = buildPath+ "/build/bin/"      
+
+        # clear env
+        os.system("ps -ef |grep 'taosdemoAllTest/subAsync.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
+        sleep(1)
+        os.system("rm -rf ./subscribe_res*")  
+        os.system("rm -rf ./all_subscribe_res*") 
+
+        # subscribe: resultfile 
+        os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
+        os.system("nohup %staosdemo -f tools/taosdemoAllTest/subAsync.json &" % binPath)
+        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/subAsync.json" |grep -v "grep"|awk \'{print $2}\'')[1])
+
+        # insert extral data     
+        tdSql.execute("use db")
+        tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)")   
+        tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)")   
+        sleep(5)
+
+        # merge result files
+        os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
+        os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
+        os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
+        os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt")    
+
+        # correct subscribeTimes testcase
+        subTimes0 = self.subTimes("all_subscribe_res0.txt")
+        self.assertCheck("all_subscribe_res0.txt",subTimes0 ,22)
+
+        subTimes1 = self.subTimes("all_subscribe_res1.txt")
+        self.assertCheck("all_subscribe_res1.txt",subTimes1 ,24)
+
+        subTimes2 = self.subTimes("all_subscribe_res2.txt")
+        self.assertCheck("all_subscribe_res2.txt",subTimes2 ,21)
+
+        subTimes3 = self.subTimes("all_subscribe_res3.txt")
+        self.assertCheck("all_subscribe_res3.txt",subTimes3 ,13)
+
+        # correct data testcase
+  
+        os.system("kill -9 %d" % query_pid)
+  
+        # # query times less than or equal to 100
+        os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
+        assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0
+        assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0
+        
+        # delete useless files
+        os.system("rm -rf ./insert_res.txt")
+        os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
+        os.system("rm -rf ./subscribe_res*")   
+        os.system("rm -rf ./all_subscribe*")
+         
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())