Merge branch '3.0' into merge/mainto3.02

contrib/CMakeLists.txt

@@ -42,11 +42,6 @@ endif()
 set(CONTRIB_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in")
 configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
-# taos-tools
-if(${BUILD_TOOLS})
-    cat("${TD_SUPPORT_DIR}/taostools_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif()
-
 # taosws-rs
 if(${WEBSOCKET})
     cat("${TD_SUPPORT_DIR}/taosws_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})

docs/en/14-reference/03-taos-sql/16-operators.md

@@ -43,7 +43,8 @@ TDengine supports `UNION ALL` and `UNION` operators. UNION ALL combines the resu
 | 9   |       LIKE          | BINARY, NCHAR, and VARCHAR                                               | Matches the specified pattern string with wildcard |
 | 10  |      NOT LIKE       | BINARY, NCHAR, and VARCHAR                                               | Does not match the specified pattern string with wildcard |
 | 11  |   MATCH, NMATCH     | BINARY, NCHAR, and VARCHAR                                               | Regular expression match   |
-| 12  |     CONTAINS        | JSON                                                                     | Whether a key exists in JSON |
+| 12  |   REGEXP, NOT REGEXP     | BINARY, NCHAR, and VARCHAR                                               | Regular expression match   |
+| 13  |     CONTAINS        | JSON                                                                     | Whether a key exists in JSON |
 
 LIKE conditions use wildcard strings for matching checks, with the following rules:
 
@@ -51,7 +52,7 @@ LIKE conditions use wildcard strings for matching checks, with the following rul
 - If you want to match an underscore character that is originally in the string, you can write it as \_ in the wildcard string, i.e., add a backslash to escape it.
 - The wildcard string cannot exceed 100 bytes in length. It is not recommended to use too long wildcard strings, as it may severely affect the performance of the LIKE operation.
 
-MATCH and NMATCH conditions use regular expressions for matching, with the following rules:
+MATCH/REGEXP and NMATCH/NOT REGEXP conditions use regular expressions for matching, with the following rules:
 
 - Supports regular expressions that comply with the POSIX standard, see Regular Expressions for specific standards.
 - When MATCH matches a regular expression, it returns TRUE. When NMATCH does not match a regular expression, it returns TRUE.

docs/zh/14-reference/03-taos-sql/16-operators.md

@@ -45,7 +45,8 @@ TDengine 支持 `UNION ALL` 和 `UNION` 操作符。UNION ALL 将查询返回的
 | 9   |       LIKE        | BINARY、NCHAR 和 VARCHAR                                             | 通配符匹配所指定的模式串          |
 | 10   |      NOT LIKE        | BINARY、NCHAR 和 VARCHAR                                             | 通配符不匹配所指定的模式串           |
 | 11   |   MATCH, NMATCH   | BINARY、NCHAR 和 VARCHAR                                             | 正则表达式匹配       |
-| 12  |     CONTAINS      | JSON                                                                 | JSON 中是否存在某键  |
+| 12   |   REGEXP, NOT REGEXP   | BINARY、NCHAR 和 VARCHAR                                          | 正则表达式匹配       |
+| 13  |     CONTAINS      | JSON                                                                 | JSON 中是否存在某键  |
 
 LIKE 条件使用通配符字符串进行匹配检查，规则如下：
 
@@ -53,7 +54,7 @@ LIKE 条件使用通配符字符串进行匹配检查，规则如下：
 - 如果希望匹配字符串中原本就带有的 \_（下划线）字符，那么可以在通配符字符串中写作 \_，即加一个反斜线来进行转义。
 - 通配符字符串最长不能超过 100 字节。不建议使用太长的通配符字符串，否则将有可能严重影响 LIKE 操作的执行性能。
 
-MATCH 条件和 NMATCH 条件使用正则表达式进行匹配，规则如下：
+MATCH/REGEXP 条件和 NMATCH/NOT REGEXP 条件使用正则表达式进行匹配，规则如下：
 
 - 支持符合 POSIX 规范的正则表达式，具体规范内容可参见 Regular Expressions。
 - MATCH 和正则表达式匹配时, 返回 TURE.  NMATCH 和正则表达式不匹配时, 返回 TRUE. 

source/libs/parser/inc/sql.y

@@ -1416,6 +1416,8 @@ compare_op(A) ::= LIKE.
 compare_op(A) ::= NOT LIKE.                                                       { A = OP_TYPE_NOT_LIKE; }
 compare_op(A) ::= MATCH.                                                          { A = OP_TYPE_MATCH; }
 compare_op(A) ::= NMATCH.                                                         { A = OP_TYPE_NMATCH; }
+compare_op(A) ::= REGEXP.                                                         { A = OP_TYPE_MATCH; }
+compare_op(A) ::= NOT REGEXP.                                                     { A = OP_TYPE_NMATCH; }
 compare_op(A) ::= CONTAINS.                                                       { A = OP_TYPE_JSON_CONTAINS; }
 
 %type in_op                                                                       { EOperatorType }

source/libs/parser/src/parTokenizer.c

@@ -358,6 +358,7 @@ static SKeyword keywordTable[] = {
     {"NOTIFY",               TK_NOTIFY},
     {"ON_FAILURE",           TK_ON_FAILURE},
     {"NOTIFY_HISTORY",       TK_NOTIFY_HISTORY},
+    {"REGEXP",               TK_REGEXP},
 };
 // clang-format on
 

tests/army/frame/caseBase.py

@@ -37,6 +37,7 @@ class TBase:
         # save param
         self.replicaVar = int(replicaVar)
         tdSql.init(conn.cursor(), True)
+        self.tmpdir = "tmp"
 
         # record server information
         self.dnodeNum = 0

tests/army/frame/etool.py

@@ -23,12 +23,31 @@ import frame.epath
 import frame.eos
 from frame.log import *
 
-# run taosBenchmark with command or json file mode
+# taosdump
-def benchMark(command = "", json = "") :
+def taosDumpFile():
-    # get taosBenchmark path
+    bmFile = frame.epath.binFile("taosdump")
+    if frame.eos.isWin():
+        bmFile += ".exe"
+    return bmFile
+
+# taosBenchmark
+def benchMarkFile():
     bmFile = frame.epath.binFile("taosBenchmark")
     if frame.eos.isWin():
         bmFile += ".exe"
+    return bmFile
+
+# taosAdapter
+def taosAdapterFile():
+    bmFile = frame.epath.binFile("taosAdapter")
+    if frame.eos.isWin():
+        bmFile += ".exe"
+    return bmFile
+
+# run taosBenchmark with command or json file mode
+def benchMark(command = "", json = "") :
+    # get taosBenchmark path
+    bmFile = benchMarkFile()
 
     # run
     if command != "":

tests/army/test.py

@@ -113,10 +113,11 @@ if __name__ == "__main__":
     previousCluster = False
     level = 1
     disk  = 1
+    taosAdapter = False
 
-    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:C:RWU:n:i:aPL:D:', [
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:C:RWBU:n:i:aPL:D:', [
         'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd','dnodeNums','mnodeNums',
-        'queryPolicy','createDnodeNums','restful','websocket','adaptercfgupdate','replicaVar','independentMnode',"asan",'previous','level','disk'])
+        'queryPolicy','createDnodeNums','restful','websocket','adapter','adaptercfgupdate','replicaVar','independentMnode',"asan",'previous','level','disk'])
     for key, value in opts:
         if key in ['-h', '--help']:
             tdLog.printNoPrefix(
@@ -145,7 +146,7 @@ if __name__ == "__main__":
             tdLog.printNoPrefix('-P run case with [P]revious cluster, do not create new cluster to run case.')
             tdLog.printNoPrefix('-L set multiple level number.     range 1 ~ 3')
             tdLog.printNoPrefix('-D set disk number on each level. range 1 ~ 10')
-
+            tdLog.printNoPrefix('-B start taosadapter process')
             sys.exit(0)
 
         if key in ['-r', '--restart']:
@@ -238,11 +239,14 @@ if __name__ == "__main__":
         if key in ['-D', '--disk']:
             disk = value
 
+        if key in ['-B']:
+            taosAdapter = True
+
     #
     # do exeCmd command
     #
     if not execCmd == "":
-        if restful or websocket:
+        if taosAdapter or taosAdapter or restful or websocket:
             tAdapter.init(deployPath)
         else:
             tdDnodes.init(deployPath)
@@ -281,7 +285,7 @@ if __name__ == "__main__":
         if valgrind:
             time.sleep(2)
 
-        if restful or websocket:
+        if taosAdapter or restful or websocket:
             toBeKilled = "taosadapter"
 
             # killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -TERM > /dev/null 2>&1" % toBeKilled
@@ -377,7 +381,7 @@ if __name__ == "__main__":
             tdDnodes.deploy(1,updateCfgDict)
             tdDnodes.start(1)
             tdCases.logSql(logSql)
-            if restful or websocket:
+            if taosAdapter or restful or websocket:
                 tAdapter.deploy(adapter_cfg_dict)
                 tAdapter.start()
 
@@ -416,7 +420,7 @@ if __name__ == "__main__":
                 clusterDnodes.starttaosd(dnode.index)
             tdCases.logSql(logSql)
                             
-            if restful or websocket:
+            if taosAdapter or restful or websocket:
                 tAdapter.deploy(adapter_cfg_dict)
                 tAdapter.start()
 
@@ -537,7 +541,7 @@ if __name__ == "__main__":
             except:
                 pass
 
-        if restful or websocket:
+        if taosAdapter or restful or websocket:
             tAdapter.init(deployPath, masterIp)
             tAdapter.stop(force_kill=True)
 
@@ -548,7 +552,7 @@ if __name__ == "__main__":
             tdDnodes.start(1)
             tdCases.logSql(logSql)
 
-            if restful or websocket:
+            if taosAdapter or restful or websocket:
                 tAdapter.deploy(adapter_cfg_dict)
                 tAdapter.start()
 
@@ -591,7 +595,7 @@ if __name__ == "__main__":
                 clusterDnodes.starttaosd(dnode.index)
             tdCases.logSql(logSql)
 
-            if restful or websocket:
+            if taosAdapter or restful or websocket:
                 tAdapter.deploy(adapter_cfg_dict)
                 tAdapter.start()
 

tests/army/tools/benchmark/basic/TD-12478.py

@@ -17,37 +17,33 @@ import os
 import sys
 import time
 import taos
-from util.log import tdLog
+
-from util.cases import tdCases
+import frame
-from util.sql import tdSql
+import frame.etool
-from util.dnodes import tdDnodes
+from frame.log import *
-from util.dnodes import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+from frame.srvCtl import *
+
 import itertools
 from itertools import product
 from itertools import combinations
 from faker import Faker
 import subprocess
 
-class TDTestCase:
+class TDTestCase(TBase):
     def caseDescription(self):
         '''
         case1<xyguo>[TD-12434]:taosdump null nchar/binary length can cause core:taos-tools/src/taosdump.c 
         case2<xyguo>[TD-12478]:taos_stmt_execute() failed! reason: WAL size exceeds limit 
         ''' 
         return
-
-    def init(self, conn, logSql, replicaVar=1):
-        self.replicaVar = int(replicaVar)
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-
-        os.system("rm -rf 5-taos-tools/TD-12478.py.sql")
-        os.system("rm db*")
-        os.system("rm dump_result.txt*")
     
     def restartDnodes(self):
-        tdDnodes.stop(1)
+        sc.dnodeStop(1)
-        tdDnodes.start(1)
+        sc.dnodeStart(1)
 
     def dropandcreateDB_random(self,n):
         self.ts = 1630000000000

tests/army/tools/benchmark/basic/bugs.py

@@ -0,0 +1,169 @@
+###################################################################
+#           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 os
+import json
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+# reomve single and double quotation
+def removeQuotation(origin):
+    value = ""
+    for c in origin:
+        if c != '\'' and c != '"':
+            value += c
+
+    return value
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-11510] taosBenchmark test cases
+        """
+
+    def benchmarkQuery(self, benchmark, jsonFile,  keys, options=""):
+        # exe insert 
+        result = "query.log"
+        os.system(f"rm -f {result}")
+        cmd = f"{benchmark} {options} -f {jsonFile} >> {result}"
+        os.system(cmd)
+        tdLog.info(cmd)
+        with open(result) as file:
+            content = file.read()
+            for key in keys:
+                if content.find(key) == -1:
+                    tdLog.exit(f"not found key: {key} in content={content}")
+                else:
+                    tdLog.info(f"found key:{key} successful.")            
+
+
+    def testBenchmarkJson(self, benchmark, jsonFile, options="", checkStep=False):
+        # exe insert 
+        cmd = f"{benchmark} {options} -f {jsonFile}"
+        os.system(cmd)
+        
+        #
+        # check insert result
+        #
+        with open(jsonFile, "r") as file:
+            data = json.load(file)
+        
+        db  = data["databases"][0]["dbinfo"]["name"]        
+        stb = data["databases"][0]["super_tables"][0]["name"]
+        child_count = data["databases"][0]["super_tables"][0]["childtable_count"]
+        insert_rows = data["databases"][0]["super_tables"][0]["insert_rows"]
+        timestamp_step = data["databases"][0]["super_tables"][0]["timestamp_step"]
+        
+        # drop
+        try:
+            drop = data["databases"][0]["dbinfo"]["drop"]
+        except:
+            drop = "yes"
+
+        # command is first
+        if options.find("-Q") != -1:
+            drop = "no"
+
+
+        # cachemodel
+        try:
+            cachemode = data["databases"][0]["dbinfo"]["cachemodel"]
+        except:
+            cachemode = None
+
+        # vgropus
+        try:
+            vgroups   = data["databases"][0]["dbinfo"]["vgroups"]
+        except:
+            vgroups = None
+
+        tdLog.info(f"get json info: db={db} stb={stb} child_count={child_count} insert_rows={insert_rows} \n")
+        
+        # all count insert_rows * child_table_count
+        sql = f"select * from {db}.{stb}"
+        tdSql.query(sql)
+        tdSql.checkRows(child_count * insert_rows)
+
+        # timestamp step
+        if checkStep:
+            sql = f"select * from (select diff(ts) as dif from {db}.{stb} partition by tbname) where dif != {timestamp_step};"
+            tdSql.query(sql)
+            tdSql.checkRows(0)
+
+        if drop.lower() == "yes":
+            # check database optins 
+            sql = f"select `vgroups`,`cachemodel` from information_schema.ins_databases where name='{db}';"
+            tdSql.query(sql)
+
+            if cachemode != None:
+                value = removeQuotation(cachemode)
+                tdLog.info(f" deal both origin={cachemode} after={value}")
+                tdSql.checkData(0, 1, value)
+
+            if vgroups != None:
+                tdSql.checkData(0, 0, vgroups)
+
+
+    # bugs ts
+    def bugsTS(self, benchmark):
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TS-5002.json")
+        # TS-5234
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TS-5234-1.json")
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TS-5234-2.json")
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TS-5234-3.json")
+        # TS-5846
+        keys = ["completed total queries: 40"]
+        self.benchmarkQuery(benchmark, "./tools/benchmark/basic/json/TS-5846-Query.json", keys)
+        keys = ["completed total queries: 20"]
+        self.benchmarkQuery(benchmark, "./tools/benchmark/basic/json/TS-5846-Mixed-Query.json", keys)
+
+    # bugs td
+    def bugsTD(self, benchmark):
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-31490.json", checkStep = False)
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-31575.json")
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-32846.json")
+        
+        # no drop
+        db      = "td32913db"
+        vgroups = 4
+        tdSql.execute(f"create database {db} vgroups {vgroups}")
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-32913.json", options="-Q")
+        tdSql.query(f"select `vgroups` from information_schema.ins_databases where name='{db}';")
+        tdSql.checkData(0, 0, vgroups)
+
+        # other
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-32913-1.json")
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-32913-2.json", options="-T 6")
+        self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/TD-32913-3.json")
+
+    def run(self):
+        benchmark = etool.benchMarkFile()
+        # ts
+        self.bugsTS(benchmark)
+
+        # td
+        self.bugsTD(benchmark)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-partial-col-numpy.py

@@ -0,0 +1,53 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-19387] taosBenchmark support partial columns num
+        """
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = "%s -t 1 -n 1 -y -L 2 " % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+
+        tdSql.query("select * from test.meters")
+        dbresult = tdSql.res
+        for i in range(len(dbresult[0])):
+            if i in (1, 2) and dbresult[0][i] is None:
+                tdLog.exit("result[0][%d] is NULL, which should not be" % i)
+            else:
+                tdLog.info("result[0][{0}] is {1}".format(i, dbresult[0][i]))
+
+        tdSql.checkData(0, 0, 1500000000000)
+        tdSql.checkData(0, 3, None)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-retry.py

