Merge pull request #8775 from taosdata/test/TD-10776-m

[TD-10776]<test>outer fill error

tests/pytest/query/nestedQuery/nestedQuery.py

@@ -470,9 +470,9 @@ class TDTestCase:
 
         #inter  && calc_aggregate_all\calc_aggregate_regular\calc_select_all
         interval_sliding = ['interval(4w) sliding(1w) ','interval(1w) sliding(1d) ','interval(1d) sliding(1h) ' ,
-                    'interval(1h) sliding(1m) ','interval(1m) sliding(1s) ','interval(1s) sliding(10a) ',
-                    'interval(1y) ','interval(1n) ','interval(1w) ','interval(1d) ','interval(1h) ','interval(1m) ','interval(1s) ' ,'interval(10a)',
-                    'interval(1y,1n) ','interval(1n,1w) ','interval(1w,1d) ','interval(1d,1h) ','interval(1h,1m) ','interval(1m,1s) ','interval(1s,10a) ' ,'interval(100a,30a)']
+                    'interval(1h) sliding(1m) ','interval(1m) sliding(1s) ','interval(1s) sliding(100a) ',
+                    'interval(1y) ','interval(1n) ','interval(1w) ','interval(1d) ','interval(1h) ','interval(1m) ','interval(1s) ' ,'interval(100a)',
+                    'interval(1y,1n) ','interval(1n,1w) ','interval(1w,1d) ','interval(1d,1h) ','interval(1h,1m) ','interval(1m,1s) ','interval(1s,100a) ' ,'interval(100a,30a)']
 
         #1 select * from (select column form regular_table where <\>\in\and\or order by)
         tdSql.query("select 1-1 from table_0;")
@@ -488,11 +488,10 @@ class TDTestCase:
             tdLog.info(len(sql))      
             tdSql.query(sql)
             #tdSql.checkData(0,0,'2020-09-13 20:26:40.000')
-            tdSql.checkRows(6*self.num)
-            
+            tdSql.checkRows(6*self.num)       
 
         #1 outer union not support        
-        dcDB = self.dropandcreateDB(random.randint(1,3))
+        #dcDB = self.dropandcreateDB(random.randint(1,3))
         tdSql.query("select 1-2 from table_0;")
         for i in range(self.fornum):
             sql = "select  ts , * from  ( select  "
@@ -2114,6 +2113,57 @@ class TDTestCase:
             tdLog.info(len(sql))      
             tdSql.query(sql)
 
+        tdSql.query("select 21-1 from table_0;")
+        for i in range(self.fornum):
+            sql = "select   avg(res1),min(res2),max(res3) from  ( select  " 
+            sql += "%s res1, " % random.choice(calc_aggregate_all)
+            sql += "%s res2," % random.choice(calc_aggregate_all) 
+            sql += "%s res3 " % random.choice(calc_aggregate_all) 
+            sql += " from regular_table_1 t1  "
+            sql += " where %s " % random.choice(q_where)
+            sql += " %s ) " % random.choice(interval_sliding)          
+            sql += " where ts >now-10h and ts < now+10h  "
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(fill_where)     
+            sql += "%s ;" % random.choice(limit_where)      
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+
+        tdSql.query("select 21-2 from table_0;")
+        for i in range(self.fornum):
+            sql = "select   avg(res1),min(res2),max(res3) from  ( select  " 
+            sql += "%s res1, " % random.choice(calc_aggregate_all)
+            sql += "%s res2," % random.choice(calc_aggregate_all) 
+            sql += "%s res3 " % random.choice(calc_aggregate_all) 
+            sql += " from table_1 t1  "
+            sql += " where %s " % random.choice(q_where)
+            sql += " %s ) " % random.choice(interval_sliding)          
+            sql += " where ts >now-10h and ts < now+10h  "
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(fill_where)   
+            sql += "%s ;" % random.choice([limit_where[2] , limit_where[3]] )         
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)
+
+        tdSql.query("select 21-3 from table_0;")
+        for i in range(self.fornum):
+            sql = "select   avg(res1),min(res2),max(res3) from  ( select  " 
+            sql += "%s res1, " % random.choice(calc_aggregate_all)
+            sql += "%s res2," % random.choice(calc_aggregate_all) 
+            sql += "%s res3 " % random.choice(calc_aggregate_all) 
+            sql += " from stable_1 t1  "
+            sql += " where %s " % random.choice(q_where)
+            sql += " %s ) " % random.choice(interval_sliding)          
+            sql += " where ts >now-10h and ts < now+10h  "
+            sql += "%s " % random.choice(interval_sliding)
+            sql += "%s " % random.choice(fill_where)   
+            sql += "%s ;" % random.choice(limit_where)         
+            tdLog.info(sql) 
+            tdLog.info(len(sql))      
+            tdSql.query(sql)     
+
         # error
         #1 select * from (select * from (select * form regular_table  where <\>\in\and\or order by limit  ))
         tdSql.query("select 1-1 from table_1;")