Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
bddba107
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看板
未验证
提交
bddba107
编写于
3月 23, 2023
作者:
X
Xiaoyu Wang
提交者:
GitHub
3月 23, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20608 from taosdata/fix/TS-2960
fix(tdb/restore): rollback journal files backward
上级
323d8ee0
a07366ed
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
85 addition
and
82 deletion
+85
-82
source/dnode/vnode/src/inc/tsdb.h
source/dnode/vnode/src/inc/tsdb.h
+2
-0
source/dnode/vnode/src/tsdb/tsdbCache.c
source/dnode/vnode/src/tsdb/tsdbCache.c
+30
-70
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
+26
-1
source/libs/tdb/src/db/tdbPager.c
source/libs/tdb/src/db/tdbPager.c
+27
-11
未找到文件。
source/dnode/vnode/src/inc/tsdb.h
浏览文件 @
bddba107
...
...
@@ -687,6 +687,8 @@ typedef struct SSttBlockLoadInfo {
STSchema
*
pSchema
;
int16_t
*
colIds
;
int32_t
numOfCols
;
bool
checkRemainingRow
;
bool
isLast
;
bool
sttBlockLoaded
;
int32_t
numOfStt
;
...
...
source/dnode/vnode/src/tsdb/tsdbCache.c
浏览文件 @
bddba107
...
...
@@ -590,6 +590,7 @@ typedef struct {
SDataFReader
**
pDataFReader
;
TSDBROW
row
;
bool
checkRemainingRow
;
SMergeTree
mergeTree
;
SMergeTree
*
pMergeTree
;
SSttBlockLoadInfo
*
pLoadInfo
;
...
...
@@ -600,7 +601,6 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow, bool *pIgnoreEa
int
nCols
)
{
SFSLastNextRowIter
*
state
=
(
SFSLastNextRowIter
*
)
iter
;
int32_t
code
=
0
;
bool
checkRemainingRow
=
true
;
switch
(
state
->
state
)
{
case
SFSLASTNEXTROW_FS
:
...
...
@@ -633,12 +633,25 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow, bool *pIgnoreEa
if
(
code
)
goto
_err
;
}
state
->
pLoadInfo
->
colIds
=
aCols
;
state
->
pLoadInfo
->
numOfCols
=
nCols
;
for
(
int
i
=
0
;
i
<
state
->
pLoadInfo
->
numOfStt
;
++
i
)
{
state
->
pLoadInfo
[
i
].
colIds
=
aCols
;
state
->
pLoadInfo
[
i
].
numOfCols
=
nCols
;
state
->
pLoadInfo
[
i
].
isLast
=
isLast
;
}
tMergeTreeOpen
(
&
state
->
mergeTree
,
1
,
*
state
->
pDataFReader
,
state
->
suid
,
state
->
uid
,
&
(
STimeWindow
){.
skey
=
state
->
lastTs
,
.
ekey
=
TSKEY_MAX
},
&
(
SVersionRange
){.
minVer
=
0
,
.
maxVer
=
UINT64_MAX
},
state
->
pLoadInfo
,
false
,
NULL
,
true
);
state
->
pMergeTree
=
&
state
->
mergeTree
;
state
->
state
=
SFSLASTNEXTROW_BLOCKROW
;
}
case
SFSLASTNEXTROW_BLOCKROW
:
{
if
(
nCols
!=
state
->
pLoadInfo
->
numOfCols
)
{
for
(
int
i
=
0
;
i
<
state
->
pLoadInfo
->
numOfStt
;
++
i
)
{
state
->
pLoadInfo
[
i
].
numOfCols
=
nCols
;
state
->
pLoadInfo
[
i
].
checkRemainingRow
=
state
->
checkRemainingRow
;
}
}
bool
hasVal
=
tMergeTreeNext
(
&
state
->
mergeTree
);
if
(
!
hasVal
)
{
if
(
tMergeTreeIgnoreEarlierTs
(
&
state
->
mergeTree
))
{
...
...
@@ -649,19 +662,9 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow, bool *pIgnoreEa
state
->
state
=
SFSLASTNEXTROW_FILESET
;
goto
_next_fileset
;
}
state
->
state
=
SFSLASTNEXTROW_BLOCKROW
;
checkRemainingRow
=
false
;
}
case
SFSLASTNEXTROW_BLOCKROW
:
{
bool
skipRow
=
false
;
do
{
bool
hasVal
=
false
;
state
->
row
=
tMergeTreeGetRow
(
&
state
->
mergeTree
);
*
ppRow
=
&
state
->
row
;
if
(
nCols
!=
state
->
pLoadInfo
->
numOfCols
)
{
state
->
pLoadInfo
->
numOfCols
=
nCols
;
}
hasVal
=
tMergeTreeNext
(
&
state
->
mergeTree
);
if
(
TSDBROW_TS
(
&
state
->
row
)
<=
state
->
lastTs
)
{
*
pIgnoreEarlierTs
=
true
;
*
ppRow
=
NULL
;
...
...
@@ -671,54 +674,11 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow, bool *pIgnoreEa
*
pIgnoreEarlierTs
=
false
;
if
(
!
hasVal
)
{
state
->
state
=
SFSLASTNEXTROW_FILESET
;
break
;
}
if
(
checkRemainingRow
)
{
bool
skipBlock
=
true
;
SBlockData
*
pBlockData
=
state
->
row
.
pBlockData
;
for
(
int
inputColIndex
=
0
;
inputColIndex
<
nCols
;
++
inputColIndex
)
{
for
(
int
colIndex
=
0
;
colIndex
<
pBlockData
->
nColData
;
++
colIndex
)
{
SColData
*
pColData
=
&
pBlockData
->
aColData
[
colIndex
];
int16_t
cid
=
pColData
->
cid
;
if
(
cid
==
aCols
[
inputColIndex
])
{
if
(
isLast
&&
(
pColData
->
flag
&
HAS_VALUE
))
{
skipBlock
=
false
;
break
;
}
else
if
(
pColData
->
flag
&
(
HAS_VALUE
|
HAS_NULL
))
{
skipBlock
=
false
;
break
;
}
}
}
}
/*
for (int colIndex = 0; colIndex < pBlockData->nColData; ++colIndex) {
SColData *pColData = &pBlockData->aColData[colIndex];
int16_t cid = pColData->cid;
if (inputColIndex < nCols && cid == aCols[inputColIndex]) {
if (isLast && (pColData->flag & HAS_VALUE)) {
skipBlock = false;
break;
} else if (pColData->flag & (HAS_VALUE | HAS_NULL)) {
skipBlock = false;
break;
}
++inputColIndex;
if
(
!
state
->
checkRemainingRow
)
{
state
->
checkRemainingRow
=
true
;
}
}
*/
if
(
skipBlock
)
{
skipRow
=
true
;
}
}
}
while
(
skipRow
);
return
code
;
}
default:
...
...
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
浏览文件 @
bddba107
...
...
@@ -504,9 +504,34 @@ bool tLDataIterNextRow(SLDataIter *pIter, const char *idStr) {
pIter
->
iRow
+=
step
;
while
(
1
)
{
bool
skipBlock
=
false
;
findNextValidRow
(
pIter
,
idStr
);
if
(
pIter
->
iRow
>=
pBlockData
->
nRow
||
pIter
->
iRow
<
0
)
{
if
(
pIter
->
pBlockLoadInfo
->
checkRemainingRow
)
{
skipBlock
=
true
;
int16_t
*
aCols
=
pIter
->
pBlockLoadInfo
->
colIds
;
int
nCols
=
pIter
->
pBlockLoadInfo
->
numOfCols
;
bool
isLast
=
pIter
->
pBlockLoadInfo
->
isLast
;
for
(
int
inputColIndex
=
0
;
inputColIndex
<
nCols
;
++
inputColIndex
)
{
for
(
int
colIndex
=
0
;
colIndex
<
pBlockData
->
nColData
;
++
colIndex
)
{
SColData
*
pColData
=
&
pBlockData
->
aColData
[
colIndex
];
int16_t
cid
=
pColData
->
cid
;
if
(
cid
==
aCols
[
inputColIndex
])
{
if
(
isLast
&&
(
pColData
->
flag
&
HAS_VALUE
))
{
skipBlock
=
false
;
break
;
}
else
if
(
pColData
->
flag
&
(
HAS_VALUE
|
HAS_NULL
))
{
skipBlock
=
false
;
break
;
}
}
}
}
}
if
(
skipBlock
||
pIter
->
iRow
>=
pBlockData
->
nRow
||
pIter
->
iRow
<
0
)
{
tLDataIterNextBlock
(
pIter
,
idStr
);
if
(
pIter
->
pSttBlk
==
NULL
)
{
// no more data
goto
_exit
;
...
...
source/libs/tdb/src/db/tdbPager.c
浏览文件 @
bddba107
...
...
@@ -947,6 +947,12 @@ static int tdbPagerRestore(SPager *pPager, const char *jFileName) {
return
0
;
}
static
int32_t
txnIdCompareDesc
(
const
void
*
pLeft
,
const
void
*
pRight
)
{
int64_t
lhs
=
*
(
int64_t
*
)
pLeft
;
int64_t
rhs
=
*
(
int64_t
*
)
pRight
;
return
lhs
>
rhs
?
-
1
:
1
;
}
int
tdbPagerRestoreJournals
(
SPager
*
pPager
)
{
tdbDirEntryPtr
pDirEntry
;
tdbDirPtr
pDir
=
taosOpenDir
(
pPager
->
pEnv
->
dbName
);
...
...
@@ -955,23 +961,33 @@ int tdbPagerRestoreJournals(SPager *pPager) {
return
-
1
;
}
SArray
*
pTxnList
=
taosArrayInit
(
16
,
sizeof
(
int64_t
));
while
((
pDirEntry
=
tdbReadDir
(
pDir
))
!=
NULL
)
{
char
*
name
=
tdbDirEntryBaseName
(
tdbGetDirEntryName
(
pDirEntry
));
if
(
strncmp
(
TDB_MAINDB_NAME
"-journal"
,
name
,
16
)
==
0
)
{
int64_t
txnId
=
-
1
;
sscanf
(
name
,
TDB_MAINDB_NAME
"-journal.%"
PRId64
,
&
txnId
);
taosArrayPush
(
pTxnList
,
&
txnId
);
}
}
taosArraySort
(
pTxnList
,
txnIdCompareDesc
);
for
(
int
i
=
0
;
i
<
TARRAY_SIZE
(
pTxnList
);
++
i
)
{
int64_t
*
pTxnId
=
taosArrayGet
(
pTxnList
,
i
);
char
jname
[
TD_PATH_MAX
]
=
{
0
};
int
dirLen
=
strlen
(
pPager
->
pEnv
->
dbName
);
memcpy
(
jname
,
pPager
->
pEnv
->
dbName
,
dirLen
);
jname
[
dirLen
]
=
'/'
;
memcpy
(
jname
+
dirLen
+
1
,
name
,
strlen
(
name
)
);
sprintf
(
jname
+
dirLen
+
1
,
TDB_MAINDB_NAME
"-journal.%"
PRId64
,
*
pTxnId
);
if
(
tdbPagerRestore
(
pPager
,
jname
)
<
0
)
{
tdbCloseDir
(
&
pDir
);
tdbError
(
"failed to restore file due to %s. jFileName:%s"
,
strerror
(
errno
),
name
);
tdbError
(
"failed to restore file due to %s. jFileName:%s"
,
strerror
(
errno
),
j
name
);
return
-
1
;
}
}
}
taosArrayDestroy
(
pTxnList
);
tdbCloseDir
(
&
pDir
);
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录