Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
19892cfa
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
19892cfa
编写于
1月 28, 2022
作者:
L
Liu Jicong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix double free
上级
108fd4cf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
11 deletion
+25
-11
source/client/src/tmq.c
source/client/src/tmq.c
+0
-1
source/dnode/mnode/impl/inc/mndDef.h
source/dnode/mnode/impl/inc/mndDef.h
+24
-9
source/dnode/mnode/impl/src/mndSubscribe.c
source/dnode/mnode/impl/src/mndSubscribe.c
+1
-1
未找到文件。
source/client/src/tmq.c
浏览文件 @
19892cfa
...
...
@@ -597,7 +597,6 @@ int32_t tmqAsyncAskEp(tmq_t* tmq, bool wait) {
asyncSendMsgToServer
(
tmq
->
pTscObj
->
pAppInfo
->
pTransporter
,
&
epSet
,
&
transporterId
,
sendInfo
);
END:
tfree
(
buf
);
if
(
wait
)
tsem_wait
(
&
tmq
->
rspSem
);
return
0
;
}
...
...
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @
19892cfa
...
...
@@ -526,7 +526,7 @@ static FORCE_INLINE void* tDecodeSubscribeObj(void* buf, SMqSubscribeObj* pSub)
return
NULL
;
}
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
SMqConsumerEp
cEp
;
SMqConsumerEp
cEp
=
{
0
}
;
buf
=
tDecodeSMqConsumerEp
(
buf
,
&
cEp
);
taosArrayPush
(
pSub
->
assigned
,
&
cEp
);
}
...
...
@@ -539,7 +539,7 @@ static FORCE_INLINE void* tDecodeSubscribeObj(void* buf, SMqSubscribeObj* pSub)
return
NULL
;
}
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
SMqConsumerEp
cEp
;
SMqConsumerEp
cEp
=
{
0
}
;
buf
=
tDecodeSMqConsumerEp
(
buf
,
&
cEp
);
taosArrayPush
(
pSub
->
lostConsumer
,
&
cEp
);
}
...
...
@@ -553,7 +553,7 @@ static FORCE_INLINE void* tDecodeSubscribeObj(void* buf, SMqSubscribeObj* pSub)
return
NULL
;
}
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
SMqConsumerEp
cEp
;
SMqConsumerEp
cEp
=
{
0
}
;
buf
=
tDecodeSMqConsumerEp
(
buf
,
&
cEp
);
taosArrayPush
(
pSub
->
idleConsumer
,
&
cEp
);
}
...
...
@@ -569,7 +569,7 @@ static FORCE_INLINE void* tDecodeSubscribeObj(void* buf, SMqSubscribeObj* pSub)
return
NULL
;
}
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
SMqConsumerEp
cEp
;
SMqConsumerEp
cEp
=
{
0
}
;
buf
=
tDecodeSMqConsumerEp
(
buf
,
&
cEp
);
taosArrayPush
(
pSub
->
unassignedVg
,
&
cEp
);
}
...
...
@@ -578,11 +578,26 @@ static FORCE_INLINE void* tDecodeSubscribeObj(void* buf, SMqSubscribeObj* pSub)
}
static
FORCE_INLINE
void
tDeleteSMqSubscribeObj
(
SMqSubscribeObj
*
pSub
)
{
if
(
pSub
->
availConsumer
)
taosArrayDestroy
(
pSub
->
availConsumer
);
if
(
pSub
->
assigned
)
taosArrayDestroyEx
(
pSub
->
assigned
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
if
(
pSub
->
unassignedVg
)
taosArrayDestroyEx
(
pSub
->
unassignedVg
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
if
(
pSub
->
idleConsumer
)
taosArrayDestroyEx
(
pSub
->
idleConsumer
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
if
(
pSub
->
lostConsumer
)
taosArrayDestroyEx
(
pSub
->
lostConsumer
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
if
(
pSub
->
availConsumer
)
{
taosArrayDestroy
(
pSub
->
availConsumer
);
pSub
->
availConsumer
=
NULL
;
}
if
(
pSub
->
assigned
)
{
taosArrayDestroyEx
(
pSub
->
assigned
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
pSub
->
assigned
=
NULL
;
}
if
(
pSub
->
unassignedVg
)
{
taosArrayDestroyEx
(
pSub
->
unassignedVg
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
pSub
->
unassignedVg
=
NULL
;
}
if
(
pSub
->
idleConsumer
)
{
taosArrayDestroyEx
(
pSub
->
idleConsumer
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
pSub
->
idleConsumer
=
NULL
;
}
if
(
pSub
->
lostConsumer
)
{
taosArrayDestroyEx
(
pSub
->
lostConsumer
,
(
void
(
*
)(
void
*
))
tDeleteSMqConsumerEp
);
pSub
->
lostConsumer
=
NULL
;
}
}
typedef
struct
SMqCGroup
{
...
...
source/dnode/mnode/impl/src/mndSubscribe.c
浏览文件 @
19892cfa
...
...
@@ -292,7 +292,7 @@ static int mndInitUnassignedVg(SMnode *pMnode, SMqTopicObj *pTopic, SArray *unas
return
-
1
;
}
SMqConsumerEp
CEp
;
SMqConsumerEp
CEp
=
{
0
}
;
CEp
.
status
=
0
;
CEp
.
consumerId
=
-
1
;
CEp
.
lastConsumerHbTs
=
CEp
.
lastVgHbTs
=
-
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录