[TD-1389]<test>: update query null value test

tests/pytest/query/queryNullValueTest.py

@@ -25,7 +25,7 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
         
-        self.numOfRecords = 10
+        self.types = ["tinyint", "smallint", "int", "bigint", "float", "double", "bool", "binary(10)", "nchar(10)"]
         self.ts = 1537146000000
 
     def checkNullValue(self, result):
@@ -38,139 +38,41 @@ class TDTestCase:
                     return False
         return True
     
-    def restartTaosd(self):
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
-        tdSql.execute("use db")
-
     def run(self):
         tdSql.prepare()
         
-        print("==============step1")
+        for i in range(len(self.types)):
+            print("======== checking type %s ==========" % self.types[i])
+            tdSql.execute("create table t0 (ts timestamp, col %s)" % self.types[i])
+            tdSql.execute("insert into t0 values (%d, NULL)" % (self.ts))
             
-        tdSql.execute(
+            tdDnodes.stop(1)
-            "create table meters (ts timestamp, col1 int) tags(tgcol1 int)")
+            tdLog.sleep(10)
-        tdSql.execute("create table t0 using meters tags(NULL)")
+            tdDnodes.start(1)
-
+            tdSql.execute("use db")
-        for i in range (self.numOfRecords):
+            tdSql.query("select * from t0")
-            tdSql.execute("insert into t0 values (%d, %d)" % (self.ts + i, i));
-
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col2 tinyint")
-        tdSql.execute("alter table meters drop column col1")        
-        tdSql.query("select * from meters")        
-        tdSql.checkRows(10)
-        tdSql.query("select col2 from meters")        
-        tdSql.checkRows(10)        
-
-        tdSql.execute("alter table meters add column col1 int")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col1 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col3 smallint")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col3 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col4 bigint")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col4 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col5 float")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col5 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col6 double")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col6 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col7 bool")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col7 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col8 binary(20)")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col8 from meters")        
-        tdSql.checkRows(10)
-
-        tdSql.execute("alter table meters add column col9 nchar(20)")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select col9 from meters")        
-        tdSql.checkRows(10)
-        
-        tdSql.execute("alter table meters add tag tgcol2 tinyint")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol2 from meters")
             tdSql.checkRows(1)
 
-
-        tdSql.execute("alter table meters add tag tgcol3 smallint")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol3 from meters")
-        tdSql.checkRows(1)
-        
-
-        tdSql.execute("alter table meters add tag tgcol4 bigint")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol4 from meters")
-        tdSql.checkRows(1)
-
-        tdSql.execute("alter table meters add tag tgcol5 float")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol5 from meters")
-        tdSql.checkRows(1)
-
-        tdSql.execute("alter table meters add tag tgcol6 double")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol6 from meters")
-        tdSql.checkRows(1)
-
-        tdSql.execute("alter table meters add tag tgcol7 bool")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol7 from meters")
-        tdSql.checkRows(1)
-
-        tdSql.execute("alter table meters add tag tgcol8 binary(20)")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol8 from meters")
-        tdSql.checkRows(1)
-
-        tdSql.execute("alter table meters add tag tgcol9 nchar(20)")
-        tdSql.query("select * from meters")
-        tdSql.checkRows(10)
-        tdSql.query("select tgcol9 from meters")
-        tdSql.checkRows(1)
-
-        self.restartTaosd()
-        tdSql.query("select * from meters")        
-        tdSql.checkRows(10)
             if self.checkNullValue(tdSql.queryResult) is False:
-            tdLog.exit("non None value is detected")
+                tdLog.exit("no None value is detected")
 
+            tdSql.execute("create table t1 (ts timestamp, col %s)" % self.types[i])
+            tdSql.execute("insert into t1 values (%d, NULL)" % (self.ts))
+            tdDnodes.stop(1)
+            tdLog.sleep(10)
+            tdDnodes.start(1)
+            tdSql.execute("use db")
 
+            for j in range(150):
+                tdSql.execute("insert into t1 values (%d, NULL)" % (self.ts + j + 1));
             
+            tdSql.query("select * from t1")
+            tdSql.checkRows(151)
+
+            if self.checkNullValue(tdSql.queryResult) is False:
+                tdLog.exit("no None value is detected")
+
+            print("======== None value check for type %s is OK ==========" % self.types[i])
 
     def stop(self):
         tdSql.close()