testcase-modify sub

tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json

@@ -41,7 +41,7 @@
             "batch_create_tbl_num": 1000,
             "data_source": "rand",
             "insert_mode": "taosc",
-            "insert_rows": 10,
+            "insert_rows": 20,
             "childtable_limit": 0,
             "childtable_offset": 0,
             "interlace_rows": 0,

tests/pytest/tools/taosdemoAllTest/subLzInsert.json

@@ -0,0 +1,44 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "node1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "num_of_records_per_req": 10000,
+    "result_file": "insert_stb1.txt",
+    "confirm_parameter_prompt": "no",
+    "databases": [{
+        "dbinfo": {
+            "name": "dy",
+            "drop": "yes"
+        },
+        "super_tables": [{
+            "name": "stb2",
+            "child_table_exists": "no",
+            "childtable_count": 100,
+            "childtable_prefix": "t2_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 500,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_interval": 0,
+            "insert_rows": 20,
+            "interlace_rows": 0,
+            "childtable_limit": 10000,
+            "childtable_offset": 1,
+            "max_sql_len": 1048576,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1000,
+            "start_timestamp": "now",
+            "sample_format": "",
+            "sample_file": "",
+            "tags_file": "",
+            "columns": [{"type": "DOUBLE","count":1},{"type": "TIMESTAMP","count":1},{"type": "SMALLINT","count":2}],
+            "tags": [{"type": "INT","count":1},{"type": "BINARY","len": 32,"count":11},{"type": "NCHAR","len": 64,"count":4}]
+            }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/subStb2.json

@@ -0,0 +1,24 @@
+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "node1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "dy",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":1,
+       "mode":"sync",
+       "interval": 0,
+       "restart":"no",
+       "keepProgress":"no",
+       "sqls": [
+        {
+          "sql": "select * from stb2 where ts>'2021-01-01 09:35:00.000' ;",
+          "result": "./sub_stb2.txt"
+        }]
+      }
+
+  }

tests/pytest/tools/taosdemoAllTest/subSyncKeepStart.json

@@ -0,0 +1,47 @@
+{
+    "filetype":"subscribe",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "databases": "db",
+    "confirm_parameter_prompt": "no",
+    "specified_table_query":
+      {
+       "concurrent":2, 
+       "mode":"sync", 
+       "interval":0, 
+       "restartAfterConsume":0,
+       "restart":"yes", 
+       "keepProgress":"yes",
+       "sqls": [
+        {
+          "sql": "select * from stb00_0", 
+          "result": "./subscribe_res0.txt"
+        },
+        {
+          "sql": "select ts from stb00_1", 
+          "result": "./subscribe_res1.txt"
+        }]
+      },
+    "super_table_query": 
+      {
+       "stblname": "stb0",
+       "threads":2, 
+       "mode":"sync", 
+       "interval":10000, 
+       "restartAfterConsume":0,
+       "restart":"yes", 
+       "keepProgress":"yes",
+       "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"
+        }]
+      }
+  }

tests/pytest/tools/taosdemoAllTest/subSyncMaxsql100.json

@@ -11,7 +11,7 @@
       {
        "concurrent":2, 
        "mode":"sync", 
-       "interval":10000, 
+       "interval":0, 
        "restart":"no", 
        "keepProgress":"no",
        "sqls": [

tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py

@@ -113,8 +113,14 @@ 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)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath)
+
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subLzInsert.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/subStb2.json" % binPath)
+
+
 
         
         # delete useless files