Skip to content

T
TDengine

慢慢CG / TDengine
与 Fork 源项目一致

Fork自 taosdata / TDengine

通知 1
Star 0
Fork 0
T
TDengine
未验证 提交 0cffdb00 编写于 作者: S slguan 提交者： GitHub
浏览文件
操作

Merge pull request #1830 from taosdata/hotfix/change-rows-to-maxrows-to-match-2.0s-change 

Hotfix/change rows to maxrows to match 2.0s change
上级 077d9952 bb075068
隐藏空白更改
内联 并排
Showing with 87 addition and 82 deletion
tests/pytest/fulltest.sh
浏览文件 @ 0cffdb00
...@@ -9,6 +9,11 @@ python3 ./test.py $1 -f insert/smallint.py ...@@ -9,6 +9,11 @@ python3 ./test.py $1 -f insert/smallint.py
python3 ./test.py $1 -f insert/tinyint.py python3 ./test.py $1 -f insert/tinyint.py
python3 ./test.py $1 -f insert/date.py python3 ./test.py $1 -f insert/date.py
python3 ./test.py $1 -f insert/binary.py python3 ./test.py $1 -f insert/binary.py
python3 ./test.py $1 -f table/column_name.py
python3 ./test.py $1 -f table/column_num.py
python3 ./test.py $1 -f table/db_table.py
python3 ./test.py $1 -f import_merge/importBlock1HO.py python3 ./test.py $1 -f import_merge/importBlock1HO.py
python3 ./test.py $1 -f import_merge/importBlock1HPO.py python3 ./test.py $1 -f import_merge/importBlock1HPO.py
python3 ./test.py $1 -f import_merge/importBlock1H.py python3 ./test.py $1 -f import_merge/importBlock1H.py
......
tests/pytest/import_merge/importDataH2.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,19 +43,19 @@ class TDTestCase: ...@@ -43,19 +43,19 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import %d sequential data" % (self.rows / 2)) tdLog.info("import %d sequential data" % (self.maxrows / 2))
startTime = self.startTime startTime = self.startTime
sqlcmd = ['import into tb1 values'] sqlcmd = ['import into tb1 values']
for rid in range(1, self.rows / 2 + 1): for rid in range(1, self.maxrows / 2 + 1):
sqlcmd.append('(%ld, %d)' % (startTime + rid, rid)) sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
tdSql.execute(" ".join(sqlcmd)) tdSql.execute(" ".join(sqlcmd))
tdLog.info("================= step3") tdLog.info("================= step3")
tdSql.query('select * from tb1') tdSql.query('select * from tb1')
tdSql.checkRows(self.rows / 2) tdSql.checkRows(self.maxrows / 2)
tdLog.info("================= step4") tdLog.info("================= step4")
tdDnodes.stop(1) tdDnodes.stop(1)
...@@ -70,7 +70,7 @@ class TDTestCase: ...@@ -70,7 +70,7 @@ class TDTestCase:
tdLog.info("================= step7") tdLog.info("================= step7")
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.query('select * from tb1 order by ts desc') tdSql.query('select * from tb1 order by ts desc')
tdSql.checkRows(self.rows / 2 + 1) tdSql.checkRows(self.maxrows / 2 + 1)
tdLog.info("================= step8") tdLog.info("================= step8")
tdLog.info("import 10 data in batch before") tdLog.info("import 10 data in batch before")
...@@ -83,7 +83,7 @@ class TDTestCase: ...@@ -83,7 +83,7 @@ class TDTestCase:
tdLog.info("================= step9") tdLog.info("================= step9")
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.query('select * from tb1 order by ts desc') tdSql.query('select * from tb1 order by ts desc')
tdSql.checkRows(self.rows / 2 + 11) tdSql.checkRows(self.maxrows / 2 + 11)
def stop(self): def stop(self):
tdSql.close() tdSql.close()
......
tests/pytest/import_merge/importDataHO.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxwrows = 200
self.rowsPerTable = 20 self.rowsPerTable = 20
tdDnodes.stop(1) tdDnodes.stop(1)
...@@ -36,7 +36,7 @@ class TDTestCase: ...@@ -36,7 +36,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -44,7 +44,7 @@ class TDTestCase: ...@@ -44,7 +44,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import %d sequential data" % self.rowsPerTable) tdLog.info("import %d sequential data" % self.rowsPerTable)
......
tests/pytest/import_merge/importDataHO2.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
self.rowsPerTable = 100 self.rowsPerTable = 100
tdDnodes.stop(1) tdDnodes.stop(1)
...@@ -36,7 +36,7 @@ class TDTestCase: ...@@ -36,7 +36,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -44,7 +44,7 @@ class TDTestCase: ...@@ -44,7 +44,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import %d sequential data" % self.rowsPerTable) tdLog.info("import %d sequential data" % self.rowsPerTable)
......
tests/pytest/import_merge/importDataHPO.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
self.rowsPerTable = 20 self.rowsPerTable = 20
tdDnodes.stop(1) tdDnodes.stop(1)
...@@ -36,7 +36,7 @@ class TDTestCase: ...@@ -36,7 +36,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -44,7 +44,7 @@ class TDTestCase: ...@@ -44,7 +44,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import %d sequential data" % self.rowsPerTable) tdLog.info("import %d sequential data" % self.rowsPerTable)
......
tests/pytest/import_merge/importDataLastH.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,7 +43,7 @@ class TDTestCase: ...@@ -43,7 +43,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastHO.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,7 +43,7 @@ class TDTestCase: ...@@ -43,7 +43,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastHPO.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,7 +43,7 @@ class TDTestCase: ...@@ -43,7 +43,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastS.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,7 +43,7 @@ class TDTestCase: ...@@ -43,7 +43,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastSub.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,7 +43,7 @@ class TDTestCase: ...@@ -43,7 +43,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastT.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastTO.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataLastTPO.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than %d rows less than %d rows will go to data and last file" % "More than %d rows less than %d rows will go to data and last file" %
(self.rows, 10 + self.rows)) (self.maxrows, 10 + self.maxrows))
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 205 sequential data") tdLog.info("import 205 sequential data")
......
tests/pytest/import_merge/importDataS.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 20 sequential data") tdLog.info("import 20 sequential data")
......
tests/pytest/import_merge/importDataSub.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -43,19 +43,19 @@ class TDTestCase: ...@@ -43,19 +43,19 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import %d sequential data" % (self.rows / 2)) tdLog.info("import %d sequential data" % (self.maxrows / 2))
startTime = self.startTime startTime = self.startTime
sqlcmd = ['import into tb1 values'] sqlcmd = ['import into tb1 values']
for rid in range(1, self.rows / 2 + 1): for rid in range(1, self.maxrows / 2 + 1):
sqlcmd.append('(%ld, %d)' % (startTime + rid, rid)) sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
tdSql.execute(" ".join(sqlcmd)) tdSql.execute(" ".join(sqlcmd))
tdLog.info("================= step3") tdLog.info("================= step3")
tdSql.query('select * from tb1') tdSql.query('select * from tb1')
tdSql.checkRows(self.rows / 2) tdSql.checkRows(self.maxrows / 2)
tdLog.info("================= step4") tdLog.info("================= step4")
tdDnodes.stop(1) tdDnodes.stop(1)
...@@ -73,7 +73,7 @@ class TDTestCase: ...@@ -73,7 +73,7 @@ class TDTestCase:
tdLog.info("================= step9") tdLog.info("================= step9")
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.query('select * from tb1 order by ts desc') tdSql.query('select * from tb1 order by ts desc')
tdSql.checkRows(self.rows / 2) tdSql.checkRows(self.maxrows / 2)
def stop(self): def stop(self):
tdSql.close() tdSql.close()
......
tests/pytest/import_merge/importDataT.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 20 sequential data") tdLog.info("import 20 sequential data")
......
tests/pytest/import_merge/importDataTO.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 20 sequential data") tdLog.info("import 20 sequential data")
......
tests/pytest/import_merge/importDataTPO.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
...@@ -39,7 +39,7 @@ class TDTestCase: ...@@ -39,7 +39,7 @@ class TDTestCase:
tdSql.execute('create table tb1 (ts timestamp, speed int)') tdSql.execute('create table tb1 (ts timestamp, speed int)')
tdLog.info( tdLog.info(
"More than 10 rows less than %d rows will go to data file" % "More than 10 rows less than %d rows will go to data file" %
self.rows) self.maxrows)
tdLog.info("================= step2") tdLog.info("================= step2")
tdLog.info("import 20 sequential data") tdLog.info("import 20 sequential data")
......
tests/pytest/import_merge/importLastH.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastHO.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastHPO.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastS.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastSub.py
浏览文件 @ 0cffdb00
...@@ -27,11 +27,11 @@ class TDTestCase: ...@@ -27,11 +27,11 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastT.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastTO.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/import_merge/importLastTPO.py
浏览文件 @ 0cffdb00
...@@ -27,7 +27,7 @@ class TDTestCase: ...@@ -27,7 +27,7 @@ class TDTestCase:
def run(self): def run(self):
self.ntables = 1 self.ntables = 1
self.startTime = 1520000010000 self.startTime = 1520000010000
self.rows = 200 self.maxrows = 200
tdDnodes.stop(1) tdDnodes.stop(1)
tdDnodes.deploy(1) tdDnodes.deploy(1)
...@@ -35,7 +35,7 @@ class TDTestCase: ...@@ -35,7 +35,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db rows %d' % self.rows) tdSql.execute('create database db maxrows %d' % self.maxrows)
tdSql.execute('use db') tdSql.execute('use db')
tdLog.info("================= step1") tdLog.info("================= step1")
......
tests/pytest/smoketest.sh
浏览文件 @ 0cffdb00
...@@ -34,12 +34,12 @@ python3 ./test.py $1 -f table/db_table.py ...@@ -34,12 +34,12 @@ python3 ./test.py $1 -f table/db_table.py
python3 ./test.py -s $1 python3 ./test.py -s $1
sleep 1 sleep 1
#python3 ./test.py $1 -f import_merge/importDataLastTO.py python3 ./test.py $1 -f import_merge/importDataLastTO.py
#python3 ./test.py -s $1 python3 ./test.py -s $1
#sleep 1 sleep 1
#python3 ./test.py $1 -f import_merge/importDataLastT.py python3 ./test.py $1 -f import_merge/importDataLastT.py
#python3 ./test.py -s $1 python3 ./test.py -s $1
#sleep 1 sleep 1
python3 ./test.py $1 -f import_merge/importDataTO.py python3 ./test.py $1 -f import_merge/importDataTO.py
python3 ./test.py -s $1 python3 ./test.py -s $1
sleep 1 sleep 1
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或