Merge pull request #6411 from taosdata/xiaoping/add_test_case

update test case

tests/pytest/query/last_row_cache.py

@@ -141,7 +141,7 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
         
-        print("============== last_row_cache_0.sim")
+        print("============== Step1:  last_row_cache_0.sim")
         tdSql.execute("create database test1 cachelast 0")
         tdSql.execute("use test1")
         self.insertData()
@@ -149,43 +149,48 @@ class TDTestCase:
         self.insertData2()
         self.executeQueries2()
 
-        print("============== alter last cache")
+        print("============== Step2: alter database test1 cachelast 1")
         tdSql.execute("alter database test1 cachelast 1")                
         self.executeQueries2()
         
+        print("============== Step3: alter database test1 cachelast 2")
         tdSql.execute("alter database test1 cachelast 2")                
         self.executeQueries2()
 
+        print("============== Step4: alter database test1 cachelast 3")
         tdSql.execute("alter database test1 cachelast 3")                
         self.executeQueries2()                
 
         
-        print("============== alter last cache")
+        print("============== Step5: alter database test1 cachelast 0 and restart taosd")
         tdSql.execute("alter database test1 cachelast 0")                
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step6: alter database test1 cachelast 1 and restart taosd")
         tdSql.execute("alter database test1 cachelast 1")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step7: alter database test1 cachelast 2 and restart taosd")
         tdSql.execute("alter database test1 cachelast 2")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step8: alter database test1 cachelast 3 and restart taosd")
         tdSql.execute("alter database test1 cachelast 3")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
-        print("============== last_row_cache_1.sim")
+        print("============== Step9: create database test2 cachelast 1")
         tdSql.execute("create database test2 cachelast 1")
         tdSql.execute("use test2")
         self.insertData()
@@ -196,42 +201,51 @@ class TDTestCase:
         tdDnodes.start(1)
         self.executeQueries2()
         
+        print("============== Step8: alter database test2 cachelast 0")
         tdSql.execute("alter database test2 cachelast 0")        
         self.executeQueries2()                
 
+        print("============== Step9: alter database test2 cachelast 1")
         tdSql.execute("alter database test2 cachelast 1")        
         self.executeQueries2()
 
+        print("============== Step10: alter database test2 cachelast 2")
         tdSql.execute("alter database test2 cachelast 2")        
         self.executeQueries2()                
 
+        print("============== Step11: alter database test2 cachelast 3")
         tdSql.execute("alter database test2 cachelast 3")        
         self.executeQueries2()
 
+        print("============== Step12: alter database test2 cachelast 0 and restart taosd")
         tdSql.execute("alter database test2 cachelast 0")        
         self.executeQueries2() 
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()               
 
+        print("============== Step13: alter database test2 cachelast 1 and restart taosd")
         tdSql.execute("alter database test2 cachelast 1")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step14: alter database test2 cachelast 2 and restart taosd")
         tdSql.execute("alter database test2 cachelast 2")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()                
 
+        print("============== Step15: alter database test2 cachelast 3 and restart taosd")
         tdSql.execute("alter database test2 cachelast 3")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
         
+        print("============== Step16: select last_row(*) from st group by tbname")
         tdSql.query("select last_row(*) from st group by tbname")
         tdSql.checkRows(10)        
 

tests/pytest/query/subqueryFilter.py

@@ -68,6 +68,50 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, 1)
 
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val >= 20")
+        tdSql.checkData(0, 0, 2)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val < 20")
+        tdSql.checkData(0, 0, 63)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val <= 20")
+        tdSql.checkData(0, 0, 64)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val = 20")
+        tdSql.checkData(0, 0, 1)
+        
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val > 20")        
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val >= 20")
+        tdSql.checkData(0, 0, 2)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val < 20")
+        tdSql.checkData(0, 0, 63)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val <= 20")
+        tdSql.checkData(0, 0, 64)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val = 20")
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val > 20")        
+        tdSql.checkData(0, 0, 3)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val >= 20")
+        tdSql.checkData(0, 0, 5)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val < 20")
+        tdSql.checkData(0, 0, 60)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val <= 20")
+        tdSql.checkData(0, 0, 62)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val = 20")
+        tdSql.checkData(0, 0, 2)
+
+
+        
         
 
     def stop(self):