未验证 提交 34017bd9 编写于 作者: Y Yiqing Liu 提交者: GitHub

Merge branch '2.0' into fix/TS-343

......@@ -18213,4 +18213,5 @@
obj:/usr/bin/python3.8
fun:PyVectorcall_Call
fun:_PyEval_EvalFrameDefault
}
\ No newline at end of file
......@@ -22,7 +22,7 @@
"cache": 50,
"blocks": 8,
"precision": "ms",
"keep": 365,
"keep": 36500,
"minRows": 100,
"maxRows": 4096,
"comp":2,
......
......@@ -13,6 +13,7 @@
import sys
import os
import time
from util.log import *
from util.cases import *
from util.sql import *
......@@ -24,6 +25,10 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
now = time.time()
print(int(round(now * 1000)))
self.ts = int(round(now * 1000))
def getBuildPath(self):
selfPath = os.path.dirname(os.path.realpath(__file__))
......@@ -50,6 +55,7 @@ class TDTestCase:
# insert: create one or mutiple tables per sql and insert multiple rows per sql
# test case for https://jira.taosdata.com:18080/browse/TD-4985
os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
os.system("%staosdemo -f tools/taosdemoAllTest/TD-4985/query-limit-offset.json -y " % binPath)
tdSql.execute("use db")
tdSql.query("select count (tbname) from stb0")
......@@ -57,127 +63,126 @@ class TDTestCase:
for i in range(1000):
tdSql.execute('''insert into stb00_9999 values(%d, %d, %d,'test99.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_8888 values(%d, %d, %d,'test98.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_7777 values(%d, %d, %d,'test97.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_6666 values(%d, %d, %d,'test96.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_5555 values(%d, %d, %d,'test95.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_4444 values(%d, %d, %d,'test94.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_3333 values(%d, %d, %d,'test93.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_2222 values(%d, %d, %d,'test92.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_1111 values(%d, %d, %d,'test91.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_100 values(%d, %d, %d,'test90.%s')'''
% (1600000000000 + i, i, -10000+i, i))
% (self.ts + i, i, -10000+i, i))
tdSql.query("select * from stb0 where c2 like 'test99%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_9999' limit 10" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_9999' limit 10 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test98%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_8888' limit 10" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_8888' limit 10 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test97%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_7777' limit 10" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_7777' limit 10 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test96%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_6666' limit 10" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_6666' limit 10 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test95%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_5555' limit 10" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_5555' limit 10 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test94%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_4444' limit 10" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_4444' limit 10 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test93%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_3333' limit 100" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_3333' limit 100 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test92%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_2222' limit 100" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_2222' limit 100 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test91%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_1111' limit 100" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_1111' limit 100 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
tdSql.query("select * from stb0 where c2 like 'test90%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_100' limit 100" )
tdSql.checkData(0, 1, 0)
tdSql.checkData(1, 1, 1)
tdSql.checkData(2, 1, 2)
tdSql.query("select * from stb0 where tbname like 'stb00_100' limit 100 offset 5" )
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
# tdSql.query("select * from stb0 where tbname like 'stb00_9999' limit 10" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_9999' limit 10 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test98%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_8888' limit 10" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_8888' limit 10 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test97%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_7777' limit 10" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_7777' limit 10 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test96%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_6666' limit 10" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_6666' limit 10 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test95%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_5555' limit 10" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_5555' limit 10 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test94%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_4444' limit 10" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_4444' limit 10 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test93%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_3333' limit 100" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_3333' limit 100 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test92%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_2222' limit 100" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_2222' limit 100 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test91%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_1111' limit 100" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_1111' limit 100 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
# tdSql.query("select * from stb0 where c2 like 'test90%' ")
# tdSql.checkRows(1000)
# tdSql.query("select * from stb0 where tbname like 'stb00_100' limit 100" )
# tdSql.checkData(0, 1, 0)
# tdSql.checkData(1, 1, 1)
# tdSql.checkData(2, 1, 2)
# tdSql.query("select * from stb0 where tbname like 'stb00_100' limit 100 offset 5" )
# tdSql.checkData(0, 1, 5)
# tdSql.checkData(1, 1, 6)
# tdSql.checkData(2, 1, 7)
def stop(self):
tdSql.close()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册