@@ -0,0 +1,63 @@
+###################################################################
+#           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 os
+import subprocess
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+from frame.srvCtl import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-19985] taosBenchmark retry test cases
+        """
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = (
+            "%s -t 1 -n 10 -i 1000 -r 1 -k 10 -z 1000 -y &"
+            #            "%s -t 1 -n 10 -i 5000 -r 1 -y &"
+            % binPath
+        )
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        time.sleep(2)
+        sc.dnodeStopAll()
+        time.sleep(2)
+        sc.dnodeStart(1)
+        time.sleep(2)
+
+        psCmd = "ps -ef|grep -w taosBenchmark| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True)
+
+        while processID:
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 10)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-single-table.py

@@ -0,0 +1,74 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-21063] taosBenchmark single table test cases
+        """
+
+
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+
+        cmd = "%s -N -I taosc -t 1 -n 1 -y -E" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("use test")
+        tdSql.query("show stables")
+        tdSql.checkRows(0)
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+        tdSql.query("select count(*) from `meters`")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -N -I rest -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("use test")
+        tdSql.query("show stables")
+        tdSql.checkRows(0)
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+        tdSql.query("select count(*) from meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -N -I stmt -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("use test")
+        tdSql.query("show stables")
+        tdSql.checkRows(0)
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+        tdSql.query("select count(*) from meters")
+        tdSql.checkData(0, 0, 1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-sml-rest.py

@@ -0,0 +1,75 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-22334] taosBenchmark sml rest test cases
+        """
+
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+
+        cmd = "%s -I sml-rest -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-rest-line -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-rest-telnet -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-rest-json -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-rest-taosjson -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -N -I sml-rest -y" % binPath
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) != 0
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-sml.py

@@ -0,0 +1,76 @@
+###################################################################
+#           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 os
+import time
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-21932] taosBenchmark sml test cases
+        """
+    def run(self):
+        binPath = etool.benchMarkFile()
+
+        cmd = "%s -I sml -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-line -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-telnet -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-json -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml-taosjson -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 1)
+
+        cmd = "%s -I sml -t 10 -n 10000  -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 10*10000)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-supplement-insert.py

@@ -0,0 +1,54 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-19352] taosBenchmark supplement insert test cases
+        """
+
+
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = "%s -t 1 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+
+        cmd = "%s -t 1 -n 10 -U -s 1600000000000 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 11)
+        tdSql.query("select * from test.meters")
+        tdSql.checkData(0, 0, 1500000000000)
+        tdSql.checkData(1, 0, 1600000000000)
+        tdSql.checkData(10, 0, 1600000000009)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline-vgroups.py

@@ -0,0 +1,51 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-21806] taosBenchmark specifying vgroups test cases
+        """
+
+
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = (
+            "%s -t 1 -n 1 -v 3 -y &"
+            % binPath
+        )
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        time.sleep(2)
+
+        tdSql.query("select `vgroups` from information_schema.ins_databases where name='test'")
+        tdSql.checkData(0, 0, 3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/commandline.py

@@ -12,53 +12,30 @@
 # -*- coding: utf-8 -*-
 import os
 import subprocess
-import time
 
-from util.log import *
+import frame
-from util.cases import *
+import frame.etool
-from util.sql import *
+from frame.log import *
-from util.dnodes import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
 
 
-class TDTestCase:
+class TDTestCase(TBase):
     def caseDescription(self):
-        '''
+        """
         [TD-11510] taosBenchmark test cases
-        '''
+        """
-        return
 
-    def init(self, conn, logSql, replicaVar=1):
-        self.replicaVar = int(replicaVar)
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
 
-    def getPath(self, tool="taosBenchmark"):
-        if (platform.system().lower() == 'windows'):
-            tool = tool + ".exe"
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        paths = []
-        for root, dirs, files in os.walk(projPath):
-            if ((tool) in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    paths.append(os.path.join(root, tool))
-                    break
-        if (len(paths) == 0):
-            tdLog.exit("taosBenchmark not found!")
-            return
-        else:
-            tdLog.info("taosBenchmark found in %s" % paths[0])
-            return paths[0]
 
     def run(self):
-        binPath = self.getPath()
+        binPath = etool.benchMarkFile()
-        cmd = "%s -F 7 -n 10 -t 2 -x -y -M -C -d newtest -l 5 -A binary,nchar\(31\) -b tinyint,binary\(23\),bool,nchar -w 29 -E -m $%%^*" %binPath
+        cmd = (
+            "%s -F 7 -n 10 -t 2 -x -y -M -C -d newtest -l 5 -A binary,nchar\(31\) -b tinyint,binary\(23\),bool,nchar -w 29 -E -m $%%^*"
+            % binPath
+        )
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("use newtest")
@@ -68,79 +45,127 @@ class TDTestCase:
         tdSql.checkRows(8)
         tdSql.checkData(0, 1, "TIMESTAMP")
         tdSql.checkData(1, 1, "TINYINT")
-        tdSql.checkData(2, 1, "VARCHAR")
+        # 2.x is binary and 3.x is varchar
+        # tdSql.checkData(2, 1, "BINARY")
         tdSql.checkData(2, 2, 23)
         tdSql.checkData(3, 1, "BOOL")
         tdSql.checkData(4, 1, "NCHAR")
         tdSql.checkData(4, 2, 29)
         tdSql.checkData(5, 1, "INT")
-        tdSql.checkData(6, 1, "VARCHAR")
+        # 2.x is binary and 3.x is varchar
+        # tdSql.checkData(6, 1, "BINARY")
         tdSql.checkData(6, 2, 29)
         tdSql.checkData(6, 3, "TAG")
         tdSql.checkData(7, 1, "NCHAR")
         tdSql.checkData(7, 2, 31)
         tdSql.checkData(7, 3, "TAG")
-        tdSql.query("select distinct(tbname) from meters where tbname like '$%^*%'")
+        tdSql.query("show tables")
         tdSql.checkRows(2)
         tdSql.execute("drop database if exists newtest")
 
-        cmd = "%s -F 7 -n 10 -t 2 -y -M -I stmt" %binPath
+        cmd = (
+            "%s -t 2 -n 10 -b bool,tinyint,smallint,int,bigint,float,double,utinyint,usmallint,uint,ubigint,binary,nchar,timestamp -A bool,tinyint,smallint,int,bigint,float,double,utinyint,usmallint,uint,ubigint,binary,nchar,timestamp -y"
+            % binPath
+        )
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        tdSql.query("select count(*) from (select distinct(tbname) from test.meters)")
+        tdSql.query("show test.tables")
-        tdSql.checkData(0, 0, 2)
+        tdSql.checkRows(2)
         tdSql.query("select count(*) from test.meters")
         tdSql.checkData(0, 0, 20)
 
-        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 2>&1 | grep sleep | wc -l" %binPath
+        cmd = (
+            "%s -I stmt -t 2 -n 10 -b bool,tinyint,smallint,int,bigint,float,double,utinyint,usmallint,uint,ubigint,binary,nchar,timestamp -A bool,tinyint,smallint,int,bigint,float,double,utinyint,usmallint,uint,ubigint,binary,nchar,timestamp -y"
+            % binPath
+        )
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("show test.tables")
+        tdSql.checkRows(2)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 20)
+
+        cmd = "%s -F 7 -n 10 -t 2 -y -M -I stmt" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("show test.tables")
+        tdSql.checkRows(2)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 20)
+
+        # add stmt2
+        cmd = "%s -F 700 -n 1000 -t 4 -y -M -I stmt2" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("show test.tables")
+        tdSql.checkRows(4)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 4000)
+
+        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 2>&1 | grep sleep | wc -l" % binPath
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        if (int(sleepTimes) != 2):
+        if int(sleepTimes) != 2:
             tdLog.exit("expected sleep times 2, actual %d" % int(sleepTimes))
 
-        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -r 1 2>&1 | grep sleep | wc -l" %binPath
+        cmd = (
+            "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -r 1 2>&1 | grep sleep | wc -l" % binPath
+        )
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        if (int(sleepTimes) != 3):
+        if int(sleepTimes) != 3:
             tdLog.exit("expected sleep times 3, actual %d" % int(sleepTimes))
 
-        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -I sml 2>&1 | grep sleep | wc -l" %binPath
+        cmd = (
+            "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -I sml 2>&1 | grep sleep | wc -l"
+            % binPath
+        )
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        if (int(sleepTimes) != 2):
+        if int(sleepTimes) != 2:
             tdLog.exit("expected sleep times 2, actual %d" % int(sleepTimes))
 
-        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -r 1 -I sml 2>&1 | grep sleep | wc -l" %binPath
+        cmd = (
+            "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -r 1 -I sml 2>&1 | grep sleep | wc -l"
+            % binPath
+        )
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        if (int(sleepTimes) != 3):
+        if int(sleepTimes) != 3:
             tdLog.exit("expected sleep times 3, actual %d" % int(sleepTimes))
 
-        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -I stmt 2>&1 | grep sleep | wc -l" %binPath
+        cmd = (
+            "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -I stmt 2>&1 | grep sleep | wc -l"
+            % binPath
+        )
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        if (int(sleepTimes) != 2):
+        if int(sleepTimes) != 2:
             tdLog.exit("expected sleep times 2, actual %d" % int(sleepTimes))
 
-        cmd = "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -r 1 -I stmt 2>&1 | grep sleep | wc -l" %binPath
+        cmd = (
+            "%s -n 3 -t 3 -B 2 -i 1 -G -y -T 1 -r 1 -I stmt 2>&1 | grep sleep | wc -l"
+            % binPath
+        )
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
-        if (int(sleepTimes) != 3):
+        if int(sleepTimes) != 3:
             tdLog.exit("expected sleep times 3, actual %d" % int(sleepTimes))
 
-        cmd = "%s -S 17 -n 3 -t 1 -y -x" %binPath
+        cmd = "%s -S 17 -n 3 -t 1 -y -x" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
+        time.sleep(2)  # to avoid invalid vgroup id
         tdSql.query("select last(ts) from test.meters")
-        tdSql.checkData(0, 0 , "2017-07-14 10:40:00.034")
+        tdSql.checkData(0, 0, "2017-07-14 10:40:00.034")
 
-        cmd = "%s -N -I taosc -t 11 -n 11 -y -x -E" %binPath
+        cmd = "%s -N -I taosc -t 11 -n 11 -y -x -E" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("use test")
@@ -151,7 +176,7 @@ class TDTestCase:
         tdSql.query("select count(*) from `d10`")
         tdSql.checkData(0, 0, 11)
 
-        cmd = "%s -N -I rest -t 11 -n 11 -y -x" %binPath
+        cmd = "%s -N -I rest -t 11 -n 11 -y -x" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("use test")
@@ -162,7 +187,7 @@ class TDTestCase:
         tdSql.query("select count(*) from d10")
         tdSql.checkData(0, 0, 11)
 
-        cmd = "%s -N -I stmt -t 11 -n 11 -y -x" %binPath
+        cmd = "%s -N -I stmt -t 11 -n 11 -y -x" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("use test")
@@ -173,139 +198,131 @@ class TDTestCase:
         tdSql.query("select count(*) from d10")
         tdSql.checkData(0, 0, 11)
 
-        cmd = "%s -N -I sml -y" %binPath
+        cmd = "%s -n 1 -t 1 -y -b bool" % binPath
-        tdLog.info("%s" % cmd)
-        assert(os.system("%s" % cmd) !=0 )
-
-        cmd = "%s -n 1 -t 1 -y -b bool" %binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "BOOL")
 
-        cmd = "%s -n 1 -t 1 -y -b tinyint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b tinyint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "TINYINT")
 
-        cmd = "%s -n 1 -t 1 -y -b utinyint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b utinyint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "TINYINT UNSIGNED")
 
-        cmd = "%s -n 1 -t 1 -y -b smallint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b smallint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "SMALLINT")
 
-        cmd = "%s -n 1 -t 1 -y -b usmallint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b usmallint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "SMALLINT UNSIGNED")
 
-        cmd = "%s -n 1 -t 1 -y -b int" %binPath
+        cmd = "%s -n 1 -t 1 -y -b int" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "INT")
 
-        cmd = "%s -n 1 -t 1 -y -b uint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b uint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "INT UNSIGNED")
 
-        cmd = "%s -n 1 -t 1 -y -b bigint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b bigint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "BIGINT")
 
-        cmd = "%s -n 1 -t 1 -y -b ubigint" %binPath
+        cmd = "%s -n 1 -t 1 -y -b ubigint" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "BIGINT UNSIGNED")
 
-        cmd = "%s -n 1 -t 1 -y -b timestamp" %binPath
+        cmd = "%s -n 1 -t 1 -y -b timestamp" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "TIMESTAMP")
 
-        cmd = "%s -n 1 -t 1 -y -b float" %binPath
+        cmd = "%s -n 1 -t 1 -y -b float" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "FLOAT")
 
-        cmd = "%s -n 1 -t 1 -y -b double" %binPath
+        cmd = "%s -n 1 -t 1 -y -b double" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "DOUBLE")
 
-        cmd = "%s -n 1 -t 1 -y -b nchar" %binPath
+        cmd = "%s -n 1 -t 1 -y -b nchar" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "NCHAR")
 
-        cmd = "%s -n 1 -t 1 -y -b nchar\(7\)" %binPath
+        cmd = "%s -n 1 -t 1 -y -b nchar\(7\)" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(1, 1, "NCHAR")
 
-        cmd = "%s -n 1 -t 1 -y -b binary" %binPath
+        # 2.x is binary and 3.x is varchar
-        tdLog.info("%s" % cmd)
+        # cmd = "%s -n 1 -t 1 -y -b binary" %binPath
-        os.system("%s" % cmd)
+        # tdLog.info("%s" % cmd)
-        tdSql.execute("reset query cache")
+        # os.system("%s" % cmd)
-        tdSql.query("describe test.meters")
+        # tdSql.execute("reset query cache")
-        tdSql.checkData(1, 1, "VARCHAR")
+        # tdSql.query("describe test.meters")
+        # tdSql.checkData(1, 1, "BINARY")
 
-        cmd = "%s -n 1 -t 1 -y -b binary\(7\)" %binPath
+        # cmd = "%s -n 1 -t 1 -y -b binary\(7\)" %binPath
-        tdLog.info("%s" % cmd)
+        # tdLog.info("%s" % cmd)
-        os.system("%s" % cmd)
+        # os.system("%s" % cmd)
-        tdSql.execute("reset query cache")
+        # tdSql.execute("reset query cache")
-        tdSql.query("describe test.meters")
+        # tdSql.query("describe test.meters")
-        tdSql.checkData(1, 1, "VARCHAR")
+        # tdSql.checkData(1, 1, "BINARY")
 
-        cmd = "%s -n 1 -t 1 -y -A json\(7\)" %binPath
+        cmd = "%s -n 1 -t 1 -y -A json" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
         tdSql.query("describe test.meters")
         tdSql.checkData(4, 1, "JSON")
 
-        cmd = "%s -n 1 -t 1 -y -b int,x" %binPath
+        cmd = "%s -n 1 -t 1 -y -b int,x" % binPath
-        tdLog.info("%s" % cmd)
+        ret = os.system("%s" % cmd)
-        assert(os.system("%s" % cmd) != 0)
+        if ret == 0:
-
+            tdLog.exit(f"expect failed, but successful cmd= {cmd} ")
-        cmd = "%s -n 1 -t 1 -y -A int,json" %binPath
+        tdLog.info(f"test except ok, cmd={cmd} ret={ret}")
-        tdLog.info("%s" % cmd)
-        assert(os.system("%s" % cmd) != 0)
-
-
-
 
     def stop(self):
         tdSql.close()

tests/army/tools/benchmark/basic/csv/TD-31490.csv

@@ -0,0 +1,50 @@
+0,300.18991105956627
+800,301.17345392774644
+1200,301.55375211473387
+1600,302.36356862640656
+2000,303.1406323751084
+2800,303.9159543118504
+3600,304.483725379133
+4000,305.05543735790496
+4400,305.3220278809733
+5600,306.5161529126947
+6000,307.39147847940967
+6400,308.3087978607504
+6800,309.15934507811176
+7200,309.2209920259603
+7600,309.803587911068
+8400,310.5335562951462
+8800,311.48930624122
+9200,311.759662137853
+9600,311.99896141075567
+10000,312.1610220373193
+10400,312.52790040358923
+11200,313.86419859052074
+11600,314.58161206236935
+12000,314.7287519381517
+12400,315.7150471030763
+12800,316.56835897615736
+13200,316.9096732936423
+14400,318.4992420459544
+14800,319.1871240892884
+15600,320.75835046846015
+16000,321.3268224700194
+16800,322.7216015334804
+17600,323.1404560641849
+18000,323.18247165088445
+18800,324.41639977875917
+20000,324.33270037314605
+20400,323.84187335783747
+20800,322.9354968771805
+21600,322.20467685333284
+22000,321.737580118744
+22400,322.1692179980207
+22800,322.4327523497001
+24000,323.9630653580819
+24400,324.90425359822837
+25200,326.1863442959756
+26000,327.02028556809154
+26400,327.71615254870494
+26800,328.6975738298687
+27200,329.26002057438444
+27600,329.92161585019835

tests/army/tools/benchmark/basic/csv/TS-5002.csv

@@ -0,0 +1,103 @@
+"100000000001",1,200,630,"A07","1","100000000001","100000000001U","100000000001U","A07","100000000001","100000000001","13141"
+"100000000001.001",1,200,630,"A07","0","100000000001","100000000001.001U","100000000001.001U","A07","100000000001","100000000001","13141"
+"100000000001.002",1,200,630,"A07","0","100000000001","100000000001.002U","100000000001.002U","A07","100000000001","100000000001","13141"
+"100000000001.003",1,200,630,"A07","0","100000000001","100000000001.003U","100000000001.003U","A07","100000000001","100000000001","13141"
+"100000000001.004",1,200,630,"A07","0","100000000001","100000000001.004U","100000000001.004U","A07","100000000001","100000000001","13141"
+"100000000001.005",1,200,630,"A07","0","100000000001","100000000001.005U","100000000001.005U","A07","100000000001","100000000001","13141"
+"100000000001.006",1,200,630,"A07","0","100000000001","100000000001.006U","100000000001.006U","A07","100000000001","100000000001","13141"
+"100000000001.007",1,200,630,"A07","0","100000000001","100000000001.007U","100000000001.007U","A07","100000000001","100000000001","13141"
+"100000000001.008",1,200,630,"A07","0","100000000001","100000000001.008U","100000000001.008U","A07","100000000001","100000000001","13141"
+"100000000001.009",1,200,630,"A07","0","100000000001","100000000001.009U","100000000001.009U","A07","100000000001","100000000001","13141"
+"100000000001.010",1,200,630,"A07","0","100000000001","100000000001.010U","100000000001.010U","A07","100000000001","100000000001","13141"
+"100000000001.011",1,200,630,"A07","0","100000000001","100000000001.011U","100000000001.011U","A07","100000000001","100000000001","13141"
+"100000000001.012",1,200,630,"A07","0","100000000001","100000000001.012U","100000000001.012U","A07","100000000001","100000000001","13141"
+"100000000001.013",1,200,630,"A07","0","100000000001","100000000001.013U","100000000001.013U","A07","100000000001","100000000001","13141"
+"100000000001.014",1,200,630,"A07","0","100000000001","100000000001.014U","100000000001.014U","A07","100000000001","100000000001","13141"
+"100000000001.015",1,200,630,"A07","0","100000000001","100000000001.015U","100000000001.015U","A07","100000000001","100000000001","13141"
+"100000000001.016",1,200,630,"A07","0","100000000001","100000000001.016U","100000000001.016U","A07","100000000001","100000000001","13141"
+"100000000001.017",1,200,630,"A07","0","100000000001","100000000001.017U","100000000001.017U","A07","100000000001","100000000001","13141"
+"100000000001.018",1,200,630,"A07","0","100000000001","100000000001.018U","100000000001.018U","A07","100000000001","100000000001","13141"
+"100000000001.019",1,200,630,"A07","0","100000000001","100000000001.019U","100000000001.019U","A07","100000000001","100000000001","13141"
+"100000000001.020",1,200,630,"A07","0","100000000001","100000000001.020U","100000000001.020U","A07","100000000001","100000000001","13141"
+"100000000001.021",1,200,630,"A07","0","100000000001","100000000001.021U","100000000001.021U","A07","100000000001","100000000001","13141"
+"100000000001.022",1,200,630,"A07","0","100000000001","100000000001.022U","100000000001.022U","A07","100000000001","100000000001","13141"
+"100000000001.023",1,200,630,"A07","0","100000000001","100000000001.023U","100000000001.023U","A07","100000000001","100000000001","13141"
+"100000000001.024",1,200,630,"A07","0","100000000001","100000000001.024U","100000000001.024U","A07","100000000001","100000000001","13141"
+"100000000001.025",1,200,630,"A07","0","100000000001","100000000001.025U","100000000001.025U","A07","100000000001","100000000001","13141"
+"100000000001.026",1,200,630,"A07","0","100000000001","100000000001.026U","100000000001.026U","A07","100000000001","100000000001","13141"
+"100000000001.027",1,200,630,"A07","0","100000000001","100000000001.027U","100000000001.027U","A07","100000000001","100000000001","13141"
+"100000000001.028",1,200,630,"A07","0","100000000001","100000000001.028U","100000000001.028U","A07","100000000001","100000000001","13141"
+"100000000001.029",1,200,630,"A07","0","100000000001","100000000001.029U","100000000001.029U","A07","100000000001","100000000001","13141"
+"100000000001.030",1,200,630,"A07","0","100000000001","100000000001.030U","100000000001.030U","A07","100000000001","100000000001","13141"
+"100000000001.031",1,200,630,"A07","0","100000000001","100000000001.031U","100000000001.031U","A07","100000000001","100000000001","13141"
+"100000000001.032",1,200,630,"A07","0","100000000001","100000000001.032U","100000000001.032U","A07","100000000001","100000000001","13141"
+"100000000001.033",1,200,630,"A07","0","100000000001","100000000001.033U","100000000001.033U","A07","100000000001","100000000001","13141"
+"100000000001.034",1,200,630,"A07","0","100000000001","100000000001.034U","100000000001.034U","A07","100000000001","100000000001","13141"
+"100000000001.035",1,200,630,"A07","0","100000000001","100000000001.035U","100000000001.035U","A07","100000000001","100000000001","13141"
+"100000000001.036",1,200,630,"A07","0","100000000001","100000000001.036U","100000000001.036U","A07","100000000001","100000000001","13141"
+"100000000001.037",1,200,630,"A07","0","100000000001","100000000001.037U","100000000001.037U","A07","100000000001","100000000001","13141"
+"100000000001.038",1,200,630,"A07","0","100000000001","100000000001.038U","100000000001.038U","A07","100000000001","100000000001","13141"
+"100000000001.039",1,200,630,"A07","0","100000000001","100000000001.039U","100000000001.039U","A07","100000000001","100000000001","13141"
+"100000000001.040",1,200,630,"A07","0","100000000001","100000000001.040U","100000000001.040U","A07","100000000001","100000000001","13141"
+"100000000001.041",1,200,630,"A07","0","100000000001","100000000001.041U","100000000001.041U","A07","100000000001","100000000001","13141"
+"100000000001.042",1,200,630,"A07","0","100000000001","100000000001.042U","100000000001.042U","A07","100000000001","100000000001","13141"
+"100000000001.043",1,200,630,"A07","0","100000000001","100000000001.043U","100000000001.043U","A07","100000000001","100000000001","13141"
+"100000000001.044",1,200,630,"A07","0","100000000001","100000000001.044U","100000000001.044U","A07","100000000001","100000000001","13141"
+"100000000001.045",1,200,630,"A07","0","100000000001","100000000001.045U","100000000001.045U","A07","100000000001","100000000001","13141"
+"100000000001.046",1,200,630,"A07","0","100000000001","100000000001.046U","100000000001.046U","A07","100000000001","100000000001","13141"
+"100000000001.047",1,200,630,"A07","0","100000000001","100000000001.047U","100000000001.047U","A07","100000000001","100000000001","13141"
+"100000000001.048",1,200,630,"A07","0","100000000001","100000000001.048U","100000000001.048U","A07","100000000001","100000000001","13141"
+"100000000001.049",1,200,630,"A07","0","100000000001","100000000001.049U","100000000001.049U","A07","100000000001","100000000001","13141"
+"100000000001.050",1,200,630,"A07","0","100000000001","100000000001.050U","100000000001.050U","A07","100000000001","100000000001","13141"
+"100000000001.051",1,200,630,"A07","0","100000000001","100000000001.051U","100000000001.051U","A07","100000000001","100000000001","13141"
+"100000000001.052",1,200,630,"A07","0","100000000001","100000000001.052U","100000000001.052U","A07","100000000001","100000000001","13141"
+"100000000001.053",1,200,630,"A07","0","100000000001","100000000001.053U","100000000001.053U","A07","100000000001","100000000001","13141"
+"100000000001.054",1,200,630,"A07","0","100000000001","100000000001.054U","100000000001.054U","A07","100000000001","100000000001","13141"
+"100000000001.055",1,200,630,"A07","0","100000000001","100000000001.055U","100000000001.055U","A07","100000000001","100000000001","13141"
+"100000000001.056",1,200,630,"A07","0","100000000001","100000000001.056U","100000000001.056U","A07","100000000001","100000000001","13141"
+"100000000001.057",1,200,630,"A07","0","100000000001","100000000001.057U","100000000001.057U","A07","100000000001","100000000001","13141"
+"100000000001.058",1,200,630,"A07","0","100000000001","100000000001.058U","100000000001.058U","A07","100000000001","100000000001","13141"
+"100000000001.059",1,200,630,"A07","0","100000000001","100000000001.059U","100000000001.059U","A07","100000000001","100000000001","13141"
+"100000000001.060",1,200,630,"A07","0","100000000001","100000000001.060U","100000000001.060U","A07","100000000001","100000000001","13141"
+"100000000001.061",1,200,630,"A07","0","100000000001","100000000001.061U","100000000001.061U","A07","100000000001","100000000001","13141"
+"100000000001.062",1,200,630,"A07","0","100000000001","100000000001.062U","100000000001.062U","A07","100000000001","100000000001","13141"
+"100000000001.063",1,200,630,"A07","0","100000000001","100000000001.063U","100000000001.063U","A07","100000000001","100000000001","13141"
+"100000000001.064",1,200,630,"A07","0","100000000001","100000000001.064U","100000000001.064U","A07","100000000001","100000000001","13141"
+"100000000001.065",1,200,630,"A07","0","100000000001","100000000001.065U","100000000001.065U","A07","100000000001","100000000001","13141"
+"100000000001.066",1,200,630,"A07","0","100000000001","100000000001.066U","100000000001.066U","A07","100000000001","100000000001","13141"
+"100000000001.067",1,200,630,"A07","0","100000000001","100000000001.067U","100000000001.067U","A07","100000000001","100000000001","13141"
+"100000000001.068",1,200,630,"A07","0","100000000001","100000000001.068U","100000000001.068U","A07","100000000001","100000000001","13141"
+"100000000001.069",1,200,630,"A07","0","100000000001","100000000001.069U","100000000001.069U","A07","100000000001","100000000001","13141"
+"100000000001.070",1,200,630,"A07","0","100000000001","100000000001.070U","100000000001.070U","A07","100000000001","100000000001","13141"
+"100000000001.071",1,200,630,"A07","0","100000000001","100000000001.071U","100000000001.071U","A07","100000000001","100000000001","13141"
+"100000000001.072",1,200,630,"A07","0","100000000001","100000000001.072U","100000000001.072U","A07","100000000001","100000000001","13141"
+"100000000001.073",1,200,630,"A07","0","100000000001","100000000001.073U","100000000001.073U","A07","100000000001","100000000001","13141"
+"100000000001.074",1,200,630,"A07","0","100000000001","100000000001.074U","100000000001.074U","A07","100000000001","100000000001","13141"
+"100000000001.075",1,200,630,"A07","0","100000000001","100000000001.075U","100000000001.075U","A07","100000000001","100000000001","13141"
+"100000000001.076",1,200,630,"A07","0","100000000001","100000000001.076U","100000000001.076U","A07","100000000001","100000000001","13141"
+"100000000001.077",1,200,630,"A07","0","100000000001","100000000001.077U","100000000001.077U","A07","100000000001","100000000001","13141"
+"100000000001.078",1,200,630,"A07","0","100000000001","100000000001.078U","100000000001.078U","A07","100000000001","100000000001","13141"
+"100000000001.079",1,200,630,"A07","0","100000000001","100000000001.079U","100000000001.079U","A07","100000000001","100000000001","13141"
+"100000000001.080",1,200,630,"A07","0","100000000001","100000000001.080U","100000000001.080U","A07","100000000001","100000000001","13141"
+"100000000001.081",1,200,630,"A07","0","100000000001","100000000001.081U","100000000001.081U","A07","100000000001","100000000001","13141"
+"100000000001.082",1,200,630,"A07","0","100000000001","100000000001.082U","100000000001.082U","A07","100000000001","100000000001","13141"
+"100000000001.083",1,200,630,"A07","0","100000000001","100000000001.083U","100000000001.083U","A07","100000000001","100000000001","13141"
+"100000000001.084",1,200,630,"A07","0","100000000001","100000000001.084U","100000000001.084U","A07","100000000001","100000000001","13141"
+"100000000001.085",1,200,630,"A07","0","100000000001","100000000001.085U","100000000001.085U","A07","100000000001","100000000001","13141"
+"100000000001.086",1,200,630,"A07","0","100000000001","100000000001.086U","100000000001.086U","A07","100000000001","100000000001","13141"
+"100000000001.087",1,200,630,"A07","0","100000000001","100000000001.087U","100000000001.087U","A07","100000000001","100000000001","13141"
+"100000000001.088",1,200,630,"A07","0","100000000001","100000000001.088U","100000000001.088U","A07","100000000001","100000000001","13141"
+"100000000001.089",1,200,630,"A07","0","100000000001","100000000001.089U","100000000001.089U","A07","100000000001","100000000001","13141"
+"100000000001.090",1,200,630,"A07","0","100000000001","100000000001.090U","100000000001.090U","A07","100000000001","100000000001","13141"
+"100000000001.091",1,200,630,"A07","0","100000000001","100000000001.091U","100000000001.091U","A07","100000000001","100000000001","13141"
+"100000000001.092",1,200,630,"A07","0","100000000001","100000000001.092U","100000000001.092U","A07","100000000001","100000000001","13141"
+"100000000001.093",1,200,630,"A07","0","100000000001","100000000001.093U","100000000001.093U","A07","100000000001","100000000001","13141"
+"100000000001.094",1,200,630,"A07","0","100000000001","100000000001.094U","100000000001.094U","A07","100000000001","100000000001","13141"
+"100000000001.095",1,200,630,"A07","0","100000000001","100000000001.095U","100000000001.095U","A07","100000000001","100000000001","13141"
+"100000000001.096",1,200,630,"A07","0","100000000001","100000000001.096U","100000000001.096U","A07","100000000001","100000000001","13141"
+"100000000001.097",1,200,630,"A07","0","100000000001","100000000001.097U","100000000001.097U","A07","100000000001","100000000001","13141"
+"100000000001.098",1,200,630,"A07","0","100000000001","100000000001.098U","100000000001.098U","A07","100000000001","100000000001","13141"
+"100000000001.099",1,200,630,"A07","0","100000000001","100000000001.099U","100000000001.099U","A07","100000000001","100000000001","13141"
+"100000000001.100",1,200,630,"A07","0","100000000001","100000000001.100U","100000000001.100U","A07","100000000001","100000000001","13141"
+"100000000002",1,200,630,"A07","1","100000000002","100000000002U","100000000002U","A07","100000000002","100000000002","13169"
+"100000000002.001",1,200,630,"A07","0","100000000002","100000000002.001U","100000000002.001U","A07","100000000002","100000000002","13169"

tests/army/tools/benchmark/basic/csv/d0.csv

@@ -0,0 +1,200 @@
+"2023-11-15 06:13:20.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:13:21.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:13:22.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:13:23.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:13:24.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:13:25.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:13:26.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:13:27.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:13:28.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:13:29.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:13:30.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:13:31.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:13:32.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:13:33.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:13:34.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:13:35.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:13:36.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:13:37.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:13:38.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:13:39.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:13:40.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:13:41.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:13:42.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:13:43.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:13:44.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:13:45.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:13:46.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:13:47.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:13:48.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:13:49.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:13:50.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:13:51.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:13:52.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:13:53.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:13:54.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:13:55.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:13:56.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:13:57.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:13:58.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:13:59.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:14:00.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:14:01.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:14:02.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:14:03.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:14:04.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:14:05.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:14:06.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:14:07.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:14:08.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:14:09.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:14:10.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:14:11.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:14:12.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:14:13.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:14:14.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:14:15.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:14:16.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:14:17.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:14:18.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:14:19.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:14:20.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:14:21.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:14:22.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:14:23.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:14:24.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:14:25.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:14:26.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:14:27.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:14:28.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:14:29.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:14:30.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:14:31.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:14:32.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:14:33.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:14:34.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:14:35.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:14:36.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:14:37.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:14:38.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:14:39.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:14:40.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:14:41.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:14:42.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:14:43.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:14:44.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:14:45.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:14:46.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:14:47.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:14:48.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:14:49.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:14:50.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:14:51.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:14:52.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:14:53.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:14:54.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:14:55.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:14:56.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:14:57.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:14:58.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:14:59.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:15:00.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:15:01.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:15:02.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:15:03.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:15:04.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:15:05.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:15:06.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:15:07.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:15:08.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:15:09.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:15:10.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:15:11.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:15:12.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:15:13.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:15:14.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:15:15.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:15:16.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:15:17.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:15:18.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:15:19.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:15:20.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:15:21.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:15:22.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:15:23.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:15:24.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:15:25.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:15:26.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:15:27.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:15:28.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:15:29.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:15:30.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:15:31.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:15:32.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:15:33.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:15:34.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:15:35.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:15:36.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:15:37.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:15:38.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:15:39.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:15:40.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:15:41.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:15:42.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:15:43.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:15:44.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:15:45.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:15:46.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:15:47.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:15:48.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:15:49.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:15:50.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:15:51.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:15:52.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:15:53.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:15:54.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:15:55.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:15:56.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:15:57.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:15:58.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:15:59.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:16:00.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:16:01.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:16:02.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:16:03.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:16:04.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:16:05.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:16:06.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:16:07.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:16:08.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:16:09.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:16:10.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:16:11.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:16:12.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:16:13.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:16:14.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:16:15.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:16:16.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:16:17.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:16:18.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:16:19.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:16:20.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:16:21.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:16:22.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:16:23.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:16:24.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:16:25.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:16:26.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:16:27.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:16:28.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:16:29.000",          11.9480000,216,           0.7197460
+"2023-11-15 06:16:30.000",          11.1370001,216,           0.2763700
+"2023-11-15 06:16:31.000",           8.8470001,215,           0.5411610
+"2023-11-15 06:16:32.000",           8.4510002,215,           0.7852990
+"2023-11-15 06:16:33.000",           9.1129999,218,           0.4466600
+"2023-11-15 06:16:34.000",          10.9060001,222,           0.1409650
+"2023-11-15 06:16:35.000",           8.1940002,217,           0.1292390
+"2023-11-15 06:16:36.000",           8.2639999,223,           0.5075400
+"2023-11-15 06:16:37.000",          10.1599998,223,           0.0787010
+"2023-11-15 06:16:38.000",           9.5030003,219,           0.7912880
+"2023-11-15 06:16:39.000",          11.9480000,216,           0.7197460

tests/army/tools/benchmark/basic/csv/insert-json-csv.csv

@@ -0,0 +1,10 @@
+0,0,'TAOSdata-0'
+1,1,'TAOSdata-1'
+2,22,'TAOSdata-2'
+3,333,'TAOSdata-3'
+4,4444,'TAOSdata-4'
+5,55555,'TAOSdata-5'
+6,666666,'TAOSdata-6'
+7,7777777,'TAOSdata-7'
+8,88888888,'TAOSdata-8'
+9,999999999,'TAOSdata-9'

tests/army/tools/benchmark/basic/csv/nano_samples.csv

@@ -0,0 +1,100 @@
+8.855,"binary_str0" ,1626870128248246976
+8.75,"binary_str1" ,1626870128249060032
+5.44,"binary_str2" ,1626870128249067968
+8.45,"binary_str3" ,1626870128249072064
+4.07,"binary_str4" ,1626870128249075904
+6.97,"binary_str5" ,1626870128249078976
+6.86,"binary_str6" ,1626870128249082048
+1.585,"binary_str7" ,1626870128249085120
+1.4,"binary_str8" ,1626870128249087936
+5.135,"binary_str9" ,1626870128249092032
+3.15,"binary_str10" ,1626870128249095104
+1.765,"binary_str11" ,1626870128249097920
+7.71,"binary_str12" ,1626870128249100992
+3.91,"binary_str13" ,1626870128249104064
+5.615,"binary_str14" ,1626870128249106880
+9.495,"binary_str15" ,1626870128249109952
+3.825,"binary_str16" ,1626870128249113024
+1.94,"binary_str17" ,1626870128249117120
+5.385,"binary_str18" ,1626870128249119936
+7.075,"binary_str19" ,1626870128249123008
+5.715,"binary_str20" ,1626870128249126080
+1.83,"binary_str21" ,1626870128249128896
+6.365,"binary_str22" ,1626870128249131968
+6.55,"binary_str23" ,1626870128249135040
+6.315,"binary_str24" ,1626870128249138112
+3.82,"binary_str25" ,1626870128249140928
+2.455,"binary_str26" ,1626870128249145024
+7.795,"binary_str27" ,1626870128249148096
+2.47,"binary_str28" ,1626870128249150912
+1.37,"binary_str29" ,1626870128249155008
+5.39,"binary_str30" ,1626870128249158080
+5.13,"binary_str31" ,1626870128249160896
+4.09,"binary_str32" ,1626870128249163968
+5.855,"binary_str33" ,1626870128249167040
+0.17,"binary_str34" ,1626870128249170112
+1.955,"binary_str35" ,1626870128249173952
+0.585,"binary_str36" ,1626870128249178048
+0.33,"binary_str37" ,1626870128249181120
+7.925,"binary_str38" ,1626870128249183936
+9.685,"binary_str39" ,1626870128249187008
+2.6,"binary_str40" ,1626870128249191104
+5.705,"binary_str41" ,1626870128249193920
+3.965,"binary_str42" ,1626870128249196992
+4.43,"binary_str43" ,1626870128249200064
+8.73,"binary_str44" ,1626870128249202880
+3.105,"binary_str45" ,1626870128249205952
+9.39,"binary_str46" ,1626870128249209024
+2.825,"binary_str47" ,1626870128249212096
+9.675,"binary_str48" ,1626870128249214912
+9.99,"binary_str49" ,1626870128249217984
+4.51,"binary_str50" ,1626870128249221056
+4.94,"binary_str51" ,1626870128249223872
+7.72,"binary_str52" ,1626870128249226944
+4.135,"binary_str53" ,1626870128249231040
+2.325,"binary_str54" ,1626870128249234112
+4.585,"binary_str55" ,1626870128249236928
+8.76,"binary_str56" ,1626870128249240000
+4.715,"binary_str57" ,1626870128249243072
+0.56,"binary_str58" ,1626870128249245888
+5.35,"binary_str59" ,1626870128249249984
+5.075,"binary_str60" ,1626870128249253056
+6.665,"binary_str61" ,1626870128249256128
+7.13,"binary_str62" ,1626870128249258944
+2.775,"binary_str63" ,1626870128249262016
+5.775,"binary_str64" ,1626870128249265088
+1.62,"binary_str65" ,1626870128249267904
+1.625,"binary_str66" ,1626870128249270976
+8.15,"binary_str67" ,1626870128249274048
+0.75,"binary_str68" ,1626870128249277120
+3.265,"binary_str69" ,1626870128249280960
+8.585,"binary_str70" ,1626870128249284032
+1.88,"binary_str71" ,1626870128249287104
+8.44,"binary_str72" ,1626870128249289920
+5.12,"binary_str73" ,1626870128249295040
+2.58,"binary_str74" ,1626870128249298112
+9.42,"binary_str75" ,1626870128249300928
+1.765,"binary_str76" ,1626870128249304000
+2.66,"binary_str77" ,1626870128249308096
+1.405,"binary_str78" ,1626870128249310912
+5.595,"binary_str79" ,1626870128249315008
+2.28,"binary_str80" ,1626870128249318080
+9.24,"binary_str81" ,1626870128249320896
+9.03,"binary_str82" ,1626870128249323968
+6.055,"binary_str83" ,1626870128249327040
+1.74,"binary_str84" ,1626870128249330112
+5.77,"binary_str85" ,1626870128249332928
+1.97,"binary_str86" ,1626870128249336000
+0.3,"binary_str87" ,1626870128249339072
+7.145,"binary_str88" ,1626870128249342912
+0.88,"binary_str89" ,1626870128249345984
+8.025,"binary_str90" ,1626870128249349056
+4.81,"binary_str91" ,1626870128249351872
+0.725,"binary_str92" ,1626870128249355968
+3.85,"binary_str93" ,1626870128249359040
+9.455,"binary_str94" ,1626870128249362112
+2.265,"binary_str95" ,1626870128249364928
+3.985,"binary_str96" ,1626870128249368000
+9.375,"binary_str97" ,1626870128249371072
+0.2,"binary_str98" ,1626870128249373888
+6.95,"binary_str99" ,1626870128249377984

tests/army/tools/benchmark/basic/csv/nano_sampletags.csv

@@ -0,0 +1,100 @@
+"string0",7,8.615
+"string1",4,9.895
+"string2",3,2.92
+"string3",3,5.62
+"string4",7,1.615
+"string5",6,1.45
+"string6",5,7.48
+"string7",7,3.01
+"string8",5,4.76
+"string9",10,7.09
+"string10",2,8.38
+"string11",7,8.65
+"string12",5,5.025
+"string13",10,5.765
+"string14",2,4.57
+"string15",2,1.03
+"string16",7,6.98
+"string17",10,0.23
+"string18",7,5.815
+"string19",1,2.37
+"string20",10,8.865
+"string21",3,1.235
+"string22",2,8.62
+"string23",9,1.045
+"string24",8,4.34
+"string25",1,5.455
+"string26",2,4.475
+"string27",1,6.95
+"string28",2,3.39
+"string29",3,6.79
+"string30",7,9.735
+"string31",1,9.79
+"string32",10,9.955
+"string33",1,5.095
+"string34",3,3.86
+"string35",9,5.105
+"string36",10,4.22
+"string37",1,2.78
+"string38",9,6.345
+"string39",1,0.975
+"string40",5,6.16
+"string41",4,7.735
+"string42",5,6.6
+"string43",8,2.845
+"string44",1,0.655
+"string45",3,2.995
+"string46",9,3.6
+"string47",8,3.47
+"string48",3,7.98
+"string49",6,2.225
+"string50",9,5.44
+"string51",4,6.335
+"string52",3,2.955
+"string53",1,0.565
+"string54",6,5.575
+"string55",6,9.905
+"string56",9,6.025
+"string57",8,0.94
+"string58",10,0.15
+"string59",8,1.555
+"string60",4,2.28
+"string61",2,8.29
+"string62",9,6.22
+"string63",6,3.35
+"string64",10,6.7
+"string65",3,9.345
+"string66",7,9.815
+"string67",1,5.365
+"string68",10,3.81
+"string69",1,6.405
+"string70",8,2.715
+"string71",3,8.58
+"string72",8,6.34
+"string73",2,7.49
+"string74",4,8.64
+"string75",3,8.995
+"string76",7,3.465
+"string77",1,7.64
+"string78",6,3.65
+"string79",6,1.4
+"string80",6,5.875
+"string81",2,1.22
+"string82",5,7.87
+"string83",9,8.41
+"string84",9,8.9
+"string85",9,3.89
+"string86",2,5.0
+"string87",2,4.495
+"string88",4,2.835
+"string89",3,5.895
+"string90",7,8.41
+"string91",5,5.125
+"string92",7,9.165
+"string93",5,8.315
+"string94",10,7.485
+"string95",7,4.635
+"string96",2,6.015
+"string97",8,0.595
+"string98",3,8.79
+"string99",4,1.72

tests/army/tools/benchmark/basic/csv/sample.csv

@@ -0,0 +1,3 @@
+1,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','true'
+0,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','true'
+0,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','false'

tests/army/tools/benchmark/basic/csv/sample_no_ts.csv

@@ -0,0 +1,4 @@
+1
+2
+3
+NULL

tests/army/tools/benchmark/basic/csv/sample_tags.csv

@@ -0,0 +1,2 @@
+17
+NULL

tests/army/tools/benchmark/basic/csv/sample_ts.csv

@@ -0,0 +1,4 @@
+'2021-10-28 15:34:44.735',1,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','true'
+'2021-10-29 15:34:44.735',2,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','true'
+'2021-10-30 15:34:44.735',3,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','false'
+1635665684735,4,-1,2147483647,0,2247483647.1,-12.2,'12ac,;\[uer]','23ac,;\[uer23423]123123','false'

tests/army/tools/benchmark/basic/csv/sample_ts_stmt_tags.csv

@@ -0,0 +1,2 @@
+1,-127,127,'23ac,;\[uer]3','true'
+1,-127,126,'23ac,;\[uer]3','true'

tests/army/tools/benchmark/basic/csv/sample_use_ts-stb3.csv

@@ -0,0 +1,4 @@
+1641976781445,300
+1641976781446,600
+1641976781447,900
+1641976781448,NULL

tests/army/tools/benchmark/basic/csv/sample_use_ts-stb5.csv

@@ -0,0 +1,4 @@
+1641976781445,500
+1641976781446,1000
+1641976781447,1500
+1641976781448,NULL

tests/army/tools/benchmark/basic/csv/sample_use_ts.csv

@@ -0,0 +1,4 @@
+1641976781445,1
+1641976781446,2
+1641976781447,3
+1641976781448,NULL

tests/army/tools/benchmark/basic/csv/tags.csv

@@ -0,0 +1,2 @@
+1,-127,127,'23ac,;\[uer]3','true'
+1,-127,126,'23ac,;\[uer]3','true'

tests/army/tools/benchmark/basic/custom_col_tag.py

@@ -0,0 +1,64 @@
+###################################################################
+#           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 os
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-13928] taosBenchmark improve user interface
+        """
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = "%s -f ./tools/benchmark/basic/json/custom_col_tag.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("reset query cache")
+        tdSql.query("describe db.stb")
+        tdSql.checkData(0, 0, "ts")
+        tdSql.checkData(1, 0, "first_col")
+        tdSql.checkData(2, 0, "second_col")
+        tdSql.checkData(3, 0, "second_col_1")
+        tdSql.checkData(4, 0, "second_col_2")
+        tdSql.checkData(5, 0, "second_col_3")
+        tdSql.checkData(6, 0, "second_col_4")
+        tdSql.checkData(7, 0, "third_col")
+        tdSql.checkData(8, 0, "forth_col")
+        tdSql.checkData(9, 0, "forth_col_1")
+        tdSql.checkData(10, 0, "forth_col_2")
+        tdSql.checkData(11, 0, "single")
+        tdSql.checkData(12, 0, "multiple")
+        tdSql.checkData(13, 0, "multiple_1")
+        tdSql.checkData(14, 0, "multiple_2")
+        tdSql.checkData(15, 0, "multiple_3")
+        tdSql.checkData(16, 0, "multiple_4")
+        tdSql.checkData(17, 0, "thensingle")
+        tdSql.checkData(18, 0, "thenmultiple")
+        tdSql.checkData(19, 0, "thenmultiple_1")
+        tdSql.checkData(20, 0, "thenmultiple_2")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/default_json.py

@@ -0,0 +1,48 @@
+###################################################################
+#           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 os
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-11510] taosBenchmark test cases
+        """
+
+
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = "%s -f ./tools/benchmark/basic/json/default.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("reset query cache")
+        tdSql.query("show db.tables")
+        tdSql.checkRows(10)
+        tdSql.query("select count(*) from db.stb")
+        tdSql.checkData(0, 0, 100)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/default_tmq_json.py

@@ -0,0 +1,66 @@
+###################################################################
+#           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 os, signal
+import os
+from time import sleep
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-11510] taosBenchmark test cases
+        """
+
+
+
+    def run(self):
+        tdSql.execute("drop topic if exists topic_0")
+        binPath = etool.benchMarkFile()
+        cmd = "%s -f ./tools/benchmark/basic/json/default.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("reset query cache")
+
+        tdSql.execute("alter database db WAL_RETENTION_PERIOD 3600000")
+
+        cmd = "%s -f ./tools/benchmark/basic/json/tmq.json " % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        sleep(15)
+
+    #        try:
+    #            for line in os.popen("ps ax | grep taosBenchmark | grep -v grep"):
+    #                fields = line.split()
+
+    #                pid = fields[0]
+
+    #                os.kill(int(pid), signal.SIGINT)
+    #                time.sleep(3)
+    #            print("taosBenchmark be killed on purpose")
+    #        except:
+    #            tdLog.exit("failed to kill taosBenchmark")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/demo.py

