Merge pull request #12290 from taosdata/test/chr/TD-14699

test: modify testcase that using taosBenchmark to test multi-process table building

tests/system-test/1-insert/insertWithMoreVgroup.py

@@ -199,7 +199,8 @@ class TDTestCase:
         os.system("%s -f %s -y " %(taosBenchbin,jsonFile))
        
         return
-    def taosBenchCreate(self,dbname,stbname,vgroups,threadNumbers,count):
+    def taosBenchCreate(self,host,dropdb,dbname,stbname,vgroups,threadNumbers,count):
+        
         # count=50000
         buildPath = self.getBuildPath()
         if (buildPath == ""):
@@ -207,20 +208,28 @@ class TDTestCase:
         else:
             tdLog.info("taosd found in %s" % buildPath)
         taosBenchbin = buildPath+ "/build/bin/taosBenchmark"
+        buildPath = self.getBuildPath()
+        config = buildPath+ "../sim/dnode1/cfg/"
+        tsql=self.newcur(host,config)
 
         # insert: create one  or mutiple tables per sql and insert multiple rows per sql
-        tdSql.execute("drop database if exists %s"%dbname)
+        tsql.execute("drop database if exists %s"%dbname)
 
-        tdSql.execute("create database %s vgroups %d"%(dbname,vgroups))
-        tdSql.execute("use %s" %dbname)
+        tsql.execute("create database %s vgroups %d"%(dbname,vgroups))
+        print("db has been created")
+        # tsql.getResult("show databases")
+        # print(tdSql.queryResult)
+        tsql.execute("use %s" %dbname)
     
         threads = []
         # threadNumbers=2
         for i in range(threadNumbers):
             jsonfile="1-insert/Vgroups%d%d.json"%(vgroups,i)
             os.system("cp -f 1-insert/manyVgroups.json   %s"%(jsonfile))
-            os.system("sed -i 's/\"name\": \"db\",/\"name\": \"%s%d\",/g' %s"%(dbname,i,jsonfile))
-            os.system("sed -i 's/\"childtable_count\": 300000,/\"childtable_count\": %d,/g' %s "%(count,jsonfile))
+            os.system("sed -i 's/\"name\": \"db\",/\"name\": \"%s\",/g' %s"%(dbname,jsonfile))
+            os.system("sed -i 's/\"drop\": \"no\",/\"drop\": \"%s\",/g' %s"%(dropdb,jsonfile))
+            os.system("sed -i 's/\"host\": \"127.0.0.1\",/\"host\": \"%s\",/g' %s"%(host,jsonfile))
+            os.system("sed -i 's/\"childtable_count\": 10000,/\"childtable_count\": %d,/g' %s "%(count,jsonfile))
             os.system("sed -i 's/\"name\": \"stb1\",/\"name\":  \"%s%d\",/g' %s "%(stbname,i,jsonfile))
             os.system("sed -i 's/\"childtable_prefix\": \"stb1_\",/\"childtable_prefix\": \"%s%d_\",/g' %s "%(stbname,i,jsonfile))
             threads.append(mp.Process(target=self.taosBench, args=("%s"%jsonfile,))) 
@@ -337,8 +346,11 @@ class TDTestCase:
         return
 
     def test_case3(self):
+        # self.taosBenchCreate("chenhaoran02","no","db1", "stb1", 1, 8, 1*10000)
+        self.taosBenchCreate("chenhaoran02","no","db1", "stb1", 1, 8, 1*1000)
 
-        self.taosBenchCreate("db1", "stb1", 1, 2, 1*50000)
+        # self.taosBenchCreate("db1", "stb1", 4, 5, 100*10000)
+        # self.taosBenchCreate("db1", "stb1", 1, 5, 100*10000)
 
         return 
 

tests/system-test/1-insert/manyVgroups.json

 {
     "filetype": "insert",
     "cfgdir": "/etc/taos/",
-    "host": "test216",
+    "host": "127.0.0.1",
     "port": 6030,
     "user": "root",
     "password": "taosdata",
@@ -16,14 +16,14 @@
         {
             "dbinfo": {
                 "name": "db",
-                "drop": "yes",
+                "drop": "no",
                 "vgroups": 1
             },
             "super_tables": [
                 {
                     "name": "stb1",
                     "child_table_exists": "no",
-                    "childtable_count": 300000,
+                    "childtable_count": 10000,
                     "childtable_prefix": "stb1_",
                     "auto_create_table": "no",
                     "batch_create_tbl_num": 50000,

tests/system-test/insert.json

+{
+	"filetype": "insert",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"thread_count": 16,
+	"create_table_thread_count": 1,
+	"result_file": "./insert_res.txt",
+	"confirm_parameter_prompt": "no",
+	"insert_interval": 0,
+	"interlace_rows": 0,
+	"num_of_records_per_req": 10000,
+	"prepared_rand": 10000,
+	"chinese": "no",
+	"databases": [
+		{
+			"dbinfo": {
+				"name": "db",
+				"drop": "yes",
+				"vgroups":4,
+				"replica": 1,
+				"precision": "ms"
+				},
+			"super_tables": [
+				{
+					"name": "stb",
+					"child_table_exists": "no",
+					"childtable_count": 1000,
+					"childtable_prefix": "stb_",
+					"escape_character": "no",
+					"auto_create_table": "no",
+					"batch_create_tbl_num": 10,
+					"data_source": "rand",
+					"insert_mode": "taosc",
+					"non_stop_mode": "no",
+					"line_protocol": "line",
+					"insert_rows": 100000,
+					"interlace_rows": 0,
+					"insert_interval": 0,
+					"disorder_ratio": 0,
+					"timestamp_step": 1,
+					"start_timestamp": "2020-10-01 00:00:00.000",
+					"use_sample_ts": "no",
+					"tags_file": "",
+					"columns": [
+						{
+							"type": "FLOAT",
+							"name": "current",
+							"count": 4,
+							"max": 12,
+							"min": 8
+						},
+						{ "type": "INT", "name": "voltage", "max": 225, "min": 215 },
+						{ "type": "FLOAT", "name": "phase", "max": 1, "min": 0 }
+					],
+					"tags": [
+						{
+							"type": "TINYINT",
+							"name": "groupid",
+							"max": 10,
+							"min": 1
+						},
+						{
+							"name": "location",
+							"type": "BINARY",
+							"len": 16,
+							"values": ["beijing", "shanghai"]
+						}
+					]
+				}
+			]
+		}
+	]
+}