Merge remote-tracking branch 'origin/feature/query' into feature/query

tests/pytest/alter/alter_keep.py

@@ -173,8 +173,9 @@ class TDTestCase:
         tdSql.checkData(0,7,'10,10,10')
         tdSql.error('insert into tb values (now-15d, 10)')
         tdSql.query('select * from tb')
-        tdSql.checkRows(rowNum)
+        tdSql.checkRows(2)
         
+        rowNum = 2
         tdLog.notice('testing keep will be altered if sudden change from small to big')
         for i in range(30):
             tdSql.execute('alter database db keep 14,14,14')
@@ -182,14 +183,19 @@ class TDTestCase:
             tdSql.execute('insert into tb values (now-15d, 10)')
             tdSql.query('select * from tb')
             rowNum += 1
-            tdSql.checkRows(rowNum )
+            tdSql.checkRows(rowNum)
 
         tdLog.notice('testing keep will be altered if sudden change from big to small')
         tdSql.execute('alter database db keep 16,16,16')
         tdSql.execute('alter database db keep 14,14,14')
         tdSql.error('insert into tb values (now-15d, 10)')
         tdSql.query('select * from tb')
-        tdSql.checkRows(rowNum)
+        tdSql.checkRows(2)
+
+        tdLog.notice('testing data will show up again when keep is being changed to large value')
+        tdSql.execute('alter database db keep 40,40,40')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(63)
 
 
 

tests/pytest/insert/retentionpolicy.py

@@ -71,13 +71,10 @@ class TDTestRetetion:
         tdDnodes.start(1)
         
         tdLog.info(cmd)
+        ttime = datetime.datetime.now()
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        if self.queryRows==4:
-            self.checkRows(4,cmd)
-            return 0
-        else:
-            self.checkRows(5,cmd)
+        self.checkRows(3,cmd)
         tdLog.info("=============== step3")
         tdDnodes.stop(1)
         os.system("date -s '%s'"%(datetime.datetime.now()+datetime.timedelta(hours=48)))
@@ -92,7 +89,7 @@ class TDTestRetetion:
         tdLog.info(cmd)
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        self.checkRows(6,cmd)
+        self.checkRows(3,cmd)
         tdLog.info("=============== step4")
         tdDnodes.stop(1)
         tdDnodes.start(1)
@@ -100,7 +97,7 @@ class TDTestRetetion:
         tdLog.info(cmd)
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        self.checkRows(5,cmd)
+        self.checkRows(4,cmd)
 
         tdLog.info("=============== step5")
         tdDnodes.stop(1)
@@ -109,6 +106,21 @@ class TDTestRetetion:
         self.queryRows=tdSql.query('select * from test where ts > now-1d')
         self.checkRows(2,cmd)
 
+        tdLog.info("=============== step6")
+        tdDnodes.stop(1)
+        os.system("date -s '%s'"%(ttime + datetime.timedelta(seconds=(72*60*60-7))))
+        tdDnodes.start(1)
+        while datetime.datetime.now() < (ttime + datetime.timedelta(seconds=(72*60*60-1))):
+            time.sleep(0.001)
+        cmd = 'select * from test'
+        self.queryRows=tdSql.query(cmd)
+        self.checkRows(4,cmd)
+        while datetime.datetime.now() < (ttime + datetime.timedelta(hours=72)):
+            time.sleep(0.001)
+        cmd = 'select * from test'
+        self.queryRows=tdSql.query(cmd)
+        self.checkRows(3,cmd)
+
     def stop(self):
         os.system("sudo timedatectl set-ntp true")
         os.system("date -s '%s'"%(datetime.datetime.now()+datetime.timedelta(hours=1)))