Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
a6fff957
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
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看板
提交
a6fff957
编写于
12月 09, 2022
作者:
L
Liu Jicong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: close wal ref
上级
5b8cc223
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
26 addition
and
16 deletion
+26
-16
include/libs/wal/wal.h
include/libs/wal/wal.h
+10
-10
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+10
-4
source/libs/wal/src/walMgmt.c
source/libs/wal/src/walMgmt.c
+1
-0
source/libs/wal/src/walRef.c
source/libs/wal/src/walRef.c
+5
-2
未找到文件。
include/libs/wal/wal.h
浏览文件 @
a6fff957
source/dnode/vnode/src/tq/tq.c
浏览文件 @
a6fff957
...
@@ -725,10 +725,16 @@ int32_t tqProcessDeleteSubReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
...
@@ -725,10 +725,16 @@ int32_t tqProcessDeleteSubReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
}
}
taosWUnLockLatch
(
&
pTq
->
pushLock
);
taosWUnLockLatch
(
&
pTq
->
pushLock
);
STqHandle
*
pHandle
=
taosHashGet
(
pTq
->
pHandle
,
pReq
->
subKey
,
strlen
(
pReq
->
subKey
));
if
(
pHandle
)
{
if
(
pHandle
->
pRef
)
{
walCloseRef
(
pTq
->
pVnode
->
pWal
,
pHandle
->
pRef
->
refId
);
}
code
=
taosHashRemove
(
pTq
->
pHandle
,
pReq
->
subKey
,
strlen
(
pReq
->
subKey
));
code
=
taosHashRemove
(
pTq
->
pHandle
,
pReq
->
subKey
,
strlen
(
pReq
->
subKey
));
if
(
code
!=
0
)
{
if
(
code
!=
0
)
{
tqError
(
"cannot process tq delete req %s, since no such handle"
,
pReq
->
subKey
);
tqError
(
"cannot process tq delete req %s, since no such handle"
,
pReq
->
subKey
);
}
}
}
code
=
tqOffsetDelete
(
pTq
->
pOffsetStore
,
pReq
->
subKey
);
code
=
tqOffsetDelete
(
pTq
->
pOffsetStore
,
pReq
->
subKey
);
if
(
code
!=
0
)
{
if
(
code
!=
0
)
{
...
@@ -736,7 +742,7 @@ int32_t tqProcessDeleteSubReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
...
@@ -736,7 +742,7 @@ int32_t tqProcessDeleteSubReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
}
}
if
(
tqMetaDeleteHandle
(
pTq
,
pReq
->
subKey
)
<
0
)
{
if
(
tqMetaDeleteHandle
(
pTq
,
pReq
->
subKey
)
<
0
)
{
ASSERT
(
0
);
tqError
(
"cannot process tq delete req %s, since no such offset in tdb"
,
pReq
->
subKey
);
}
}
return
0
;
return
0
;
}
}
...
...
source/libs/wal/src/walMgmt.c
浏览文件 @
a6fff957
...
@@ -223,6 +223,7 @@ void walClose(SWal *pWal) {
...
@@ -223,6 +223,7 @@ void walClose(SWal *pWal) {
taosMemoryFree
(
pRef
);
taosMemoryFree
(
pRef
);
}
}
taosHashCleanup
(
pWal
->
pRefHash
);
taosHashCleanup
(
pWal
->
pRefHash
);
pWal
->
pRefHash
=
NULL
;
taosThreadMutexUnlock
(
&
pWal
->
mutex
);
taosThreadMutexUnlock
(
&
pWal
->
mutex
);
taosRemoveRef
(
tsWal
.
refSetId
,
pWal
->
refId
);
taosRemoveRef
(
tsWal
.
refSetId
,
pWal
->
refId
);
...
...
source/libs/wal/src/walRef.c
浏览文件 @
a6fff957
...
@@ -32,15 +32,18 @@ SWalRef *walOpenRef(SWal *pWal) {
...
@@ -32,15 +32,18 @@ SWalRef *walOpenRef(SWal *pWal) {
return
pRef
;
return
pRef
;
}
}
#if 1
void
walCloseRef
(
SWal
*
pWal
,
int64_t
refId
)
{
void
walCloseRef
(
SWal
*
pWal
,
int64_t
refId
)
{
SWalRef
**
ppRef
=
taosHashGet
(
pWal
->
pRefHash
,
&
refId
,
sizeof
(
int64_t
));
SWalRef
**
ppRef
=
taosHashGet
(
pWal
->
pRefHash
,
&
refId
,
sizeof
(
int64_t
));
if
(
ppRef
==
NULL
)
return
;
if
(
ppRef
==
NULL
)
return
;
SWalRef
*
pRef
=
*
ppRef
;
SWalRef
*
pRef
=
*
ppRef
;
if
(
pRef
)
{
wDebug
(
"vgId:%d, wal close ref %"
PRId64
", refId %"
PRId64
,
pWal
->
cfg
.
vgId
,
pRef
->
refVer
,
pRef
->
refId
);
}
else
{
wDebug
(
"vgId:%d, wal close ref null, refId %"
PRId64
,
pWal
->
cfg
.
vgId
,
refId
);
}
taosHashRemove
(
pWal
->
pRefHash
,
&
refId
,
sizeof
(
int64_t
));
taosHashRemove
(
pWal
->
pRefHash
,
&
refId
,
sizeof
(
int64_t
));
taosMemoryFree
(
pRef
);
taosMemoryFree
(
pRef
);
}
}
#endif
int32_t
walRefVer
(
SWalRef
*
pRef
,
int64_t
ver
)
{
int32_t
walRefVer
(
SWalRef
*
pRef
,
int64_t
ver
)
{
SWal
*
pWal
=
pRef
->
pWal
;
SWal
*
pWal
=
pRef
->
pWal
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录