From 90d03f69addc47a29df1065dc3f4806dded6b7cd Mon Sep 17 00:00:00 2001
From: Yang Zhao <yzhao@taosdata.com>
Date: Wed, 23 Mar 2022 18:23:42 +0800
Subject: [PATCH] [TD-14257]<fix>taosbenchmark connection pool (#10935)

---
 src/kit/taos-tools                                              | 2 +-
 tests/develop-test/5-taos-tools/taosbenchmark/commandline.py    | 2 +-
 .../5-taos-tools/taosbenchmark/invalid_commandline.py           | 2 +-
 .../5-taos-tools/taosbenchmark/json/custom_col_tag.json         | 2 +-
 tests/develop-test/5-taos-tools/taosbenchmark/json/default.json | 2 +-
 .../5-taos-tools/taosbenchmark/json/rest_auto_create_table.json | 2 +-
 .../5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json   | 2 +-
 .../5-taos-tools/taosbenchmark/json/rest_query.json             | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_auto_create_table.json  | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json    | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_interlace.json          | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_json_alltypes.json      | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_rest_json.json          | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_rest_line.json          | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_rest_telnet.json        | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json    | 2 +-
 .../5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json         | 2 +-
 .../5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json | 2 +-
 .../5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json   | 2 +-
 .../taosbenchmark/json/taosc_auto_create_table.json             | 2 +-
 .../5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json  | 2 +-
 .../5-taos-tools/taosbenchmark/json/taosc_json_tag.json         | 2 +-
 .../5-taos-tools/taosbenchmark/json/taosc_limit_offset.json     | 2 +-
 .../taosbenchmark/json/taosc_only_create_table.json             | 2 +-
 .../5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json    | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/kit/taos-tools b/src/kit/taos-tools
index 5fe275c396..cd24949b4f 160000
--- a/src/kit/taos-tools
+++ b/src/kit/taos-tools
@@ -1 +1 @@
-Subproject commit 5fe275c396108f564d8b95107056ec6d0640c0e4
+Subproject commit cd24949b4faa8b52cfe0761cd4055cdf9756ff58
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py
index 672da9a56e..ffc7d48601 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py
+++ b/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")
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py b/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py
index 99e3d1dc76..1ae8a775ae 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py
+++ b/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")
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json
index 60f1c01461..8f652b9d73 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/default.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/default.json
index f0ad9d516e..d4b2aae2fb 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/default.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json
index 8dc121e5a8..a4706bf47d 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json
index e45ae7890a..01e3950502 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json
index 12d6c383d3..459e496f0b 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json
+++ b/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":
   {
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json
index 3cdd2b911e..62846bf2b6 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json
index 7326cbcba2..8722d124d6 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json
index 5b55ceb4a1..1aa5b09348 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
index d23d12e800..8806b52a1e 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json
index e037fff0aa..1e9e28d4e8 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json
index 5000da489f..deef77fdef 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json
index c9c4554e01..8893a73467 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json
index 739e0eaca4..0bf363e673 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json
index b76d3da3bd..84419760c1 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json
index d917bec0c9..2e5965c14b 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json
index 91e4d40bcd..48f4e23166 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json
index 0895f1b45c..06c5be47bf 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json
index 47eee39193..1bb03b4fab 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json
index 71fed3c48c..893b203aa8 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json
index 346e3cd868..b0e903347d 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json
index 46672bcc4c..4d42ed63fa 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json
+++ b/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,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json
index 8ac8aab93e..22bd13d5be 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json
+++ b/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,
-- 
GitLab