Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
b0b119
TDengine
提交
9ac37307
TDengine
项目概览
b0b119
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ac37307
编写于
1月 12, 2021
作者:
sangshuduo
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into feature/sangshuduo/TD-2598-ci-integration
上级
7b476ef7
c93810ac
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
11 deletion
+13
-11
src/kit/taosdemox/subscribe.json
src/kit/taosdemox/subscribe.json
+7
-7
src/kit/taosdemox/taosdemox.c
src/kit/taosdemox/taosdemox.c
+6
-4
未找到文件。
src/kit/taosdemox/subscribe.json
浏览文件 @
9ac37307
...
@@ -5,13 +5,13 @@
...
@@ -5,13 +5,13 @@
"port"
:
6030
,
"port"
:
6030
,
"user"
:
"root"
,
"user"
:
"root"
,
"password"
:
"taosdata"
,
"password"
:
"taosdata"
,
"databases"
:
"db
01
"
,
"databases"
:
"db"
,
"s
uper
_table_query"
:
"s
pecified
_table_query"
:
{
"concurrent"
:
1
,
"mode"
:
"sync"
,
"interval"
:
5000
,
"restart"
:
"yes"
,
"keepProgress"
:
"yes"
,
{
"concurrent"
:
1
,
"mode"
:
"sync"
,
"interval"
:
5000
,
"restart"
:
"yes"
,
"keepProgress"
:
"yes"
,
"sqls"
:
[{
"sql"
:
"select avg(c
1) from stb01 where col1 > 1;"
,
"result"
:
"./subscribe_res0.txt"
}]
"sqls"
:
[{
"sql"
:
"select avg(col
1) from stb01 where col1 > 1;"
,
"result"
:
"./subscribe_res0.txt"
}]
},
},
"su
b
_table_query"
:
"su
per
_table_query"
:
{
"stblname"
:
"stb
01
"
,
"threads"
:
1
,
"mode"
:
"sync"
,
"interval"
:
10000
,
"restart"
:
"yes"
,
"keepProgress"
:
"yes"
,
{
"stblname"
:
"stb"
,
"threads"
:
1
,
"mode"
:
"sync"
,
"interval"
:
10000
,
"restart"
:
"yes"
,
"keepProgress"
:
"yes"
,
"sqls"
:
[{
"sql"
:
"select col1 from xxxx where col1 > 10;"
,
"result"
:
"./subscribe_res1.txt"
}]
"sqls"
:
[{
"sql"
:
"select col1 from xxxx where col1 > 10;"
,
"result"
:
"./subscribe_res1.txt"
}]
}
}
}
}
src/kit/taosdemox/taosdemox.c
浏览文件 @
9ac37307
...
@@ -4269,23 +4269,24 @@ void *subSubscribeProcess(void *sarg) {
...
@@ -4269,23 +4269,24 @@ void *subSubscribeProcess(void *sarg) {
}
while
(
0
);
}
while
(
0
);
// start loop to consume result
// start loop to consume result
TAOS_RES
*
res
=
NULL
;
while
(
1
)
{
while
(
1
)
{
for
(
int
i
=
0
;
i
<
g_queryInfo
.
subQueryInfo
.
sqlCount
;
i
++
)
{
for
(
int
i
=
0
;
i
<
g_queryInfo
.
subQueryInfo
.
sqlCount
;
i
++
)
{
if
(
1
==
g_queryInfo
.
subQueryInfo
.
subscribeMode
)
{
if
(
1
==
g_queryInfo
.
subQueryInfo
.
subscribeMode
)
{
continue
;
continue
;
}
}
TAOS_RES
*
res
=
taos_consume
(
g_queryInfo
.
subQueryInfo
.
tsub
[
i
]);
res
=
taos_consume
(
g_queryInfo
.
subQueryInfo
.
tsub
[
i
]);
if
(
res
)
{
if
(
res
)
{
char
tmpFile
[
MAX_FILE_NAME_LEN
*
2
]
=
{
0
};
char
tmpFile
[
MAX_FILE_NAME_LEN
*
2
]
=
{
0
};
if
(
g_queryInfo
.
subQueryInfo
.
result
[
i
][
0
]
!=
0
)
{
if
(
g_queryInfo
.
subQueryInfo
.
result
[
i
][
0
]
!=
0
)
{
sprintf
(
tmpFile
,
"%s-%d"
,
g_queryInfo
.
subQueryInfo
.
result
[
i
],
winfo
->
threadID
);
sprintf
(
tmpFile
,
"%s-%d"
,
g_queryInfo
.
subQueryInfo
.
result
[
i
],
winfo
->
threadID
);
}
}
getResult
(
res
,
tmpFile
);
getResult
(
res
,
tmpFile
);
taos_free_result
(
res
);
}
}
}
}
}
}
taos_free_result
(
res
);
for
(
int
i
=
0
;
i
<
g_queryInfo
.
subQueryInfo
.
sqlCount
;
i
++
)
{
for
(
int
i
=
0
;
i
<
g_queryInfo
.
subQueryInfo
.
sqlCount
;
i
++
)
{
taos_unsubscribe
(
g_queryInfo
.
subQueryInfo
.
tsub
[
i
],
g_queryInfo
.
subQueryInfo
.
subscribeKeepProgress
);
taos_unsubscribe
(
g_queryInfo
.
subQueryInfo
.
tsub
[
i
],
g_queryInfo
.
subQueryInfo
.
subscribeKeepProgress
);
...
@@ -4328,23 +4329,24 @@ void *superSubscribeProcess(void *sarg) {
...
@@ -4328,23 +4329,24 @@ void *superSubscribeProcess(void *sarg) {
}
while
(
0
);
}
while
(
0
);
// start loop to consume result
// start loop to consume result
TAOS_RES
*
res
=
NULL
;
while
(
1
)
{
while
(
1
)
{
for
(
int
i
=
0
;
i
<
g_queryInfo
.
superQueryInfo
.
sqlCount
;
i
++
)
{
for
(
int
i
=
0
;
i
<
g_queryInfo
.
superQueryInfo
.
sqlCount
;
i
++
)
{
if
(
1
==
g_queryInfo
.
superQueryInfo
.
subscribeMode
)
{
if
(
1
==
g_queryInfo
.
superQueryInfo
.
subscribeMode
)
{
continue
;
continue
;
}
}
TAOS_RES
*
res
=
taos_consume
(
g_queryInfo
.
superQueryInfo
.
tsub
[
i
]);
res
=
taos_consume
(
g_queryInfo
.
superQueryInfo
.
tsub
[
i
]);
if
(
res
)
{
if
(
res
)
{
char
tmpFile
[
MAX_FILE_NAME_LEN
*
2
]
=
{
0
};
char
tmpFile
[
MAX_FILE_NAME_LEN
*
2
]
=
{
0
};
if
(
g_queryInfo
.
superQueryInfo
.
result
[
i
][
0
]
!=
0
)
{
if
(
g_queryInfo
.
superQueryInfo
.
result
[
i
][
0
]
!=
0
)
{
sprintf
(
tmpFile
,
"%s-%d"
,
g_queryInfo
.
superQueryInfo
.
result
[
i
],
winfo
->
threadID
);
sprintf
(
tmpFile
,
"%s-%d"
,
g_queryInfo
.
superQueryInfo
.
result
[
i
],
winfo
->
threadID
);
}
}
getResult
(
res
,
tmpFile
);
getResult
(
res
,
tmpFile
);
taos_free_result
(
res
);
}
}
}
}
}
}
taos_free_result
(
res
);
for
(
int
i
=
0
;
i
<
g_queryInfo
.
superQueryInfo
.
sqlCount
;
i
++
)
{
for
(
int
i
=
0
;
i
<
g_queryInfo
.
superQueryInfo
.
sqlCount
;
i
++
)
{
taos_unsubscribe
(
g_queryInfo
.
superQueryInfo
.
tsub
[
i
],
g_queryInfo
.
superQueryInfo
.
subscribeKeepProgress
);
taos_unsubscribe
(
g_queryInfo
.
superQueryInfo
.
tsub
[
i
],
g_queryInfo
.
superQueryInfo
.
subscribeKeepProgress
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录