From fc0d0bd2162063bebde860c581c683de46cd5017 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Fri, 27 Aug 2021 11:24:47 +0800
Subject: [PATCH] modify test for development debug

---
 tests/pytest/insert/schemalessInsert.py          | 16 ++++++++--------
 .../pytest/tools/schemalessInsertPerformance.py  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/pytest/insert/schemalessInsert.py b/tests/pytest/insert/schemalessInsert.py
index 88abea477a..fc95f860bc 100644
--- a/tests/pytest/insert/schemalessInsert.py
+++ b/tests/pytest/insert/schemalessInsert.py
@@ -1053,7 +1053,7 @@ class TDTestCase:
         s_stb_d_tb_a_col_m_tag_list = self.genSqlList(stb_name=stb_name)[5]
         self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_a_col_m_tag_list))
         tdSql.query(f"show tables;")
-        tdSql.checkRows(6)
+        tdSql.checkRows(3)
 
     def sStbDtbDdataAtMcInsertMultiThreadCheckCase(self):
         """
@@ -1123,7 +1123,7 @@ class TDTestCase:
             tdSql.checkRows(5)        
         for t in ["t10", "t11"]:
             tdSql.query(f"select * from {stb_name} where {t} is not NULL;")
-            tdSql.checkRows(6)
+            tdSql.checkRows(0)
 
     def sStbDtbDdataDtsInsertMultiThreadCheckCase(self):
         """
@@ -1150,7 +1150,7 @@ class TDTestCase:
         s_stb_d_tb_d_ts_a_col_m_tag_list = self.genSqlList(stb_name=stb_name)[11]
         self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_d_ts_a_col_m_tag_list))
         tdSql.query(f"show tables;")
-        tdSql.checkRows(6)
+        tdSql.checkRows(3)
 
     def test(self):
         input_sql1 = "rfasta,id=\"rfasta_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"ddzhiksj\",t8=L\"ncharTagValue\" c0=True,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"bnhwlgvj\",c8=L\"ncharTagValue\",c9=7u64 1626006933640000000ns"
@@ -1203,19 +1203,19 @@ class TDTestCase:
         self.sStbDtbDdataInsertMultiThreadCheckCase()
 
         # # ! concurrency conflict
-        # self.sStbDtbDdataAcMtInsertMultiThreadCheckCase()
-        # self.sStbDtbDdataAtMcInsertMultiThreadCheckCase()
+        self.sStbDtbDdataAcMtInsertMultiThreadCheckCase()
+        self.sStbDtbDdataAtMcInsertMultiThreadCheckCase()
 
         self.sStbStbDdataDtsInsertMultiThreadCheckCase()
 
         # # ! concurrency conflict
-        # self.sStbStbDdataDtsAcMtInsertMultiThreadCheckCase()
-        # self.sStbStbDdataDtsAtMcInsertMultiThreadCheckCase()
+        self.sStbStbDdataDtsAcMtInsertMultiThreadCheckCase()
+        self.sStbStbDdataDtsAtMcInsertMultiThreadCheckCase()
 
         self.sStbDtbDdataDtsInsertMultiThreadCheckCase()
 
         # ! concurrency conflict
-        # self.sStbDtbDdataDtsAcMtInsertMultiThreadCheckCase()
+        self.sStbDtbDdataDtsAcMtInsertMultiThreadCheckCase()
 
 
 
diff --git a/tests/pytest/tools/schemalessInsertPerformance.py b/tests/pytest/tools/schemalessInsertPerformance.py
index bdb090726a..78e79a7b64 100644
--- a/tests/pytest/tools/schemalessInsertPerformance.py
+++ b/tests/pytest/tools/schemalessInsertPerformance.py
@@ -116,11 +116,11 @@ class TDTestCase:
         '''
             schemaless insert api
         '''
+        print(threading.current_thread().name, "length=", len(batch_list))
+        print(threading.current_thread().name, 'firstline', batch_list[0])
+        print(threading.current_thread().name, 'lastline:', batch_list[-1])
         self._conn.insert_lines(batch_list)
-        # print(threading.current_thread().name, "length=", len(batch_list))
-        # print(threading.current_thread().name, 'firstline', batch_list[0])
-        # print(threading.current_thread().name, 'lastline:', batch_list[-1])
-        # print(threading.current_thread().name, 'end')
+        print(threading.current_thread().name, 'end')
 
     def splitGenerator(self, table_list, sub_list_len):
         '''
@@ -235,16 +235,16 @@ class TDTestCase:
         # col4_time /= test_times
         # print(col4_time)
 
-        # tdCom.cleanTb()
+        tdCom.cleanTb()
         for i in range(test_times):
-            time_used = self.schemalessPerfTest(count=1000, table_count=table_count, sub_list_len=sub_list_len, thread_count=thread_count)[0]
+            time_used = self.schemalessPerfTest(count=100, table_count=table_count, sub_list_len=sub_list_len, thread_count=thread_count)[0]
             col1000_time += time_used
         col1000_time /= test_times    
         print(col1000_time)
         
         tdCom.cleanTb()
         for i in range(test_times):
-            time_used = self.schemalessPerfTest(count=4000, table_count=table_count, sub_list_len=sub_list_len, thread_count=thread_count)[0]
+            time_used = self.schemalessPerfTest(count=400, table_count=table_count, sub_list_len=sub_list_len, thread_count=thread_count)[0]
             col4000_time += time_used
         col4000_time /= test_times
         print(col4000_time)
@@ -254,7 +254,7 @@ class TDTestCase:
     def run(self):
         print("running {}".format(__file__))
         tdSql.prepare()
-        result = self.getPerfResults(test_times=3, table_count=1000, sub_list_len=100, thread_count=10)
+        result = self.getPerfResults(test_times=1, table_count=1000, sub_list_len=100, thread_count=10)
         print(result)
 
     def stop(self):
-- 
GitLab