[TD-4132]<test>: add taosdump-testcase of boundary value testing

tests/pytest/tools/taosdemoAllTest/convertResFile.py

@@ -2,6 +2,14 @@ from datetime import datetime
 import time
 import os
 
+# class  FileSeparaSpaceConvertcomma:
+#     def __init__(self):
+#         self.inputfile = ""
+#         self.oputfile = ""
+#         self.affectedRows = 0
+   
+#     def ConvertFile(self, inputfile,):
+
 os.system("awk -v  OFS=','  '{$1=$1;print$0}' ./all_query_res0.txt  > ./new_query_res0.txt")
 with open('./new_query_res0.txt','r+') as f0:
     contents = f0.readlines()

tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 0,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 10240000000, 
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb0",
+            "child_table_exists":"no",
+            "childtable_count": 10,
+            "childtable_prefix": "stb00_",
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 1000,
+            "childtable_limit": 0,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 1000,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1004}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":7}]
+        }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/querrThreads0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 0,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/querrThreadsless0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": -1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/queryConcurrent0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 0,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/queryConcurrentless0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times":3,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": -1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/speciQueryInsertdata.json → tests/pytest/tools/taosdemoAllTest/queryInsertdata.json

@@ -54,7 +54,7 @@
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
-            "columns": [{"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
         },
         {
@@ -79,7 +79,7 @@
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
-            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":6}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":6}, {"type": "BINARY", "len": 1, "count":3}, {"type": "BINARY", "len": 2, "count":6}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
         }]
     }]

tests/pytest/tools/taosdemoAllTest/queryQps.json

