From 3dc61016deb502e2586decbde7c513ab9a2555a5 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Thu, 23 Jan 2025 10:01:34 +0800 Subject: [PATCH] fix: query mode forbid parallel running --- .../taosbenchmark/json/queryQps.json | 11 --------- .../taosbenchmark/json/queryQps1.json | 22 +++++++++++++++++ .../taosbenchmark/json/queryRestful.json | 11 --------- .../taosbenchmark/json/queryRestful1.json | 24 +++++++++++++++++++ .../taosbenchmark/json/queryTaosc.json | 11 --------- .../taosbenchmark/json/queryTaosc1.json | 23 ++++++++++++++++++ .../taosbenchmark/json/rest_query.json | 9 ------- .../taosbenchmark/json/rest_query1.json | 18 ++++++++++++++ .../taosbenchmark/json/taosc_query.json | 11 --------- .../taosbenchmark/json/taosc_query1.json | 23 ++++++++++++++++++ .../5-taos-tools/taosbenchmark/query_json.py | 7 ++++++ .../taosdemoTestQueryWithJson.py | 5 ++++ 12 files changed, 122 insertions(+), 53 deletions(-) create mode 100644 tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps1.json create mode 100644 tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful1.json create mode 100644 tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc1.json create mode 100644 tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query1.json create mode 100644 tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query1.json diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps.json index 9e75d52a6c..a80c2caceb 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps.json @@ -20,16 +20,5 @@ "sql": "select last_row(*) from stb00_9 ", "result": "./query_res1.txt" }] - }, - "super_table_query": { - "stblname": "stb1", - "query_interval":20, - "threads": 4, - "sqls": [ - { - "sql": "select last_row(ts) from xxxx", - "result": "./query_res2.txt" - } - ] } } diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps1.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps1.json new file mode 100644 index 0000000000..fe72004e47 --- /dev/null +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryQps1.json @@ -0,0 +1,22 @@ +{ + "filetype": "query", + "cfgdir": "/etc/taos", + "host": "127.0.0.1", + "port": 6030, + "user": "root", + "password": "taosdata", + "confirm_parameter_prompt": "no", + "databases": "db", + "query_times": 1, + "super_table_query": { + "stblname": "stb1", + "query_interval":20, + "threads": 4, + "sqls": [ + { + "sql": "select last_row(ts) from xxxx", + "result": "./query_res2.txt" + } + ] + } +} diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful.json index 5de560fd21..6cb83bc2e1 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful.json @@ -22,17 +22,6 @@ "result": "./query_res1.txt" } ] - }, - "super_table_query": { - "stblname": "stb1", - "query_interval": 1, - "threads": 3, - "sqls": [ - { - "sql": "select last_row(ts) from xxxx", - "result": "./query_res2.txt" - } - ] } } diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful1.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful1.json new file mode 100644 index 0000000000..54d2589ce9 --- /dev/null +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryRestful1.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": "db", + "query_times": 2, + "query_mode": "rest", + "super_table_query": { + "stblname": "stb1", + "query_interval": 1, + "threads": 3, + "sqls": [ + { + "sql": "select last_row(ts) from xxxx", + "result": "./query_res2.txt" + } + ] + } + } + diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc.json index 9ce4237660..08a63803bd 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc.json @@ -22,16 +22,5 @@ "result": "./query_res1.txt" } ] - }, - "super_table_query": { - "stblname": "stb1", - "query_interval": 1, - "threads": 3, - "sqls": [ - { - "sql": "select last_row(ts) from xxxx", - "result": "./query_res2.txt" - } - ] } } diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc1.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc1.json new file mode 100644 index 0000000000..a3caa1c5e8 --- /dev/null +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/queryTaosc1.json @@ -0,0 +1,23 @@ +{ + "filetype": "query", + "cfgdir": "/etc/taos", + "host": "127.0.0.1", + "port": 6030, + "user": "root", + "password": "taosdata", + "confirm_parameter_prompt": "no", + "databases": "db", + "query_times": 2, + "query_mode": "taosc", + "super_table_query": { + "stblname": "stb1", + "query_interval": 1, + "threads": 3, + "sqls": [ + { + "sql": "select last_row(ts) from xxxx", + "result": "./query_res2.txt" + } + ] + } +} 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 459e496f0b..817d733202 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 @@ -14,14 +14,5 @@ "sql": "select count(*) from db.stb", "result": "rest_query_specified" }] - }, - "super_table_query": { - "stblname": "stb", - "sqls": [ - { - "sql": "select count(*) from xxxx", - "result": "rest_query_super" - } - ] } } \ No newline at end of file diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query1.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query1.json new file mode 100644 index 0000000000..e09112737e --- /dev/null +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query1.json @@ -0,0 +1,18 @@ +{ + "filetype":"query", + "cfgdir": "/etc/taos", + "confirm_parameter_prompt": "no", + "databases": "db", + "query_mode": "rest", + "connection_pool_size": 10, + "response_buffer": 10000, + "super_table_query": { + "stblname": "stb", + "sqls": [ + { + "sql": "select count(*) from xxxx", + "result": "rest_query_super" + } + ] + } +} \ No newline at end of file diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query.json index c8ff2e9275..2cf8f648a6 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query.json @@ -18,16 +18,5 @@ "sql": "select count(*) from db.stb", "result": "taosc_query_specified" }] - }, - "super_table_query": { - "stblname": "stb", - "query_interval": 1, - "concurrent": 1, - "sqls": [ - { - "sql": "select count(*) from xxxx", - "result": "taosc_query_super" - } - ] } } \ No newline at end of file diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query1.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query1.json new file mode 100644 index 0000000000..90f25a4b4e --- /dev/null +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_query1.json @@ -0,0 +1,23 @@ +{ + "filetype":"query", + "cfgdir": "/etc/taos", + "host": "localhost", + "port": 6030, + "user": "root", + "password": "taosdata", + "confirm_parameter_prompt": "no", + "databases": "db", + "query_times": 1, + "reset_query_cache": "yes", + "super_table_query": { + "stblname": "stb", + "query_interval": 1, + "concurrent": 1, + "sqls": [ + { + "sql": "select count(*) from xxxx", + "result": "taosc_query_super" + } + ] + } +} \ No newline at end of file diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py index f300e65203..118468ad5a 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py @@ -74,6 +74,9 @@ class TDTestCase: cmd = "%s -f ./5-taos-tools/taosbenchmark/json/taosc_query.json" %binPath tdLog.info("%s" % cmd) os.system("%s" % cmd) + cmd = "%s -f ./5-taos-tools/taosbenchmark/json/taosc_query1.json" %binPath + tdLog.info("%s" % cmd) + os.system("%s" % cmd) with open("%s" % "taosc_query_specified-0", 'r+') as f1: for line in f1.readlines(): queryTaosc = line.strip().split()[0] @@ -84,9 +87,13 @@ class TDTestCase: queryTaosc = line.strip().split()[0] assert queryTaosc == '1', "result is %s != expect: 1" % queryTaosc + # split two cmd = "%s -f ./5-taos-tools/taosbenchmark/json/rest_query.json" %binPath tdLog.info("%s" % cmd) os.system("%s" % cmd) + cmd = "%s -f ./5-taos-tools/taosbenchmark/json/rest_query1.json" %binPath + tdLog.info("%s" % cmd) + os.system("%s" % cmd) times = 0 with open("rest_query_super-0", 'r+') as f1: diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/taosdemoTestQueryWithJson.py b/tests/develop-test/5-taos-tools/taosbenchmark/taosdemoTestQueryWithJson.py index 91ebf1b1df..433ea17541 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/taosdemoTestQueryWithJson.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/taosdemoTestQueryWithJson.py @@ -118,6 +118,8 @@ class TDTestCase: # taosc query: query specified table and query super table os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryInsertdata.json" % binPath) os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryTaosc.json" % binPath) + # forbid parallel spec query with super query + os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryTaosc1.json" % binPath) os.system("cat query_res0.txt* > all_query_res0_taosc.txt") os.system("cat query_res1.txt* > all_query_res1_taosc.txt") os.system("cat query_res2.txt* > all_query_res2_taosc.txt") @@ -144,6 +146,7 @@ class TDTestCase: # use restful api to query os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryInsertrestdata.json" % binPath) os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryRestful.json" % binPath) + os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryRestful1.json" % binPath) os.system("cat query_res0.txt* > all_query_res0_rest.txt") os.system("cat query_res1.txt* > all_query_res1_rest.txt") os.system("cat query_res2.txt* > all_query_res2_rest.txt") @@ -191,6 +194,8 @@ class TDTestCase: os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryInsertdata.json" % binPath) exceptcode = os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryQps.json" % binPath) assert exceptcode == 0 + exceptcode = os.system("%s -f ./5-taos-tools/taosbenchmark/json/queryQps1.json" % binPath) + assert exceptcode == 0 # 2021.02.09 need modify taosBenchmakr code # use illegal or out of range parameters query json file