Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b7549bdc
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
未验证
提交
b7549bdc
编写于
2月 08, 2023
作者:
X
Xiaoyu Wang
提交者:
GitHub
2月 08, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19869 from taosdata/FIX/TS-2533-main
enh: reset wal reader after walReadVer
上级
a39f80ba
5ce5dded
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
0 deletion
+11
-0
include/libs/wal/wal.h
include/libs/wal/wal.h
+1
-0
source/libs/sync/src/syncRaftLog.c
source/libs/sync/src/syncRaftLog.c
+1
-0
source/libs/wal/src/walRead.c
source/libs/wal/src/walRead.c
+9
-0
未找到文件。
include/libs/wal/wal.h
浏览文件 @
b7549bdc
...
@@ -191,6 +191,7 @@ int32_t walApplyVer(SWal *, int64_t ver);
...
@@ -191,6 +191,7 @@ int32_t walApplyVer(SWal *, int64_t ver);
// read
// read
SWalReader
*
walOpenReader
(
SWal
*
,
SWalFilterCond
*
pCond
);
SWalReader
*
walOpenReader
(
SWal
*
,
SWalFilterCond
*
pCond
);
void
walCloseReader
(
SWalReader
*
pRead
);
void
walCloseReader
(
SWalReader
*
pRead
);
void
walReadReset
(
SWalReader
*
pReader
);
int32_t
walReadVer
(
SWalReader
*
pRead
,
int64_t
ver
);
int32_t
walReadVer
(
SWalReader
*
pRead
,
int64_t
ver
);
int32_t
walReadSeekVer
(
SWalReader
*
pRead
,
int64_t
ver
);
int32_t
walReadSeekVer
(
SWalReader
*
pRead
,
int64_t
ver
);
int32_t
walNextValidMsg
(
SWalReader
*
pRead
);
int32_t
walNextValidMsg
(
SWalReader
*
pRead
);
...
...
source/libs/sync/src/syncRaftLog.c
浏览文件 @
b7549bdc
...
@@ -249,6 +249,7 @@ int32_t raftLogGetEntry(struct SSyncLogStore* pLogStore, SyncIndex index, SSyncR
...
@@ -249,6 +249,7 @@ int32_t raftLogGetEntry(struct SSyncLogStore* pLogStore, SyncIndex index, SSyncR
int64_t
ts2
=
taosGetTimestampNs
();
int64_t
ts2
=
taosGetTimestampNs
();
code
=
walReadVer
(
pWalHandle
,
index
);
code
=
walReadVer
(
pWalHandle
,
index
);
walReadReset
(
pWalHandle
);
int64_t
ts3
=
taosGetTimestampNs
();
int64_t
ts3
=
taosGetTimestampNs
();
// code = walReadVerCached(pWalHandle, index);
// code = walReadVerCached(pWalHandle, index);
...
...
source/libs/wal/src/walRead.c
浏览文件 @
b7549bdc
...
@@ -594,3 +594,12 @@ int32_t walReadVer(SWalReader *pReader, int64_t ver) {
...
@@ -594,3 +594,12 @@ int32_t walReadVer(SWalReader *pReader, int64_t ver) {
return
0
;
return
0
;
}
}
void
walReadReset
(
SWalReader
*
pReader
)
{
taosThreadMutexLock
(
&
pReader
->
mutex
);
taosCloseFile
(
&
pReader
->
pIdxFile
);
taosCloseFile
(
&
pReader
->
pLogFile
);
pReader
->
curInvalid
=
1
;
pReader
->
curFileFirstVer
=
-
1
;
taosThreadMutexUnlock
(
&
pReader
->
mutex
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录