[TD-14257]<fix>taosbenchmark connection pool (#10935)

taos-tools @ cd24949b

-Subproject commit 5fe275c396108f564d8b95107056ec6d0640c0e4
+Subproject commit cd24949b4faa8b52cfe0761cd4055cdf9756ff58

tests/develop-test/5-taos-tools/taosbenchmark/commandline.py

@@ -32,7 +32,7 @@ class TDTestCase:
         tdSql.init(conn.cursor(), logSql)
 
     def run(self):
-        cmd = "taosBenchmark -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 $%^*"
+        cmd = "taosBenchmark -F 7 -H 9 -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 $%^*"
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("use newtest")

tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py

@@ -29,7 +29,7 @@ class TDTestCase:
         tdSql.init(conn.cursor(), logSql)
 
     def run(self):
-        cmd = "taosBenchmark -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"
+        cmd = "taosBenchmark -F abc -P abc -I abc -T abc -H 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"
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.query("select count(*) from test.meters")

tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/default.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,

tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json

@@ -4,7 +4,7 @@
   "confirm_parameter_prompt": "no",
   "databases": "db",
   "query_mode": "rest",
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "response_buffer": 10000,
   "specified_table_query":
   {

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json

@@ -7,7 +7,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,

tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 10,
+  "connection_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,

tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,

tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json

@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "connection_pool_size": 20,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,