From df1fb4c5bb77d9e7216e9d46ebc3bb49f4388397 Mon Sep 17 00:00:00 2001 From: tomchon Date: Sat, 22 May 2021 17:01:22 +0800 Subject: [PATCH] update taosdemo testcase --- ...ert_1s1tnt1r.json => insert-1s1tnt1r.json} | 0 ...stful_1s1tnt1r.json => insertRestful.json} | 8 +- .../subInsertdataMaxsql100 copy.json | 2 +- .../subInsertdataMaxsql100.json | 2 +- .../subSyncSuperMaxsql100.json | 2 +- .../taosdemoTestInsertWithJson.py | 430 +++++++++--------- .../taosdemoTestSubWithJson.py | 12 +- 7 files changed, 228 insertions(+), 228 deletions(-) rename tests/pytest/tools/taosdemoAllTest/{insert_1s1tnt1r.json => insert-1s1tnt1r.json} (100%) rename tests/pytest/tools/taosdemoAllTest/{insertRestful_1s1tnt1r.json => insertRestful.json} (95%) diff --git a/tests/pytest/tools/taosdemoAllTest/insert_1s1tnt1r.json b/tests/pytest/tools/taosdemoAllTest/insert-1s1tnt1r.json similarity index 100% rename from tests/pytest/tools/taosdemoAllTest/insert_1s1tnt1r.json rename to tests/pytest/tools/taosdemoAllTest/insert-1s1tnt1r.json diff --git a/tests/pytest/tools/taosdemoAllTest/insertRestful_1s1tnt1r.json b/tests/pytest/tools/taosdemoAllTest/insertRestful.json similarity index 95% rename from tests/pytest/tools/taosdemoAllTest/insertRestful_1s1tnt1r.json rename to tests/pytest/tools/taosdemoAllTest/insertRestful.json index 4c9c0a8d42..cbb8f80c36 100644 --- a/tests/pytest/tools/taosdemoAllTest/insertRestful_1s1tnt1r.json +++ b/tests/pytest/tools/taosdemoAllTest/insertRestful.json @@ -11,7 +11,7 @@ "confirm_parameter_prompt": "no", "insert_interval": 0, "interlace_rows": 100, - "num_of_records_per_req": 1, + "num_of_records_per_req": 100, "max_sql_len": 1024000, "databases": [{ "dbinfo": { @@ -38,10 +38,10 @@ "childtable_count": 10, "childtable_prefix": "stb00_", "auto_create_table": "no", - "batch_create_tbl_num": 1, + "batch_create_tbl_num": 10, "data_source": "rand", "insert_mode": "restful", - "insert_rows": 100, + "insert_rows": 10, "childtable_limit": 0, "childtable_offset":0, "multi_thread_write_one_tbl": "no", @@ -67,7 +67,7 @@ "batch_create_tbl_num": 10, "data_source": "rand", "insert_mode": "taosc", - "insert_rows": 200, + "insert_rows": 20, "childtable_limit": 0, "childtable_offset":0, "multi_thread_write_one_tbl": "no", diff --git a/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100 copy.json b/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100 copy.json index d4bae6b274..80d47b2a8f 100644 --- a/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100 copy.json +++ b/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100 copy.json @@ -35,7 +35,7 @@ "super_tables": [{ "name": "stb0", "child_table_exists":"no", - "childtable_count": 100, + "childtable_count": 200, "childtable_prefix": "stb00_", "auto_create_table": "no", "batch_create_tbl_num": 1000, diff --git a/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json b/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json index d4bae6b274..bbc2609880 100644 --- a/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json +++ b/tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json @@ -35,7 +35,7 @@ "super_tables": [{ "name": "stb0", "child_table_exists":"no", - "childtable_count": 100, + "childtable_count": 201, "childtable_prefix": "stb00_", "auto_create_table": "no", "batch_create_tbl_num": 1000, diff --git a/tests/pytest/tools/taosdemoAllTest/subSyncSuperMaxsql100.json b/tests/pytest/tools/taosdemoAllTest/subSyncSuperMaxsql100.json index 6e8c8b4a1d..26225a5955 100644 --- a/tests/pytest/tools/taosdemoAllTest/subSyncSuperMaxsql100.json +++ b/tests/pytest/tools/taosdemoAllTest/subSyncSuperMaxsql100.json @@ -10,7 +10,7 @@ "super_table_query": { "stblname": "stb0", - "threads":2, + "threads":4, "mode":"sync", "interval":0, "restart":"no", diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py index 2b2dd8d739..a3e2d3021d 100644 --- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py +++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py @@ -48,234 +48,234 @@ class TDTestCase: tdLog.info("taosd found in %s" % buildPath) binPath = buildPath+ "/build/bin/" - # # insert: create one or mutiple tables per sql and insert multiple rows per sql - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-1s1tnt1r.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 1000) - # tdSql.query("select count (tbname) from stb1") - # tdSql.checkData(0, 0, 1000) - # tdSql.query("select count(*) from stb00_0") - # tdSql.checkData(0, 0, 100) - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 100000) - # tdSql.query("select count(*) from stb01_1") - # tdSql.checkData(0, 0, 200) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 200000) + # insert: create one or mutiple tables per sql and insert multiple rows per sql + os.system("%staosdemo -f tools/taosdemoAllTest/insert-1s1tnt1r.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 1000) + tdSql.query("select count (tbname) from stb1") + tdSql.checkData(0, 0, 1000) + tdSql.query("select count(*) from stb00_0") + tdSql.checkData(0, 0, 100) + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 100000) + tdSql.query("select count(*) from stb01_1") + tdSql.checkData(0, 0, 200) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 200000) - # #restful connector insert data - # os.system("%staosdemo -f tools/taosdemoAllTest/insertRestful_1s1tnt1r.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 10) - # tdSql.query("select count (tbname) from stb1") - # tdSql.checkData(0, 0, 10) - # tdSql.query("select count(*) from stb00_0") - # tdSql.checkData(0, 0, 100) - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 1000) - # tdSql.query("select count(*) from stb01_1") - # tdSql.checkData(0, 0, 200) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 2000) + # restful connector insert data + os.system("%staosdemo -f tools/taosdemoAllTest/insertRestful.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 10) + tdSql.query("select count (tbname) from stb1") + tdSql.checkData(0, 0, 10) + tdSql.query("select count(*) from stb00_0") + tdSql.checkData(0, 0, 10) + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 100) + tdSql.query("select count(*) from stb01_1") + tdSql.checkData(0, 0, 20) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 200) - # # insert: create mutiple tables per sql and insert one rows per sql . - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-1s1tntmr.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 10) - # tdSql.query("select count (tbname) from stb1") - # tdSql.checkData(0, 0, 20) - # tdSql.query("select count(*) from stb00_0") - # tdSql.checkData(0, 0, 10000) - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 100000) - # tdSql.query("select count(*) from stb01_0") - # tdSql.checkData(0, 0, 20000) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 400000) + # insert: create mutiple tables per sql and insert one rows per sql . + os.system("%staosdemo -f tools/taosdemoAllTest/insert-1s1tntmr.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 10) + tdSql.query("select count (tbname) from stb1") + tdSql.checkData(0, 0, 20) + tdSql.query("select count(*) from stb00_0") + tdSql.checkData(0, 0, 10000) + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 100000) + tdSql.query("select count(*) from stb01_0") + tdSql.checkData(0, 0, 20000) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 400000) - # # insert: using parament "insert_interval to controls spped of insert. - # # but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。 - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-interval-speed.json -y" % binPath) - # tdSql.execute("use db") - # tdSql.query("show stables") - # tdSql.checkData(0, 4, 100) - # tdSql.query("select count(*) from stb00_0") - # tdSql.checkData(0, 0, 20000) - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 2000000) - # tdSql.query("show stables") - # tdSql.checkData(1, 4, 100) - # tdSql.query("select count(*) from stb01_0") - # tdSql.checkData(0, 0, 20000) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 2000000) + # insert: using parament "insert_interval to controls spped of insert. + # but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。 + os.system("%staosdemo -f tools/taosdemoAllTest/insert-interval-speed.json -y" % binPath) + tdSql.execute("use db") + tdSql.query("show stables") + tdSql.checkData(0, 4, 100) + tdSql.query("select count(*) from stb00_0") + tdSql.checkData(0, 0, 20000) + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 2000000) + tdSql.query("show stables") + tdSql.checkData(1, 4, 100) + tdSql.query("select count(*) from stb01_0") + tdSql.checkData(0, 0, 20000) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 2000000) - # # spend 2min30s for 3 testcases. - # # insert: drop and child_table_exists combination test - # # insert: using parament "childtable_offset and childtable_limit" to control table'offset point and offset - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-nodbnodrop.json -y" % binPath) - # tdSql.error("show dbno.stables") - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-newdb.json -y" % binPath) - # tdSql.execute("use db") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 5) - # tdSql.query("select count (tbname) from stb1") - # tdSql.checkData(0, 0, 6) - # tdSql.query("select count (tbname) from stb2") - # tdSql.checkData(0, 0, 7) - # tdSql.query("select count (tbname) from stb3") - # tdSql.checkData(0, 0, 8) - # tdSql.query("select count (tbname) from stb4") - # tdSql.checkData(0, 0, 8) - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-offset.json -y" % binPath) - # tdSql.execute("use db") - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 50) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 240) - # tdSql.query("select count(*) from stb2") - # tdSql.checkData(0, 0, 220) - # tdSql.query("select count(*) from stb3") - # tdSql.checkData(0, 0, 180) - # tdSql.query("select count(*) from stb4") - # tdSql.checkData(0, 0, 160) - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-newtable.json -y" % binPath) - # tdSql.execute("use db") - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 150) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 360) - # tdSql.query("select count(*) from stb2") - # tdSql.checkData(0, 0, 360) - # tdSql.query("select count(*) from stb3") - # tdSql.checkData(0, 0, 340) - # tdSql.query("select count(*) from stb4") - # tdSql.checkData(0, 0, 400) - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-renewdb.json -y" % binPath) - # tdSql.execute("use db") - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 50) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 120) - # tdSql.query("select count(*) from stb2") - # tdSql.checkData(0, 0, 140) - # tdSql.query("select count(*) from stb3") - # tdSql.checkData(0, 0, 160) - # tdSql.query("select count(*) from stb4") - # tdSql.checkData(0, 0, 160) + # spend 2min30s for 3 testcases. + # insert: drop and child_table_exists combination test + # insert: using parament "childtable_offset and childtable_limit" to control table'offset point and offset + os.system("%staosdemo -f tools/taosdemoAllTest/insert-nodbnodrop.json -y" % binPath) + tdSql.error("show dbno.stables") + os.system("%staosdemo -f tools/taosdemoAllTest/insert-newdb.json -y" % binPath) + tdSql.execute("use db") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 5) + tdSql.query("select count (tbname) from stb1") + tdSql.checkData(0, 0, 6) + tdSql.query("select count (tbname) from stb2") + tdSql.checkData(0, 0, 7) + tdSql.query("select count (tbname) from stb3") + tdSql.checkData(0, 0, 8) + tdSql.query("select count (tbname) from stb4") + tdSql.checkData(0, 0, 8) + os.system("%staosdemo -f tools/taosdemoAllTest/insert-offset.json -y" % binPath) + tdSql.execute("use db") + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 50) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 240) + tdSql.query("select count(*) from stb2") + tdSql.checkData(0, 0, 220) + tdSql.query("select count(*) from stb3") + tdSql.checkData(0, 0, 180) + tdSql.query("select count(*) from stb4") + tdSql.checkData(0, 0, 160) + os.system("%staosdemo -f tools/taosdemoAllTest/insert-newtable.json -y" % binPath) + tdSql.execute("use db") + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 150) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 360) + tdSql.query("select count(*) from stb2") + tdSql.checkData(0, 0, 360) + tdSql.query("select count(*) from stb3") + tdSql.checkData(0, 0, 340) + tdSql.query("select count(*) from stb4") + tdSql.checkData(0, 0, 400) + os.system("%staosdemo -f tools/taosdemoAllTest/insert-renewdb.json -y" % binPath) + tdSql.execute("use db") + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 50) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 120) + tdSql.query("select count(*) from stb2") + tdSql.checkData(0, 0, 140) + tdSql.query("select count(*) from stb3") + tdSql.checkData(0, 0, 160) + tdSql.query("select count(*) from stb4") + tdSql.checkData(0, 0, 160) - # # insert: let parament in json file is illegal, it'll expect error. - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsAndTagNumLarge1024.json -y " % binPath) - # tdSql.error("use db") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertSigcolumnsNum1024.json -y " % binPath) - # tdSql.error("select * from db.stb0") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsAndTagNum1024.json -y " % binPath) - # tdSql.query("select count(*) from db.stb0") - # tdSql.checkData(0, 0, 10000) - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json -y " % binPath) - # tdSql.query("select count(*) from db.stb0") - # tdSql.checkRows(0) - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsNum0.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("show stables like 'stb0%' ") - # tdSql.checkData(0, 2, 11) - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertTagsNumLarge128.json -y " % binPath) - # tdSql.error("use db1") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar16384.json -y " % binPath) - # tdSql.query("select count(*) from db.stb0") - # tdSql.checkRows(1) - # tdSql.query("select count(*) from db.stb1") - # tdSql.checkRows(1) - # tdSql.error("select * from db.stb3") - # tdSql.error("select * from db.stb2") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertNumOfrecordPerReq0.json -y " % binPath) - # tdSql.error("select count(*) from db.stb0") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json -y " % binPath) - # tdSql.error("use db") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertChildTab0.json -y " % binPath) - # tdSql.error("use db") - # tdSql.execute("drop database if exists db") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertChildTabLess0.json -y " % binPath) - # tdSql.error("use db") - # tdSql.execute("drop database if exists blf") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertTimestepMulRowsLargeint16.json -y " % binPath) - # tdSql.execute("use blf") - # tdSql.query("select ts from blf.p_0_topics_7 limit 262800,1") - # tdSql.checkData(0, 0, "2020-03-31 12:00:00.000") - # tdSql.query("select first(ts) from blf.p_0_topics_2") - # tdSql.checkData(0, 0, "2019-10-01 00:00:00") - # tdSql.query("select last(ts) from blf.p_0_topics_6 ") - # tdSql.checkData(0, 0, "2020-09-29 23:59:00") - # os.system("%staosdemo -f tools/taosdemoAllTest/insertMaxNumPerReq.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 5000000) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 5000000) + # insert: let parament in json file is illegal, it'll expect error. + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsAndTagNumLarge1024.json -y " % binPath) + tdSql.error("use db") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertSigcolumnsNum1024.json -y " % binPath) + tdSql.error("select * from db.stb0") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsAndTagNum1024.json -y " % binPath) + tdSql.query("select count(*) from db.stb0") + tdSql.checkData(0, 0, 10000) + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json -y " % binPath) + tdSql.query("select count(*) from db.stb0") + tdSql.checkRows(0) + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertColumnsNum0.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("show stables like 'stb0%' ") + tdSql.checkData(0, 2, 11) + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertTagsNumLarge128.json -y " % binPath) + tdSql.error("use db1") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar16384.json -y " % binPath) + tdSql.query("select count(*) from db.stb0") + tdSql.checkRows(1) + tdSql.query("select count(*) from db.stb1") + tdSql.checkRows(1) + tdSql.error("select * from db.stb3") + tdSql.error("select * from db.stb2") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertNumOfrecordPerReq0.json -y " % binPath) + tdSql.error("select count(*) from db.stb0") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json -y " % binPath) + tdSql.error("use db") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertChildTab0.json -y " % binPath) + tdSql.error("use db") + tdSql.execute("drop database if exists db") + os.system("%staosdemo -f tools/taosdemoAllTest/insertChildTabLess0.json -y " % binPath) + tdSql.error("use db") + tdSql.execute("drop database if exists blf") + os.system("%staosdemo -f tools/taosdemoAllTest/insertTimestepMulRowsLargeint16.json -y " % binPath) + tdSql.execute("use blf") + tdSql.query("select ts from blf.p_0_topics_7 limit 262800,1") + tdSql.checkData(0, 0, "2020-03-31 12:00:00.000") + tdSql.query("select first(ts) from blf.p_0_topics_2") + tdSql.checkData(0, 0, "2019-10-01 00:00:00") + tdSql.query("select last(ts) from blf.p_0_topics_6 ") + tdSql.checkData(0, 0, "2020-09-29 23:59:00") + os.system("%staosdemo -f tools/taosdemoAllTest/insertMaxNumPerReq.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 5000000) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 5000000) - # # insert: timestamp and step - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-timestep.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("show stables") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 10) - # tdSql.query("select count (tbname) from stb1") - # tdSql.checkData(0, 0, 20) - # tdSql.query("select last(ts) from db.stb00_0") - # tdSql.checkData(0, 0, "2020-10-01 00:00:00.019000") - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 200) - # tdSql.query("select last(ts) from db.stb01_0") - # tdSql.checkData(0, 0, "2020-11-01 00:00:00.190000") - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 400) + # insert: timestamp and step + os.system("%staosdemo -f tools/taosdemoAllTest/insert-timestep.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("show stables") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 10) + tdSql.query("select count (tbname) from stb1") + tdSql.checkData(0, 0, 20) + tdSql.query("select last(ts) from db.stb00_0") + tdSql.checkData(0, 0, "2020-10-01 00:00:00.019000") + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 200) + tdSql.query("select last(ts) from db.stb01_0") + tdSql.checkData(0, 0, "2020-11-01 00:00:00.190000") + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 400) - # # # insert: disorder_ratio - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-disorder.json -g 2>&1 -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 1) - # tdSql.query("select count (tbname) from stb1") - # tdSql.checkData(0, 0, 1) - # tdSql.query("select count(*) from stb0") - # tdSql.checkData(0, 0, 10) - # tdSql.query("select count(*) from stb1") - # tdSql.checkData(0, 0, 10) + # # insert: disorder_ratio + os.system("%staosdemo -f tools/taosdemoAllTest/insert-disorder.json -g 2>&1 -y " % binPath) + tdSql.execute("use db") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 1) + tdSql.query("select count (tbname) from stb1") + tdSql.checkData(0, 0, 1) + tdSql.query("select count(*) from stb0") + tdSql.checkData(0, 0, 10) + tdSql.query("select count(*) from stb1") + tdSql.checkData(0, 0, 10) - # # insert: sample json - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-sample.json -y " % binPath) - # tdSql.execute("use dbtest123") - # tdSql.query("select col2 from stb0") - # tdSql.checkData(0, 0, 2147483647) - # tdSql.query("select t1 from stb1") - # tdSql.checkData(0, 0, -127) - # tdSql.query("select t2 from stb1") - # tdSql.checkData(1, 0, 126) + # insert: sample json + os.system("%staosdemo -f tools/taosdemoAllTest/insert-sample.json -y " % binPath) + tdSql.execute("use dbtest123") + tdSql.query("select col2 from stb0") + tdSql.checkData(0, 0, 2147483647) + tdSql.query("select t1 from stb1") + tdSql.checkData(0, 0, -127) + tdSql.query("select t2 from stb1") + tdSql.checkData(1, 0, 126) - # # insert: test interlace parament - # os.system("%staosdemo -f tools/taosdemoAllTest/insert-interlace-row.json -y " % binPath) - # tdSql.execute("use db") - # tdSql.query("select count (tbname) from stb0") - # tdSql.checkData(0, 0, 100) - # tdSql.query("select count (*) from stb0") - # tdSql.checkData(0, 0, 15000) + # insert: test interlace parament + os.system("%staosdemo -f tools/taosdemoAllTest/insert-interlace-row.json -y " % binPath) + tdSql.execute("use db") + tdSql.query("select count (tbname) from stb0") + tdSql.checkData(0, 0, 100) + tdSql.query("select count (*) from stb0") + tdSql.checkData(0, 0, 15000) os.system("rm -rf ./insert_res.txt") diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py index 5702b5a81f..fc2b2f0f2c 100644 --- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py +++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py @@ -113,10 +113,10 @@ class TDTestCase: # sql number lager 100 os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath) - # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) !=0 - # os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) - os.system("%staosdemo -f tools/taosdemoAllTest/subSyncKeepStart.json" % binPath) - tdSql.execute("insert into db.stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") + assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0 + assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0 + # os.system("%staosdemo -f tools/taosdemoAllTest/subSyncKeepStart.json" % binPath) + # tdSql.execute("insert into db.stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") # # # merge result files @@ -149,8 +149,8 @@ class TDTestCase: # delete useless files os.system("rm -rf ./insert_res.txt") os.system("rm -rf tools/taosdemoAllTest/*.py.sql") - # os.system("rm -rf ./subscribe_res*") - # os.system("rm -rf ./all_subscribe*") + os.system("rm -rf ./subscribe_res*") + os.system("rm -rf ./all_subscribe*") def stop(self): tdSql.close()