add testcases for issue-7666

tests/pytest/insert/verifyMemToDiskCrash.py

@@ -13,16 +13,14 @@
 from util.log import tdLog
 from util.cases import tdCases
 from util.sql import tdSql
-import time 
 from util.common import tdCom
 
-
 class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
-    def checkMemDiskMerge(self):
+    def checkTbMemDiskMerge(self):
         tb_name = tdCom.getLongName(8, "letters")
         tdSql.execute(
             f'CREATE TABLE {tb_name} (ts timestamp, c1 int, c2 int)')
@@ -41,8 +39,32 @@ class TDTestCase:
         res2 = tdSql.query(query_sql, True)
         for i in range(4):
             tdSql.checkEqual(res1[i], res2[i])
+
+    def checkStbMemDiskMerge(self):
+        tdCom.cleanTb()
+        stb_name = tdCom.getLongName(8, "letters")
+        tb_name = tdCom.getLongName(7, "letters")
+        tdSql.execute(
+            f'CREATE TABLE {stb_name} (ts timestamp, c1 int, c2 int) tags (t1 int)')
+        tdSql.execute(
+            f'CREATE TABLE {tb_name} using {stb_name} tags (1)')
+        tdSql.execute(
+            f'insert into {tb_name} values ("2021-01-01 12:00:00.000", 1, 1)')
+        tdSql.execute(
+            f'insert into {tb_name} values ("2021-01-03 12:00:00.000", 3, 3)')
+        tdCom.restartTaosd()
+        tdSql.execute(
+            f'insert into {tb_name} values ("2021-01-02 12:00:00.000", Null, 2)')
+        tdSql.execute(
+            f'insert into {tb_name} values ("2021-01-04 12:00:00.000", Null, 4)')
+        query_sql = f'select * from {stb_name}'
+        res1 = tdSql.query(query_sql, True)
+        tdCom.restartTaosd()
+        res2 = tdSql.query(query_sql, True)
+        for i in range(4):
+            tdSql.checkEqual(res1[i], res2[i])
     
-    def checkSuperSubBlockMerge(self):
+    def checkTbSuperSubBlockMerge(self):
         tdCom.cleanTb()
         tb_name = tdCom.getLongName(8, "letters")
         tdSql.execute(
@@ -55,14 +77,12 @@ class TDTestCase:
             start_ts += 1
         tdCom.restartTaosd()
 
-        tdSql.query(f'select * from {tb_name}')
         for i in range(10):
             tdSql.execute(
                 f'insert into {tb_name} values ({start_ts}, Null)')
             start_ts += 1
         tdCom.restartTaosd()
 
-        tdSql.query(f'select * from {tb_name}')
         for i in range(10):
             new_ts = i + 10 + 10
             tdSql.execute(
@@ -71,11 +91,42 @@ class TDTestCase:
         tdCom.restartTaosd()
         tdSql.query(f'select * from {tb_name}')
 
+    def checkStbSuperSubBlockMerge(self):
+        tdCom.cleanTb()
+        stb_name = tdCom.getLongName(8, "letters")
+        tb_name = tdCom.getLongName(7, "letters")
+        tdSql.execute(
+            f'CREATE TABLE {stb_name} (ts timestamp, c1 int) tags (t1 int)')
+        tdSql.execute(
+            f'CREATE TABLE {tb_name} using {stb_name} tags (1)')
+
+        start_ts = 1577808001000
+        for i in range(79):
+            tdSql.execute(
+                f'insert into {tb_name} values ({start_ts}, {i})')
+            start_ts += 1
+        tdCom.restartTaosd()
+
+        for i in range(10):
+            tdSql.execute(
+                f'insert into {tb_name} values ({start_ts}, Null)')
+            start_ts += 1
+        tdCom.restartTaosd()
+
+        for i in range(10):
+            new_ts = i + 10 + 10
+            tdSql.execute(
+                f'insert into {tb_name} values ({start_ts}, {new_ts})')
+            start_ts += 1
+        tdCom.restartTaosd()
+        tdSql.query(f'select * from {stb_name}')
+
     def run(self):
         tdSql.prepare()
-        # self.checkMemDiskMerge()
-        self.checkSuperSubBlockMerge()
-
+        self.checkTbMemDiskMerge()
+        self.checkStbMemDiskMerge()
+        self.checkTbSuperSubBlockMerge()
+        self.checkStbSuperSubBlockMerge()
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)