@@ -11,53 +11,26 @@
 
 # -*- coding: utf-8 -*-
 import os
-import subprocess
-import time
 
-from util.log import *
+import frame
-from util.cases import *
+import frame.etool
-from util.sql import *
+from frame.log import *
-from util.dnodes import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
 
 
-class TDTestCase:
+class TDTestCase(TBase):
     def caseDescription(self):
         """
         [TD-13823] taosBenchmark test cases
         """
-        return
 
-    def init(self, conn, logSql, replicaVar=1):
-        # comment off by Shuduo for CI self.replicaVar = int(replicaVar)
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
 
-    def getPath(self, tool="taosBenchmark"):
-        if (platform.system().lower() == 'windows'):
-            tool = tool + ".exe"
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if "community" in selfPath:
-            projPath = selfPath[: selfPath.find("community")]
-        else:
-            projPath = selfPath[: selfPath.find("tests")]
-
-        paths = []
-        for root, dirs, files in os.walk(projPath):
-            if (tool) in files:
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if "packaging" not in rootRealPath:
-                    paths.append(os.path.join(root, tool))
-                    break
-        if len(paths) == 0:
-            tdLog.exit("taosBenchmark not found!")
-            return
-        else:
-            tdLog.info("taosBenchmark found in %s" % paths[0])
-            return paths[0]
 
     def run(self):
