diff --git a/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json b/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json index 0ea64e74cd3e531827e41d63a31be60fca4a8c64..d4bae6b274ec9b0bcace20ef64597bf2c122b2b0 100644 --- a/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json +++ b/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json @@ -35,10 +35,10 @@ "super_tables": [{ "name": "stb0", "child_table_exists":"no", - "childtable_count": 200, + "childtable_count": 100, "childtable_prefix": "stb00_", "auto_create_table": "no", - "batch_create_tbl_num": 10, + "batch_create_tbl_num": 1000, "data_source": "rand", "insert_mode": "taosc", "insert_rows": 10, diff --git a/tests/pytest/tools/taosdemoAllTest/subSupermaxsql100.json b/tests/pytest/tools/taosdemoAllTest/subSupermaxsql100.json new file mode 100644 index 0000000000000000000000000000000000000000..5eb7a3f03045c8aead2fb4991795760908bcb3e6 --- /dev/null +++ b/tests/pytest/tools/taosdemoAllTest/subSupermaxsql100.json @@ -0,0 +1,28 @@ +{ + "filetype":"subscribe", + "cfgdir": "/etc/taos", + "host": "127.0.0.1", + "port": 6030, + "user": "root", + "password": "taosdata", + "databases": "db", + "confirm_parameter_prompt": "no", + "super_table_query": + { + "stblname": "stb0", + "threads":2, + "mode":"sync", + "interval":0, + "restart":"no", + "keepProgress":"no", + "sqls": [ + { + "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", + "result": "./subscribe_res2.txt" + }, + { + "sql": "select * from xxxx where ts > '2021-02-25 10:00:04.000' ", + "result": "./subscribe_res3.txt" + }] + } +} \ No newline at end of file diff --git a/tests/pytest/tools/taosdemoAllTest/subSyncMaxsql100.json b/tests/pytest/tools/taosdemoAllTest/subSyncMaxsql100.json index 1ec4f9ba62868bc8009df15d3270d9419ceee4e8..a3d7910844b54e8de476c2fbfaa668c890d2ac41 100644 --- a/tests/pytest/tools/taosdemoAllTest/subSyncMaxsql100.json +++ b/tests/pytest/tools/taosdemoAllTest/subSyncMaxsql100.json @@ -11,12 +11,12 @@ { "concurrent":2, "mode":"sync", - "interval":0, - "restart":"yes", - "keepProgress":"yes", + "interval":10000, + "restart":"no", + "keepProgress":"no", "sqls": [ { - "sql": "select * from stb00_0", + "sql": "select * from stb0", "result": "./subscribe_res0.txt" }, { @@ -421,17 +421,13 @@ "stblname": "stb0", "threads":2, "mode":"sync", - "interval":10000, - "restart":"yes", - "keepProgress":"yes", + "interval":0, + "restart":"no", + "keepProgress":"no", "sqls": [ { "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", "result": "./subscribe_res2.txt" - }, - { - "sql": "select * from xxxx where ts > '2021-02-25 10:00:04.000' ", - "result": "./subscribe_res3.txt" }] } } \ No newline at end of file diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py index 643fa6dcd6ae1fa5ae171f4704ab5bab1df05eea..3af68134be1f847347a320c7f30cbcfc1f09a6e4 100644 --- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py +++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py @@ -113,7 +113,9 @@ class TDTestCase: # query times less than or equal to 100 os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath) - os.system("%staosdemo -f tools/taosdemoAllTest/subSyncMaxsql100.json" % binPath) + # os.system("%staosdemo -f tools/taosdemoAllTest/subSyncMaxsql100.json" % binPath) + os.system("%staosdemo -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath) + # delete useless files os.system("rm -rf ./insert_res.txt")