Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
23e8edd1
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
23e8edd1
编写于
4月 01, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(tmq): set the default commit callback fn.
上级
f1384206
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
13 addition
and
7 deletion
+13
-7
source/client/src/clientTmq.c
source/client/src/clientTmq.c
+13
-7
未找到文件。
source/client/src/clientTmq.c
浏览文件 @
23e8edd1
...
@@ -198,7 +198,7 @@ typedef struct {
...
@@ -198,7 +198,7 @@ typedef struct {
int32_t
waitingRspNum
;
int32_t
waitingRspNum
;
int32_t
totalRspNum
;
int32_t
totalRspNum
;
int32_t
code
;
int32_t
code
;
tmq_commit_cb
*
userCb
;
tmq_commit_cb
*
callbackFn
;
/*SArray* successfulOffsets;*/
/*SArray* successfulOffsets;*/
/*SArray* failedOffsets;*/
/*SArray* failedOffsets;*/
void
*
userParam
;
void
*
userParam
;
...
@@ -590,7 +590,7 @@ static void asyncCommitOffset(tmq_t* tmq, const TAOS_RES* pRes, tmq_commit_cb* p
...
@@ -590,7 +590,7 @@ static void asyncCommitOffset(tmq_t* tmq, const TAOS_RES* pRes, tmq_commit_cb* p
pParamSet
->
refId
=
tmq
->
refId
;
pParamSet
->
refId
=
tmq
->
refId
;
pParamSet
->
epoch
=
tmq
->
epoch
;
pParamSet
->
epoch
=
tmq
->
epoch
;
pParamSet
->
userCb
=
pCommitFp
;
pParamSet
->
callbackFn
=
pCommitFp
;
pParamSet
->
userParam
=
userParam
;
pParamSet
->
userParam
=
userParam
;
int32_t
numOfTopics
=
taosArrayGetSize
(
tmq
->
clientTopics
);
int32_t
numOfTopics
=
taosArrayGetSize
(
tmq
->
clientTopics
);
...
@@ -656,7 +656,7 @@ static void asyncCommitAllOffsets(tmq_t* tmq, tmq_commit_cb* pCommitFp, void* us
...
@@ -656,7 +656,7 @@ static void asyncCommitAllOffsets(tmq_t* tmq, tmq_commit_cb* pCommitFp, void* us
pParamSet
->
refId
=
tmq
->
refId
;
pParamSet
->
refId
=
tmq
->
refId
;
pParamSet
->
epoch
=
tmq
->
epoch
;
pParamSet
->
epoch
=
tmq
->
epoch
;
pParamSet
->
userCb
=
pCommitFp
;
pParamSet
->
callbackFn
=
pCommitFp
;
pParamSet
->
userParam
=
userParam
;
pParamSet
->
userParam
=
userParam
;
// init as 1 to prevent concurrency issue
// init as 1 to prevent concurrency issue
...
@@ -810,6 +810,12 @@ OVER:
...
@@ -810,6 +810,12 @@ OVER:
taosReleaseRef
(
tmqMgmt
.
rsetId
,
refId
);
taosReleaseRef
(
tmqMgmt
.
rsetId
,
refId
);
}
}
static
void
defaultCommitCbFn
(
tmq_t
*
pTmq
,
int32_t
code
,
void
*
param
)
{
if
(
code
!=
0
)
{
tscDebug
(
"consumer:0x%"
PRIx64
", failed to commit offset, code:%s"
,
pTmq
->
consumerId
,
tstrerror
(
code
));
}
}
int32_t
tmqHandleAllDelayedTask
(
tmq_t
*
pTmq
)
{
int32_t
tmqHandleAllDelayedTask
(
tmq_t
*
pTmq
)
{
STaosQall
*
qall
=
taosAllocateQall
();
STaosQall
*
qall
=
taosAllocateQall
();
taosReadAllQitems
(
pTmq
->
delayedTask
,
qall
);
taosReadAllQitems
(
pTmq
->
delayedTask
,
qall
);
...
@@ -833,7 +839,9 @@ int32_t tmqHandleAllDelayedTask(tmq_t* pTmq) {
...
@@ -833,7 +839,9 @@ int32_t tmqHandleAllDelayedTask(tmq_t* pTmq) {
tscDebug
(
"consumer:0x%"
PRIx64
" retrieve ep from mnode in 1s"
,
pTmq
->
consumerId
);
tscDebug
(
"consumer:0x%"
PRIx64
" retrieve ep from mnode in 1s"
,
pTmq
->
consumerId
);
taosTmrReset
(
tmqAssignAskEpTask
,
1000
,
pRefId
,
tmqMgmt
.
timer
,
&
pTmq
->
epTimer
);
taosTmrReset
(
tmqAssignAskEpTask
,
1000
,
pRefId
,
tmqMgmt
.
timer
,
&
pTmq
->
epTimer
);
}
else
if
(
*
pTaskType
==
TMQ_DELAYED_TASK__COMMIT
)
{
}
else
if
(
*
pTaskType
==
TMQ_DELAYED_TASK__COMMIT
)
{
asyncCommitAllOffsets
(
pTmq
,
pTmq
->
commitCb
,
pTmq
->
commitCbUserParam
);
tmq_commit_cb
*
pCallbackFn
=
pTmq
->
commitCb
?
pTmq
->
commitCb
:
defaultCommitCbFn
;
asyncCommitAllOffsets
(
pTmq
,
pCallbackFn
,
pTmq
->
commitCbUserParam
);
int64_t
*
pRefId
=
taosMemoryMalloc
(
sizeof
(
int64_t
));
int64_t
*
pRefId
=
taosMemoryMalloc
(
sizeof
(
int64_t
));
*
pRefId
=
pTmq
->
refId
;
*
pRefId
=
pTmq
->
refId
;
...
@@ -1029,8 +1037,6 @@ tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) {
...
@@ -1029,8 +1037,6 @@ tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) {
pTmq
->
status
=
TMQ_CONSUMER_STATUS__INIT
;
pTmq
->
status
=
TMQ_CONSUMER_STATUS__INIT
;
pTmq
->
pollCnt
=
0
;
pTmq
->
pollCnt
=
0
;
pTmq
->
epoch
=
0
;
pTmq
->
epoch
=
0
;
/*pTmq->epStatus = 0;*/
/*pTmq->epSkipCnt = 0;*/
// set conf
// set conf
strcpy
(
pTmq
->
clientId
,
conf
->
clientId
);
strcpy
(
pTmq
->
clientId
,
conf
->
clientId
);
...
@@ -2279,7 +2285,7 @@ int32_t tmqCommitDone(SMqCommitCbParamSet* pParamSet) {
...
@@ -2279,7 +2285,7 @@ int32_t tmqCommitDone(SMqCommitCbParamSet* pParamSet) {
}
}
// if no more waiting rsp
// if no more waiting rsp
pParamSet
->
userCb
(
tmq
,
pParamSet
->
code
,
pParamSet
->
userParam
);
pParamSet
->
callbackFn
(
tmq
,
pParamSet
->
code
,
pParamSet
->
userParam
);
taosMemoryFree
(
pParamSet
);
taosMemoryFree
(
pParamSet
);
taosReleaseRef
(
tmqMgmt
.
rsetId
,
refId
);
taosReleaseRef
(
tmqMgmt
.
rsetId
,
refId
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录