Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
d21b905c
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1181
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,发现更多精彩内容 >>
提交
d21b905c
编写于
6月 15, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more work
上级
85847473
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
302 addition
and
66 deletion
+302
-66
source/dnode/vnode/src/inc/tsdb.h
source/dnode/vnode/src/inc/tsdb.h
+7
-5
source/dnode/vnode/src/tsdb/tsdbCommit.c
source/dnode/vnode/src/tsdb/tsdbCommit.c
+55
-18
source/dnode/vnode/src/tsdb/tsdbMemTable.c
source/dnode/vnode/src/tsdb/tsdbMemTable.c
+15
-30
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+225
-13
未找到文件。
source/dnode/vnode/src/inc/tsdb.h
浏览文件 @
d21b905c
...
...
@@ -63,11 +63,11 @@ void tsdbMemTableDestroy(SMemTable *pMemTable);
void
tsdbGetTbDataFromMemTable
(
SMemTable
*
pMemTable
,
tb_uid_t
suid
,
tb_uid_t
uid
,
STbData
**
ppTbData
);
// STbDataIter
int32_t
tsdbTbDataIterCreate
(
STbData
*
pTbData
,
TSDBKEY
*
pFrom
,
int8_t
backward
,
STbDataIter
**
ppIter
);
void
*
tsdbTbDataIterDestroy
(
STbDataIter
*
pIter
);
bool
tsdbTbDataIterOpen
(
STbData
*
pTbData
,
TSDBKEY
*
pFrom
,
int8_t
backward
,
STbDataIter
*
pIter
);
bool
tsdbTbDataIterNex
t
(
STbDataIter
*
pIter
);
bool
tsdbTbDataIterGet
(
STbDataIter
*
pIter
,
TSDBROW
*
pRow
);
int32_t
tsdbTbDataIterCreate
(
STbData
*
pTbData
,
TSDBKEY
*
pFrom
,
int8_t
backward
,
STbDataIter
**
ppIter
);
void
*
tsdbTbDataIterDestroy
(
STbDataIter
*
pIter
);
void
tsdbTbDataIterOpen
(
STbData
*
pTbData
,
TSDBKEY
*
pFrom
,
int8_t
backward
,
STbDataIter
*
pIter
);
TSDBROW
*
tsdbTbDataIterGe
t
(
STbDataIter
*
pIter
);
bool
tsdbTbDataIterNext
(
STbDataIter
*
pIter
);
// tsdbFile.c ==============================================================================================
typedef
struct
SDelFile
SDelFile
;
...
...
@@ -341,6 +341,8 @@ struct STbDataIter {
STbData
*
pTbData
;
int8_t
backward
;
SMemSkipListNode
*
pNode
;
TSDBROW
*
pRow
;
TSDBROW
row
;
};
struct
SDelOp
{
...
...
source/dnode/vnode/src/tsdb/tsdbCommit.c
浏览文件 @
d21b905c
...
...
@@ -23,7 +23,7 @@ typedef struct {
int32_t
minRow
;
int32_t
maxRow
;
// --------------
TSKEY
nextKey
;
TSKEY
nextKey
;
// need to be reset by each table commit
int32_t
commitFid
;
TSKEY
minKey
;
TSKEY
maxKey
;
...
...
@@ -347,17 +347,21 @@ _err:
}
static
int32_t
tsdbCommitTableData
(
SCommitter
*
pCommitter
,
STbData
*
pTbData
,
SBlockIdx
*
pBlockIdx
)
{
int32_t
code
=
0
;
STbDataIter
iter
;
TSDBROW
row
;
SBlockIdx
blockIdx
;
int32_t
code
=
0
;
STbDataIter
*
pIter
=
NULL
;
STbDataIter
iter
;
TSDBROW
*
pRow
=
NULL
;
SBlockIdx
blockIdx
;
int32_t
iBlock
;
int32_t
nBlock
;
SBlock
*
pBlock
;
// check
: if no memory data and no disk data, exit
// check
if
(
pTbData
)
{
tsdbTbDataIterOpen
(
pTbData
,
&
(
TSDBKEY
){.
ts
=
pCommitter
->
minKey
,
.
version
=
0
},
0
,
&
iter
)
;
if
((
!
tsdbTbDataIterGet
(
&
iter
,
&
row
)
||
row
.
pTSRow
->
ts
>
pCommitter
->
maxKey
)
&&
pBlockIdx
==
NULL
)
{
goto
_exit
;
}
pIter
=
&
iter
;
tsdbTbDataIterOpen
(
pTbData
,
&
(
TSDBKEY
){.
ts
=
pCommitter
->
minKey
,
.
version
=
0
},
0
,
pIter
);
pRow
=
tsdbTbDataIterGet
(
pIter
)
;
if
((
pRow
==
NULL
||
pRow
->
pTSRow
->
ts
>
pCommitter
->
maxKey
)
&&
pBlockIdx
==
NULL
)
goto
_exit
;
}
// start
...
...
@@ -368,11 +372,40 @@ static int32_t tsdbCommitTableData(SCommitter *pCommitter, STbData *pTbData, SBl
if
(
code
)
goto
_err
;
}
// impl
if
(
pTbData
)
{
blockIdx
.
suid
=
pTbData
->
suid
;
blockIdx
.
uid
=
pTbData
->
uid
;
}
else
{
blockIdx
.
suid
=
pBlockIdx
->
suid
;
blockIdx
.
uid
=
pBlockIdx
->
uid
;
}
blockIdx
.
minKey
.
version
=
INT64_MAX
;
blockIdx
.
minKey
.
ts
=
TSKEY_MAX
;
blockIdx
.
maxKey
.
version
=
0
;
blockIdx
.
maxKey
.
ts
=
TSKEY_MIN
;
blockIdx
.
minVersion
=
INT64_MAX
;
blockIdx
.
maxVersion
=
INT64_MIN
;
blockIdx
.
offset
=
-
1
;
blockIdx
.
size
=
-
1
;
// impl (todo)
// end
code
=
tsdbWriteBlock
(
pCommitter
->
pWriter
,
&
pCommitter
->
nBlock
,
NULL
,
&
blockIdx
);
if
(
code
)
goto
_err
;
code
=
tMapDataPutItem
(
&
pCommitter
->
nBlockIdx
,
&
blockIdx
,
tPutBlockIdx
);
if
(
code
)
goto
_err
;
_exit:
pRow
=
tsdbTbDataIterGet
(
pIter
);
if
(
pRow
)
{
ASSERT
(
pRow
->
pTSRow
->
ts
>
pCommitter
->
maxKey
);
if
(
pCommitter
->
nextKey
>
pRow
->
pTSRow
->
ts
)
{
pCommitter
->
nextKey
=
pRow
->
pTSRow
->
ts
;
}
}
return
code
;
_err:
...
...
@@ -424,15 +457,18 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
int32_t
iBlockIdx
=
0
;
int32_t
nBlockIdx
=
pCommitter
->
oBlockIdx
.
nItem
;
STbData
*
pTbData
;
SBlockIdx
*
pBlockIdx
=
NULL
;
SBlockIdx
*
pBlockIdx
;
SBlockIdx
blockIdx
;
ASSERT
(
nTbData
>
0
);
pTbData
=
(
STbData
*
)
taosArrayGetP
(
pMemTable
->
aTbData
,
iTbData
);
if
(
iBlockIdx
<
nBlockIdx
)
{
pBlockIdx
=
&
blockIdx
;
code
=
tMapDataGetItemByIdx
(
&
pCommitter
->
oBlockIdx
,
iBlockIdx
,
&
blockIdx
,
tGetBlockIdx
);
if
(
code
)
goto
_err
;
pBlockIdx
=
&
blockIdx
;
}
else
{
pBlockIdx
=
NULL
;
}
while
(
true
)
{
...
...
@@ -457,6 +493,7 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
_commit_mem_data:
code
=
tsdbCommitTableData
(
pCommitter
,
pTbData
,
NULL
);
if
(
code
)
goto
_err
;
iTbData
++
;
if
(
iTbData
<
nTbData
)
{
pTbData
=
(
STbData
*
)
taosArrayGetP
(
pMemTable
->
aTbData
,
iTbData
);
...
...
@@ -468,11 +505,12 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
_commit_disk_data:
code
=
tsdbCommitTableData
(
pCommitter
,
NULL
,
pBlockIdx
);
if
(
code
)
goto
_err
;
iBlockIdx
++
;
if
(
iBlockIdx
<
nBlockIdx
)
{
pBlockIdx
=
&
blockIdx
;
code
=
tMapDataGetItemByIdx
(
&
pCommitter
->
oBlockIdx
,
iBlockIdx
,
&
blockIdx
,
tGetBlockIdx
);
if
(
code
)
goto
_err
;
pBlockIdx
=
&
blockIdx
;
}
else
{
pBlockIdx
=
NULL
;
}
...
...
@@ -481,6 +519,7 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
_commit_mem_and_disk_data:
code
=
tsdbCommitTableData
(
pCommitter
,
pTbData
,
pBlockIdx
);
if
(
code
)
goto
_err
;
iTbData
++
;
iBlockIdx
++
;
if
(
iTbData
<
nTbData
)
{
...
...
@@ -489,9 +528,9 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
pTbData
=
NULL
;
}
if
(
iBlockIdx
<
nBlockIdx
)
{
pBlockIdx
=
&
blockIdx
;
code
=
tMapDataGetItemByIdx
(
&
pCommitter
->
oBlockIdx
,
iBlockIdx
,
&
blockIdx
,
tGetBlockIdx
);
if
(
code
)
goto
_err
;
pBlockIdx
=
&
blockIdx
;
}
else
{
pBlockIdx
=
NULL
;
}
...
...
@@ -582,9 +621,7 @@ static int32_t tsdbCommitData(SCommitter *pCommitter) {
SMemTable
*
pMemTable
=
pTsdb
->
imem
;
// check
if
(
pMemTable
->
nRow
==
0
)
{
goto
_exit
;
}
if
(
pMemTable
->
nRow
==
0
)
goto
_exit
;
// loop
pCommitter
->
nextKey
=
pMemTable
->
minKey
.
ts
;
...
...
source/dnode/vnode/src/tsdb/tsdbMemTable.c
浏览文件 @
d21b905c
...
...
@@ -211,17 +211,16 @@ void *tsdbTbDataIterDestroy(STbDataIter *pIter) {
return
NULL
;
}
bool
tsdbTbDataIterOpen
(
STbData
*
pTbData
,
TSDBKEY
*
pFrom
,
int8_t
backward
,
STbDataIter
*
pIter
)
{
void
tsdbTbDataIterOpen
(
STbData
*
pTbData
,
TSDBKEY
*
pFrom
,
int8_t
backward
,
STbDataIter
*
pIter
)
{
SMemSkipListNode
*
pos
[
SL_MAX_LEVEL
];
SMemSkipListNode
*
pHead
;
SMemSkipListNode
*
pTail
;
if
(
pTbData
==
NULL
)
return
false
;
pHead
=
pTbData
->
sl
.
pHead
;
pTail
=
pTbData
->
sl
.
pTail
;
pIter
->
pTbData
=
pTbData
;
pIter
->
backward
=
backward
;
pIter
->
pRow
=
NULL
;
if
(
pFrom
==
NULL
)
{
// create from head or tail
if
(
backward
)
{
...
...
@@ -239,20 +238,13 @@ bool tsdbTbDataIterOpen(STbData *pTbData, TSDBKEY *pFrom, int8_t backward, STbDa
pIter
->
pNode
=
SL_NODE_FORWARD
(
pos
[
0
],
0
);
}
}
if
((
backward
&&
pIter
->
pNode
==
pHead
)
||
(
!
backward
&&
pIter
->
pNode
==
pTail
))
{
return
false
;
}
return
true
;
}
bool
tsdbTbDataIterNext
(
STbDataIter
*
pIter
)
{
SMemSkipListNode
*
pHead
=
pIter
->
pTbData
->
sl
.
pHead
;
SMemSkipListNode
*
pTail
=
pIter
->
pTbData
->
sl
.
pTail
;
if
(
pIter
==
NULL
)
return
false
;
pIter
->
pRow
=
NULL
;
if
(
pIter
->
backward
)
{
ASSERT
(
pIter
->
pNode
!=
pTail
);
...
...
@@ -280,33 +272,26 @@ bool tsdbTbDataIterNext(STbDataIter *pIter) {
return
true
;
}
bool
tsdbTbDataIterGet
(
STbDataIter
*
pIter
,
TSDBROW
*
pRow
)
{
SMemSkipListNode
*
pHead
=
pIter
->
pTbData
->
sl
.
pHead
;
SMemSkipListNode
*
pTail
=
pIter
->
pTbData
->
sl
.
pTail
;
TSDBROW
row
=
{
0
};
if
(
pIter
==
NULL
)
return
false
;
if
(
pRow
==
NULL
)
{
pRow
=
&
row
;
TSDBROW
*
tsdbTbDataIterGet
(
STbDataIter
*
pIter
)
{
if
(
pIter
->
pRow
)
{
goto
_exit
;
}
if
(
pIter
->
backward
)
{
ASSERT
(
pIter
->
pNode
!=
pTail
);
if
(
pIter
->
pNode
==
pHead
)
{
return
false
;
if
(
pIter
->
pNode
==
pIter
->
pTbData
->
sl
.
pHead
)
{
goto
_exit
;
}
}
else
{
ASSERT
(
pIter
->
pNode
!=
pHead
);
if
(
pIter
->
pNode
==
pTail
)
{
return
false
;
if
(
pIter
->
pNode
==
pIter
->
pTbData
->
sl
.
pTail
)
{
goto
_exit
;
}
}
tGetTSDBRow
((
uint8_t
*
)
SL_NODE_DATA
(
pIter
->
pNode
),
pRow
);
return
true
;
tGetTSDBRow
((
uint8_t
*
)
SL_NODE_DATA
(
pIter
->
pNode
),
&
pIter
->
row
);
pIter
->
pRow
=
&
pIter
->
row
;
_exit:
return
pIter
->
pRow
;
}
static
int32_t
tsdbGetOrCreateTbData
(
SMemTable
*
pMemTable
,
tb_uid_t
suid
,
tb_uid_t
uid
,
STbData
**
ppTbData
)
{
...
...
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
浏览文件 @
d21b905c
...
...
@@ -225,6 +225,7 @@ int32_t tsdbDelFReaderOpen(SDelFReader **ppReader, SDelFile *pFile, STsdb *pTsdb
int32_t
code
=
0
;
char
*
fname
=
NULL
;
// todo
SDelFReader
*
pDelFReader
;
int64_t
n
;
// alloc
pDelFReader
=
(
SDelFReader
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pDelFReader
));
...
...
@@ -250,7 +251,11 @@ int32_t tsdbDelFReaderOpen(SDelFReader **ppReader, SDelFile *pFile, STsdb *pTsdb
goto
_err
;
}
if
(
taosReadFile
(
pDelFReader
->
pReadH
,
*
ppBuf
,
TSDB_FHDR_SIZE
)
<
TSDB_FHDR_SIZE
)
{
n
=
taosReadFile
(
pDelFReader
->
pReadH
,
*
ppBuf
,
TSDB_FHDR_SIZE
);
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
else
if
(
n
<
TSDB_FHDR_SIZE
)
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
...
...
@@ -311,6 +316,9 @@ int32_t tsdbReadDelData(SDelFReader *pReader, SDelIdx *pDelIdx, SMapData *pDelDa
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
else
if
(
n
<
pDelIdx
->
size
)
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
// check
...
...
@@ -358,9 +366,13 @@ int32_t tsdbReadDelIdx(SDelFReader *pReader, SMapData *pDelIdxMap, uint8_t **ppB
if
(
code
)
goto
_err
;
// read
if
(
taosReadFile
(
pReader
->
pReadH
,
*
ppBuf
,
size
)
<
size
)
{
n
=
taosReadFile
(
pReader
->
pReadH
,
*
ppBuf
,
size
);
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
else
if
(
n
<
size
)
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
// check
...
...
@@ -387,7 +399,10 @@ _err:
struct
SDataFReader
{
STsdb
*
pTsdb
;
SDFileSet
*
pSet
;
TdFilePtr
pReadH
;
TdFilePtr
pHeadFD
;
TdFilePtr
pDataFD
;
TdFilePtr
pLastFD
;
TdFilePtr
pSmaFD
;
};
int32_t
tsdbDataFReaderOpen
(
SDataFReader
**
ppReader
,
STsdb
*
pTsdb
,
SDFileSet
*
pSet
)
{
...
...
@@ -398,19 +413,133 @@ int32_t tsdbDataFReaderOpen(SDataFReader **ppReader, STsdb *pTsdb, SDFileSet *pS
int32_t
tsdbDataFReaderClose
(
SDataFReader
*
pReader
)
{
int32_t
code
=
0
;
// TODO
if
(
taosCloseFile
(
&
pReader
->
pHeadFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosCloseFile
(
&
pReader
->
pDataFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosCloseFile
(
&
pReader
->
pLastFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosCloseFile
(
&
pReader
->
pSmaFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
return
code
;
_err:
tsdbError
(
"vgId:%d data file reader close failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
return
code
;
}
int32_t
tsdbReadBlockIdx
(
SDataFReader
*
pReader
,
SMapData
*
pMapData
,
uint8_t
**
ppBuf
)
{
int32_t
code
=
0
;
// TODO
int32_t
code
=
0
;
int64_t
offset
=
-
1
;
// TODO
int64_t
size
=
-
1
;
// TODO
int64_t
n
;
uint32_t
delimiter
;
// alloc
if
(
!
ppBuf
)
ppBuf
=
&
pMapData
->
pBuf
;
code
=
tsdbRealloc
(
ppBuf
,
size
);
if
(
code
)
goto
_err
;
// seek
if
(
taosLSeekFile
(
pReader
->
pHeadFD
,
offset
,
SEEK_SET
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
// read
n
=
taosReadFile
(
pReader
->
pHeadFD
,
*
ppBuf
,
size
);
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
else
if
(
n
<
size
)
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
// check
if
(
!
taosCheckChecksumWhole
(
*
ppBuf
,
size
))
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
// decode
n
=
0
;
n
+=
tGetU32
(
*
ppBuf
+
n
,
&
delimiter
);
ASSERT
(
delimiter
==
TSDB_FILE_DLMT
);
n
+=
tGetMapData
(
*
ppBuf
+
n
,
pMapData
);
ASSERT
(
n
+
sizeof
(
TSCKSUM
)
==
size
);
return
code
;
_err:
tsdbError
(
"vgId:%d read block idx failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
return
code
;
}
int32_t
tsdbReadBlock
(
SDataFReader
*
pReader
,
SBlockIdx
*
pBlockIdx
,
SMapData
*
pMapData
,
uint8_t
**
ppBuf
)
{
int32_t
code
=
0
;
// TODO
int32_t
code
=
0
;
int64_t
offset
=
pBlockIdx
->
offset
;
int64_t
size
=
pBlockIdx
->
size
;
int64_t
n
;
uint32_t
delimiter
;
tb_uid_t
suid
;
tb_uid_t
uid
;
// alloc
if
(
!
ppBuf
)
ppBuf
=
&
pMapData
->
pBuf
;
code
=
tsdbRealloc
(
ppBuf
,
size
);
if
(
code
)
goto
_err
;
// seek
if
(
taosLSeekFile
(
pReader
->
pHeadFD
,
offset
,
SEEK_SET
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
// read
n
=
taosReadFile
(
pReader
->
pHeadFD
,
*
ppBuf
,
size
);
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
else
if
(
n
<
size
)
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
// check
if
(
!
taosCheckChecksumWhole
(
*
ppBuf
,
size
))
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
// decode
n
=
0
;
n
+=
tGetU32
(
*
ppBuf
+
n
,
&
delimiter
);
ASSERT
(
delimiter
==
TSDB_FILE_DLMT
);
n
+=
tGetI64
(
*
ppBuf
+
n
,
&
suid
);
ASSERT
(
suid
==
pBlockIdx
->
suid
);
n
+=
tGetI64
(
*
ppBuf
+
n
,
&
uid
);
ASSERT
(
uid
==
pBlockIdx
->
uid
);
n
+=
tGetMapData
(
*
ppBuf
+
n
,
pMapData
);
ASSERT
(
n
+
sizeof
(
TSCKSUM
)
==
size
);
return
code
;
_err:
tsdbError
(
"vgId:%d read block failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
return
code
;
}
...
...
@@ -430,7 +559,10 @@ int32_t tsdbReadBlockSMA(SDataFReader *pReader, SBlockSMA *pBlkSMA) {
struct
SDataFWriter
{
STsdb
*
pTsdb
;
SDFileSet
*
pSet
;
TdFilePtr
pWriteH
;
TdFilePtr
pHeadFD
;
TdFilePtr
pDataFD
;
TdFilePtr
pLastFD
;
TdFilePtr
pSmaFD
;
};
int32_t
tsdbDataFWriterOpen
(
SDataFWriter
**
ppWriter
,
STsdb
*
pTsdb
,
SDFileSet
*
pSet
)
{
...
...
@@ -441,7 +573,53 @@ int32_t tsdbDataFWriterOpen(SDataFWriter **ppWriter, STsdb *pTsdb, SDFileSet *pS
int32_t
tsdbDataFWriterClose
(
SDataFWriter
*
pWriter
,
int8_t
sync
)
{
int32_t
code
=
0
;
// TODO
if
(
sync
)
{
if
(
taosFsyncFile
(
pWriter
->
pHeadFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosFsyncFile
(
pWriter
->
pDataFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosFsyncFile
(
pWriter
->
pLastFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosFsyncFile
(
pWriter
->
pSmaFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
}
if
(
taosCloseFile
(
&
pWriter
->
pHeadFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosCloseFile
(
&
pWriter
->
pDataFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosCloseFile
(
&
pWriter
->
pLastFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosCloseFile
(
&
pWriter
->
pSmaFD
)
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
return
code
;
_err:
tsdbError
(
"vgId:%d data file writer close failed since %s"
,
TD_VID
(
pWriter
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
return
code
;
}
...
...
@@ -451,9 +629,43 @@ int32_t tsdbUpdateDFileSetHeader(SDataFWriter *pWriter, uint8_t **ppBuf) {
return
code
;
}
int32_t
tsdbWriteBlockIdx
(
SDataFWriter
*
pWriter
,
SMapData
*
pMapData
,
uint8_t
**
ppBuf
)
{
int32_t
code
=
0
;
// TODO
int32_t
tsdbWriteBlockIdx
(
SDataFWriter
*
pWriter
,
SMapData
*
pBlockIdxMap
,
uint8_t
**
ppBuf
)
{
int32_t
code
=
0
;
int64_t
size
=
0
;
int64_t
n
=
0
;
uint8_t
*
pBuf
=
NULL
;
// prepare
size
+=
tPutU32
(
NULL
,
TSDB_FILE_DLMT
);
size
=
size
+
tPutMapData
(
NULL
,
pBlockIdxMap
)
+
sizeof
(
TSCKSUM
);
// alloc
if
(
!
ppBuf
)
ppBuf
=
&
pBuf
;
code
=
tsdbRealloc
(
ppBuf
,
size
);
if
(
code
)
goto
_err
;
// build
n
+=
tPutU32
(
*
ppBuf
+
n
,
TSDB_FILE_DLMT
);
n
+=
tPutMapData
(
*
ppBuf
,
pBlockIdxMap
);
taosCalcChecksumAppend
(
0
,
*
ppBuf
,
size
);
ASSERT
(
n
+
sizeof
(
TSCKSUM
)
==
size
);
// write
n
=
taosWriteFile
(
pWriter
->
pHeadFD
,
*
ppBuf
,
size
);
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
// update (todo)
tsdbFree
(
pBuf
);
return
code
;
_err:
tsdbError
(
"vgId:%d write block idx failed since %s"
,
TD_VID
(
pWriter
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
tsdbFree
(
pBuf
);
return
code
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录