-        binPath = self.getPath()
+        binPath = etool.benchMarkFile()
         cmd = "%s -n 100 -t 100 -y" % binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
@@ -79,7 +52,8 @@ class TDTestCase:
         tdSql.checkData(4, 1, "INT")
         tdSql.checkData(4, 3, "TAG")
         tdSql.checkData(5, 0, "location")
-        tdSql.checkData(5, 1, "VARCHAR")
+        # binary for 2.x and varchar for 3.x
+        # tdSql.checkData(5, 1, "BINARY")
         tdSql.checkData(5, 2, 24)
         tdSql.checkData(5, 3, "TAG")
 

tests/army/tools/benchmark/basic/exportCsv.py

@@ -0,0 +1,119 @@
+###################################################################
+#           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 os
+import json
+import csv
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+# reomve single and double quotation
+def removeQuotation(origin):
+    value = ""
+    for c in origin:
+        if c != '\'' and c != '"':
+            value += c
+
+    return value
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-11510] taosBenchmark test cases
+        """    
+    # check correct    
+    def checkCorrect(self, csvFile, allRows, interlaceRows):
+        # open as csv 
+        count = 0
+        batch = 0
+        name  = ""
+        with open(csvFile) as file:
+            rows = csv.reader(file)
+            for row in rows:
+                # interlaceRows
+                if name == "":
+                    name  = row[0]
+                    batch = 1
+                else:
+                    if name == row[0]:
+                        batch += 1
+                    else:
+                        # switch to another child table
+                        if batch != interlaceRows:
+                            tdLog.exit(f"interlaceRows invalid. tbName={name} real={batch} expect={interlaceRows} i={count} csvFile={csvFile}")
+                        batch = 1
+                        name  = row[0]             
+                # count ++
+                count += 1
+        # batch
+        if batch != interlaceRows:
+            tdLog.exit(f"interlaceRows invalid. tbName={name} real={batch} expect={interlaceRows} i={count} csvFile={csvFile}")
+
+        # check all rows
+        if count != allRows:
+            tdLog.exit(f"allRows invalid. real={count} expect={allRows} csvFile={csvFile}")
+
+        tdLog.info(f"Check generate csv file successfully. csvFile={csvFile} count={count} interlaceRows={batch}")
+    
+    # check result
+    def checResult(self, jsonFile):
+         # csv
+        with open(jsonFile) as file:
+             data = json.load(file)
+
+         # read json
+        database = data["databases"][0]
+        out      = data["csvPath"]
+        dbName   = database["dbinfo"]["name"]
+        stables  = database["super_tables"]
+        for stable in stables:
+            stbName = stable["name"]
+            childs  = stable["childtable_count"]
+            insertRows    = stable["insert_rows"]
+            interlaceRows = stable["interlace_rows"]
+            csvFile = f"{out}{dbName}-{stbName}.csv"
+            rows = childs * insertRows
+            if interlaceRows == 0:
+                interlaceRows = insertRows
+            # check csv context correct
+            self.checkCorrect(csvFile, rows, interlaceRows)
+
+    def checkExportCsv(self, benchmark, jsonFile, options=""):
+        # exec
+        cmd = f"{benchmark} {options} -f {jsonFile}"
+        os.system(cmd)
+
+        # check result
+        self.checResult(jsonFile)
+ 
+    def run(self):
+        # path
+        benchmark = etool.benchMarkFile()
+
+        # do check
+        json = "tools/benchmark/basic/json/exportCsv.json"
+        self.checkExportCsv(benchmark, json)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/from-to-continue.py

@@ -0,0 +1,72 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-20424] taosBenchmark insert child table from and to test cases
+        """
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = "%s -t 6 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+
+        cmd = "%s -f ./tools/benchmark/basic/json/insert-from-to-continue-no.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 6 + 3)
+
+        cmd = "%s -t 5 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("use test")
+        tdSql.execute("create table d5 using meters tags (4, 'd5')")
+
+        cmd = "%s -f ./tools/benchmark/basic/json/insert-from-to-continue-yes.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 5 + 3)
+
+        cmd = "%s -t 4 -n 1 -y" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("use test")
+        tdSql.execute("create table d4 using meters tags (4, 'd4')")
+
+        cmd = "%s -f ./tools/benchmark/basic/json/insert-from-to-continue-smart.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 4 + 1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/from-to.py