@@ -9,8 +9,8 @@
     "databases": "db",
     "query_times": 1,
     "specified_table_query": {
-        "query_interval": 0,
-        "concurrent": 1,
+        "query_interval": 10000,
+        "concurrent": 4,
         "sqls": [
           {    
               "sql": "select last_row(*) from stb00_0",
@@ -24,8 +24,8 @@
       },
       "super_table_query": {
           "stblname": "stb1",
-          "query_interval":0,
-          "threads": 1,
+          "query_interval":20000,
+          "threads": 4,
           "sqls": [
             {
               "sql": "select last_row(ts) from xxxx",

tests/pytest/tools/taosdemoAllTest/queryTimes0.json

+{
+    "filetype": "query",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "confirm_parameter_prompt": "no",
+    "databases": "db",
+    "query_times": 0,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/queryTimesless0.json

+{
+    "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,
+    "specified_table_query": {
+        "query_interval": 0,
+        "concurrent": 1,
+        "sqls": [
+          {    
+              "sql": "select last_row(*) from stb00_0",
+              "result": "./query_res0.txt"
+          },
+          {
+              "sql": "select last_row(*) from stb00_99 ",
+              "result": "./query_res1.txt"
+  
+          }]
+      },
+      "super_table_query": {
+          "stblname": "stb1",
+          "query_interval":0,
+          "threads": 1,
+          "sqls": [
+            {
+              "sql": "select last_row(ts) from xxxx",
+              "result": "./query_res2.txt"
+            }
+          ]
+        }
+  }
+    
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/sub.json

@@ -9,29 +9,37 @@
     "confirm_parameter_prompt": "no",
     "specified_table_query":
       {
-       "concurrent":1, 
+       "concurrent":2, 
        "mode":"sync", 
        "interval":0, 
        "restart":"yes", 
        "keepProgress":"yes",
        "sqls": [
         {
-          "sql": "select * from stb00_0 ;", 
+          "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":1, 
+       "threads":2, 
        "mode":"sync", 
        "interval":10000, 
        "restart":"yes", 
        "keepProgress":"yes",
        "sqls": [
         {
-          "sql": "select * from xxxx where ts > '2021-02-25 11:35:00.000' ;", 
-          "result": "./subscribe_res1.txt"
+          "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

tests/pytest/tools/taosdemoAllTest/subInsertdata.json

@@ -35,26 +35,26 @@
         "super_tables": [{
             "name": "stb0",
             "child_table_exists":"no",
-            "childtable_count": 1,
+            "childtable_count": 2,
             "childtable_prefix": "stb00_",
             "auto_create_table": "no",
             "batch_create_tbl_num": 10,
             "data_source": "rand",
             "insert_mode": "taosc",
-            "insert_rows": 1,
+            "insert_rows": 10,
             "childtable_limit": 0,
             "childtable_offset": 0,
             "interlace_rows": 0,
             "insert_interval": 0,
             "max_sql_len": 1024000,
             "disorder_ratio": 0,
-            "disorder_range": 0,
+            "disorder_range": 1000,
             "timestamp_step": 1000,
             "start_timestamp": "2021-02-25 10:00:00.000",
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
-            "columns": [{"type": "BINARY", "len":50, "count":1}, {"type": "BINARY", "len": 16, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
+            "columns": [{"type": "BINARY", "len": 1, "count":1}, {"type": "BINARY", "len": 3, "count":1}, {"type": "INT"}, {"type": "DOUBLE", "count":1}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
         }]
     }]

tests/pytest/tools/taosdemoAllTest/taosdemoTestQueryWithJson.py

@@ -47,14 +47,57 @@ class TDTestCase:
             tdLog.exit("taosd not found!")
         else:
             tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"      
+        binPath = buildPath+ "/build/bin/"  
+          
+        # delete useless files
+        os.system("rm -rf ./insert_res.txt")
+        os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
+        os.system("rm -rf ./querySystemInfo*")  
+        os.system("rm -rf ./query_res*")   
+        os.system("rm -rf ./all_query*")
+        os.system("rm -rf ./test_query_res0.txt")  
+        
+        # # query: query specified  table  and query  super table 
+        # os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/queryTaosc.json" % binPath)
+        # os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
+        # os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
+        # os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
+        # tdSql.execute("use db")
+        # tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
+        # os.system("python3 tools/taosdemoAllTest/convertResFile.py")
+        # tdSql.execute("insert into result0 file './test_query_res0.txt'")   
+        # tdSql.query("select ts from result0")
+        # tdSql.checkData(0, 0, "2020-11-01 00:00:00.099000") 
+        # tdSql.query("select count(*) from result0")
+        # tdSql.checkData(0, 0, 1) 
+        # with open('./all_query_res1.txt','r+') as f1:    
+        #     result1 = int(f1.readline())
+        #     tdSql.query("select count(*) from stb00_1")
+        #     tdSql.checkData(0, 0, "%d" % result1)
+
+        # with open('./all_query_res2.txt','r+') as f2:
+        #     result2 = int(f2.readline())
+        #     d2 = datetime.fromtimestamp(result2/1000)
+        #     timest = d2.strftime("%Y-%m-%d %H:%M:%S.%f")
+        #     tdSql.query("select last_row(ts) from stb1")
+        #     tdSql.checkData(0, 0, "%s" % timest)
         
-        # query: query specified  table  and query  super table 
-        os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryInsertdata.json" % binPath)
-        os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryTaosc.json" % binPath)
+        # # delete useless files
+        # os.system("rm -rf ./insert_res.txt")
+        # os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
+        # os.system("rm -rf ./querySystemInfo*")  
+        # os.system("rm -rf ./query_res*")   
+        # os.system("rm -rf ./all_query*")
+        # os.system("rm -rf ./test_query_res0.txt")
+
+
+        # use restful api to query
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
+        os.system("%staosdemo -f tools/taosdemoAllTest/queryRestful.json" % binPath)
         os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
         os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
-        os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
+        # os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
         tdSql.execute("use db")
         tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
         os.system("python3 tools/taosdemoAllTest/convertResFile.py")
@@ -75,49 +118,33 @@ class TDTestCase:
             tdSql.query("select last_row(ts) from stb1")
             tdSql.checkData(0, 0, "%s" % timest)
         
-        # # delete useless files
-        # os.system("rm -rf ./insert_res.txt")
-        # os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        # os.system("rm -rf ./querySystemInfo*")  
-        # os.system("rm -rf ./query_res*")   
-        # os.system("rm -rf ./all_query*")
-        # os.system("rm -rf ./test_query_res0.txt")
 
+        
+        # # query times less than or equal to 100
+        # os.system("%staosdemo -f tools/taosdemoAllTest/queryInsertdata.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/querySpeciMutisql100.json" % binPath)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/querySuperMutisql100.json" % binPath)
 
-        # # use restful api to query
+        # #query result print QPS
         # os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryInsertdata.json" % binPath)
-        # os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryRestful.json" % binPath)
-        # os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
-        # os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
-        # # os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
-        # tdSql.execute("use db")
-        # tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
-        # os.system("python3 tools/taosdemoAllTest/convertResFile.py")
-        # tdSql.execute("insert into result0 file './test_query_res0.txt'")   
-        # tdSql.query("select ts from result0")
-        # tdSql.checkData(0, 0, "2020-11-01 00:00:00.099000") 
-        # tdSql.query("select count(*) from result0")
-        # tdSql.checkData(0, 0, 1) 
-        # with open('./all_query_res1.txt','r+') as f1:    
-        #     result1 = int(f1.readline())
-        #     tdSql.query("select count(*) from stb00_1")
-        #     tdSql.checkData(0, 0, "%d" % result1)
+        # os.system("%staosdemo -f tools/taosdemoAllTest/queryQps.json" % binPath)
 
-        # with open('./all_query_res2.txt','r+') as f2:
-        #     result2 = int(f2.readline())
-        #     d2 = datetime.fromtimestamp(result2/1000)
-        #     timest = d2.strftime("%Y-%m-%d %H:%M:%S.%f")
-        #     tdSql.query("select last_row(ts) from stb1")
-        #     tdSql.checkData(0, 0, "%s" % timest)
-        
+        # # use illegal or out of range parameters query json file
+        # os.system("%staosdemo -f tools/taosdemoAllTest/speciQueryInsertdata.json" % binPath)
+        # exceptcode = os.system("%staosdemo -f tools/taosdemoAllTest/queryTimes0.json" % binPath)
+        # assert exceptcode != 0
+        # exceptcode0 = os.system("%staosdemo -f tools/taosdemoAllTest/queryTimesless0.json" % binPath)
+        # assert exceptcode0 != 0
+        # exceptcode1 = os.system("%staosdemo -f tools/taosdemoAllTest/queryConcurrentless0.json" % binPath)
+        # assert exceptcode1 != 0
+        # exceptcode2 = os.system("%staosdemo -f tools/taosdemoAllTest/queryConcurrent0.json" % binPath)
+        # assert exceptcode2 != 0
+        # exceptcode3 = os.system("%staosdemo -f tools/taosdemoAllTest/querrThreadsless0.json" % binPath)
+        # assert exceptcode3 != 0
+        # exceptcode4 = os.system("%staosdemo -f tools/taosdemoAllTest/querrThreads0.json" % binPath)
+        # assert exceptcode4 != 0
 
-        
-        # query times less than or equal to 100
-        os.system("%staosdemo -f tools/taosdemoAllTest/querySpeciMutisql100.json" % binPath)
-        os.system("%staosdemo -f tools/taosdemoAllTest/querySuperMutisql100.json" % binPath)
 
-        # query result print QPS
-        os.system("%staosdemo -f tools/taosdemoAllTest/queryQps.json" % binPath)
 
 
         # delete useless files

tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py

@@ -19,6 +19,8 @@ from util.sql import *
 from util.dnodes import *
 import time
 from datetime import datetime
+import subprocess
+
 
 class TDTestCase:
     def init(self, conn, logSql):
@@ -50,15 +52,32 @@ class TDTestCase:
         binPath = buildPath+ "/build/bin/"      
         
         # query: query specified  table  and query  super table 
-        # os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
-        # os.system("%staosdemo -f tools/taosdemoAllTest/sub.json" % binPath)
-        # os.system("cat query_res0.txt* |sort -u > all_query_res0.txt")
-        # os.system("cat query_res1.txt* |sort -u > all_query_res1.txt")
-        # os.system("cat query_res2.txt* |sort -u > all_query_res2.txt")
-        # tdSql.execute("use db")
-        # tdSql.execute('create table result0 using stb0 tags(121,43,"beijing","beijing","beijing","beijing","beijing")')
-        # os.system("python3 tools/taosdemoAllTest/convertResFile.py")
-        # tdSql.execute("insert into result0 file './test_query_res0.txt'")   
+        os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
+        os.system("nohup %staosdemo -f tools/taosdemoAllTest/sub.json &" % binPath)
+        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/sub.json" |grep -v "grep"|awk \'{print $2}\'')[1])    
+        tdSql.execute("use db")
+        tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)")   
+        tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)")   
+        sleep(5)
+        sub0_0 = int(subprocess.getstatusoutput('cat subscribe_res0.txt-0 |wc -l')[1])
+        assert sub0_0 == 11
+        sub0_1 = int(subprocess.getstatusoutput('cat subscribe_res0.txt-1 |wc -l')[1])
+        assert sub0_1 == 11
+        sub1_0 = int(subprocess.getstatusoutput('cat subscribe_res1.txt-0 |wc -l')[1])
+        assert sub1_0 == 12
+        sub1_1 = int(subprocess.getstatusoutput('cat subscribe_res1.txt-1 |wc -l')[1])
+        assert sub1_1 == 12
+        # sub2_0 = int(subprocess.getstatusoutput('cat subscribe_res2.txt-0 |wc -l')[0])
+        # assert sub2_0 == 10
+        # sub2_1 = int(subprocess.getstatusoutput('cat subscribe_res2.txt-1 |wc -l')[0])
+        # assert sub2_1 == 10
+        # sub3_0 = int(subprocess.getstatusoutput('cat subscribe_res3.txt-0 |wc -l')[0])
+        # assert sub3_0 == 7
+        # sub3_1 = int(subprocess.getstatusoutput('cat subscribe_res3.txt-1 |wc -l')[0])
+        # assert sub3_1 == 7
+        sleep(1)
+        os.system("kill -9 %d" % query_pid)
+
         # tdSql.query("select ts from result0")
         # tdSql.checkData(0, 0, "2020-11-01 00:00:00.099000") 
         # tdSql.query("select count(*) from result0")
@@ -84,10 +103,10 @@ class TDTestCase:
 
 
         # delete useless files
-        # os.system("rm -rf ./insert_res.txt")
-        # os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        # os.system("rm -rf ./querySystemInfo*")  
-        # os.system("rm -rf ./query_res*")   
+        os.system("rm -rf ./insert_res.txt")
+        os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
+        os.system("rm -rf ./querySystemInfo*")  
+        os.system("rm -rf ./subscribe_res*")   
         # os.system("rm -rf ./all_query*")
         # os.system("rm -rf ./test_query_res0.txt")
          

tests/pytest/tools/taosdumpTest.py

@@ -27,10 +27,18 @@ class TDTestCase:
         self.ts = 1538548685000
         self.numberOfTables = 10000
         self.numberOfRecords = 100
-    
-    def run(self):
-        tdSql.prepare()
 
+    def run(self):
+        if not os.path.exists("/taosdumptest/tmp1"):
+            os.makedirs("/taosdumptest/tmp1")
+        else:
+            print("目录存在")
+        if not os.path.exists("/taosdumptest/tmp2"):
+            os.makedirs("/taosdumptest/tmp2")        
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
+        tdSql.execute("create database db1  days 12 keep 3640 blocks 7 ")
+        tdSql.execute("use db")
         tdSql.execute("create table st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
         tdSql.execute("create table t1 using st tags(1, 'beijing')")        
         sql = "insert into t1 values"
@@ -38,27 +46,41 @@ class TDTestCase:
         for i in range(100):
             sql += "(%d, %d, 'nchar%d')" % (currts + i, i % 100, i % 100)
         tdSql.execute(sql)
-
         tdSql.execute("create table t2 using st tags(2, 'shanghai')")        
         sql = "insert into t2 values"
         currts = self.ts
         for i in range(100):
             sql += "(%d, %d, 'nchar%d')" % (currts + i, i % 100, i % 100)
-        tdSql.execute(sql)
-
-        os.system("taosdump --databases db -o /tmp")
-        
+        tdSql.execute(sql)     
+        os.system("taosdump --databases db -o /taosdumptest/tmp1")
+        os.system("taosdump --databases db1 -N -o /taosdumptest/tmp2")
+       
         tdSql.execute("drop database db")
+        tdSql.execute("drop database db1")
         tdSql.query("show databases")
         tdSql.checkRows(0)
-        
-        os.system("taosdump -i /tmp")
+        os.system("taosdump -i /taosdumptest/tmp1")
+        os.system("taosdump -i /taosdumptest/tmp2")
 
-        tdSql.query("show databases")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'db')
-        
         tdSql.execute("use db")
+        tdSql.query("show databases")
+        tdSql.checkRows(2)
+        dbresult = tdSql.queryResult
+        # 6--days,7--keep0,keep1,keep, 12--block,
+        for i in  range(len(dbresult)):
+            if dbresult[i][0] == 'db':
+                print(dbresult[i])
+                print(type(dbresult[i][6]))
+                print(type(dbresult[i][7]))
+                print(type(dbresult[i][9]))
+                assert dbresult[i][6] == 11
+                assert dbresult[i][7] == "3649,3649,3649"
+                assert dbresult[i][9] == 8
+            if dbresult[i][0] == 'db1':
+                assert dbresult[i][6] == 10
+                assert dbresult[i][7] == "3650,3650,3650"
+                assert dbresult[i][9] == 6
+
         tdSql.query("show stables")
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, 'st')
@@ -80,6 +102,36 @@ class TDTestCase:
             tdSql.checkData(i, 1, i)
             tdSql.checkData(i, 2, "nchar%d" % i)
 
+        # drop all databases，boundary value testing. length(databasename)<=32;length(tablesname)<=192
+        tdSql.execute("drop database db")
+        tdSql.execute("drop database db1")
+        os.system("rm -rf /taosdumptest/tmp1")
+        os.system("rm -rf /taosdumptest/tmp2")    
+        os.makedirs("/taosdumptest/tmp1")
+        tdSql.execute("create database db12312313231231321312312312_323")     
+        tdSql.error("create database db12312313231231321312312312_3231")     
+        tdSql.execute("use db12312313231231321312312312_323")
+        tdSql.execute("create stable st12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
+        tdSql.error("create stable st_12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
+        tdSql.execute("create stable st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
+        tdSql.execute("create stable st1(ts timestamp, c1 int, col2_012345678901234567890123456789012345678901234567890123456789 nchar(10)) tags(t1 int, t2 binary(10))")
+
+        tdSql.execute("select * from db12312313231231321312312312_323.st12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9")   
+        tdSql.error("create table t0_12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9 using st tags(1, 'beijing')")  
+        tdSql.query("show stables")
+        tdSql.checkRows(3)
+        os.system("taosdump --databases db12312313231231321312312312_323 -o /taosdumptest/tmp1")
+        tdSql.execute("drop database db12312313231231321312312312_323")       
+        os.system("taosdump -i /taosdumptest/tmp1")
+        tdSql.execute("use db12312313231231321312312312_323")
+        tdSql.query("show stables")
+        tdSql.checkRows(3)
+        os.system("rm -rf /taosdumptest/tmp1")
+        os.system("rm -rf /taosdumptest/tmp2") 
+        os.system("rm -rf ./dump_result.txt")
+        os.system("rm -rf ./db.csv")      
+      
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)