Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
eb8ca83b
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eb8ca83b
编写于
2月 22, 2021
作者:
sangshuduo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-2984] <fix>: combine taosdemo and taosdemox.
上级
0dc94d66
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
12 deletion
+18
-12
tests/pytest/tools/taosdemoTest.py
tests/pytest/tools/taosdemoTest.py
+11
-6
tests/pytest/tools/taosdemoTest2.py
tests/pytest/tools/taosdemoTest2.py
+7
-6
未找到文件。
tests/pytest/tools/taosdemoTest.py
浏览文件 @
eb8ca83b
...
...
@@ -23,9 +23,10 @@ class TDTestCase:
def
init
(
self
,
conn
,
logSql
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
(),
logSql
)
self
.
numberOfTables
=
10000
self
.
numberOfRecords
=
100
def
getBuildPath
(
self
):
selfPath
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
))
...
...
@@ -38,9 +39,10 @@ class TDTestCase:
if
(
"taosd"
in
files
):
rootRealPath
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
root
))
if
(
"packaging"
not
in
rootRealPath
):
buildPath
=
root
[:
len
(
root
)
-
len
(
"/build/bin"
)]
buildPath
=
root
[:
len
(
root
)
-
len
(
"/build/bin"
)]
break
return
buildPath
def
run
(
self
):
tdSql
.
prepare
()
buildPath
=
self
.
getBuildPath
()
...
...
@@ -48,17 +50,20 @@ class TDTestCase:
tdLog
.
exit
(
"taosd not found!"
)
else
:
tdLog
.
info
(
"taosd found in %s"
%
buildPath
)
binPath
=
buildPath
+
"/build/bin/"
os
.
system
(
"%staosdemo -y -M -t %d -n %d -x"
%
(
binPath
,
self
.
numberOfTables
,
self
.
numberOfRecords
))
binPath
=
buildPath
+
"/build/bin/"
os
.
system
(
"%staosdemo -y -M -t %d -n %d -x"
%
(
binPath
,
self
.
numberOfTables
,
self
.
numberOfRecords
))
tdSql
.
execute
(
"use test"
)
tdSql
.
query
(
"select count(*) from meters"
)
tdSql
.
checkData
(
0
,
0
,
self
.
numberOfTables
*
self
.
numberOfRecords
)
tdSql
.
query
(
"select sum(col1) from test.meters interval(1h) sliding(30m)"
)
tdSql
.
query
(
"select sum(col1) from test.meters interval(1h) sliding(30m)"
)
tdSql
.
checkRows
(
2
)
tdSql
.
query
(
"select apercentile(col1, 1) from test.meters interval(10s)"
)
tdSql
.
query
(
"select apercentile(col1, 1) from test.meters interval(10s)"
)
tdSql
.
checkRows
(
1
)
tdSql
.
error
(
"select loc, count(loc) from test.meters"
)
...
...
tests/pytest/tools/taosdemoTest2.py
浏览文件 @
eb8ca83b
...
...
@@ -31,11 +31,12 @@ class TDTestCase:
def
insertDataAndAlterTable
(
self
,
threadID
):
if
(
threadID
==
0
):
os
.
system
(
"yes | taosdemo -t %d -n %d -x"
%
(
self
.
numberOfTables
,
self
.
numberOfRecords
))
os
.
system
(
"taosdemo -y -t %d -n %d -x"
%
(
self
.
numberOfTables
,
self
.
numberOfRecords
))
if
(
threadID
==
1
):
time
.
sleep
(
2
)
print
(
"use test"
)
tdSql
.
execute
(
"use test"
)
tdSql
.
execute
(
"use test"
)
# check if all the tables have heen created
while
True
:
tdSql
.
query
(
"show tables"
)
...
...
@@ -52,19 +53,19 @@ class TDTestCase:
print
(
"number of records: %d"
%
rows
)
if
(
rows
>
0
):
break
time
.
sleep
(
1
)
time
.
sleep
(
1
)
print
(
"alter table test.meters add column f4 int"
)
tdSql
.
execute
(
"alter table test.meters add column f4 int"
)
print
(
"insert into test.t0 values (now, 1, 2, 3, 4)"
)
tdSql
.
execute
(
"insert into test.t0 values (now, 1, 2, 3, 4)"
)
def
run
(
self
):
def
run
(
self
):
tdSql
.
prepare
()
t1
=
threading
.
Thread
(
target
=
self
.
insertDataAndAlterTable
,
args
=
(
0
,
))
t2
=
threading
.
Thread
(
target
=
self
.
insertDataAndAlterTable
,
args
=
(
1
,
))
t1
.
start
()
t1
.
start
()
t2
.
start
()
t1
.
join
()
t2
.
join
()
...
...
@@ -78,4 +79,4 @@ class TDTestCase:
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
\ No newline at end of file
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录