Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4f15a328
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
4f15a328
编写于
3月 17, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(client): fix potential memory leak.
上级
8d1c6956
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
24 addition
and
25 deletion
+24
-25
source/client/src/clientTmq.c
source/client/src/clientTmq.c
+24
-25
未找到文件。
source/client/src/clientTmq.c
浏览文件 @
4f15a328
...
...
@@ -874,7 +874,7 @@ int32_t tmqHandleAllDelayedTask(tmq_t* pTmq) {
return
0
;
}
static
void
tmqFreeRspWrapper
(
SMqRspWrapper
*
rspWrapper
)
{
static
void
*
tmqFreeRspWrapper
(
SMqRspWrapper
*
rspWrapper
)
{
if
(
rspWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__END_RSP
)
{
// do nothing
}
else
if
(
rspWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__EP_RSP
)
{
...
...
@@ -905,6 +905,8 @@ static void tmqFreeRspWrapper(SMqRspWrapper* rspWrapper) {
taosArrayDestroy
(
pRsp
->
taosxRsp
.
createTableLen
);
taosArrayDestroyP
(
pRsp
->
taosxRsp
.
createTableReq
,
taosMemoryFree
);
}
return
NULL
;
}
void
tmqClearUnhandleMsg
(
tmq_t
*
tmq
)
{
...
...
@@ -1788,29 +1790,28 @@ static void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
tscDebug
(
"consumer:0x%"
PRIx64
" start to handle the rsp, total:%d"
,
tmq
->
consumerId
,
tmq
->
qall
->
numOfItems
);
while
(
1
)
{
SMqRspWrapper
*
r
spWrapper
=
NULL
;
taosGetQitem
(
tmq
->
qall
,
(
void
**
)
&
r
spWrapper
);
SMqRspWrapper
*
pR
spWrapper
=
NULL
;
taosGetQitem
(
tmq
->
qall
,
(
void
**
)
&
pR
spWrapper
);
if
(
r
spWrapper
==
NULL
)
{
if
(
pR
spWrapper
==
NULL
)
{
taosReadAllQitems
(
tmq
->
mqueue
,
tmq
->
qall
);
taosGetQitem
(
tmq
->
qall
,
(
void
**
)
&
r
spWrapper
);
taosGetQitem
(
tmq
->
qall
,
(
void
**
)
&
pR
spWrapper
);
if
(
r
spWrapper
==
NULL
)
{
if
(
pR
spWrapper
==
NULL
)
{
return
NULL
;
}
}
tscDebug
(
"consumer:0x%"
PRIx64
" handle rsp, type:%d"
,
tmq
->
consumerId
,
r
spWrapper
->
tmqRspType
);
tscDebug
(
"consumer:0x%"
PRIx64
" handle rsp, type:%d"
,
tmq
->
consumerId
,
pR
spWrapper
->
tmqRspType
);
if
(
r
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__END_RSP
)
{
taosFreeQitem
(
r
spWrapper
);
if
(
pR
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__END_RSP
)
{
taosFreeQitem
(
pR
spWrapper
);
terrno
=
TSDB_CODE_TQ_NO_COMMITTED_OFFSET
;
tscError
(
"consumer:0x%"
PRIx64
" unexpected rsp from poll, code:%s"
,
tmq
->
consumerId
,
tstrerror
(
terrno
));
return
NULL
;
}
else
if
(
r
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__POLL_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
r
spWrapper
;
}
else
if
(
pR
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__POLL_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
pR
spWrapper
;
/*atomic_sub_fetch_32(&tmq->readyRequest, 1);*/
int32_t
consumerEpoch
=
atomic_load_32
(
&
tmq
->
epoch
);
SMqDataRsp
*
pDataRsp
=
&
pollRspWrapper
->
dataRsp
;
...
...
@@ -1835,9 +1836,8 @@ static void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
if
(
pDataRsp
->
blockNum
==
0
)
{
tscDebug
(
"consumer:0x%"
PRIx64
" empty block received, vgId:%d, offset:%s, reqId:0x%"
PRIx64
,
tmq
->
consumerId
,
pVg
->
vgId
,
buf
,
pollRspWrapper
->
reqId
);
pRspWrapper
=
tmqFreeRspWrapper
(
pRspWrapper
);
taosFreeQitem
(
pollRspWrapper
);
rspWrapper
=
NULL
;
continue
;
}
else
{
// build rsp
SMqRspObj
*
pRsp
=
tmqBuildRspFromWrapper
(
pollRspWrapper
,
pVg
);
tscDebug
(
"consumer:0x%"
PRIx64
" process poll rsp, vgId:%d, offset:%s, blocks:%d, rows:%"
PRId64
" reqId:0x%"
PRIx64
,
...
...
@@ -1850,11 +1850,11 @@ static void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
}
else
{
tscDebug
(
"consumer:0x%"
PRIx64
" msg discard since epoch mismatch: msg epoch %d, consumer epoch %d"
,
tmq
->
consumerId
,
pDataRsp
->
head
.
epoch
,
consumerEpoch
);
tmqFreeRspWrapper
(
r
spWrapper
);
pRspWrapper
=
tmqFreeRspWrapper
(
pR
spWrapper
);
taosFreeQitem
(
pollRspWrapper
);
}
}
else
if
(
r
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__POLL_META_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
r
spWrapper
;
}
else
if
(
pR
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__POLL_META_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
pR
spWrapper
;
int32_t
consumerEpoch
=
atomic_load_32
(
&
tmq
->
epoch
);
tscDebug
(
"consumer:0x%"
PRIx64
" process meta rsp"
,
tmq
->
consumerId
);
...
...
@@ -1870,11 +1870,11 @@ static void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
}
else
{
tscDebug
(
"consumer:0x%"
PRIx64
" msg discard since epoch mismatch: msg epoch %d, consumer epoch %d"
,
tmq
->
consumerId
,
pollRspWrapper
->
metaRsp
.
head
.
epoch
,
consumerEpoch
);
tmqFreeRspWrapper
(
r
spWrapper
);
pRspWrapper
=
tmqFreeRspWrapper
(
pR
spWrapper
);
taosFreeQitem
(
pollRspWrapper
);
}
}
else
if
(
r
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__TAOSX_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
r
spWrapper
;
}
else
if
(
pR
spWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__TAOSX_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
pR
spWrapper
;
int32_t
consumerEpoch
=
atomic_load_32
(
&
tmq
->
epoch
);
if
(
pollRspWrapper
->
taosxRsp
.
head
.
epoch
==
consumerEpoch
)
{
...
...
@@ -1883,10 +1883,10 @@ static void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
atomic_store_32
(
&
pVg
->
vgStatus
,
TMQ_VG_STATUS__IDLE
);
if
(
pollRspWrapper
->
taosxRsp
.
blockNum
==
0
)
{
rspWrapper
=
NULL
;
tscDebug
(
"consumer:0x%"
PRIx64
" taosx empty block received, vgId:%d, reqId:0x%"
PRIx64
,
tmq
->
consumerId
,
pVg
->
vgId
,
pollRspWrapper
->
reqId
);
pVg
->
emptyBlockReceiveTs
=
taosGetTimestampMs
();
pRspWrapper
=
tmqFreeRspWrapper
(
pRspWrapper
);
taosFreeQitem
(
pollRspWrapper
);
continue
;
}
else
{
...
...
@@ -1912,15 +1912,15 @@ static void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
}
else
{
tscDebug
(
"consumer:0x%"
PRIx64
" msg discard since epoch mismatch: msg epoch %d, consumer epoch %d"
,
tmq
->
consumerId
,
pollRspWrapper
->
taosxRsp
.
head
.
epoch
,
consumerEpoch
);
tmqFreeRspWrapper
(
r
spWrapper
);
pRspWrapper
=
tmqFreeRspWrapper
(
pR
spWrapper
);
taosFreeQitem
(
pollRspWrapper
);
}
}
else
{
tscDebug
(
"consumer:0x%"
PRIx64
" not data msg received"
,
tmq
->
consumerId
);
bool
reset
=
false
;
tmqHandleNoPollRsp
(
tmq
,
r
spWrapper
,
&
reset
);
taosFreeQitem
(
r
spWrapper
);
tmqHandleNoPollRsp
(
tmq
,
pR
spWrapper
,
&
reset
);
taosFreeQitem
(
pR
spWrapper
);
if
(
pollIfReset
&&
reset
)
{
tscDebug
(
"consumer:0x%"
PRIx64
", reset and repoll"
,
tmq
->
consumerId
);
tmqPollImpl
(
tmq
,
timeout
);
...
...
@@ -1968,7 +1968,6 @@ TAOS_RES* tmq_consumer_poll(tmq_t* tmq, int64_t timeout) {
if
(
tmqPollImpl
(
tmq
,
timeout
)
<
0
)
{
tscDebug
(
"consumer:0x%"
PRIx64
" return due to poll error"
,
tmq
->
consumerId
);
/*return NULL;*/
}
rspObj
=
tmqHandleAllRsp
(
tmq
,
timeout
,
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录