Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
TDengine
提交
35976735
T
TDengine
项目概览
dgr6878
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
8
Star
0
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,发现更多精彩内容 >>
提交
35976735
编写于
1月 18, 2020
作者:
weixin_48148422
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
subscribe: fix bug in multi-vnode subscription
上级
fa8baf80
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
14 deletion
+18
-14
src/client/src/tscSub.c
src/client/src/tscSub.c
+4
-0
tests/examples/c/subscribe.c
tests/examples/c/subscribe.c
+14
-14
未找到文件。
src/client/src/tscSub.c
浏览文件 @
35976735
...
...
@@ -362,6 +362,8 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
}
for
(
int
retry
=
0
;
retry
<
3
;
retry
++
)
{
tscRemoveFromSqlList
(
pSql
);
if
(
taosGetTimestampMs
()
-
pSub
->
lastSyncTime
>
10
*
60
*
1000
)
{
tscTrace
(
"begin meter synchronization"
);
char
*
sqlstr
=
pSql
->
sqlstr
;
...
...
@@ -380,6 +382,8 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
pSql
->
thandle
=
NULL
;
pSql
->
cmd
.
command
=
TSDB_SQL_SELECT
;
pSql
->
cmd
.
type
=
type
;
tscGetMeterMetaInfo
(
&
pSql
->
cmd
,
0
)
->
vnodeIndex
=
0
;
}
tscDoQuery
(
pSql
);
...
...
tests/examples/c/subscribe.c
浏览文件 @
35976735
...
...
@@ -49,7 +49,7 @@ void check_row_count(int line, TAOS_RES* res, int expected) {
void
run_test
(
TAOS
*
taos
)
{
taos_query
(
taos
,
"drop database test;"
);
taos_query
(
taos
,
"drop database
if exists
test;"
);
usleep
(
100000
);
taos_query
(
taos
,
"create database test tables 5;"
);
...
...
@@ -86,21 +86,26 @@ void run_test(TAOS* taos) {
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
0
);
taos_query
(
taos
,
"insert into t
2 using meters tags('london', 0) values('2020-01-01 00:01:02.001', 0, 'UK
');"
);
taos_query
(
taos
,
"insert into t
1 using meters tags('london', 0) values('2020-01-01 00:03:00.001', 0, 'UK
');"
);
taos_query
(
taos
,
"insert into t
0 values('2020-01-01 00:03:00.000', 0, 'china
');"
);
taos_query
(
taos
,
"insert into t
8 values('2020-01-01 00:01:03.000', 0, 'china
');"
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
2
);
taos_query
(
taos
,
"insert into t1 using meters tags('shanghai', 0) values('2020-01-01 00:03:00.002', 0, 'china');"
);
taos_query
(
taos
,
"insert into t2 values('2020-01-01 00:01:02.001', 0, 'UK');"
);
taos_query
(
taos
,
"insert into t1 values('2020-01-01 00:03:00.001', 0, 'UK');"
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
2
);
taos_query
(
taos
,
"insert into t1 values('2020-01-01 00:03:00.002', 0, 'china');"
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
1
);
// keep progress information and restart subscription
taos_unsubscribe
(
tsub
,
1
);
taos_query
(
taos
,
"insert into t0
using meters tags('beijing', 0) values('2020-01-01 00:03
:00.000', 0, 'china');"
);
taos_query
(
taos
,
"insert into t0
values('2020-01-01 00:04
:00.000', 0, 'china');"
);
tsub
=
taos_subscribe
(
taos
,
1
,
"test"
,
"select * from meters;"
,
NULL
,
NULL
,
0
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
2
2
);
check_row_count
(
__LINE__
,
res
,
2
4
);
// keep progress information and continue previous subscription
taos_unsubscribe
(
tsub
,
1
);
...
...
@@ -112,27 +117,22 @@ void run_test(TAOS* taos) {
taos_unsubscribe
(
tsub
,
0
);
tsub
=
taos_subscribe
(
taos
,
0
,
"test"
,
"select * from meters;"
,
NULL
,
NULL
,
0
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
2
2
);
check_row_count
(
__LINE__
,
res
,
2
4
);
// single meter subscription
taos_unsubscribe
(
tsub
,
0
);
tsub
=
taos_subscribe
(
taos
,
0
,
"test"
,
"select * from t0;"
,
NULL
,
NULL
,
0
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
4
);
check_row_count
(
__LINE__
,
res
,
5
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
0
);
taos_query
(
taos
,
"insert into t0
using meters tags('beijing', 0) values('2020-01-01 00:03
:00.001', 0, 'china');"
);
taos_query
(
taos
,
"insert into t0
values('2020-01-01 00:04
:00.001', 0, 'china');"
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
1
);
taos_query
(
taos
,
"insert into t0 using meters tags('beijing', 0) values('2020-01-01 00:03:00.002', 0, 'china');"
);
taos_query
(
taos
,
"insert into t0 using meters tags('beijing', 0) values('2020-01-01 00:04:00.000', 0, 'china');"
);
res
=
taos_consume
(
tsub
);
check_row_count
(
__LINE__
,
res
,
2
);
taos_unsubscribe
(
tsub
,
0
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录