Hotfix/sangshuduo/td 3401 query statistic (#5795)

* [TD-3401]<fix>: taosdemo query statistic.

refactor func name.

* [TD-3401]<fix>: taosdemo query statistic.

refactor func name 2.

* [TD-3401]<fix>: taosdemo support query statistic.

implementation.

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

src/kit/taosdemo/insert-interlace.json

@@ -40,7 +40,6 @@
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 1000,
-            "multi_thread_write_one_tbl": "no",
             "interlace_rows": 20,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,

src/kit/taosdemo/insert.json

@@ -40,7 +40,6 @@
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 100000,
-            "multi_thread_write_one_tbl": "no",
             "interlace_rows": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,

src/kit/taosdemo/query.json

 {
-  "filetype":"query",
+  "filetype": "query",
   "cfgdir": "/etc/taos",
   "host": "127.0.0.1",
   "port": 6030,
@@ -7,13 +7,30 @@
   "password": "taosdata",
   "confirm_parameter_prompt": "yes",
   "databases": "dbx",
-  "specified_table_query":
-    {"query_interval":1, "concurrent":4,
-     "sqls": [{"sql": "select last_row(*) from stb where color='red'", "result": "./query_res0.txt"},
-              {"sql": "select count(*) from stb_01", "result": "./query_res1.txt"}]
-    },
-  "super_table_query": 
-    {"stblname": "stb", "query_interval":1, "threads":4,
-     "sqls": [{"sql": "select last_row(*) from xxxx", "result": "./query_res2.txt"}]
-    }
+  "query_times": 1,
+  "specified_table_query": {
+    "query_interval": 1,
+    "concurrent": 4,
+    "sqls": [
+      {
+        "sql": "select last_row(*) from stb where color='red'",
+        "result": "./query_res0.txt"
+      },
+      {
+        "sql": "select count(*) from stb_01",
+        "result": "./query_res1.txt"
+      }
+    ]
+  },
+  "super_table_query": {
+    "stblname": "stb",
+    "query_interval": 1,
+    "threads": 4,
+    "sqls": [
+      {
+        "sql": "select last_row(*) from xxxx",
+        "result": "./query_res2.txt"
+      }
+    ]
+  }
 }

tests/examples/JDBC/taosdemo/src/main/resources/insert.json

@@ -36,8 +36,6 @@
           "insert_mode": "taosc",
           "insert_rate": 0,
           "insert_rows": 100,
-          "multi_thread_write_one_tbl": "no",
-          "number_of_tbl_in_one_sql": 0,
           "interlace_rows": 3,
           "max_sql_len": 1024,
           "disorder_ratio": 0,

tests/pytest/cluster/clusterEnvSetup/insert.json

@@ -37,8 +37,6 @@
 			"insert_mode": "taosc",
 			"insert_rate": 0,
 			"insert_rows": 100000,
-			"multi_thread_write_one_tbl": "no",
-			"number_of_tbl_in_one_sql": 1,
 			"interlace_rows": 100,
 			"max_sql_len": 1024000,
 			"disorder_ratio": 0,

tests/pytest/perfbenchmark/bug3433.py

@@ -91,8 +91,6 @@ class TDTestCase:
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 1,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "rows_per_tbl": 1,
             "max_sql_len": 65480,
             "disorder_ratio": 0,
@@ -135,8 +133,6 @@ class TDTestCase:
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 1,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "rows_per_tbl": 1,
             "max_sql_len": 65480,
             "disorder_ratio": 0,

tests/pytest/query/query1970YearsAf.py

@@ -82,8 +82,6 @@ class TDTestCase:
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 5000,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "rows_per_tbl": 1,
             "max_sql_len": 65480,
             "disorder_ratio": 0,
@@ -255,4 +253,4 @@ class TDTestCase:
 
 
 tdCases.addLinux(__file__, TDTestCase())
-tdCases.addWindows(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/tools/insert-interlace.json

@@ -41,7 +41,6 @@
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 250,
-            "multi_thread_write_one_tbl": "no",
             "interlace_rows": 80,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,

tests/pytest/tools/insert-tblimit-tboffset-createdb.json

@@ -40,8 +40,6 @@
             "data_source": "rand",
             "insert_mode": "taosc",
             "insert_rows": 0,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
             "disorder_range": 1000,

tests/pytest/tools/insert-tblimit-tboffset-insertrec.json

@@ -42,8 +42,6 @@
             "insert_rows": 1000,
             "childtable_limit": 33,
             "childtable_offset": 33,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
             "disorder_range": 1000,

tests/pytest/tools/insert-tblimit-tboffset.json

@@ -42,8 +42,6 @@
             "insert_rows": 1000,
             "childtable_limit": 33,
             "childtable_offset": 33,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
             "disorder_range": 1000,

tests/pytest/tools/insert-tblimit-tboffset0.json

@@ -42,8 +42,6 @@
             "insert_rows": 1000,
             "childtable_limit": 20,
             "childtable_offset": 0,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
             "disorder_range": 1000,

tests/pytest/tools/insert-tblimit1-tboffset.json

@@ -42,8 +42,6 @@
             "insert_rows": 1000,
             "childtable_limit": 1,
             "childtable_offset": 50,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
             "disorder_range": 1000,

tests/pytest/tools/taosdemo-sampledata.json

@@ -22,8 +22,6 @@
 			"insert_mode": "taosc",
 			"insert_rate": 0,
 			"insert_rows": 20,
-			"multi_thread_write_one_tbl": "no",
-			"number_of_tbl_in_one_sql": 0,
 			"max_sql_len": 1048000,
 			"timestamp_step": 1000,
 			"start_timestamp": "2020-1-1 00:00:00",

tests/pytest/tools/taosdemoPerformance.py

@@ -49,8 +49,6 @@ class taosdemoPerformace:
             "batch_create_tbl_num": 10,
             "insert_mode": "taosc",
             "insert_rows": 100000,
-            "multi_thread_write_one_tbl": "no",
-            "number_of_tbl_in_one_sql": 0,
             "interlace_rows": 100,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,