update diff.py

a6ee0cd3 · jiacy-jcy · 95fe22db · a6ee0cd3 · a6ee0cd3
隐藏空白更改
内联并排

Showing with 52 addition and 58 deletion

tests/system-test/2-query/diff.py tests/system-test/2-query/diff.py +51 -57

tests/system-test/fulltest.sh tests/system-test/fulltest.sh +1 -1

未找到文件。
--- a/tests/system-test/2-query/diff.py
+++ b/tests/system-test/2-query/diff.py
@@ -15,59 +15,51 @@ class TDTestCase:
        self.perfix = 'dev'
        self.tables = 10

-    def insertData(self):
-        print("==============step1")
-        tdSql.execute(
-            "create table if not exists st (ts timestamp, col int) tags(dev nchar(50))")
-
-        for i in range(self.tables):
-            tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i))
-            rows = 15 + i
-            for j in range(rows):
-                tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, self.ts + i * 20 * 10000 + j * 10000, j))

    def run(self):
        tdSql.prepare()
-        tdSql.execute("create table ntb(ts timestamp,c1 int,c2 double,c3 float)")
-        tdSql.execute("insert into ntb values(now,1,1.0,10.5)(now+1s,10,-100.0,5.1)(now+10s,-1,15.1,5.0)")
+        tdSql.execute(
+            "create table ntb(ts timestamp,c1 int,c2 double,c3 float)")
+        tdSql.execute(
+            "insert into ntb values(now,1,1.0,10.5)(now+1s,10,-100.0,5.1)(now+10s,-1,15.1,5.0)")

        tdSql.query("select diff(c1,0) from ntb")
        tdSql.checkRows(2)
-        tdSql.checkData(0,0,9)
-        tdSql.checkData(1,0,-11)
+        tdSql.checkData(0, 0, 9)
+        tdSql.checkData(1, 0, -11)
        tdSql.query("select diff(c1,1) from ntb")
        tdSql.checkRows(2)
-        tdSql.checkData(0,0,9)
-        tdSql.checkData(1,0,None)
-        
+        tdSql.checkData(0, 0, 9)
+        tdSql.checkData(1, 0, None)
+
        tdSql.query("select diff(c2,0) from ntb")
        tdSql.checkRows(2)
-        tdSql.checkData(0,0,-101)
-        tdSql.checkData(1,0,115.1)
+        tdSql.checkData(0, 0, -101)
+        tdSql.checkData(1, 0, 115.1)
        tdSql.query("select diff(c2,1) from ntb")
        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.checkData(1,0,115.1)
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, 115.1)

        tdSql.query("select diff(c3,0) from ntb")
        tdSql.checkRows(2)
-        tdSql.checkData(0,0,-5.4)
-        tdSql.checkData(1,0,-0.1)
+        tdSql.checkData(0, 0, -5.4)
+        tdSql.checkData(1, 0, -0.1)
        tdSql.query("select diff(c3,1) from ntb")
        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.checkData(1,0,None)
-
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, None)

        tdSql.execute('''create table stb(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
                    col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''')
        tdSql.execute("create table stb_1 using stb tags('beijing')")
-        tdSql.execute("insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1))
-        
-        # diff verifacation 
+        tdSql.execute(
+            "insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1))
+
+        # diff verifacation
        tdSql.query("select diff(col1) from stb_1")
        tdSql.checkRows(0)
-        
+
        tdSql.query("select diff(col2) from stb_1")
        tdSql.checkRows(0)

@@ -87,38 +79,23 @@ class TDTestCase:
        tdSql.checkRows(0)

        for i in range(self.rowNum):
-            tdSql.execute("insert into stb_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" 
-                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))                                
-        
-        # tdSql.error("select diff(ts) from stb")
+            tdSql.execute("insert into stb_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+
+        tdSql.error("select diff(ts) from stb")
        tdSql.error("select diff(ts) from stb_1")
-        # tdSql.error("select diff(col7) from stb")     
-                       
-        # tdSql.error("select diff(col8) from stb") 
+
+        # tdSql.error("select diff(col7) from stb")
+
+        tdSql.error("select diff(col8) from stb")
        tdSql.error("select diff(col8) from stb_1")
-        # tdSql.error("select diff(col9) from stb")        
+        tdSql.error("select diff(col9) from stb")
        tdSql.error("select diff(col9) from stb_1")
        tdSql.error("select diff(col11) from stb_1")
        tdSql.error("select diff(col12) from stb_1")
        tdSql.error("select diff(col13) from stb_1")
        tdSql.error("select diff(col14) from stb_1")
-
-        tdSql.query("select ts,diff(col1),ts from stb_1")
-        tdSql.checkRows(11)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.000")
-        tdSql.checkData(1, 2, "2018-09-17 09:00:00.000")
-        tdSql.checkData(9, 0, "2018-09-17 09:00:00.009")
-        tdSql.checkData(9, 2, "2018-09-17 09:00:00.009")
-
-        # tdSql.query("select ts,diff(col1),ts from stb group by tbname")
-        # tdSql.checkRows(10)
-        # tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
-        # tdSql.checkData(0, 1, "2018-09-17 09:00:00.000")
-        # tdSql.checkData(0, 3, "2018-09-17 09:00:00.000")
-        # tdSql.checkData(9, 0, "2018-09-17 09:00:00.009")
-        # tdSql.checkData(9, 1, "2018-09-17 09:00:00.009")
-        # tdSql.checkData(9, 3, "2018-09-17 09:00:00.009")
+        tdSql.error("select ts,diff(col1),ts from stb_1")

        tdSql.query("select diff(col1) from stb_1")
        tdSql.checkRows(10)
@@ -137,10 +114,27 @@ class TDTestCase:

        tdSql.query("select diff(col6) from stb_1")
        tdSql.checkRows(10)
-        
+
+        tdSql.execute('''create table stb1(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''')
+        tdSql.execute("create table stb1_1 using stb tags('shanghai')")
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into stb1_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+        for i in range(self.rowNum):
+            tdSql.execute("insert into stb1_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+                          % (self.ts - i-1, i-1, i-1, i-1, i-1, -i - 0.1, -i - 0.1, -i % 2, i - 1, i - 1, i + 1, i + 1, i + 1, i + 1))
+        tdSql.query("select diff(col1,0) from stb1_1")
+        tdSql.checkRows(19)
+        tdSql.query("select diff(col1,1) from stb1_1")
+        tdSql.checkRows(19)
+        tdSql.checkData(0,0,None)
+
    def stop(self):
        tdSql.close()
        tdLog.success("%s successfully executed" % __file__)

+
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -43,7 +43,7 @@ python3 ./test.py -f 2-query/last.py
 #python3 ./test.py -f 2-query/To_iso8601.py
 python3 ./test.py -f 2-query/To_unixtimestamp.py
 python3 ./test.py -f 2-query/timetruncate.py
-# python3 ./test.py -f 2-query/diff.py
+python3 ./test.py -f 2-query/diff.py
 python3 ./test.py -f 2-query/Timediff.py
 #python3 ./test.py -f 2-query/cast.py