@@ -0,0 +1,59 @@
+###################################################################
+#           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 os
+
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-22157] taosBenchmark insert child table from and to test cases
+        """
+
+    def run(self):
+        tdSql.query("select client_version()")
+        client_ver = "".join(tdSql.res[0])
+        major_ver = client_ver.split(".")[0]
+
+        binPath = etool.benchMarkFile()
+
+        cmd = "%s -f ./tools/benchmark/basic/json/from-to.json" % binPath
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from db.stb")
+        tdSql.checkData(0, 0, 50)
+
+        if major_ver == "3":
+            for i in range(0, 5):
+                tdSql.error("select count(*) from db.d%d" % i)
+        else:
+            for i in range(0, 5):
+                tdSql.error("select count(*) from db.d%d" % i)
+        for i in range(5, 10):
+            tdSql.query("select count(*) from db.d%d" % i)
+            tdSql.checkData(0, 0, 10)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/insert-json-csv.py

@@ -0,0 +1,59 @@
+###################################################################
+#           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 os
+import time
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def run(self):
+        tdSql.query("select client_version()")
+        client_ver = "".join(tdSql.res[0])
+        major_ver = client_ver.split(".")[0]
+
+        binPath = etool.benchMarkFile()
+        if binPath == "":
+            tdLog.exit("taosBenchmark not found!")
+        else:
+            tdLog.info("taosBenchmark found in %s" % binPath)
+
+        # insert: create one  or multiple tables per sql and insert multiple rows per sql
+        # test case for https://jira.taosdata.com:18080/browse/TD-4985
+        os.system("%s -f ./tools/benchmark/basic/json/insert-json-csv.json -y " % binPath)
+
+        tdSql.execute("use db")
+        if major_ver == "3":
+            tdSql.query("select count(*) from (select distinct(tbname) from stb0)")
+        else:
+            tdSql.query("select count(tbname) from stb0")
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select * from stb0 where  tbname like 'stb00_0'  limit 10")
+        tdSql.checkData(0, 1, 0)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 2)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/insertMix.py

@@ -14,47 +14,21 @@ import os
 import subprocess
 import time
 
-from util.log import *
+import frame
-from util.cases import *
+import frame.etool
-from util.sql import *
+from frame.log import *
-from util.dnodes import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
 
 
-class TDTestCase:
+class TDTestCase(TBase):
     def caseDescription(self):
         """
         [TD-13823] taosBenchmark test cases
         """
         return
-
-    def init(self, conn, logSql, replicaVar=1):
-        # comment off by Shuduo for CI self.replicaVar = int(replicaVar)
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-
-    def getPath(self, tool="taosBenchmark"):
-        if (platform.system().lower() == 'windows'):
-            tool = tool + ".exe"
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if "community" in selfPath:
-            projPath = selfPath[: selfPath.find("community")]
-        else:
-            projPath = selfPath[: selfPath.find("tests")]
-
-        paths = []
-        for root, dirs, files in os.walk(projPath):
-            if (tool) in files:
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if "packaging" not in rootRealPath:
-                    paths.append(os.path.join(root, tool))
-                    break
-        if len(paths) == 0:
-            tdLog.exit("taosBenchmark not found!")
-            return
-        else:
-            tdLog.info("taosBenchmark found in %s" % paths[0])
-            return paths[0]
         
     def checkDataCorrect(self):
         sql = "select count(*) from meters"
@@ -86,8 +60,8 @@ class TDTestCase:
 
 
     def run(self):
-        binPath = self.getPath()
+        binPath = etool.benchMarkFile()
-        cmd = "%s -f ./5-taos-tools/taosbenchmark/json/insertMix.json" % binPath
+        cmd = "%s -f ./tools/benchmark/basic//json/insertMix.json" % binPath
         tdLog.info("%s" % cmd)
         errcode = os.system("%s" % cmd)
         if errcode != 0:

tests/army/tools/benchmark/basic/invalid_commandline.py

@@ -0,0 +1,68 @@
+###################################################################
+#           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 os
+import frame
+import frame.etool
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def caseDescription(self):
+        """
+        [TD-11510] taosBenchmark test cases
+        """
+
+
+
+    def run(self):
+        binPath = etool.benchMarkFile()
+        cmd = (
+            "%s -F abc -P abc -I abc -T abc -i abc -S abc -B abc -r abc -t abc -n abc -l abc -w abc -w 16385 -R abc -O abc -a abc -n 2 -t 2 -r 1 -y"
+            % binPath
+        )
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, 4)
+
+        cmd = "%s non_exist_opt" % binPath
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) != 0
+
+        cmd = "%s -f non_exist_file -y" % binPath
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) != 0
+
+        cmd = "%s -h non_exist_host -y" % binPath
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) != 0
+
+        cmd = "%s -p non_exist_pass -y" % binPath
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) != 0
+
+        cmd = "%s -u non_exist_user -y" % binPath
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) != 0
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/army/tools/benchmark/basic/json/TD-31490.json

@@ -0,0 +1,63 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "localhost",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 1,
+    "thread_count": 1,
+    "create_table_thread_count": 1,
+    "result_file": "./res.txt",
+    "confirm_parameter_prompt": "no",
+    "num_of_records_per_req": 1 ,
+    "prepared_rand": 10000,
+    "chinese": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "zh",
+                "drop": "yes",
+                "keep": 36500,
+                "wal_retention_period": 0,
+                "buffer": 256,
+                "stt_trigger": 1,
+                "vgroups ": 1
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "no",
+                    "childtable_count": 1,
+                    "childtable_prefix": "d",
+                    "escape_character": "yes",
+                    "auto_create_table": "no",
+                    "batch_create_tbl_num": 300,
+                    "data_source": "sample",
+                    "insert_mode": "stmt",
+                    "non_stop_mode": "no",
+                    "insert_rows": 50,
+                    "childtable_limit": 0,
+                    "childtable_offset": 0,
+                    "interlace_rows": 10,
+                    "insert_interval": 0,
+                    "partial_col_num": 0,
+                    "disorder_ratio": 0,
+                    "disorder_range": 0,
+                    "timestamp_step": 0,
+                    "start_timestamp": "2020-1-1 0:0:0",
+                    "sample_format": "csv",
+                    "sample_file": "./tools/benchmark/basic/csv/TD-31490.csv",
+                    "use_sample_ts": "yes",
+                    "tags_file": "",
+                    "columns": [
+                        { "type": "DOUBLE", "count": 1 }
+                    ],
+                    "tags": [
+                        { "name": "id", "type": "UINT" }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/TD-31575.json

@@ -0,0 +1,81 @@
+{
+    "filetype":"insert",
+    "cfgdir":"/etc/taos",
+    "host":"127.0.0.1",
+    "port":6030,
+    "user":"root",
+    "password":"taosdata",
+    "connection_pool_size":32,
+    "thread_count":32,
+    "create_table_thread_count":10,
+    "confirm_parameter_prompt":"no",
+    "num_of_records_per_req":1000,
+    "thread_bind_vgroup":"yes",
+    "databases":[
+        {
+            "dbinfo":{
+                "name":"power",
+                "drop":"yes",
+                "replica":1,
+                "wal_retention_period":0,
+                "wal_retention_size":0,
+                "vgroups":4,
+                "cachemodel": "'none'",
+                "cachesize":1,
+                "wal_level":1,
+                "buffer":256,
+                "duration":"14400m",
+                "stt_trigger":1
+            },
+            "super_tables":[
+                {
+                    "name":"meters",
+                    "child_table_exists":"no",
+                    "childtable_count":100,
+                    "childtable_prefix":"d",
+                    "escape_character":"yes",
+                    "auto_create_table":"no",
+                    "batch_create_tbl_num":5,
+                    "data_source":"rand",
+                    "insert_mode":"stmt",
+                    "insert_rows":320,
+                    "interlace_rows":1,
+                    "insert_interval":0,
+                    "timestamp_step":1000,
+                    "start_timestamp":"2022-10-01 00:00:00.000",
+                    "columns":[
+                        { "type": "float",      "name": "current",  "max": 1, "min": 0 },
+                        { "type": "int",        "name": "voltage",  "max": 100, "min": 0 },
+                        { "type": "float",      "name": "phase",    "max": 100, "min": 0 }
+                    ],
+                    "tags":[
+                        {
+                            "type":"binary",
+                            "name":"location",
+                            "max":64,
+                            "min":1,
+                            "values":[
+                                "San Francisco",
+                                "Los Angles",
+                                "San Diego",
+                                "San Jose",
+                                "Palo Alto",
+                                "Campbell",
+                                "Mountain View",
+                                "Sunnyvale",
+                                "Santa Clara",
+                                "Cupertino"
+                            ]
+                        },
+                        {
+                            "name":"groupId",
+                            "type":"int",
+                            "max":100000,
+                            "min":1
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/TD-32846.json

@@ -0,0 +1,82 @@
+{
+	"filetype":	"insert",
+	"cfgdir":	"/etc/taos",
+	"host":	"localhost",
+	"port":	6030,
+	"user":	"root",
+	"password":	"taosdata",
+	"connection_pool_size":	20,
+	"thread_count":	4,
+	"create_table_thread_count":	8,
+	"confirm_parameter_prompt":	"no",
+	"num_of_records_per_req":	300,
+	"thread_bind_vgroup":	"no",
+	"prepared_rand":	1000,
+	"chinese":	"no",
+	"escape_character":	"yes",
+	"continue_if_fail":	"no",
+	"databases":	[{
+			"dbinfo":	{
+				"name":	"nws",
+				"drop":	"yes",
+				"wal_retention_size":10,
+				"vgroups":	4,
+				"buffer":	30,
+				"stt_trigger":	1,
+				"wal_level":	0,
+				"precision":	"ms"
+			},
+			"super_tables":	[{
+					"name":	"product",
+					"child_table_exists":	"no",
+					"childtable_count":	5,
+					"childtable_prefix":	"d",
+					"auto_create_table":	"yes",
+					"batch_create_tbl_num":	10,
+					"data_source":	"rand",
+					"insert_mode":	"stmt2",
+					"non_stop_mode":	"no",
+					"line_protocol":	"line",
+					"insert_rows":	1034,
+					"childtable_limit":	0,
+					"childtable_offset":	0,
+					"interlace_rows":	0,
+					"insert_interval":	0,
+					"partial_col_num":	0,
+					"timestamp_step":	10,
+					"start_timestamp":	"2024-01-01 00:00:00.000",
+					"sample_format":	"csv",
+					"sample_file":	"./sample.csv",
+					"use_sample_ts":	"no",
+					"tags_file":	"",
+					"columns":	[{
+							"type":	"VARCHAR",
+							"name":	"datakey",
+							"len":	32,
+							"values":	["Grid_0_0"]
+						}, {
+							"type":	"VARCHAR",
+							"name":	"datavalue",
+							"len":	32768
+						}, {
+							"type":	"TIMESTAMP",
+							"name":	"itime"
+						}],
+					"tags":	[{
+							"type":	"VARCHAR",
+							"name":	"prodcode",
+							"values":	["AAA"]
+						}, {
+							"type":	"INT",
+							"name":	"validtime",
+							"max":	72,
+							"min":	1
+						}, {
+							"type":	"INT",
+							"name":	"heightcount",
+							"max":	21,
+							"min":	1
+						}]
+				}]
+		}]
+}

tests/army/tools/benchmark/basic/json/TD-32913-1.json

@@ -0,0 +1,67 @@
+{
+	"filetype":	"insert",
+	"cfgdir":	"/etc/taos",
+	"dsn":	"http://127.0.0.1:6041",
+	"host":	"127.0.0.1",
+	"port":	"6030",
+	"user":	"root",
+	"password":	"taosdata",
+	"connection_pool_size":	100,
+	"thread_count":	10,
+	"create_table_thread_count":	3,
+	"result_file":	"./res.txt",
+	"confirm_parameter_prompt":	"no",
+	"num_of_records_per_req":	1000,
+	"thread_bind_vgroup":	"yes",
+	"prepared_rand":	1000,
+	"chinese":	"no",
+	"escape_character":	"yes",
+	"continue_if_fail":	"no",
+	"databases":	[{
+			"dbinfo":	{
+				"name":	"td32913db",
+				"drop":	"no",
+				"vgroups":	4,
+				"precision":	"ms"
+			},
+			"super_tables":	[{
+					"name":	"ntsp_realtime_hf",
+					"child_table_exists":	"no",
+					"childtable_count":	17,
+					"childtable_prefix":	"d",
+					"auto_create_table":	"no",
+					"batch_create_tbl_num":	500,
+					"data_source":	"rand",
+					"insert_mode":	"taosc",
+					"non_stop_mode":	"no",
+					"line_protocol":	"line",
+					"insert_rows":	1000,
+					"childtable_limit":	0,
+					"childtable_offset":	0,
+					"interlace_rows":	10,
+					"insert_interval":	0,
+					"partial_col_num":	0,
+					"timestamp_step":	1000,
+					"start_timestamp":	"2024-10-01 00:00:00.000",
+					"use_sample_ts":	"no",
+					"tags_file":	"",
+					"columns":	[{
+							"type":	"TIMESTAMP",
+							"name":	"st"
+						}, {
+							"type":	"VARCHAR",
+							"name":	"data",
+							"len":	512
+						}],
+					"tags":	[{
+							"type":	"VARCHAR",
+							"name":	"type",
+							"len":	2
+						}, {
+							"type":	"VARCHAR",
+							"name":	"vin",
+							"len":	100
+						}]
+				}]
+		}]
+}

tests/army/tools/benchmark/basic/json/TD-32913-2.json

@@ -0,0 +1,67 @@
+{
+	"filetype":	"insert",
+	"cfgdir":	"/etc/taos",
+	"dsn":	"http://127.0.0.1:6041",
+	"host":	"127.0.0.1",
+	"port":	"6030",
+	"user":	"root",
+	"password":	"taosdata",
+	"connection_pool_size":	100,
+	"thread_count":	10,
+	"create_table_thread_count":	3,
+	"result_file":	"./res.txt",
+	"confirm_parameter_prompt":	"no",
+	"num_of_records_per_req":	1000,
+	"thread_bind_vgroup":	"no",
+	"prepared_rand":	1000,
+	"chinese":	"no",
+	"escape_character":	"yes",
+	"continue_if_fail":	"no",
+	"databases":	[{
+			"dbinfo":	{
+				"name":	"td32913db2",
+				"drop":	"yes",
+				"vgroups":	4,
+				"precision":	"ms"
+			},
+			"super_tables":	[{
+					"name":	"ntsp_realtime_hf",
+					"child_table_exists":	"no",
+					"childtable_count":	17,
+					"childtable_prefix":	"d",
+					"auto_create_table":	"no",
+					"batch_create_tbl_num":	500,
+					"data_source":	"rand",
+					"insert_mode":	"stmt",
+					"non_stop_mode":	"no",
+					"line_protocol":	"line",
+					"insert_rows":	1000,
+					"childtable_limit":	0,
+					"childtable_offset":	0,
+					"interlace_rows":	10,
+					"insert_interval":	0,
+					"partial_col_num":	0,
+					"timestamp_step":	1000,
+					"start_timestamp":	"2024-10-01 00:00:00.000",
+					"use_sample_ts":	"no",
+					"tags_file":	"",
+					"columns":	[{
+							"type":	"TIMESTAMP",
+							"name":	"st"
+						}, {
+							"type":	"VARCHAR",
+							"name":	"data",
+							"len":	512
+						}],
+					"tags":	[{
+							"type":	"VARCHAR",
+							"name":	"type",
+							"len":	2
+						}, {
+							"type":	"VARCHAR",
+							"name":	"vin",
+							"len":	100
+						}]
+				}]
+		}]
+}

tests/army/tools/benchmark/basic/json/TD-32913-3.json

@@ -0,0 +1,66 @@
+{
+	"filetype":	"insert",
+	"cfgdir":	"/etc/taos",
+	"host":	"127.0.0.1",
+	"port":	"6030",
+	"user":	"root",
+	"password":	"taosdata",
+	"connection_pool_size":	100,
+	"thread_count":	10,
+	"create_table_thread_count":	3,
+	"result_file":	"./res.txt",
+	"confirm_parameter_prompt":	"no",
+	"num_of_records_per_req":	1000,
+	"thread_bind_vgroup":	"yes",
+	"prepared_rand":	1000,
+	"chinese":	"no",
+	"escape_character":	"yes",
+	"continue_if_fail":	"no",
+	"databases":	[{
+			"dbinfo":	{
+				"name":	"td32913db3",
+				"drop":	"yes",
+				"vgroups":	2,
+				"precision":	"ms"
+			},
+			"super_tables":	[{
+					"name":	"ntsp_realtime_hf",
+					"child_table_exists":	"no",
+					"childtable_count":	13,
+					"childtable_prefix":	"d",
+					"auto_create_table":	"no",
+					"batch_create_tbl_num":	500,
+					"data_source":	"rand",
+					"insert_mode":	"taosc",
+					"non_stop_mode":	"no",
+					"line_protocol":	"line",
+					"insert_rows":	 1231,
+					"childtable_limit":	0,
+					"childtable_offset":	0,
+					"interlace_rows":	10,
+					"insert_interval":	0,
+					"partial_col_num":	0,
+					"timestamp_step":	1000,
+					"start_timestamp":	"2024-10-01 00:00:00.000",
+					"use_sample_ts":	"no",
+					"tags_file":	"",
+					"columns":	[{
+							"type":	"TIMESTAMP",
+							"name":	"st"
+						}, {
+							"type":	"VARCHAR",
+							"name":	"data",
+							"len":	512
+						}],
+					"tags":	[{
+							"type":	"VARCHAR",
+							"name":	"type",
+							"len":	2
+						}, {
+							"type":	"VARCHAR",
+							"name":	"vin",
+							"len":	100
+						}]
+				}]
+		}]
+}

tests/army/tools/benchmark/basic/json/TD-32913.json

@@ -0,0 +1,66 @@
+{
+	"filetype":	"insert",
+	"cfgdir":	"/etc/taos",
+	"host":	"127.0.0.1",
+	"port":	"6030",
+	"user":	"root",
+	"password":	"taosdata",
+	"connection_pool_size":	100,
+	"thread_count":	10,
+	"create_table_thread_count":	3,
+	"result_file":	"./res.txt",
+	"confirm_parameter_prompt":	"no",
+	"num_of_records_per_req":	1000,
+	"thread_bind_vgroup":	"yes",
+	"prepared_rand":	1000,
+	"chinese":	"no",
+	"escape_character":	"yes",
+	"continue_if_fail":	"no",
+	"databases":	[{
+			"dbinfo":	{
+				"name":	"td32913db",
+				"drop":	"yes",
+				"vgroups":	2,
+				"precision":	"ms"
+			},
+			"super_tables":	[{
+					"name":	"ntsp_realtime_hf",
+					"child_table_exists":	"no",
+					"childtable_count":	17,
+					"childtable_prefix":	"d",
+					"auto_create_table":	"no",
+					"batch_create_tbl_num":	500,
+					"data_source":	"rand",
+					"insert_mode":	"stmt",
+					"non_stop_mode":	"no",
+					"line_protocol":	"line",
+					"insert_rows":	1000,
+					"childtable_limit":	0,
+					"childtable_offset":	0,
+					"interlace_rows":	10,
+					"insert_interval":	0,
+					"partial_col_num":	0,
+					"timestamp_step":	1000,
+					"start_timestamp":	"2024-10-01 00:00:00.000",
+					"use_sample_ts":	"no",
+					"tags_file":	"",
+					"columns":	[{
+							"type":	"TIMESTAMP",
+							"name":	"st"
+						}, {
+							"type":	"VARCHAR",
+							"name":	"data",
+							"len":	512
+						}],
+					"tags":	[{
+							"type":	"VARCHAR",
+							"name":	"type",
+							"len":	2
+						}, {
+							"type":	"VARCHAR",
+							"name":	"vin",
+							"len":	100
+						}]
+				}]
+		}]
+}

tests/army/tools/benchmark/basic/json/TS-5002.json

@@ -0,0 +1,155 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 20,
+    "thread_count": 20,
+    "create_table_thread_count": 1,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "num_of_records_per_req": 5000,
+    "prepared_rand": 10000,
+    "chinese": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "test240613",
+                "drop": "yes",
+                "replica": 1,
+                "wal_retention_period": 0,
+                "buffer": 256,
+                "cachemodel": "'both'",
+                "cachesize": 100,
+                "stt_trigger": 1,
+                "vgroups ": 3
+            },
+            "super_tables": [
+                {
+                    "name": "test_cj_dydlqx_03",
+                    "child_table_exists": "no",
+                    "childtable_count": 100,
+                    "childtable_prefix": "dydlqx_03_",
+                    "escape_character": "yes",
+                    "auto_create_table": "no",
+                    "batch_create_tbl_num": 10,
+                    "data_source": "rand",
+                    "insert_mode": "stmt",
+                    "non_stop_mode": "no",
+                    "insert_rows": 0,
+                    "childtable_exists": "no",
+                    "childtable_limit": 0,
+                    "childtable_offset": 0,
+                    "interlace_rows": 0,
+                    "insert_interval": 0,
+                    "partial_col_num": 0,
+                    "disorder_ratio": 0,
+                    "disorder_range": 0,
+                    "timestamp_step": 900000,
+                    "start_timestamp": "2024-6-01 0:0:0",
+                    "tags_file": "./tools/benchmark/basic/csv/TS-5002.csv",
+                    "columns": [
+                        {
+                            "type": "FLOAT",
+                            "name": "ady",
+                            "max": 230,
+                            "min": 140
+                        },
+                        {
+                            "type": "FLOAT",
+                            "name": "bdy",
+                            "max": 230,
+                            "min": 140
+                        },
+                        {
+                            "type": "FLOAT",
+                            "name": "cdy",
+                            "max": 230,
+                            "min": 140
+                        },
+                        {
+                            "type": "FLOAT",
+                            "name": "adl",
+                            "max": 6,
+                            "min": 4
+                        },
+                        {
+                            "type": "FLOAT",
+                            "name": "bdl",
+                            "max": 6,
+                            "min": 4
+                        },
+                        {
+                            "type": "FLOAT",
+                            "name": "cdl",
+                            "max": 6,
+                            "min": 4
+                        },
+                        {
+                            "type": "FLOAT",
+                            "name": "lxdl",
+                            "max": 6,
+                            "min": 4
+                        }
+                    ],
+                    "tags": [
+                        {
+                            "name": "cldbs",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "pt_ratio",
+                            "type": "FLOAT"
+                        },
+                        {
+                            "name": "ct_ratio",
+                            "type": "FLOAT"
+                        },
+                        {
+                            "name": "rated_cap",
+                            "type": "FLOAT"
+                        },
+                        {
+                            "name": "area_code",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "zdy_flag",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "ta_id",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "cust_no",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "elec_cust_name",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "bureau_code",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "id",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "fl_name",
+                            "type": "VARCHAR"
+                        },
+                        {
+                            "name": "classify_id",
+                            "type": "VARCHAR"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/TS-5234-1.json

@@ -0,0 +1,78 @@
+{
+    "filetype":"insert",
+    "cfgdir":"/etc/taos",
+    "host":"127.0.0.1",
+    "port":6030,
+    "user":"root",
+    "password":"taosdata",
+    "thread_count":1,
+    "create_table_thread_count":1,
+    "confirm_parameter_prompt":"no",
+    "num_of_records_per_req":1000,
+    "databases":[
+        {
+            "dbinfo":{
+                "name":"test",
+                "drop":"yes",
+                "replica":1,
+                "wal_retention_period":2,
+                "wal_retention_size":10,
+                "vgroups":1,
+                "precision": "ns",
+                "cachemodel": "none",
+                "duration":"14400m",
+                "cachesize":1,
+                "wal_level":1,
+                "buffer":256,
+                "stt_trigger":1
+            },
+            "super_tables":[
+                {
+                    "name":"meters",
+                    "child_table_exists":"no",
+                    "childtable_prefix":"d",
+                    "escape_character":"yes",
+                    "auto_create_table":"no",
+                    "batch_create_tbl_num":5,
+                    "data_source":"rand",
+                    "insert_mode":"taosc",
+                    "childtable_count": 4,
+                    "insert_rows":1000,
+                    "timestamp_step":1000,
+                    "start_timestamp":"2022-10-01 00:00:00.000",
+                    "columns":[
+                        { "type": "float",      "name": "current",  "max": 1, "min": 0 },
+                        { "type": "int",        "name": "voltage",  "max": 100, "min": 0 },
+                        { "type": "float",      "name": "phase",    "max": 100, "min": 0 }
+                    ],
+                    "tags":[
+                        {
+                            "type":"binary",
+                            "name":"location",
+                            "max":64,
+                            "min":1,
+                            "values":[
+                                "San Francisco",
+                                "Los Angles",
+                                "San Diego",
+                                "San Jose",
+                                "Palo Alto",
+                                "Campbell",
+                                "Mountain View",
+                                "Sunnyvale",
+                                "Santa Clara",
+                                "Cupertino"
+                            ]
+                        },
+                        {
+                            "name":"groupId",
+                            "type":"int",
+                            "max":100000,
+                            "min":1
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/TS-5234-2.json

@@ -0,0 +1,78 @@
+{
+    "filetype":"insert",
+    "cfgdir":"/etc/taos",
+    "host":"127.0.0.1",
+    "port":6030,
+    "user":"root",
+    "password":"taosdata",
+    "thread_count":1,
+    "create_table_thread_count":1,
+    "confirm_parameter_prompt":"no",
+    "num_of_records_per_req":1000,
+    "databases":[
+        {
+            "dbinfo":{
+                "name":"test",
+                "drop":"yes",
+                "replica":1,
+                "wal_retention_period":20,
+                "wal_retention_size":10,
+                "vgroups":2,
+                "precision": "us",
+                "cachemodel": "'both'",
+                "cachesize":1,
+                "wal_level":1,
+                "buffer":256,
+                "duration": 3,
+                "stt_trigger":1
+            },
+            "super_tables":[
+                {
+                    "name":"meters",
+                    "child_table_exists":"no",
+                    "childtable_prefix":"d",
+                    "escape_character":"yes",
+                    "auto_create_table":"no",
+                    "batch_create_tbl_num":5,
+                    "data_source":"rand",
+                    "insert_mode":"taosc",
+                    "childtable_count": 4,
+                    "insert_rows":1000,
+                    "timestamp_step":1000,
+                    "start_timestamp":"2022-10-01 00:00:00.000",
+                    "columns":[
+                        { "type": "float",      "name": "current",  "max": 1, "min": 0 },
+                        { "type": "int",        "name": "voltage",  "max": 100, "min": 0 },
+                        { "type": "float",      "name": "phase",    "max": 100, "min": 0 }
+                    ],
+                    "tags":[
+                        {
+                            "type":"binary",
+                            "name":"location",
+                            "max":64,
+                            "min":1,
+                            "values":[
+                                "San Francisco",
+                                "Los Angles",
+                                "San Diego",
+                                "San Jose",
+                                "Palo Alto",
+                                "Campbell",
+                                "Mountain View",
+                                "Sunnyvale",
+                                "Santa Clara",
+                                "Cupertino"
+                            ]
+                        },
+                        {
+                            "name":"groupId",
+                            "type":"int",
+                            "max":100000,
+                            "min":1
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/TS-5234-3.json

@@ -0,0 +1,76 @@
+{
+    "filetype":"insert",
+    "cfgdir":"/etc/taos",
+    "host":"127.0.0.1",
+    "port":6030,
+    "user":"root",
+    "password":"taosdata",
+    "thread_count":1,
+    "create_table_thread_count":1,
+    "confirm_parameter_prompt":"no",
+    "num_of_records_per_req":1000,
+    "databases":[
+        {
+            "dbinfo":{
+                "name":"test",
+                "drop":"yes",
+                "replica":1,
+                "wal_retention_period":20,
+                "wal_retention_size":10,
+                "vgroups":3,
+                "precision": "us",
+                "cachemodel": "\"last_value\"",
+                "cachesize":1,
+                "wal_level":1,
+                "buffer":256,
+                "stt_trigger":1
+            },
+            "super_tables":[
+                {
+                    "name":"meters",
+                    "child_table_exists":"no",
+                    "childtable_prefix":"d",
+                    "escape_character":"yes",
+                    "auto_create_table":"no",
+                    "batch_create_tbl_num":5,
+                    "data_source":"rand",
+                    "childtable_count": 4,
+                    "insert_rows":1000,
+                    "timestamp_step":1000,
+                    "start_timestamp":"2022-10-01 00:00:00.000",
+                    "columns":[
+                        { "type": "float",      "name": "current",  "max": 1, "min": 0 },
+                        { "type": "int",        "name": "voltage",  "max": 100, "min": 0 },
+                        { "type": "float",      "name": "phase",    "max": 100, "min": 0 }
+                    ],
+                    "tags":[
+                        {
+                            "type":"binary",
+                            "name":"location",
+                            "max":64,
+                            "min":1,
+                            "values":[
+                                "San Francisco",
+                                "Los Angles",
+                                "San Diego",
+                                "San Jose",
+                                "Palo Alto",
+                                "Campbell",
+                                "Mountain View",
+                                "Sunnyvale",
+                                "Santa Clara",
+                                "Cupertino"
+                            ]
+                        },
+                        {
+                            "name":"groupId",
+                            "type":"int",
+                            "max":100000,
+                            "min":1
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/TS-5846-Mixed-Query.json

@@ -0,0 +1,25 @@
+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "continue_if_fail": "yes",
+    "databases": "test",
+    "query_times": 10,
+    "query_mode": "taosc",
+    "specified_table_query": {
+      "threads": 2,
+      "mixed_query": "yes",
+      "sqls": [
+        {
+          "sql": "select count(*) from test.meters"
+        },
+        {
+          "sql": "select * from test.d0 limit 10"
+        }
+       ]
+   }
+}        

tests/army/tools/benchmark/basic/json/TS-5846-Query.json

@@ -0,0 +1,25 @@
+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "continue_if_fail": "yes",
+    "databases": "test",
+    "query_times": 10,
+    "query_mode": "taosc",
+    "specified_table_query": {
+      "threads": 2,
+      "mixed_query": "no",
+      "sqls": [
+        {
+          "sql": "select count(*) from test.meters"
+        },
+        {
+          "sql": "select * from test.d0 limit 10"
+        }
+       ]
+   }
+}        

tests/army/tools/benchmark/basic/json/case-insert-mix1.json

@@ -0,0 +1,76 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "num_of_records_per_req": 100,
+    "thread_count": 3,
+    "create_table_thread_count": 1,
+    "result_file": "./insert_res_mix1.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "check_sql": "yes",
+    "continue_if_fail": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "mix1",
+                "drop": "yes",
+                "precision": "ms"
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "no",
+                    "childtable_count": 1,
+                    "insert_rows": 10000,
+                    "childtable_prefix": "d",
+                    "insert_mode": "taosc",
+                    "insert_interval": 0,
+                    "timestamp_step": 10,
+                    "start_timestamp":1500000000000,
+                    "disorder_ratio": 10,
+                    "update_ratio": 5,
+                    "delete_ratio": 1,
+                    "disorder_fill_interval": 50,
+                    "update_fill_interval": 25,
+                    "generate_row_rule": 2,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc",  "max": 1, "min": 0 },
+                        { "type": "double",      "name": "dc",  "max": 1, "min": 0 },
+                        { "type": "tinyint",     "name": "ti",  "max": 100, "min": 0 },
+                        { "type": "smallint",    "name": "si",  "max": 100, "min": 0 },
+                        { "type": "int",         "name": "ic",  "max": 100, "min": 0 },
+                        { "type": "bigint",      "name": "bi",  "max": 100, "min": 0 },
+                        { "type": "utinyint",    "name": "uti", "max": 100, "min": 0 },
+                        { "type": "usmallint",   "name": "usi", "max": 100, "min": 0 },
+                        { "type": "uint",        "name": "ui",  "max": 100, "min": 0 },
+                        { "type": "ubigint",     "name": "ubi", "max": 100, "min": 0 },
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {
+                            "type": "tinyint",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "binary",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/case-insert-mix2.json

@@ -0,0 +1,76 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "num_of_records_per_req": 100,
+    "thread_count": 3,
+    "create_table_thread_count": 1,
+    "result_file": "./insert_res_mix2.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "check_sql": "yes",
+    "continue_if_fail": "yes",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "mix2",
+                "drop": "yes",
+                "precision": "ms"
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "no",
+                    "childtable_count": 3,
+                    "insert_rows": 10000,
+                    "childtable_prefix": "d",
+                    "insert_mode": "taosc",
+                    "insert_interval": 0,
+                    "timestamp_step": 10,
+                    "start_timestamp":1500000000000,
+                    "disorder_ratio": 10,
+                    "update_ratio": 5,
+                    "delete_ratio": 1,
+                    "disorder_fill_interval": 50,
+                    "update_fill_interval": 25,
+                    "generate_row_rule": 3,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc",  "max": 1, "min": 0 },
+                        { "type": "double",      "name": "dc",  "max": 1, "min": 0 },
+                        { "type": "tinyint",     "name": "ti",  "max": 100, "min": 0 },
+                        { "type": "smallint",    "name": "si",  "max": 100, "min": 0 },
+                        { "type": "int",         "name": "ic",  "max": 100, "min": 0 },
+                        { "type": "bigint",      "name": "bi",  "max": 100, "min": 0 },
+                        { "type": "utinyint",    "name": "uti", "max": 100, "min": 0 },
+                        { "type": "usmallint",   "name": "usi", "max": 100, "min": 0 },
+                        { "type": "uint",        "name": "ui",  "max": 100, "min": 0 },
+                        { "type": "ubigint",     "name": "ubi", "max": 100, "min": 0 },
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {
+                            "type": "tinyint",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "binary",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/case-insert-mix3.json

@@ -0,0 +1,70 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "num_of_records_per_req": 100,
+    "thread_count": 1,
+    "create_table_thread_count": 1,
+    "result_file": "./mix3.txt",
+    "confirm_parameter_prompt": "no",
+    "check_sql": "no",
+    "continue_if_fail": "yes",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "mix3",
+                "drop": "yes",
+                "precision": "ms"                
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "no",
+                    "childtable_count": 1,
+                    "insert_rows": 1000,
+                    "childtable_prefix": "d",
+                    "insert_mode": "taosc",
+                    "insert_interval": 1,
+                    "timestamp_step": 1000,
+                    "start_timestamp":"now",
+                    "random_write_future": "yes",
+                    "generate_row_rule": 1,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc",  "max": 1, "min": 0 },
+                        { "type": "double",      "name": "dc",  "max": 1, "min": 0 },
+                        { "type": "tinyint",     "name": "ti",  "max": 100, "min": 0 },
+                        { "type": "smallint",    "name": "si",  "max": 100, "min": 0 },
+                        { "type": "int",         "name": "ic",  "max": 100, "min": 0 },
+                        { "type": "bigint",      "name": "bi",  "max": 100, "min": 0 },
+                        { "type": "utinyint",    "name": "uti", "max": 100, "min": 0 },
+                        { "type": "usmallint",   "name": "usi", "max": 100, "min": 0 },
+                        { "type": "uint",        "name": "ui",  "max": 100, "min": 0 },
+                        { "type": "ubigint",     "name": "ubi", "max": 100, "min": 0 },
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {
+                            "type": "tinyint",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "binary",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/case-insert-mix4.json

@@ -0,0 +1,74 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "num_of_records_per_req": 100,
+    "confirm_parameter_prompt": "no",
+    "thread_count": 1,
+    "create_table_thread_count": 1,
+    "result_file": "./res_mix4.txt",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "mix4",
+                "drop": "yes",
+                "stt_trigger": 6,
+                "flush_each_batch":"yes",
+                "precision": "ms"
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "no",
+                    "childtable_count": 2,
+                    "insert_rows": 2000,
+                    "childtable_prefix": "d",
+                    "insert_mode": "taosc",
+                    "insert_interval": 0,
+                    "timestamp_step": 10,
+                    "start_timestamp":1600000000000,
+                    "generate_row_rule":3,
+                    "keep_trying": 2,
+                    "trying_interval":10,
+                    "check_correct_interval": 1,
+                    "columns": [
+                        { "type": "timestamp",   "name": "tc"},
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc",  "max": 1, "min": 0 },
+                        { "type": "double",      "name": "dc",  "max": 1, "min": 0 },
+                        { "type": "tinyint",     "name": "ti",  "max": 100, "min": 0 },
+                        { "type": "smallint",    "name": "si",  "max": 100, "min": 0 },
+                        { "type": "int",         "name": "ic",  "max": 100, "min": 0 },
+                        { "type": "bigint",      "name": "bi",  "max": 100, "min": 0 },
+                        { "type": "utinyint",    "name": "uti", "max": 100, "min": 0 },
+                        { "type": "usmallint",   "name": "usi", "max": 100, "min": 0 },
+                        { "type": "uint",        "name": "ui",  "max": 100, "min": 0 },
+                        { "type": "ubigint",     "name": "ubi", "max": 100, "min": 0 },
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {
+                            "type": "tinyint",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "binary",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/custom_col_tag.json

@@ -16,13 +16,7 @@
   "databases": [{
     "dbinfo": {
       "name": "db",
-      "drop": "yes",
+      "drop": "yes"
-      "replica": 1,
-      "precision": "ms",
-      "keep": 36500,
-      "minRows": 100,
-      "maxRows": 4096,
-      "comp":2
     },
     "super_tables": [{
       "name": "stb",
@@ -50,17 +44,17 @@
       "partial_col_num": 0,
       "columns": [{
         "type": "INT",
-        "name": "first_type"
+        "name": "first_col"
       }, {
         "type": "UINT",
-        "name": "second_type",
+        "name": "second_col",
         "count": 5
       },{
         "type": "double",
-        "name": "third_type"
+        "name": "third_col"
       },{
         "type": "float",
-        "name": "forth_type",
+        "name": "forth_col",
         "count": 3
       }],
       "tags": [{

tests/army/tools/benchmark/basic/json/default.json

@@ -15,18 +15,13 @@
   "num_of_records_per_req": 10,
   "databases": [{
     "dbinfo": {
-      "name": "db",
+      "name": "db"
-      "drop": "yes"
-
     },
     "super_tables": [{
-      "child_table_exists":"no",
       "name": "stb",
       "childtable_prefix": "stb_",
       "childtable_count": 10,
       "insert_rows": 10,
-      "childtable_from": 1,
-      "childtable_to": 9,
       "columns": [{"type": "INT"}],
       "tags": [{"type": "INT"}]
     }]

tests/army/tools/benchmark/basic/json/exportCsv.json

@@ -0,0 +1,78 @@
+{
+    "filetype": "csvfile",
+    "csvPath": "./csv/",
+    "num_of_records_per_req": 10000,
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "csvdb"
+            },
+            "super_tables": [
+                {
+                    "name": "batchTable",
+                    "childtable_count": 5,
+                    "insert_rows": 100,
+                    "interlace_rows": 0,
+                    "childtable_prefix": "d",
+                    "timestamp_step": 10,
+                    "start_timestamp":1600000000000,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc", "min": 1},
+                        { "type": "double",      "name": "dc", "min":10, "max":10},
+                        { "type": "tinyint",     "name": "ti"},
+                        { "type": "smallint",    "name": "si"},
+                        { "type": "int",         "name": "ic", "fillNull":"false"},
+                        { "type": "bigint",      "name": "bi"},
+                        { "type": "utinyint",    "name": "uti"},
+                        { "type": "usmallint",   "name": "usi", "min":100, "max":120},
+                        { "type": "uint",        "name": "ui"},
+                        { "type": "ubigint",     "name": "ubi"},
+                        { "type": "binary",      "name": "bin", "len": 16},
+                        { "type": "nchar",       "name": "nch", "len": 16}
+                    ],
+                    "tags": [
+                        {"type": "tinyint", "name": "groupid","max": 10,"min": 1},
+                        {"type": "binary",  "name": "location", "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                },
+                {
+                    "name": "interlaceTable",
+                    "childtable_count": 5,
+                    "insert_rows": 100,
+                    "interlace_rows": 10,
+                    "childtable_prefix": "d",
+                    "timestamp_step": 1000,
+                    "start_timestamp":1700000000000,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc", "min":16},
+                        { "type": "double",      "name": "dc", "min":16},
+                        { "type": "tinyint",     "name": "ti"},
+                        { "type": "smallint",    "name": "si"},
+                        { "type": "int",         "name": "ic", "fillNull":"false"},
+                        { "type": "bigint",      "name": "bi"},
+                        { "type": "utinyint",    "name": "uti"},
+                        { "type": "usmallint",   "name": "usi"},
+                        { "type": "uint",        "name": "ui"},
+                        { "type": "ubigint",     "name": "ubi"},
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {"type": "tinyint", "name": "groupid","max": 10,"min": 1},
+                        {"type": "binary",  "name": "location", "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/from-to.json

@@ -0,0 +1,33 @@
+{
+  "filetype": "insert",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "thread_count": 4,
+  "connection_pool_size": 20,
+  "result_file": "./insert_res.txt",
+  "confirm_parameter_prompt": "no",
+  "prepared_rand": 10,
+  "chinese": "no",
+  "insert_interval": 0,
+  "num_of_records_per_req": 10,
+  "databases": [{
+    "dbinfo": {
+      "name": "db",
+      "drop": "yes"
+    },
+    "super_tables": [{
+      "name": "stb",
+      "childtable_prefix": "d",
+      "child_table_exists": "yes",
+      "childtable_count": 10,
+      "insert_rows": 10,
+      "childtable_from": 5,
+      "childtable_to": 10,
+      "columns": [{"type": "INT"}],
+      "tags": [{"type": "INT"}]
+    }]
+  }]
+}

tests/army/tools/benchmark/basic/json/insert-disorder-stmt.json

@@ -0,0 +1,75 @@
+{
+    "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": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 1,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "stmt",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "childtable_offset": 0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 1,
+            "insert_interval": 0,
+            "max_sql_len": 1024000, 
+            "disorder_ratio": 10,
+            "disorder_range": 100,
+            "timestamp_step": 1000,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count":1,
+            "childtable_prefix": "stb01_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 1,
+            "data_source": "rand",
+            "insert_mode": "stmt",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 100,
+            "disorder_range": 1000,
+            "timestamp_step": 1000,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-disorder.json

@@ -0,0 +1,87 @@
+{
+    "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": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 36500,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 1,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "childtable_offset": 0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 1,
+            "insert_interval": 0,
+            "max_sql_len": 1024000, 
+            "disorder_ratio": 10,
+            "disorder_range": 1000,
+            "timestamp_step": 1000,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count":1,
+            "childtable_prefix": "stb01_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 1,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 100,
+            "disorder_range": 1000,
+            "timestamp_step": 1000,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-drop-exist-auto-N00-stmt.json

@@ -0,0 +1,168 @@
+{
+    "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,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "no",                
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb1",
+            "child_table_exists":"no",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NN123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "stmt",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb2",
+            "child_table_exists":"no",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NNN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "stmt",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb3",
+            "child_table_exists":"no",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NNY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "stmt",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb4",
+            "child_table_exists":"yes",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NY123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "stmt",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb5",
+            "child_table_exists":"yes",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NYN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "stmt",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb6",
+            "child_table_exists":"yes",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NYY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "stmt",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        }
+    ]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-drop-exist-auto-Y00-stmt.json

@@ -0,0 +1,168 @@
+{
+    "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,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",                
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb1",
+            "child_table_exists":"no",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YN123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb2",
+            "child_table_exists":"no",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YNN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb3",
+            "child_table_exists":"no",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YNY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb4",
+            "child_table_exists":"yes",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YY123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb5",
+            "child_table_exists":"yes",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YYN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb6",
+            "child_table_exists":"yes",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YYY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        }
+    ]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-from-to-continue-no.json

@@ -0,0 +1,84 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "thread_count": 4,
+    "create_table_thread_count": 7,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 100,
+    "num_of_records_per_req": 100,
+    "prepared_rand": 10000,
+    "chinese": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "test",
+                "drop": "no",
+                "precision": "ms"
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "yes",
+                    "childtable_count": 6,
+                    "childtable_prefix": "d",
+                    "escape_character": "yes",
+                    "auto_create_table": "no",
+                    "batch_create_tbl_num": 5,
+                    "data_source": "rand",
+                    "insert_mode": "taosc",
+                    "non_stop_mode": "no",
+                    "line_protocol": "line",
+                    "insert_rows": 1,
+                    "childtable_from": 2,
+                    "childtable_to": 5,
+                    "continue_if_fail": "no",
+                    "interlace_rows": 0,
+                    "insert_interval": 0,
+                    "partial_col_num": 0,
+                    "disorder_ratio": 0,
+                    "disorder_range": 1000,
+                    "timestamp_step": 10,
+                    "start_timestamp": "2022-10-01 00:00:00.000",
+                    "sample_format": "csv",
+                    "sample_file": "./sample.csv",
+                    "use_sample_ts": "no",
+                    "tags_file": "",
+                    "columns": [
+                        {
+                            "type": "FLOAT",
+                            "name": "current",
+                            "count": 1,
+                            "max": 12,
+                            "min": 8
+                        },
+                        { "type": "INT", "name": "voltage", "max": 225, "min": 215 },
+                        { "type": "FLOAT", "name": "phase", "max": 1, "min": 0 }
+                    ],
+                    "tags": [
+                        {
+                            "type": "TINYINT",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "BINARY",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/insert-from-to-continue-smart.json

@@ -0,0 +1,84 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "thread_count": 4,
+    "create_table_thread_count": 7,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 100,
+    "num_of_records_per_req": 100,
+    "prepared_rand": 10000,
+    "chinese": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "test",
+                "drop": "no",
+                "precision": "ms"
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "yes",
+                    "childtable_count": 4,
+                    "childtable_prefix": "d",
+                    "escape_character": "yes",
+                    "auto_create_table": "no",
+                    "batch_create_tbl_num": 5,
+                    "data_source": "rand",
+                    "insert_mode": "taosc",
+                    "non_stop_mode": "no",
+                    "line_protocol": "line",
+                    "insert_rows": 1,
+                    "childtable_from": 0,
+                    "childtable_to": 1,
+                    "continue_if_fail": "smart",
+                    "interlace_rows": 0,
+                    "insert_interval": 0,
+                    "partial_col_num": 0,
+                    "disorder_ratio": 0,
+                    "disorder_range": 1000,
+                    "timestamp_step": 10,
+                    "start_timestamp": "2020-10-01 00:00:00.000",
+                    "sample_format": "csv",
+                    "sample_file": "./sample.csv",
+                    "use_sample_ts": "no",
+                    "tags_file": "",
+                    "columns": [
+                        {
+                            "type": "FLOAT",
+                            "name": "current",
+                            "count": 1,
+                            "max": 12,
+                            "min": 8
+                        },
+                        { "type": "INT", "name": "voltage", "max": 225, "min": 215 },
+                        { "type": "FLOAT", "name": "phase", "max": 1, "min": 0 }
+                    ],
+                    "tags": [
+                        {
+                            "type": "TINYINT",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "BINARY",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/insert-from-to-continue-yes.json

@@ -0,0 +1,84 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "thread_count": 4,
+    "create_table_thread_count": 7,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 100,
+    "num_of_records_per_req": 100,
+    "prepared_rand": 10000,
+    "chinese": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "test",
+                "drop": "no",
+                "precision": "ms"
+            },
+            "super_tables": [
+                {
+                    "name": "meters",
+                    "child_table_exists": "yes",
+                    "childtable_count": 6,
+                    "childtable_prefix": "d",
+                    "escape_character": "yes",
+                    "auto_create_table": "no",
+                    "batch_create_tbl_num": 5,
+                    "data_source": "rand",
+                    "insert_mode": "taosc",
+                    "non_stop_mode": "no",
+                    "line_protocol": "line",
+                    "insert_rows": 1,
+                    "childtable_from": 2,
+                    "childtable_to": 5,
+                    "continue_if_fail": "yes",
+                    "interlace_rows": 0,
+                    "insert_interval": 0,
+                    "partial_col_num": 0,
+                    "disorder_ratio": 0,
+                    "disorder_range": 1000,
+                    "timestamp_step": 10,
+                    "start_timestamp": "2022-10-01 00:00:00.000",
+                    "sample_format": "csv",
+                    "sample_file": "./sample.csv",
+                    "use_sample_ts": "no",
+                    "tags_file": "",
+                    "columns": [
+                        {
+                            "type": "FLOAT",
+                            "name": "current",
+                            "count": 1,
+                            "max": 12,
+                            "min": 8
+                        },
+                        { "type": "INT", "name": "voltage", "max": 225, "min": 215 },
+                        { "type": "FLOAT", "name": "phase", "max": 1, "min": 0 }
+                    ],
+                    "tags": [
+                        {
+                            "type": "TINYINT",
+                            "name": "groupid",
+                            "max": 10,
+                            "min": 1
+                        },
+                        {
+                            "name": "location",
+                            "type": "BINARY",
+                            "len": 16,
+                            "values": ["San Francisco", "Los Angles", "San Diego",
+                                "San Jose", "Palo Alto", "Campbell", "Mountain View",
+                                "Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

tests/army/tools/benchmark/basic/json/insert-interlace-row-stmt.json

@@ -0,0 +1,49 @@
+{
+    "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": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 100,
+            "childtable_prefix": "stb00_",  
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 20,
+            "data_source": "rand",
+            "insert_mode": "stmt",
+            "insert_rows": 150,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 151,
+            "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":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-interlace-row.json

@@ -0,0 +1,61 @@
+{
+    "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": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 36500,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "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": 20,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 150,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 151,
+            "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":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-json-csv.json

@@ -0,0 +1,48 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 10,
+    "thread_count_create_tbl": 10,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 10,
+    "num_of_records_per_req": 1,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 1,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 1,
+            "data_source": "sample",
+            "insert_mode": "taosc",
+            "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": "2022-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./tools/benchmark/basic/csv/insert-json-csv.csv",
+            "columns": [{"type": "INT","count":2}, {"type": "BINARY", "len": 16, "count":1}],
+            "tags": [{"type": "INT", "count":2}, {"type": "BINARY", "len": 16, "count":1}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-sample-ts-stmt.json

@@ -0,0 +1,76 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "create_table_thread_count": 1,
+    "result_file":"./insert_res.txt",
+    "confirm_parameter_prompt": "no",   
+    "insert_interval": 0,
+    "interlace_rows": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "dbtest123",
+            "drop": "yes",
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 10,
+            "childtable_prefix": "stb0_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "sample",
+            "insert_mode": "taosc",
+            "insert_rows": 100,
+            "childtable_limit": -1,
+            "childtable_offset": 0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 80,
+            "disorder_range": 10,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./tools/benchmark/basic/csv/sample_ts.csv",
+            "use_sample_ts": "yes",
+            "tags_file": "",
+            "columns": [{"type": "INT", "count":3}, {"type": "DOUBLE", "count":3}, {"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}, {"type": "BOOL"}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count":2,
+            "childtable_prefix": "stb1_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "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": 10,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "./tools/benchmark/basic/csv/sample_ts_stmt_tags.csv",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":3}, {"type": "BINARY", "len": 16, "count":2}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-sample-ts.json

@@ -0,0 +1,76 @@
+{
+    "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": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "dbtest123",
+            "drop": "yes",
+            "precision": "ms"
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 10,
+            "childtable_prefix": "stb0_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "sample",
+            "insert_mode": "taosc",
+            "insert_rows": 100,
+            "childtable_limit": -1,
+            "childtable_offset": 0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 80,
+            "disorder_range": 10,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./tools/benchmark/basic/csv/sample_ts.csv",
+            "use_sample_ts": "yes",
+            "tags_file": "",
+            "columns": [{"type": "INT", "count":3}, {"type": "DOUBLE", "count":3}, {"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}, {"type": "BOOL"}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        },
+        {
+            "name": "stb1",
+            "child_table_exists":"no",
+            "childtable_count":2,
+            "childtable_prefix": "stb1_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "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": 10,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./tools/benchmark/basic/csv/sample.csv",
+            "tags_file": "./tools/benchmark/basic/csv/tags.csv",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":3}, {"type": "BINARY", "len": 16, "count":2}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-sample.json

@@ -0,0 +1,87 @@
+{
+    "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": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "dbtest123",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 36500,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 1,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "sample",
+            "insert_mode": "taosc",
+            "insert_rows": 10,
+            "childtable_limit": -1,
+            "childtable_offset": 0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./tools/benchmark/basic/csv/sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT", "count":3}, {"type": "DOUBLE", "count":3}, {"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}, {"type": "BOOL"}],
+            "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": 10,
+            "childtable_limit": -1,
+            "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": 10,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./tools/benchmark/basic/csv/sample.csv",
+            "tags_file": "./tools/benchmark/basic/csv/tags.csv",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":3}, {"type": "BINARY", "len": 16, "count":2}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-timestep-stmt.json

@@ -0,0 +1,75 @@
+{
+    "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": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "precision": "ms"
+        },
+        "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": "stmt",
+            "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":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "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": 10,
+            "data_source": "rand",
+            "insert_mode": "stmt",
+            "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": 10,
+            "start_timestamp": "2020-11-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insert-timestep.json

@@ -0,0 +1,87 @@
+{
+    "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": 10,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 36500,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "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": 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":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "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": 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": 10,
+            "start_timestamp": "2020-11-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/army/tools/benchmark/basic/json/insertMix.json

@@ -20,7 +20,6 @@
                 "name": "mixdb",
                 "drop": "yes",
                 "vgroups": 6,
-                "replica": 3,
                 "precision": "ms",
                 "keep": 3650,
                 "minRows": 100,

tests/army/tools/benchmark/basic/json/query-error-sqls.txt

@@ -0,0 +1,3 @@
+select AVG(t0) ; 
+select TOP(c1,100) ; 
+select LAST_ROW(c1) ; 

tests/army/tools/benchmark/basic/json/query-sqls-slow-query.txt

@@ -0,0 +1,2 @@
+select count(*) from test.d0
+select * from test.meters

tests/army/tools/benchmark/basic/json/query-sqls.txt

@@ -0,0 +1,2 @@
+select last_row(*) from stb
+select count(*) from stb_0

tests/army/tools/benchmark/basic/json/queryErrorBothSpecSuper.json

@@ -0,0 +1,35 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "taosc",
+	"specified_table_query": {
+		"concurrent": 3,
+		"sqls": [
+			{
+				"sql": "select last_row(*) from meters"
+			},
+			{
+				"sql": "select count(*) from d0",
+				"result": "./query_res1.txt"
+			}
+		]
+	},
+	"super_table_query": {
+		"stblname": "meters",
+		"concurrent": 3,
+		"query_interval": 1,
+		"sqls": [
+			{
+				"sql": "select last_row(ts) from xxxx",
+				"result": "./query_res2.txt"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryErrorFormat.json

@@ -0,0 +1,27 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+    "continue_if_fail": "yes",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "taosc",
+	"super_table_query": 
+		"stblname": "meters",
+		"concurrent": 3,
+		"query_interval": 1,
+		"sqls": [
+			{
+				"sql": "select last_row(ts) from xxxx",
+				"result": "./query_res2.txt"
+			},
+			{
+				"sql": "select count(ts) from xxxx"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryErrorNoSpecSuper.json

@@ -0,0 +1,12 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "taosc"
+}

tests/army/tools/benchmark/basic/json/queryInsertdata.json

@@ -17,7 +17,6 @@
         "dbinfo": {
             "name": "db",
             "drop": "yes",
-            "replica": 1,
             "precision": "ms"
         },
         "super_tables": [{

tests/army/tools/benchmark/basic/json/queryModeSpec.json

@@ -0,0 +1,24 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "taosc",
+	"specified_table_query": {
+		"concurrent": 3,
+		"sqls": [
+			{
+				"sql": "select last_row(*) from meters"
+			},
+			{
+				"sql": "select count(*) from d0",
+				"result": "./query_res1.txt"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryModeSpecMix.json

@@ -0,0 +1,25 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "taosc",
+	"specified_table_query": {
+		"concurrent": 4,
+		"mixed_query": "yes",
+		"sqls": [
+			{
+				"sql": "select last_row(*) from meters"
+			},
+			{
+				"sql": "select count(*) from d0",
+				"result": "./query_res1.txt"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryModeSpecMixRest.json

@@ -0,0 +1,28 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "rest",
+	"specified_table_query": {
+		"concurrent": 3,
+		"mixed_query": "yes",
+		"sqls": [
+			{
+				"sql": "select last_row(*) from meters"
+			},
+			{
+				"sql": "select count(*) from d0",
+				"result": "./query_res1.txt"
+			},
+			{
+				"sql": "select count(*) from meters"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryModeSpecRest.json

@@ -0,0 +1,27 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "rest",
+	"specified_table_query": {
+		"concurrent": 3,
+		"sqls": [
+			{
+				"sql": "select last_row(*) from meters"
+			},
+			{
+				"sql": "select count(*) from d0",
+				"result": "./query_res1.txt"
+			},
+			{
+				"sql": "select count(*) from meters"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryModeSuper.json

@@ -0,0 +1,27 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+    "continue_if_fail": "yes",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "taosc",
+	"super_table_query": {
+		"stblname": "meters",
+		"concurrent": 3,
+		"query_interval": 0,
+		"sqls": [
+			{
+				"sql": "select last_row(ts) from xxxx",
+				"result": "./query_res2.txt"
+			},
+			{
+				"sql": "select count(ts) from xxxx"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryModeSuperRest.json

@@ -0,0 +1,24 @@
+{
+	"filetype": "query",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"confirm_parameter_prompt": "no",
+    "continue_if_fail": "yes",
+	"databases": "test",
+	"query_times": 100,
+	"query_mode": "rest",
+	"super_table_query": {
+		"stblname": "meters",
+		"concurrent": 3,
+		"query_interval": 0,
+		"sqls": [
+			{
+				"sql": "select last_row(ts) from xxxx",
+				"result": "./query_res2.txt"
+			}
+		]
+	}
+}

tests/army/tools/benchmark/basic/json/queryQps.json

@@ -12,13 +12,13 @@
         "query_interval": 10,
         "threads": 4,
         "sqls": [
-            {
+          {
-                "sql": "select last_row(*) from stb00_0",
+              "sql": "select last_row(*) from db.stb00_0",
-                "result": "./query_res0.txt"
+              "result": "./query_res0.txt"
-            },
+          },
-            {
+          {
-                "sql": "select last_row(*) from stb00_9 ",
+              "sql": "select last_row(*) from db.stb00_9 ",
-                "result": "./query_res1.txt"
+              "result": "./query_res1.txt"
-            }]
+          }]
-    }
+      }
-}
+  }

tests/army/tools/benchmark/basic/json/queryQps1.json

@@ -13,10 +13,10 @@
         "query_interval":20,
         "threads": 4,
         "sqls": [
-            {
+          {
-                "sql": "select last_row(ts) from xxxx",
+            "sql": "select last_row(ts) from xxxx",
-                "result": "./query_res2.txt"
+            "result": "./query_res2.txt"
-            }
+          }
         ]
     }
-}
+  }

tests/army/tools/benchmark/basic/json/querySpeciMutisql100.json

@@ -13,417 +13,406 @@
       "threads": 3,
       "sqls": [
         {    
-            "sql": "select last_row(*) from stb00_0",
+            "sql": "select last_row(*) from db.stb00_0",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_1",
+            "sql": "select last_row(*) from db.stb00_1",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_2",
+            "sql": "select last_row(*) from db.stb00_2",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_3",
+            "sql": "select last_row(*) from db.stb00_3",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_4",
+            "sql": "select last_row(*) from db.stb00_4",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_5",
+            "sql": "select last_row(*) from db.stb00_5",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_6",
+            "sql": "select last_row(*) from db.stb00_6",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_7",
+            "sql": "select last_row(*) from db.stb00_7",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_8",
+            "sql": "select last_row(*) from db.stb00_8",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_9",
+            "sql": "select last_row(*) from db.stb00_9",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_10 ",
+            "sql": "select last_row(*) from db.stb00_10 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_11 ",
+            "sql": "select last_row(*) from db.stb00_11 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_12 ",
+            "sql": "select last_row(*) from db.stb00_12 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_13 ",
+            "sql": "select last_row(*) from db.stb00_13 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_14 ",
+            "sql": "select last_row(*) from db.stb00_14 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_15 ",
+            "sql": "select last_row(*) from db.stb00_15 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_16 ",
+            "sql": "select last_row(*) from db.stb00_16 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_17 ",
+            "sql": "select last_row(*) from db.stb00_17 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_18 ",
+            "sql": "select last_row(*) from db.stb00_18 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_19 ",
+            "sql": "select last_row(*) from db.stb00_19 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_20 ",
+            "sql": "select last_row(*) from db.stb00_20 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_21 ",
+            "sql": "select last_row(*) from db.stb00_21 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_22 ",
+            "sql": "select last_row(*) from db.stb00_22 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_23 ",
+            "sql": "select last_row(*) from db.stb00_23 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_24 ",
+            "sql": "select last_row(*) from db.stb00_24 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_25 ",
+            "sql": "select last_row(*) from db.stb00_25 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_26 ",
+            "sql": "select last_row(*) from db.stb00_26 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_27 ",
+            "sql": "select last_row(*) from db.stb00_27 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_28 ",
+            "sql": "select last_row(*) from db.stb00_28 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_29 ",
+            "sql": "select last_row(*) from db.stb00_29 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_30 ",
+            "sql": "select last_row(*) from db.stb00_30 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_31 ",
+            "sql": "select last_row(*) from db.stb00_31 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_32 ",
+            "sql": "select last_row(*) from db.stb00_32 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_33 ",
+            "sql": "select last_row(*) from db.stb00_33 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_34 ",
+            "sql": "select last_row(*) from db.stb00_34 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_35 ",
+            "sql": "select last_row(*) from db.stb00_35 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_36 ",
+            "sql": "select last_row(*) from db.stb00_36 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_37 ",
+            "sql": "select last_row(*) from db.stb00_37 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_38 ",
+            "sql": "select last_row(*) from db.stb00_38 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_39 ",
+            "sql": "select last_row(*) from db.stb00_39 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_40 ",
+            "sql": "select last_row(*) from db.stb00_40 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_41 ",
+            "sql": "select last_row(*) from db.stb00_41 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_42 ",
+            "sql": "select last_row(*) from db.stb00_42 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_43 ",
+            "sql": "select last_row(*) from db.stb00_43 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_44 ",
+            "sql": "select last_row(*) from db.stb00_44 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_45 ",
+            "sql": "select last_row(*) from db.stb00_45 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_46 ",
+            "sql": "select last_row(*) from db.stb00_46 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_47 ",
+            "sql": "select last_row(*) from db.stb00_47 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_48 ",
+            "sql": "select last_row(*) from db.stb00_48 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_49 ",
+            "sql": "select last_row(*) from db.stb00_49 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_50 ",
+            "sql": "select last_row(*) from db.stb00_50 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_51 ",
+            "sql": "select last_row(*) from db.stb00_51 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_52 ",
+            "sql": "select last_row(*) from db.stb00_52 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_53 ",
+            "sql": "select last_row(*) from db.stb00_53 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_54 ",
+            "sql": "select last_row(*) from db.stb00_54 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_55 ",
+            "sql": "select last_row(*) from db.stb00_55 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_56 ",
+            "sql": "select last_row(*) from db.stb00_56 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_57 ",
+            "sql": "select last_row(*) from db.stb00_57 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_58 ",
+            "sql": "select last_row(*) from db.stb00_58 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_59 ",
+            "sql": "select last_row(*) from db.stb00_59 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_60",
+            "sql": "select last_row(*) from db.stb00_60",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_61",
+            "sql": "select last_row(*) from db.stb00_61",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_62",
+            "sql": "select last_row(*) from db.stb00_62",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_63",
+            "sql": "select last_row(*) from db.stb00_63",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_64",
+            "sql": "select last_row(*) from db.stb00_64",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_65",
+            "sql": "select last_row(*) from db.stb00_65",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_66",
+            "sql": "select last_row(*) from db.stb00_66",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_67",
+            "sql": "select last_row(*) from db.stb00_67",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_68",
+            "sql": "select last_row(*) from db.stb00_68",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_69",
+            "sql": "select last_row(*) from db.stb00_69",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_70 ",
+            "sql": "select last_row(*) from db.stb00_70 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_71 ",
+            "sql": "select last_row(*) from db.stb00_71 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_72 ",
+            "sql": "select last_row(*) from db.stb00_72 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_73 ",
+            "sql": "select last_row(*) from db.stb00_73 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_74 ",
+            "sql": "select last_row(*) from db.stb00_74 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_75 ",
+            "sql": "select last_row(*) from db.stb00_75 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_76 ",
+            "sql": "select last_row(*) from db.stb00_76 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_77 ",
+            "sql": "select last_row(*) from db.stb00_77 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_78 ",
+            "sql": "select last_row(*) from db.stb00_78 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_79 ",
+            "sql": "select last_row(*) from db.stb00_79 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_80 ",
+            "sql": "select last_row(*) from db.stb00_80 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_81 ",
+            "sql": "select last_row(*) from db.stb00_81 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_82 ",
+            "sql": "select last_row(*) from db.stb00_82 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_83 ",
+            "sql": "select last_row(*) from db.stb00_83 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_84 ",
+            "sql": "select last_row(*) from db.stb00_84 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_85 ",
+            "sql": "select last_row(*) from db.stb00_85 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_86 ",
+            "sql": "select last_row(*) from db.stb00_86 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_87 ",
+            "sql": "select last_row(*) from db.stb00_87 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_88 ",
+            "sql": "select last_row(*) from db.stb00_88 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_89 ",
+            "sql": "select last_row(*) from db.stb00_89 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_90 ",
+            "sql": "select last_row(*) from db.stb00_90 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_91 ",
+            "sql": "select last_row(*) from db.stb00_91 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_92 ",
+            "sql": "select last_row(*) from db.stb00_92 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_93 ",
+            "sql": "select last_row(*) from db.stb00_93 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_94 ",
+            "sql": "select last_row(*) from db.stb00_94 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_95 ",
+            "sql": "select last_row(*) from db.stb00_95 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_96 ",
+            "sql": "select last_row(*) from db.stb00_96 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_97 ",
+            "sql": "select last_row(*) from db.stb00_97 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_98 ",
+            "sql": "select last_row(*) from db.stb00_98 ",
             "result": "./query_res0.txt"
         },
         {
-            "sql": "select last_row(*) from stb00_99 ",
+            "sql": "select last_row(*) from db.stb00_99 ",
             "result": "./query_res0.txt"
 
         }]
-    },
+    }
-    "super_table_query": {
-        "stblname": "stb1",
-        "query_interval": 1,
-        "threads": 3,
-        "sqls": [
-          {
-            "sql": "select last_row(ts) from xxxx",
-            "result": "./query_res2.txt"
-          }
-        ]
-      }
 }
   

tests/army/tools/benchmark/basic/json/querySuperMutisql100.json

@@ -0,0 +1,419 @@
+{
+    "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,
+    "super_table_query": {
+        "stblname": "stb0",
+        "query_interval": 10,
+        "threads": 9,
+        "sqls": [
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from xxxx  ",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select * from xxxx  ",
+              "result": "./query_res0.txt"
+
+          }]
+      }
+  }
+