Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1e6caa26
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1181
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1e6caa26
编写于
9月 05, 2022
作者:
C
Cary Xu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '3.0' into feature/3.0_interval_hash_optimize
上级
d8ccd787
0963df90
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
333 addition
and
333 deletion
+333
-333
source/dnode/vnode/src/inc/tsdb.h
source/dnode/vnode/src/inc/tsdb.h
+19
-19
source/dnode/vnode/src/tsdb/tsdbCommit.c
source/dnode/vnode/src/tsdb/tsdbCommit.c
+47
-47
source/dnode/vnode/src/tsdb/tsdbFS.c
source/dnode/vnode/src/tsdb/tsdbFS.c
+99
-99
source/dnode/vnode/src/tsdb/tsdbFile.c
source/dnode/vnode/src/tsdb/tsdbFile.c
+21
-21
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
+31
-31
source/dnode/vnode/src/tsdb/tsdbRead.c
source/dnode/vnode/src/tsdb/tsdbRead.c
+9
-9
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+58
-58
source/dnode/vnode/src/tsdb/tsdbRetention.c
source/dnode/vnode/src/tsdb/tsdbRetention.c
+1
-1
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
+18
-18
source/dnode/vnode/src/tsdb/tsdbUtil.c
source/dnode/vnode/src/tsdb/tsdbUtil.c
+30
-30
未找到文件。
source/dnode/vnode/src/inc/tsdb.h
浏览文件 @
1e6caa26
...
...
@@ -43,14 +43,14 @@ typedef struct STbDataIter STbDataIter;
typedef
struct
SMapData
SMapData
;
typedef
struct
SBlockIdx
SBlockIdx
;
typedef
struct
SDataBlk
SDataBlk
;
typedef
struct
SS
stBlk
SSs
tBlk
;
typedef
struct
SS
ttBlk
SSt
tBlk
;
typedef
struct
SColData
SColData
;
typedef
struct
SDiskDataHdr
SDiskDataHdr
;
typedef
struct
SBlockData
SBlockData
;
typedef
struct
SDelFile
SDelFile
;
typedef
struct
SHeadFile
SHeadFile
;
typedef
struct
SDataFile
SDataFile
;
typedef
struct
SS
stFile
SSs
tFile
;
typedef
struct
SS
ttFile
SSt
tFile
;
typedef
struct
SSmaFile
SSmaFile
;
typedef
struct
SDFileSet
SDFileSet
;
typedef
struct
SDataFWriter
SDataFWriter
;
...
...
@@ -69,8 +69,8 @@ typedef struct SLDataIter SLDataIter;
#define TSDB_FILE_DLMT ((uint32_t)0xF00AFA0F)
#define TSDB_MAX_SUBBLOCKS 8
#define TSDB_MAX_S
S
T_FILE 16
#define TSDB_DEFAULT_S
S
T_FILE 8
#define TSDB_MAX_S
T
T_FILE 16
#define TSDB_DEFAULT_S
T
T_FILE 8
#define TSDB_FHDR_SIZE 512
#define TSDB_DEFAULT_PAGE_SIZE 4096
...
...
@@ -130,9 +130,9 @@ int32_t tPutDataBlk(uint8_t *p, void *ph);
int32_t
tGetDataBlk
(
uint8_t
*
p
,
void
*
ph
);
int32_t
tDataBlkCmprFn
(
const
void
*
p1
,
const
void
*
p2
);
bool
tDataBlkHasSma
(
SDataBlk
*
pDataBlk
);
// SS
s
tBlk
int32_t
tPutS
s
tBlk
(
uint8_t
*
p
,
void
*
ph
);
int32_t
tGetS
s
tBlk
(
uint8_t
*
p
,
void
*
ph
);
// SS
t
tBlk
int32_t
tPutS
t
tBlk
(
uint8_t
*
p
,
void
*
ph
);
int32_t
tGetS
t
tBlk
(
uint8_t
*
p
,
void
*
ph
);
// SBlockIdx
int32_t
tPutBlockIdx
(
uint8_t
*
p
,
void
*
ph
);
int32_t
tGetBlockIdx
(
uint8_t
*
p
,
void
*
ph
);
...
...
@@ -228,7 +228,7 @@ bool tsdbDelFileIsSame(SDelFile *pDelFile1, SDelFile *pDelFile2);
int32_t
tsdbDFileRollback
(
STsdb
*
pTsdb
,
SDFileSet
*
pSet
,
EDataFileT
ftype
);
int32_t
tPutHeadFile
(
uint8_t
*
p
,
SHeadFile
*
pHeadFile
);
int32_t
tPutDataFile
(
uint8_t
*
p
,
SDataFile
*
pDataFile
);
int32_t
tPutS
stFile
(
uint8_t
*
p
,
SSstFile
*
pSs
tFile
);
int32_t
tPutS
ttFile
(
uint8_t
*
p
,
SSttFile
*
pSt
tFile
);
int32_t
tPutSmaFile
(
uint8_t
*
p
,
SSmaFile
*
pSmaFile
);
int32_t
tPutDelFile
(
uint8_t
*
p
,
SDelFile
*
pDelFile
);
int32_t
tGetDelFile
(
uint8_t
*
p
,
SDelFile
*
pDelFile
);
...
...
@@ -237,7 +237,7 @@ int32_t tGetDFileSet(uint8_t *p, SDFileSet *pSet);
void
tsdbHeadFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SHeadFile
*
pHeadF
,
char
fname
[]);
void
tsdbDataFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SDataFile
*
pDataF
,
char
fname
[]);
void
tsdbS
stFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SSstFile
*
pSs
tF
,
char
fname
[]);
void
tsdbS
ttFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SSttFile
*
pSt
tF
,
char
fname
[]);
void
tsdbSmaFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SSmaFile
*
pSmaF
,
char
fname
[]);
// SDelFile
void
tsdbDelFileName
(
STsdb
*
pTsdb
,
SDelFile
*
pFile
,
char
fname
[]);
...
...
@@ -263,7 +263,7 @@ int32_t tsdbDataFWriterClose(SDataFWriter **ppWriter, int8_t sync);
int32_t
tsdbUpdateDFileSetHeader
(
SDataFWriter
*
pWriter
);
int32_t
tsdbWriteBlockIdx
(
SDataFWriter
*
pWriter
,
SArray
*
aBlockIdx
);
int32_t
tsdbWriteBlock
(
SDataFWriter
*
pWriter
,
SMapData
*
pMapData
,
SBlockIdx
*
pBlockIdx
);
int32_t
tsdbWriteS
stBlk
(
SDataFWriter
*
pWriter
,
SArray
*
aSs
tBlk
);
int32_t
tsdbWriteS
ttBlk
(
SDataFWriter
*
pWriter
,
SArray
*
aSt
tBlk
);
int32_t
tsdbWriteBlockData
(
SDataFWriter
*
pWriter
,
SBlockData
*
pBlockData
,
SBlockInfo
*
pBlkInfo
,
SSmaInfo
*
pSmaInfo
,
int8_t
cmprAlg
,
int8_t
toLast
);
...
...
@@ -273,10 +273,10 @@ int32_t tsdbDataFReaderOpen(SDataFReader **ppReader, STsdb *pTsdb, SDFileSet *pS
int32_t
tsdbDataFReaderClose
(
SDataFReader
**
ppReader
);
int32_t
tsdbReadBlockIdx
(
SDataFReader
*
pReader
,
SArray
*
aBlockIdx
);
int32_t
tsdbReadBlock
(
SDataFReader
*
pReader
,
SBlockIdx
*
pBlockIdx
,
SMapData
*
pMapData
);
int32_t
tsdbReadS
stBlk
(
SDataFReader
*
pReader
,
int32_t
iSst
,
SArray
*
aSs
tBlk
);
int32_t
tsdbReadS
ttBlk
(
SDataFReader
*
pReader
,
int32_t
iStt
,
SArray
*
aSt
tBlk
);
int32_t
tsdbReadBlockSma
(
SDataFReader
*
pReader
,
SDataBlk
*
pBlock
,
SArray
*
aColumnDataAgg
);
int32_t
tsdbReadDataBlock
(
SDataFReader
*
pReader
,
SDataBlk
*
pBlock
,
SBlockData
*
pBlockData
);
int32_t
tsdbReadS
stBlock
(
SDataFReader
*
pReader
,
int32_t
iSst
,
SSstBlk
*
pSs
tBlk
,
SBlockData
*
pBlockData
);
int32_t
tsdbReadS
ttBlock
(
SDataFReader
*
pReader
,
int32_t
iStt
,
SSttBlk
*
pSt
tBlk
,
SBlockData
*
pBlockData
);
// SDelFWriter
int32_t
tsdbDelFWriterOpen
(
SDelFWriter
**
ppWriter
,
SDelFile
*
pFile
,
STsdb
*
pTsdb
);
int32_t
tsdbDelFWriterClose
(
SDelFWriter
**
ppWriter
,
int8_t
sync
);
...
...
@@ -448,7 +448,7 @@ struct SDataBlk {
SSmaInfo
smaInfo
;
};
struct
SS
s
tBlk
{
struct
SS
t
tBlk
{
int64_t
suid
;
int64_t
minUid
;
int64_t
maxUid
;
...
...
@@ -550,7 +550,7 @@ struct SDataFile {
int64_t
size
;
};
struct
SS
s
tFile
{
struct
SS
t
tFile
{
volatile
int32_t
nRef
;
int64_t
commitID
;
...
...
@@ -571,8 +571,8 @@ struct SDFileSet {
SHeadFile
*
pHeadF
;
SDataFile
*
pDataF
;
SSmaFile
*
pSmaF
;
uint8_t
nS
s
tF
;
SS
stFile
*
aSstF
[
TSDB_MAX_SS
T_FILE
];
uint8_t
nS
t
tF
;
SS
ttFile
*
aSttF
[
TSDB_MAX_ST
T_FILE
];
};
struct
SRowIter
{
...
...
@@ -617,12 +617,12 @@ struct SDataFWriter {
STsdbFD
*
pHeadFD
;
STsdbFD
*
pDataFD
;
STsdbFD
*
pSmaFD
;
STsdbFD
*
pS
s
tFD
;
STsdbFD
*
pS
t
tFD
;
SHeadFile
fHead
;
SDataFile
fData
;
SSmaFile
fSma
;
SS
stFile
fSst
[
TSDB_MAX_SS
T_FILE
];
SS
ttFile
fStt
[
TSDB_MAX_ST
T_FILE
];
uint8_t
*
aBuf
[
4
];
};
...
...
@@ -633,7 +633,7 @@ struct SDataFReader {
STsdbFD
*
pHeadFD
;
STsdbFD
*
pDataFD
;
STsdbFD
*
pSmaFD
;
STsdbFD
*
aS
stFD
[
TSDB_MAX_SS
T_FILE
];
STsdbFD
*
aS
ttFD
[
TSDB_MAX_ST
T_FILE
];
uint8_t
*
aBuf
[
3
];
};
...
...
source/dnode/vnode/src/tsdb/tsdbCommit.c
浏览文件 @
1e6caa26
...
...
@@ -32,12 +32,12 @@ typedef struct {
STbDataIter
iter
;
};
// memory data iter
struct
{
int32_t
iS
s
t
;
SArray
*
aS
s
tBlk
;
int32_t
iS
s
tBlk
;
int32_t
iS
t
t
;
SArray
*
aS
t
tBlk
;
int32_t
iS
t
tBlk
;
SBlockData
bData
;
int32_t
iRow
;
};
// s
s
t file data iter
};
// s
t
t file data iter
};
}
SDataIter
;
...
...
@@ -71,13 +71,13 @@ typedef struct {
SDataIter
*
pIter
;
SRBTree
rbt
;
SDataIter
dataIter
;
SDataIter
aDataIter
[
TSDB_MAX_S
S
T_FILE
];
SDataIter
aDataIter
[
TSDB_MAX_S
T
T_FILE
];
int8_t
toLastOnly
;
};
struct
{
SDataFWriter
*
pWriter
;
SArray
*
aBlockIdx
;
// SArray<SBlockIdx>
SArray
*
aS
stBlk
;
// SArray<SSs
tBlk>
SArray
*
aS
ttBlk
;
// SArray<SSt
tBlk>
SMapData
mBlock
;
// SMapData<SDataBlk>
SBlockData
bData
;
SBlockData
bDatal
;
...
...
@@ -428,21 +428,21 @@ static int32_t tsdbOpenCommitIter(SCommitter *pCommitter) {
pCommitter
->
toLastOnly
=
0
;
SDataFReader
*
pReader
=
pCommitter
->
dReader
.
pReader
;
if
(
pReader
)
{
if
(
pReader
->
pSet
->
nS
s
tF
>=
pCommitter
->
maxLast
)
{
if
(
pReader
->
pSet
->
nS
t
tF
>=
pCommitter
->
maxLast
)
{
int8_t
iIter
=
0
;
for
(
int32_t
iS
st
=
0
;
iSst
<
pReader
->
pSet
->
nSstF
;
iSs
t
++
)
{
for
(
int32_t
iS
tt
=
0
;
iStt
<
pReader
->
pSet
->
nSttF
;
iSt
t
++
)
{
pIter
=
&
pCommitter
->
aDataIter
[
iIter
];
pIter
->
type
=
LAST_DATA_ITER
;
pIter
->
iS
st
=
iSs
t
;
pIter
->
iS
tt
=
iSt
t
;
code
=
tsdbReadS
stBlk
(
pCommitter
->
dReader
.
pReader
,
iSst
,
pIter
->
aSs
tBlk
);
code
=
tsdbReadS
ttBlk
(
pCommitter
->
dReader
.
pReader
,
iStt
,
pIter
->
aSt
tBlk
);
if
(
code
)
goto
_err
;
if
(
taosArrayGetSize
(
pIter
->
aS
s
tBlk
)
==
0
)
continue
;
if
(
taosArrayGetSize
(
pIter
->
aS
t
tBlk
)
==
0
)
continue
;
pIter
->
iS
s
tBlk
=
0
;
SS
stBlk
*
pSstBlk
=
(
SSstBlk
*
)
taosArrayGet
(
pIter
->
aSs
tBlk
,
0
);
code
=
tsdbReadS
stBlock
(
pCommitter
->
dReader
.
pReader
,
iSst
,
pSs
tBlk
,
&
pIter
->
bData
);
pIter
->
iS
t
tBlk
=
0
;
SS
ttBlk
*
pSttBlk
=
(
SSttBlk
*
)
taosArrayGet
(
pIter
->
aSt
tBlk
,
0
);
code
=
tsdbReadS
ttBlock
(
pCommitter
->
dReader
.
pReader
,
iStt
,
pSt
tBlk
,
&
pIter
->
bData
);
if
(
code
)
goto
_err
;
pIter
->
iRow
=
0
;
...
...
@@ -454,9 +454,9 @@ static int32_t tsdbOpenCommitIter(SCommitter *pCommitter) {
iIter
++
;
}
}
else
{
for
(
int32_t
iS
st
=
0
;
iSst
<
pReader
->
pSet
->
nSstF
;
iSs
t
++
)
{
SS
stFile
*
pSstFile
=
pReader
->
pSet
->
aSstF
[
iSs
t
];
if
(
pS
stFile
->
size
>
pSs
tFile
->
offset
)
{
for
(
int32_t
iS
tt
=
0
;
iStt
<
pReader
->
pSet
->
nSttF
;
iSt
t
++
)
{
SS
ttFile
*
pSttFile
=
pReader
->
pSet
->
aSttF
[
iSt
t
];
if
(
pS
ttFile
->
size
>
pSt
tFile
->
offset
)
{
pCommitter
->
toLastOnly
=
1
;
break
;
}
...
...
@@ -512,34 +512,34 @@ static int32_t tsdbCommitFileDataStart(SCommitter *pCommitter) {
SHeadFile
fHead
=
{.
commitID
=
pCommitter
->
commitID
};
SDataFile
fData
=
{.
commitID
=
pCommitter
->
commitID
};
SSmaFile
fSma
=
{.
commitID
=
pCommitter
->
commitID
};
SS
stFile
fSs
t
=
{.
commitID
=
pCommitter
->
commitID
};
SS
ttFile
fSt
t
=
{.
commitID
=
pCommitter
->
commitID
};
SDFileSet
wSet
=
{.
fid
=
pCommitter
->
commitFid
,
.
pHeadF
=
&
fHead
,
.
pDataF
=
&
fData
,
.
pSmaF
=
&
fSma
};
if
(
pRSet
)
{
ASSERT
(
pRSet
->
nS
s
tF
<=
pCommitter
->
maxLast
);
ASSERT
(
pRSet
->
nS
t
tF
<=
pCommitter
->
maxLast
);
fData
=
*
pRSet
->
pDataF
;
fSma
=
*
pRSet
->
pSmaF
;
wSet
.
diskId
=
pRSet
->
diskId
;
if
(
pRSet
->
nS
s
tF
<
pCommitter
->
maxLast
)
{
for
(
int32_t
iS
st
=
0
;
iSst
<
pRSet
->
nSstF
;
iSs
t
++
)
{
wSet
.
aS
stF
[
iSst
]
=
pRSet
->
aSstF
[
iSs
t
];
if
(
pRSet
->
nS
t
tF
<
pCommitter
->
maxLast
)
{
for
(
int32_t
iS
tt
=
0
;
iStt
<
pRSet
->
nSttF
;
iSt
t
++
)
{
wSet
.
aS
ttF
[
iStt
]
=
pRSet
->
aSttF
[
iSt
t
];
}
wSet
.
nS
stF
=
pRSet
->
nSs
tF
+
1
;
wSet
.
nS
ttF
=
pRSet
->
nSt
tF
+
1
;
}
else
{
wSet
.
nS
s
tF
=
1
;
wSet
.
nS
t
tF
=
1
;
}
}
else
{
SDiskID
did
=
{
0
};
tfsAllocDisk
(
pTsdb
->
pVnode
->
pTfs
,
0
,
&
did
);
tfsMkdirRecurAt
(
pTsdb
->
pVnode
->
pTfs
,
pTsdb
->
path
,
did
);
wSet
.
diskId
=
did
;
wSet
.
nS
s
tF
=
1
;
wSet
.
nS
t
tF
=
1
;
}
wSet
.
aS
stF
[
wSet
.
nSstF
-
1
]
=
&
fSs
t
;
wSet
.
aS
ttF
[
wSet
.
nSttF
-
1
]
=
&
fSt
t
;
code
=
tsdbDataFWriterOpen
(
&
pCommitter
->
dWriter
.
pWriter
,
pTsdb
,
&
wSet
);
if
(
code
)
goto
_err
;
taosArrayClear
(
pCommitter
->
dWriter
.
aBlockIdx
);
taosArrayClear
(
pCommitter
->
dWriter
.
aS
s
tBlk
);
taosArrayClear
(
pCommitter
->
dWriter
.
aS
t
tBlk
);
tMapDataReset
(
&
pCommitter
->
dWriter
.
mBlock
);
tBlockDataReset
(
&
pCommitter
->
dWriter
.
bData
);
tBlockDataReset
(
&
pCommitter
->
dWriter
.
bDatal
);
...
...
@@ -610,7 +610,7 @@ _err:
static
int32_t
tsdbCommitLastBlock
(
SCommitter
*
pCommitter
)
{
int32_t
code
=
0
;
SS
s
tBlk
blockL
;
SS
t
tBlk
blockL
;
SBlockData
*
pBlockData
=
&
pCommitter
->
dWriter
.
bDatal
;
ASSERT
(
pBlockData
->
nRow
>
0
);
...
...
@@ -635,8 +635,8 @@ static int32_t tsdbCommitLastBlock(SCommitter *pCommitter) {
code
=
tsdbWriteBlockData
(
pCommitter
->
dWriter
.
pWriter
,
pBlockData
,
&
blockL
.
bInfo
,
NULL
,
pCommitter
->
cmprAlg
,
1
);
if
(
code
)
goto
_err
;
// push SS
s
tBlk
if
(
taosArrayPush
(
pCommitter
->
dWriter
.
aS
s
tBlk
,
&
blockL
)
==
NULL
)
{
// push SS
t
tBlk
if
(
taosArrayPush
(
pCommitter
->
dWriter
.
aS
t
tBlk
,
&
blockL
)
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
...
...
@@ -658,8 +658,8 @@ static int32_t tsdbCommitFileDataEnd(SCommitter *pCommitter) {
code
=
tsdbWriteBlockIdx
(
pCommitter
->
dWriter
.
pWriter
,
pCommitter
->
dWriter
.
aBlockIdx
);
if
(
code
)
goto
_err
;
// write aS
s
tBlk
code
=
tsdbWriteS
stBlk
(
pCommitter
->
dWriter
.
pWriter
,
pCommitter
->
dWriter
.
aSs
tBlk
);
// write aS
t
tBlk
code
=
tsdbWriteS
ttBlk
(
pCommitter
->
dWriter
.
pWriter
,
pCommitter
->
dWriter
.
aSt
tBlk
);
if
(
code
)
goto
_err
;
// update file header
...
...
@@ -757,7 +757,7 @@ static int32_t tsdbStartCommit(STsdb *pTsdb, SCommitter *pCommitter) {
pCommitter
->
minRow
=
pTsdb
->
pVnode
->
config
.
tsdbCfg
.
minRows
;
pCommitter
->
maxRow
=
pTsdb
->
pVnode
->
config
.
tsdbCfg
.
maxRows
;
pCommitter
->
cmprAlg
=
pTsdb
->
pVnode
->
config
.
tsdbCfg
.
compression
;
pCommitter
->
maxLast
=
TSDB_DEFAULT_S
S
T_FILE
;
// TODO: make it as a config
pCommitter
->
maxLast
=
TSDB_DEFAULT_S
T
T_FILE
;
// TODO: make it as a config
pCommitter
->
aTbDataP
=
tsdbMemTableGetTbDataArray
(
pTsdb
->
imem
);
if
(
pCommitter
->
aTbDataP
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
...
...
@@ -787,10 +787,10 @@ static int32_t tsdbCommitDataStart(SCommitter *pCommitter) {
if
(
code
)
goto
_exit
;
// merger
for
(
int32_t
iS
st
=
0
;
iSst
<
TSDB_MAX_SST_FILE
;
iSs
t
++
)
{
SDataIter
*
pIter
=
&
pCommitter
->
aDataIter
[
iS
s
t
];
pIter
->
aS
stBlk
=
taosArrayInit
(
0
,
sizeof
(
SSs
tBlk
));
if
(
pIter
->
aS
s
tBlk
==
NULL
)
{
for
(
int32_t
iS
tt
=
0
;
iStt
<
TSDB_MAX_STT_FILE
;
iSt
t
++
)
{
SDataIter
*
pIter
=
&
pCommitter
->
aDataIter
[
iS
t
t
];
pIter
->
aS
ttBlk
=
taosArrayInit
(
0
,
sizeof
(
SSt
tBlk
));
if
(
pIter
->
aS
t
tBlk
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
...
...
@@ -806,8 +806,8 @@ static int32_t tsdbCommitDataStart(SCommitter *pCommitter) {
goto
_exit
;
}
pCommitter
->
dWriter
.
aS
stBlk
=
taosArrayInit
(
0
,
sizeof
(
SSs
tBlk
));
if
(
pCommitter
->
dWriter
.
aS
s
tBlk
==
NULL
)
{
pCommitter
->
dWriter
.
aS
ttBlk
=
taosArrayInit
(
0
,
sizeof
(
SSt
tBlk
));
if
(
pCommitter
->
dWriter
.
aS
t
tBlk
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
...
...
@@ -829,15 +829,15 @@ static void tsdbCommitDataEnd(SCommitter *pCommitter) {
tBlockDataDestroy
(
&
pCommitter
->
dReader
.
bData
,
1
);
// merger
for
(
int32_t
iS
st
=
0
;
iSst
<
TSDB_MAX_SST_FILE
;
iSs
t
++
)
{
SDataIter
*
pIter
=
&
pCommitter
->
aDataIter
[
iS
s
t
];
taosArrayDestroy
(
pIter
->
aS
s
tBlk
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
TSDB_MAX_STT_FILE
;
iSt
t
++
)
{
SDataIter
*
pIter
=
&
pCommitter
->
aDataIter
[
iS
t
t
];
taosArrayDestroy
(
pIter
->
aS
t
tBlk
);
tBlockDataDestroy
(
&
pIter
->
bData
,
1
);
}
// writer
taosArrayDestroy
(
pCommitter
->
dWriter
.
aBlockIdx
);
taosArrayDestroy
(
pCommitter
->
dWriter
.
aS
s
tBlk
);
taosArrayDestroy
(
pCommitter
->
dWriter
.
aS
t
tBlk
);
tMapDataClear
(
&
pCommitter
->
dWriter
.
mBlock
);
tBlockDataDestroy
(
&
pCommitter
->
dWriter
.
bData
,
1
);
tBlockDataDestroy
(
&
pCommitter
->
dWriter
.
bDatal
,
1
);
...
...
@@ -1052,11 +1052,11 @@ static int32_t tsdbNextCommitRow(SCommitter *pCommitter) {
pIter
->
r
.
uid
=
pIter
->
bData
.
uid
?
pIter
->
bData
.
uid
:
pIter
->
bData
.
aUid
[
pIter
->
iRow
];
pIter
->
r
.
row
=
tsdbRowFromBlockData
(
&
pIter
->
bData
,
pIter
->
iRow
);
}
else
{
pIter
->
iS
s
tBlk
++
;
if
(
pIter
->
iS
stBlk
<
taosArrayGetSize
(
pIter
->
aSs
tBlk
))
{
SS
stBlk
*
pSstBlk
=
(
SSstBlk
*
)
taosArrayGet
(
pIter
->
aSstBlk
,
pIter
->
iSs
tBlk
);
pIter
->
iS
t
tBlk
++
;
if
(
pIter
->
iS
ttBlk
<
taosArrayGetSize
(
pIter
->
aSt
tBlk
))
{
SS
ttBlk
*
pSttBlk
=
(
SSttBlk
*
)
taosArrayGet
(
pIter
->
aSttBlk
,
pIter
->
iSt
tBlk
);
code
=
tsdbReadS
stBlock
(
pCommitter
->
dReader
.
pReader
,
pIter
->
iSst
,
pSs
tBlk
,
&
pIter
->
bData
);
code
=
tsdbReadS
ttBlock
(
pCommitter
->
dReader
.
pReader
,
pIter
->
iStt
,
pSt
tBlk
,
&
pIter
->
bData
);
if
(
code
)
goto
_exit
;
pIter
->
iRow
=
0
;
...
...
source/dnode/vnode/src/tsdb/tsdbFS.c
浏览文件 @
1e6caa26
...
...
@@ -113,7 +113,7 @@ _err:
// taosRemoveFile(fname);
// }
// // s
s
t
// // s
t
t
// if (isSameDisk && pFrom->pLastF->commitID == pTo->pLastF->commitID) {
// if (pFrom->pLastF->size > pTo->pLastF->size) {
// code = tsdbDFileRollback(pFS->pTsdb, pTo, TSDB_LAST_FILE);
...
...
@@ -143,7 +143,7 @@ _err:
// tsdbDataFileName(pFS->pTsdb, pFrom->diskId, pFrom->fid, pFrom->pDataF, fname);
// taosRemoveFile(fname);
// // s
s
t
// // s
t
t
// tsdbLastFileName(pFS->pTsdb, pFrom->diskId, pFrom->fid, pFrom->pLastF, fname);
// taosRemoveFile(fname);
...
...
@@ -258,8 +258,8 @@ void tsdbFSDestroy(STsdbFS *pFS) {
taosMemoryFree
(
pSet
->
pHeadF
);
taosMemoryFree
(
pSet
->
pDataF
);
taosMemoryFree
(
pSet
->
pSmaF
);
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
taosMemoryFree
(
pSet
->
aS
stF
[
iSs
t
]);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
taosMemoryFree
(
pSet
->
aS
ttF
[
iSt
t
]);
}
}
...
...
@@ -328,14 +328,14 @@ static int32_t tsdbScanAndTryFixFS(STsdb *pTsdb) {
if
(
code
)
goto
_err
;
}
// s
s
t ===========
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
tsdbS
stFileName
(
pTsdb
,
pSet
->
diskId
,
pSet
->
fid
,
pSet
->
aSstF
[
iSs
t
],
fname
);
// s
t
t ===========
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
tsdbS
ttFileName
(
pTsdb
,
pSet
->
diskId
,
pSet
->
fid
,
pSet
->
aSttF
[
iSt
t
],
fname
);
if
(
taosStatFile
(
fname
,
&
size
,
NULL
))
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
size
!=
LOGIC_TO_FILE_SIZE
(
pSet
->
aS
stF
[
iSs
t
]
->
size
,
TSDB_DEFAULT_PAGE_SIZE
))
{
if
(
size
!=
LOGIC_TO_FILE_SIZE
(
pSet
->
aS
ttF
[
iSt
t
]
->
size
,
TSDB_DEFAULT_PAGE_SIZE
))
{
code
=
TSDB_CODE_FILE_CORRUPTED
;
goto
_err
;
}
...
...
@@ -519,10 +519,10 @@ int32_t tsdbFSClose(STsdb *pTsdb) {
ASSERT
(
pSet
->
pSmaF
->
nRef
==
1
);
taosMemoryFree
(
pSet
->
pSmaF
);
// s
s
t
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
ASSERT
(
pSet
->
aS
stF
[
iSs
t
]
->
nRef
==
1
);
taosMemoryFree
(
pSet
->
aS
stF
[
iSs
t
]);
// s
t
t
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
ASSERT
(
pSet
->
aS
ttF
[
iSt
t
]
->
nRef
==
1
);
taosMemoryFree
(
pSet
->
aS
ttF
[
iSt
t
]);
}
}
...
...
@@ -579,14 +579,14 @@ int32_t tsdbFSCopy(STsdb *pTsdb, STsdbFS *pFS) {
}
*
fSet
.
pSmaF
=
*
pSet
->
pSmaF
;
// s
s
t
for
(
fSet
.
nS
stF
=
0
;
fSet
.
nSstF
<
pSet
->
nSstF
;
fSet
.
nSs
tF
++
)
{
fSet
.
aS
stF
[
fSet
.
nSstF
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
fSet
.
aS
stF
[
fSet
.
nSs
tF
]
==
NULL
)
{
// s
t
t
for
(
fSet
.
nS
ttF
=
0
;
fSet
.
nSttF
<
pSet
->
nSttF
;
fSet
.
nSt
tF
++
)
{
fSet
.
aS
ttF
[
fSet
.
nSttF
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
fSet
.
aS
ttF
[
fSet
.
nSt
tF
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
*
fSet
.
aS
stF
[
fSet
.
nSstF
]
=
*
pSet
->
aSstF
[
fSet
.
nSs
tF
];
*
fSet
.
aS
ttF
[
fSet
.
nSttF
]
=
*
pSet
->
aSttF
[
fSet
.
nSt
tF
];
}
if
(
taosArrayPush
(
pFS
->
aDFileSet
,
&
fSet
)
==
NULL
)
{
...
...
@@ -639,28 +639,28 @@ int32_t tsdbFSUpsertFSet(STsdbFS *pFS, SDFileSet *pSet) {
*
pDFileSet
->
pHeadF
=
*
pSet
->
pHeadF
;
*
pDFileSet
->
pDataF
=
*
pSet
->
pDataF
;
*
pDFileSet
->
pSmaF
=
*
pSet
->
pSmaF
;
// s
s
t
if
(
pSet
->
nS
stF
>
pDFileSet
->
nSs
tF
)
{
ASSERT
(
pSet
->
nS
stF
==
pDFileSet
->
nSs
tF
+
1
);
// s
t
t
if
(
pSet
->
nS
ttF
>
pDFileSet
->
nSt
tF
)
{
ASSERT
(
pSet
->
nS
ttF
==
pDFileSet
->
nSt
tF
+
1
);
pDFileSet
->
aS
stF
[
pDFileSet
->
nSstF
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
pDFileSet
->
aS
stF
[
pDFileSet
->
nSs
tF
]
==
NULL
)
{
pDFileSet
->
aS
ttF
[
pDFileSet
->
nSttF
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
pDFileSet
->
aS
ttF
[
pDFileSet
->
nSt
tF
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
*
pDFileSet
->
aS
stF
[
pDFileSet
->
nSstF
]
=
*
pSet
->
aSstF
[
pSet
->
nSs
tF
-
1
];
pDFileSet
->
nS
s
tF
++
;
}
else
if
(
pSet
->
nS
stF
<
pDFileSet
->
nSs
tF
)
{
ASSERT
(
pSet
->
nS
s
tF
==
1
);
for
(
int32_t
iS
st
=
1
;
iSst
<
pDFileSet
->
nSstF
;
iSs
t
++
)
{
taosMemoryFree
(
pDFileSet
->
aS
stF
[
iSs
t
]);
*
pDFileSet
->
aS
ttF
[
pDFileSet
->
nSttF
]
=
*
pSet
->
aSttF
[
pSet
->
nSt
tF
-
1
];
pDFileSet
->
nS
t
tF
++
;
}
else
if
(
pSet
->
nS
ttF
<
pDFileSet
->
nSt
tF
)
{
ASSERT
(
pSet
->
nS
t
tF
==
1
);
for
(
int32_t
iS
tt
=
1
;
iStt
<
pDFileSet
->
nSttF
;
iSt
t
++
)
{
taosMemoryFree
(
pDFileSet
->
aS
ttF
[
iSt
t
]);
}
*
pDFileSet
->
aS
stF
[
0
]
=
*
pSet
->
aSs
tF
[
0
];
pDFileSet
->
nS
s
tF
=
1
;
*
pDFileSet
->
aS
ttF
[
0
]
=
*
pSet
->
aSt
tF
[
0
];
pDFileSet
->
nS
t
tF
=
1
;
}
else
{
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
*
pDFileSet
->
aS
stF
[
iSst
]
=
*
pSet
->
aSstF
[
iSs
t
];
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
*
pDFileSet
->
aS
ttF
[
iStt
]
=
*
pSet
->
aSttF
[
iSt
t
];
}
}
...
...
@@ -668,8 +668,8 @@ int32_t tsdbFSUpsertFSet(STsdbFS *pFS, SDFileSet *pSet) {
}
}
ASSERT
(
pSet
->
nS
s
tF
==
1
);
SDFileSet
fSet
=
{.
diskId
=
pSet
->
diskId
,
.
fid
=
pSet
->
fid
,
.
nS
s
tF
=
1
};
ASSERT
(
pSet
->
nS
t
tF
==
1
);
SDFileSet
fSet
=
{.
diskId
=
pSet
->
diskId
,
.
fid
=
pSet
->
fid
,
.
nS
t
tF
=
1
};
// head
fSet
.
pHeadF
=
(
SHeadFile
*
)
taosMemoryMalloc
(
sizeof
(
SHeadFile
));
...
...
@@ -695,13 +695,13 @@ int32_t tsdbFSUpsertFSet(STsdbFS *pFS, SDFileSet *pSet) {
}
*
fSet
.
pSmaF
=
*
pSet
->
pSmaF
;
// s
s
t
fSet
.
aS
stF
[
0
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
fSet
.
aS
s
tF
[
0
]
==
NULL
)
{
// s
t
t
fSet
.
aS
ttF
[
0
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
fSet
.
aS
t
tF
[
0
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
*
fSet
.
aS
stF
[
0
]
=
*
pSet
->
aSs
tF
[
0
];
*
fSet
.
aS
ttF
[
0
]
=
*
pSet
->
aSt
tF
[
0
];
if
(
taosArrayInsert
(
pFS
->
aDFileSet
,
idx
,
&
fSet
)
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
...
...
@@ -869,81 +869,81 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
pSetOld
->
pSmaF
->
size
=
pSetNew
->
pSmaF
->
size
;
}
// s
s
t
// s
t
t
if
(
sameDisk
)
{
if
(
pSetNew
->
nS
stF
>
pSetOld
->
nSs
tF
)
{
ASSERT
(
pSetNew
->
nS
stF
=
pSetOld
->
nSs
tF
+
1
);
pSetOld
->
aS
stF
[
pSetOld
->
nSstF
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
pSetOld
->
aS
stF
[
pSetOld
->
nSs
tF
]
==
NULL
)
{
if
(
pSetNew
->
nS
ttF
>
pSetOld
->
nSt
tF
)
{
ASSERT
(
pSetNew
->
nS
ttF
=
pSetOld
->
nSt
tF
+
1
);
pSetOld
->
aS
ttF
[
pSetOld
->
nSttF
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
pSetOld
->
aS
ttF
[
pSetOld
->
nSt
tF
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
*
pSetOld
->
aS
stF
[
pSetOld
->
nSstF
]
=
*
pSetNew
->
aSstF
[
pSetOld
->
nSs
tF
];
pSetOld
->
aS
stF
[
pSetOld
->
nSs
tF
]
->
nRef
=
1
;
pSetOld
->
nS
s
tF
++
;
}
else
if
(
pSetNew
->
nS
stF
<
pSetOld
->
nSs
tF
)
{
ASSERT
(
pSetNew
->
nS
s
tF
==
1
);
for
(
int32_t
iS
st
=
0
;
iSst
<
pSetOld
->
nSstF
;
iSs
t
++
)
{
SS
stFile
*
pSstFile
=
pSetOld
->
aSstF
[
iSs
t
];
nRef
=
atomic_sub_fetch_32
(
&
pS
s
tFile
->
nRef
,
1
);
*
pSetOld
->
aS
ttF
[
pSetOld
->
nSttF
]
=
*
pSetNew
->
aSttF
[
pSetOld
->
nSt
tF
];
pSetOld
->
aS
ttF
[
pSetOld
->
nSt
tF
]
->
nRef
=
1
;
pSetOld
->
nS
t
tF
++
;
}
else
if
(
pSetNew
->
nS
ttF
<
pSetOld
->
nSt
tF
)
{
ASSERT
(
pSetNew
->
nS
t
tF
==
1
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSetOld
->
nSttF
;
iSt
t
++
)
{
SS
ttFile
*
pSttFile
=
pSetOld
->
aSttF
[
iSt
t
];
nRef
=
atomic_sub_fetch_32
(
&
pS
t
tFile
->
nRef
,
1
);
if
(
nRef
==
0
)
{
tsdbS
stFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSs
tFile
,
fname
);
tsdbS
ttFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSt
tFile
,
fname
);
taosRemoveFile
(
fname
);
taosMemoryFree
(
pS
s
tFile
);
taosMemoryFree
(
pS
t
tFile
);
}
pSetOld
->
aS
stF
[
iSs
t
]
=
NULL
;
pSetOld
->
aS
ttF
[
iSt
t
]
=
NULL
;
}
pSetOld
->
nS
s
tF
=
1
;
pSetOld
->
aS
stF
[
0
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
pSetOld
->
aS
s
tF
[
0
]
==
NULL
)
{
pSetOld
->
nS
t
tF
=
1
;
pSetOld
->
aS
ttF
[
0
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
pSetOld
->
aS
t
tF
[
0
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
*
pSetOld
->
aS
stF
[
0
]
=
*
pSetNew
->
aSs
tF
[
0
];
pSetOld
->
aS
s
tF
[
0
]
->
nRef
=
1
;
*
pSetOld
->
aS
ttF
[
0
]
=
*
pSetNew
->
aSt
tF
[
0
];
pSetOld
->
aS
t
tF
[
0
]
->
nRef
=
1
;
}
else
{
for
(
int32_t
iS
st
=
0
;
iSst
<
pSetOld
->
nSstF
;
iSs
t
++
)
{
if
(
pSetOld
->
aS
stF
[
iSst
]
->
commitID
!=
pSetNew
->
aSstF
[
iSs
t
]
->
commitID
)
{
SS
stFile
*
pSstFile
=
pSetOld
->
aSstF
[
iSs
t
];
nRef
=
atomic_sub_fetch_32
(
&
pS
s
tFile
->
nRef
,
1
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSetOld
->
nSttF
;
iSt
t
++
)
{
if
(
pSetOld
->
aS
ttF
[
iStt
]
->
commitID
!=
pSetNew
->
aSttF
[
iSt
t
]
->
commitID
)
{
SS
ttFile
*
pSttFile
=
pSetOld
->
aSttF
[
iSt
t
];
nRef
=
atomic_sub_fetch_32
(
&
pS
t
tFile
->
nRef
,
1
);
if
(
nRef
==
0
)
{
tsdbS
stFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSs
tFile
,
fname
);
tsdbS
ttFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSt
tFile
,
fname
);
taosRemoveFile
(
fname
);
taosMemoryFree
(
pS
s
tFile
);
taosMemoryFree
(
pS
t
tFile
);
}
pSetOld
->
aS
stF
[
iSst
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
pSetOld
->
aS
stF
[
iSs
t
]
==
NULL
)
{
pSetOld
->
aS
ttF
[
iStt
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
pSetOld
->
aS
ttF
[
iSt
t
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
*
pSetOld
->
aS
stF
[
iSst
]
=
*
pSetNew
->
aSstF
[
iSs
t
];
pSetOld
->
aS
stF
[
iSs
t
]
->
nRef
=
1
;
*
pSetOld
->
aS
ttF
[
iStt
]
=
*
pSetNew
->
aSttF
[
iSt
t
];
pSetOld
->
aS
ttF
[
iSt
t
]
->
nRef
=
1
;
}
else
{
ASSERT
(
pSetOld
->
aS
stF
[
iSst
]
->
size
==
pSetOld
->
aSstF
[
iSs
t
]
->
size
);
ASSERT
(
pSetOld
->
aS
stF
[
iSst
]
->
offset
==
pSetOld
->
aSstF
[
iSs
t
]
->
offset
);
ASSERT
(
pSetOld
->
aS
ttF
[
iStt
]
->
size
==
pSetOld
->
aSttF
[
iSt
t
]
->
size
);
ASSERT
(
pSetOld
->
aS
ttF
[
iStt
]
->
offset
==
pSetOld
->
aSttF
[
iSt
t
]
->
offset
);
}
}
}
}
else
{
ASSERT
(
pSetOld
->
nS
stF
==
pSetNew
->
nSs
tF
);
for
(
int32_t
iS
st
=
0
;
iSst
<
pSetOld
->
nSstF
;
iSs
t
++
)
{
SS
stFile
*
pSstFile
=
pSetOld
->
aSstF
[
iSs
t
];
nRef
=
atomic_sub_fetch_32
(
&
pS
s
tFile
->
nRef
,
1
);
ASSERT
(
pSetOld
->
nS
ttF
==
pSetNew
->
nSt
tF
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSetOld
->
nSttF
;
iSt
t
++
)
{
SS
ttFile
*
pSttFile
=
pSetOld
->
aSttF
[
iSt
t
];
nRef
=
atomic_sub_fetch_32
(
&
pS
t
tFile
->
nRef
,
1
);
if
(
nRef
==
0
)
{
tsdbS
stFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSs
tFile
,
fname
);
tsdbS
ttFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSt
tFile
,
fname
);
taosRemoveFile
(
fname
);
taosMemoryFree
(
pS
s
tFile
);
taosMemoryFree
(
pS
t
tFile
);
}
pSetOld
->
aS
stF
[
iSst
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
pSetOld
->
aS
stF
[
iSs
t
]
==
NULL
)
{
pSetOld
->
aS
ttF
[
iStt
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
pSetOld
->
aS
ttF
[
iSt
t
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
*
pSetOld
->
aS
stF
[
iSst
]
=
*
pSetNew
->
aSstF
[
iSs
t
];
pSetOld
->
aS
stF
[
iSs
t
]
->
nRef
=
1
;
*
pSetOld
->
aS
ttF
[
iStt
]
=
*
pSetNew
->
aSttF
[
iSt
t
];
pSetOld
->
aS
ttF
[
iSt
t
]
->
nRef
=
1
;
}
}
...
...
@@ -977,12 +977,12 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
taosMemoryFree
(
pSetOld
->
pSmaF
);
}
for
(
int8_t
iS
st
=
0
;
iSst
<
pSetOld
->
nSstF
;
iSs
t
++
)
{
nRef
=
atomic_sub_fetch_32
(
&
pSetOld
->
aS
stF
[
iSs
t
]
->
nRef
,
1
);
for
(
int8_t
iS
tt
=
0
;
iStt
<
pSetOld
->
nSttF
;
iSt
t
++
)
{
nRef
=
atomic_sub_fetch_32
(
&
pSetOld
->
aS
ttF
[
iSt
t
]
->
nRef
,
1
);
if
(
nRef
==
0
)
{
tsdbS
stFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSetOld
->
aSstF
[
iSs
t
],
fname
);
tsdbS
ttFileName
(
pTsdb
,
pSetOld
->
diskId
,
pSetOld
->
fid
,
pSetOld
->
aSttF
[
iSt
t
],
fname
);
taosRemoveFile
(
fname
);
taosMemoryFree
(
pSetOld
->
aS
stF
[
iSs
t
]);
taosMemoryFree
(
pSetOld
->
aS
ttF
[
iSt
t
]);
}
}
...
...
@@ -990,7 +990,7 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
continue
;
_add_new:
fSet
=
(
SDFileSet
){.
diskId
=
pSetNew
->
diskId
,
.
fid
=
pSetNew
->
fid
,
.
nS
s
tF
=
1
};
fSet
=
(
SDFileSet
){.
diskId
=
pSetNew
->
diskId
,
.
fid
=
pSetNew
->
fid
,
.
nS
t
tF
=
1
};
// head
fSet
.
pHeadF
=
(
SHeadFile
*
)
taosMemoryMalloc
(
sizeof
(
SHeadFile
));
...
...
@@ -1019,15 +1019,15 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
*
fSet
.
pSmaF
=
*
pSetNew
->
pSmaF
;
fSet
.
pSmaF
->
nRef
=
1
;
// s
s
t
ASSERT
(
pSetNew
->
nS
s
tF
==
1
);
fSet
.
aS
stF
[
0
]
=
(
SSstFile
*
)
taosMemoryMalloc
(
sizeof
(
SSs
tFile
));
if
(
fSet
.
aS
s
tF
[
0
]
==
NULL
)
{
// s
t
t
ASSERT
(
pSetNew
->
nS
t
tF
==
1
);
fSet
.
aS
ttF
[
0
]
=
(
SSttFile
*
)
taosMemoryMalloc
(
sizeof
(
SSt
tFile
));
if
(
fSet
.
aS
t
tF
[
0
]
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
*
fSet
.
aS
stF
[
0
]
=
*
pSetNew
->
aSs
tF
[
0
];
fSet
.
aS
s
tF
[
0
]
->
nRef
=
1
;
*
fSet
.
aS
ttF
[
0
]
=
*
pSetNew
->
aSt
tF
[
0
];
fSet
.
aS
t
tF
[
0
]
->
nRef
=
1
;
if
(
taosArrayInsert
(
pTsdb
->
fs
.
aDFileSet
,
iOld
,
&
fSet
)
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
...
...
@@ -1075,8 +1075,8 @@ int32_t tsdbFSRef(STsdb *pTsdb, STsdbFS *pFS) {
nRef
=
atomic_fetch_add_32
(
&
pSet
->
pSmaF
->
nRef
,
1
);
ASSERT
(
nRef
>
0
);
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
nRef
=
atomic_fetch_add_32
(
&
pSet
->
aS
stF
[
iSs
t
]
->
nRef
,
1
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
nRef
=
atomic_fetch_add_32
(
&
pSet
->
aS
ttF
[
iSt
t
]
->
nRef
,
1
);
ASSERT
(
nRef
>
0
);
}
...
...
@@ -1134,14 +1134,14 @@ void tsdbFSUnref(STsdb *pTsdb, STsdbFS *pFS) {
taosMemoryFree
(
pSet
->
pSmaF
);
}
// s
s
t
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
nRef
=
atomic_sub_fetch_32
(
&
pSet
->
aS
stF
[
iSs
t
]
->
nRef
,
1
);
// s
t
t
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
nRef
=
atomic_sub_fetch_32
(
&
pSet
->
aS
ttF
[
iSt
t
]
->
nRef
,
1
);
ASSERT
(
nRef
>=
0
);
if
(
nRef
==
0
)
{
tsdbS
stFileName
(
pTsdb
,
pSet
->
diskId
,
pSet
->
fid
,
pSet
->
aSstF
[
iSs
t
],
fname
);
tsdbS
ttFileName
(
pTsdb
,
pSet
->
diskId
,
pSet
->
fid
,
pSet
->
aSttF
[
iSt
t
],
fname
);
taosRemoveFile
(
fname
);
taosMemoryFree
(
pSet
->
aS
stF
[
iSs
t
]);
taosMemoryFree
(
pSet
->
aS
ttF
[
iSt
t
]);
/* code */
}
}
...
...
source/dnode/vnode/src/tsdb/tsdbFile.c
浏览文件 @
1e6caa26
...
...
@@ -53,22 +53,22 @@ static int32_t tGetDataFile(uint8_t *p, SDataFile *pDataFile) {
return
n
;
}
int32_t
tPutS
stFile
(
uint8_t
*
p
,
SSstFile
*
pSs
tFile
)
{
int32_t
tPutS
ttFile
(
uint8_t
*
p
,
SSttFile
*
pSt
tFile
)
{
int32_t
n
=
0
;
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tFile
->
commitID
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tFile
->
size
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tFile
->
offset
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tFile
->
commitID
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tFile
->
size
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tFile
->
offset
);
return
n
;
}
static
int32_t
tGetS
stFile
(
uint8_t
*
p
,
SSstFile
*
pSs
tFile
)
{
static
int32_t
tGetS
ttFile
(
uint8_t
*
p
,
SSttFile
*
pSt
tFile
)
{
int32_t
n
=
0
;
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tFile
->
commitID
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tFile
->
size
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tFile
->
offset
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tFile
->
commitID
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tFile
->
size
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tFile
->
offset
);
return
n
;
}
...
...
@@ -102,9 +102,9 @@ void tsdbDataFileName(STsdb *pTsdb, SDiskID did, int32_t fid, SDataFile *pDataF,
TD_DIRSEP
,
pTsdb
->
path
,
TD_DIRSEP
,
TD_VID
(
pTsdb
->
pVnode
),
fid
,
pDataF
->
commitID
,
".data"
);
}
void
tsdbS
stFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SSstFile
*
pSs
tF
,
char
fname
[])
{
void
tsdbS
ttFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SSttFile
*
pSt
tF
,
char
fname
[])
{
snprintf
(
fname
,
TSDB_FILENAME_LEN
-
1
,
"%s%s%s%sv%df%dver%"
PRId64
"%s"
,
tfsGetDiskPath
(
pTsdb
->
pVnode
->
pTfs
,
did
),
TD_DIRSEP
,
pTsdb
->
path
,
TD_DIRSEP
,
TD_VID
(
pTsdb
->
pVnode
),
fid
,
pS
stF
->
commitID
,
".ss
t"
);
TD_DIRSEP
,
pTsdb
->
path
,
TD_DIRSEP
,
TD_VID
(
pTsdb
->
pVnode
),
fid
,
pS
ttF
->
commitID
,
".st
t"
);
}
void
tsdbSmaFileName
(
STsdb
*
pTsdb
,
SDiskID
did
,
int32_t
fid
,
SSmaFile
*
pSmaF
,
char
fname
[])
{
...
...
@@ -194,10 +194,10 @@ int32_t tPutDFileSet(uint8_t *p, SDFileSet *pSet) {
n
+=
tPutDataFile
(
p
?
p
+
n
:
p
,
pSet
->
pDataF
);
n
+=
tPutSmaFile
(
p
?
p
+
n
:
p
,
pSet
->
pSmaF
);
// s
s
t
n
+=
tPutU8
(
p
?
p
+
n
:
p
,
pSet
->
nS
s
tF
);
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
n
+=
tPutS
stFile
(
p
?
p
+
n
:
p
,
pSet
->
aSstF
[
iSs
t
]);
// s
t
t
n
+=
tPutU8
(
p
?
p
+
n
:
p
,
pSet
->
nS
t
tF
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
n
+=
tPutS
ttFile
(
p
?
p
+
n
:
p
,
pSet
->
aSttF
[
iSt
t
]);
}
return
n
;
...
...
@@ -234,15 +234,15 @@ int32_t tGetDFileSet(uint8_t *p, SDFileSet *pSet) {
pSet
->
pSmaF
->
nRef
=
1
;
n
+=
tGetSmaFile
(
p
+
n
,
pSet
->
pSmaF
);
// s
s
t
n
+=
tGetU8
(
p
+
n
,
&
pSet
->
nS
s
tF
);
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
pSet
->
aS
stF
[
iSst
]
=
(
SSstFile
*
)
taosMemoryCalloc
(
1
,
sizeof
(
SSs
tFile
));
if
(
pSet
->
aS
stF
[
iSs
t
]
==
NULL
)
{
// s
t
t
n
+=
tGetU8
(
p
+
n
,
&
pSet
->
nS
t
tF
);
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
pSet
->
aS
ttF
[
iStt
]
=
(
SSttFile
*
)
taosMemoryCalloc
(
1
,
sizeof
(
SSt
tFile
));
if
(
pSet
->
aS
ttF
[
iSt
t
]
==
NULL
)
{
return
-
1
;
}
pSet
->
aS
stF
[
iSs
t
]
->
nRef
=
1
;
n
+=
tGetS
stFile
(
p
+
n
,
pSet
->
aSstF
[
iSs
t
]);
pSet
->
aS
ttF
[
iSt
t
]
->
nRef
=
1
;
n
+=
tGetS
ttFile
(
p
+
n
,
pSet
->
aSttF
[
iSt
t
]);
}
return
n
;
...
...
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
浏览文件 @
1e6caa26
...
...
@@ -18,12 +18,12 @@
// SLDataIter =================================================
struct
SLDataIter
{
SRBTreeNode
node
;
SS
stBlk
*
pSs
tBlk
;
SS
ttBlk
*
pSt
tBlk
;
SDataFReader
*
pReader
;
int32_t
iS
s
t
;
int32_t
iS
t
t
;
int8_t
backward
;
SArray
*
aS
s
tBlk
;
int32_t
iS
s
tBlk
;
SArray
*
aS
t
tBlk
;
int32_t
iS
t
tBlk
;
SBlockData
bData
[
2
];
int32_t
loadIndex
;
int32_t
iRow
;
...
...
@@ -40,7 +40,7 @@ static SBlockData *getNextBlock(SLDataIter *pIter) {
return
getCurrentBlock
(
pIter
);
}
int32_t
tLDataIterOpen
(
struct
SLDataIter
**
pIter
,
SDataFReader
*
pReader
,
int32_t
iS
s
t
,
int8_t
backward
,
uint64_t
uid
,
int32_t
tLDataIterOpen
(
struct
SLDataIter
**
pIter
,
SDataFReader
*
pReader
,
int32_t
iS
t
t
,
int8_t
backward
,
uint64_t
uid
,
STimeWindow
*
pTimeWindow
,
SVersionRange
*
pRange
)
{
int32_t
code
=
0
;
*
pIter
=
taosMemoryCalloc
(
1
,
sizeof
(
SLDataIter
));
...
...
@@ -53,10 +53,10 @@ int32_t tLDataIterOpen(struct SLDataIter **pIter, SDataFReader *pReader, int32_t
(
*
pIter
)
->
timeWindow
=
*
pTimeWindow
;
(
*
pIter
)
->
verRange
=
*
pRange
;
(
*
pIter
)
->
pReader
=
pReader
;
(
*
pIter
)
->
iS
st
=
iSs
t
;
(
*
pIter
)
->
iS
tt
=
iSt
t
;
(
*
pIter
)
->
backward
=
backward
;
(
*
pIter
)
->
aS
stBlk
=
taosArrayInit
(
0
,
sizeof
(
SSs
tBlk
));
if
((
*
pIter
)
->
aS
s
tBlk
==
NULL
)
{
(
*
pIter
)
->
aS
ttBlk
=
taosArrayInit
(
0
,
sizeof
(
SSt
tBlk
));
if
((
*
pIter
)
->
aS
t
tBlk
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
}
...
...
@@ -71,18 +71,18 @@ int32_t tLDataIterOpen(struct SLDataIter **pIter, SDataFReader *pReader, int32_t
goto
_exit
;
}
code
=
tsdbReadS
stBlk
(
pReader
,
iSst
,
(
*
pIter
)
->
aSs
tBlk
);
code
=
tsdbReadS
ttBlk
(
pReader
,
iStt
,
(
*
pIter
)
->
aSt
tBlk
);
if
(
code
)
{
goto
_exit
;
}
size_t
size
=
taosArrayGetSize
((
*
pIter
)
->
aS
s
tBlk
);
size_t
size
=
taosArrayGetSize
((
*
pIter
)
->
aS
t
tBlk
);
// find the start block
int32_t
index
=
-
1
;
if
(
!
backward
)
{
// asc
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
SS
stBlk
*
p
=
taosArrayGet
((
*
pIter
)
->
aSs
tBlk
,
i
);
SS
ttBlk
*
p
=
taosArrayGet
((
*
pIter
)
->
aSt
tBlk
,
i
);
if
(
p
->
minUid
<=
uid
&&
p
->
maxUid
>=
uid
)
{
index
=
i
;
break
;
...
...
@@ -90,7 +90,7 @@ int32_t tLDataIterOpen(struct SLDataIter **pIter, SDataFReader *pReader, int32_t
}
}
else
{
// desc
for
(
int32_t
i
=
size
-
1
;
i
>=
0
;
--
i
)
{
SS
stBlk
*
p
=
taosArrayGet
((
*
pIter
)
->
aSs
tBlk
,
i
);
SS
ttBlk
*
p
=
taosArrayGet
((
*
pIter
)
->
aSt
tBlk
,
i
);
if
(
p
->
minUid
<=
uid
&&
p
->
maxUid
>=
uid
)
{
index
=
i
;
break
;
...
...
@@ -98,9 +98,9 @@ int32_t tLDataIterOpen(struct SLDataIter **pIter, SDataFReader *pReader, int32_t
}
}
(
*
pIter
)
->
iS
s
tBlk
=
index
;
(
*
pIter
)
->
iS
t
tBlk
=
index
;
if
(
index
!=
-
1
)
{
(
*
pIter
)
->
pS
stBlk
=
taosArrayGet
((
*
pIter
)
->
aSstBlk
,
(
*
pIter
)
->
iSs
tBlk
);
(
*
pIter
)
->
pS
ttBlk
=
taosArrayGet
((
*
pIter
)
->
aSttBlk
,
(
*
pIter
)
->
iSt
tBlk
);
}
_exit:
...
...
@@ -110,18 +110,18 @@ _exit:
void
tLDataIterClose
(
SLDataIter
*
pIter
)
{
tBlockDataDestroy
(
&
pIter
->
bData
[
0
],
1
);
tBlockDataDestroy
(
&
pIter
->
bData
[
1
],
1
);
taosArrayDestroy
(
pIter
->
aS
s
tBlk
);
taosArrayDestroy
(
pIter
->
aS
t
tBlk
);
taosMemoryFree
(
pIter
);
}
void
tLDataIterNextBlock
(
SLDataIter
*
pIter
)
{
int32_t
step
=
pIter
->
backward
?
-
1
:
1
;
pIter
->
iS
s
tBlk
+=
step
;
pIter
->
iS
t
tBlk
+=
step
;
int32_t
index
=
-
1
;
size_t
size
=
taosArrayGetSize
(
pIter
->
aS
s
tBlk
);
for
(
int32_t
i
=
pIter
->
iS
s
tBlk
;
i
<
size
&&
i
>=
0
;
i
+=
step
)
{
SS
stBlk
*
p
=
taosArrayGet
(
pIter
->
aSs
tBlk
,
i
);
size_t
size
=
taosArrayGetSize
(
pIter
->
aS
t
tBlk
);
for
(
int32_t
i
=
pIter
->
iS
t
tBlk
;
i
<
size
&&
i
>=
0
;
i
+=
step
)
{
SS
ttBlk
*
p
=
taosArrayGet
(
pIter
->
aSt
tBlk
,
i
);
if
((
!
pIter
->
backward
)
&&
p
->
minUid
>
pIter
->
uid
)
{
break
;
}
...
...
@@ -137,9 +137,9 @@ void tLDataIterNextBlock(SLDataIter *pIter) {
}
if
(
index
==
-
1
)
{
pIter
->
pS
s
tBlk
=
NULL
;
pIter
->
pS
t
tBlk
=
NULL
;
}
else
{
pIter
->
pS
stBlk
=
(
SSstBlk
*
)
taosArrayGet
(
pIter
->
aSstBlk
,
pIter
->
iSs
tBlk
);
pIter
->
pS
ttBlk
=
(
SSttBlk
*
)
taosArrayGet
(
pIter
->
aSttBlk
,
pIter
->
iSt
tBlk
);
}
}
...
...
@@ -212,16 +212,16 @@ bool tLDataIterNextRow(SLDataIter *pIter) {
int32_t
step
=
pIter
->
backward
?
-
1
:
1
;
// no qualified last file block in current file, no need to fetch row
if
(
pIter
->
pS
s
tBlk
==
NULL
)
{
if
(
pIter
->
pS
t
tBlk
==
NULL
)
{
return
false
;
}
int32_t
iBlockL
=
pIter
->
iS
s
tBlk
;
int32_t
iBlockL
=
pIter
->
iS
t
tBlk
;
SBlockData
*
pBlockData
=
getCurrentBlock
(
pIter
);
if
(
pBlockData
->
nRow
==
0
&&
pIter
->
pS
s
tBlk
!=
NULL
)
{
// current block not loaded yet
if
(
pBlockData
->
nRow
==
0
&&
pIter
->
pS
t
tBlk
!=
NULL
)
{
// current block not loaded yet
pBlockData
=
getNextBlock
(
pIter
);
code
=
tsdbReadS
stBlock
(
pIter
->
pReader
,
pIter
->
iSst
,
pIter
->
pSs
tBlk
,
pBlockData
);
code
=
tsdbReadS
ttBlock
(
pIter
->
pReader
,
pIter
->
iStt
,
pIter
->
pSt
tBlk
,
pBlockData
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
goto
_exit
;
}
...
...
@@ -236,16 +236,16 @@ bool tLDataIterNextRow(SLDataIter *pIter) {
if
(
pIter
->
iRow
>=
pBlockData
->
nRow
||
pIter
->
iRow
<
0
)
{
tLDataIterNextBlock
(
pIter
);
if
(
pIter
->
pS
s
tBlk
==
NULL
)
{
// no more data
if
(
pIter
->
pS
t
tBlk
==
NULL
)
{
// no more data
goto
_exit
;
}
}
else
{
break
;
}
if
(
iBlockL
!=
pIter
->
iS
s
tBlk
)
{
if
(
iBlockL
!=
pIter
->
iS
t
tBlk
)
{
pBlockData
=
getNextBlock
(
pIter
);
code
=
tsdbReadS
stBlock
(
pIter
->
pReader
,
pIter
->
iSst
,
pIter
->
pSs
tBlk
,
pBlockData
);
code
=
tsdbReadS
ttBlock
(
pIter
->
pReader
,
pIter
->
iStt
,
pIter
->
pSt
tBlk
,
pBlockData
);
if
(
code
)
{
goto
_exit
;
}
...
...
@@ -262,7 +262,7 @@ _exit:
terrno
=
code
;
}
return
(
code
==
TSDB_CODE_SUCCESS
)
&&
(
pIter
->
pS
s
tBlk
!=
NULL
);
return
(
code
==
TSDB_CODE_SUCCESS
)
&&
(
pIter
->
pS
t
tBlk
!=
NULL
);
}
SRowInfo
*
tLDataIterGet
(
SLDataIter
*
pIter
)
{
return
&
pIter
->
rInfo
;
}
...
...
@@ -302,8 +302,8 @@ int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFRead
tRBTreeCreate
(
&
pMTree
->
rbt
,
tLDataIterCmprFn
);
int32_t
code
=
TSDB_CODE_OUT_OF_MEMORY
;
struct
SLDataIter
*
pIterList
[
TSDB_DEFAULT_S
S
T_FILE
]
=
{
0
};
for
(
int32_t
i
=
0
;
i
<
pFReader
->
pSet
->
nS
s
tF
;
++
i
)
{
// open all last file
struct
SLDataIter
*
pIterList
[
TSDB_DEFAULT_S
T
T_FILE
]
=
{
0
};
for
(
int32_t
i
=
0
;
i
<
pFReader
->
pSet
->
nS
t
tF
;
++
i
)
{
// open all last file
code
=
tLDataIterOpen
(
&
pIterList
[
i
],
pFReader
,
i
,
pMTree
->
backward
,
uid
,
pTimeWindow
,
pVerRange
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
goto
_end
;
...
...
source/dnode/vnode/src/tsdb/tsdbRead.c
浏览文件 @
1e6caa26
...
...
@@ -621,7 +621,7 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
}
}
pBlockNum
->
numOfLastFiles
=
pReader
->
pFileReader
->
pSet
->
nS
s
tF
;
pBlockNum
->
numOfLastFiles
=
pReader
->
pFileReader
->
pSet
->
nS
t
tF
;
int32_t
total
=
pBlockNum
->
numOfLastFiles
+
pBlockNum
->
numOfBlocks
;
double
el
=
(
taosGetTimestampUs
()
-
st
)
/
1000
.
0
;
...
...
@@ -1163,7 +1163,7 @@ static bool fileBlockShouldLoad(STsdbReader* pReader, SFileDataBlockInfo* pFBloc
bool
overlapWithlastBlock
=
false
;
#if 0
if (taosArrayGetSize(pLastBlockReader->pSstBlk) > 0 && (pLastBlockReader->currentBlockIndex != -1)) {
SS
s
tBlk* pSstBlk = taosArrayGet(pLastBlockReader->pSstBlk, pLastBlockReader->currentBlockIndex);
SS
t
tBlk* pSstBlk = taosArrayGet(pLastBlockReader->pSstBlk, pLastBlockReader->currentBlockIndex);
overlapWithlastBlock = !(pBlock->maxKey.ts < pSstBlk->minKey || pBlock->minKey.ts > pSstBlk->maxKey);
}
#endif
...
...
@@ -1380,7 +1380,7 @@ static int32_t doMergeFileBlockAndLastBlock(SLastBlockReader* pLastBlockReader,
bool
mergeBlockData
)
{
SFileBlockDumpInfo
*
pDumpInfo
=
&
pReader
->
status
.
fBlockDumpInfo
;
// SBlockData* pLastBlockData = &pLastBlockReader->lastBlockData;
int64_t
tsLastBlock
=
getCurrentKeyInLastBlock
(
pLastBlockReader
);
int64_t
tsLastBlock
=
getCurrentKeyInLastBlock
(
pLastBlockReader
);
STSRow
*
pTSRow
=
NULL
;
SRowMerger
merge
=
{
0
};
...
...
@@ -1779,7 +1779,7 @@ static int32_t initMemDataIterator(STableBlockScanInfo* pBlockScanInfo, STsdbRea
pBlockScanInfo
->
iter
.
hasVal
=
(
tsdbTbDataIterGet
(
pBlockScanInfo
->
iter
.
iter
)
!=
NULL
);
tsdbDebug
(
"%p uid:%"
PRId64
", check data in mem from skey:%"
PRId64
", order:%d, ts range in buf:%"
PRId64
"-%"
PRId64
" %s"
,
"-%"
PRId64
" %s"
,
pReader
,
pBlockScanInfo
->
uid
,
startKey
.
ts
,
pReader
->
order
,
d
->
minKey
,
d
->
maxKey
,
pReader
->
idStr
);
}
else
{
tsdbError
(
"%p uid:%"
PRId64
", failed to create iterator for imem, code:%s, %s"
,
pReader
,
pBlockScanInfo
->
uid
,
...
...
@@ -1800,7 +1800,7 @@ static int32_t initMemDataIterator(STableBlockScanInfo* pBlockScanInfo, STsdbRea
pBlockScanInfo
->
iiter
.
hasVal
=
(
tsdbTbDataIterGet
(
pBlockScanInfo
->
iiter
.
iter
)
!=
NULL
);
tsdbDebug
(
"%p uid:%"
PRId64
", check data in imem from skey:%"
PRId64
", order:%d, ts range in buf:%"
PRId64
"-%"
PRId64
" %s"
,
"-%"
PRId64
" %s"
,
pReader
,
pBlockScanInfo
->
uid
,
startKey
.
ts
,
pReader
->
order
,
di
->
minKey
,
di
->
maxKey
,
pReader
->
idStr
);
}
else
{
tsdbError
(
"%p uid:%"
PRId64
", failed to create iterator for mem, code:%s, %s"
,
pReader
,
pBlockScanInfo
->
uid
,
...
...
@@ -1850,7 +1850,7 @@ static bool isValidFileBlockRow(SBlockData* pBlockData, SFileBlockDumpInfo* pDum
static
bool
outOfTimeWindow
(
int64_t
ts
,
STimeWindow
*
pWindow
)
{
return
(
ts
>
pWindow
->
ekey
)
||
(
ts
<
pWindow
->
skey
);
}
static
bool
nextRowFromLastBlocks
(
SLastBlockReader
*
pLastBlockReader
,
STableBlockScanInfo
*
pBlockScanInfo
)
{
while
(
1
)
{
while
(
1
)
{
bool
hasVal
=
tMergeTreeNext
(
&
pLastBlockReader
->
mergeTree
);
if
(
!
hasVal
)
{
return
false
;
...
...
@@ -2166,7 +2166,7 @@ _err:
}
static
TSDBKEY
getCurrentKeyInBuf
(
STableBlockScanInfo
*
pScanInfo
,
STsdbReader
*
pReader
)
{
TSDBKEY
key
=
{.
ts
=
TSKEY_INITIAL_VAL
};
TSDBKEY
key
=
{.
ts
=
TSKEY_INITIAL_VAL
};
TSDBROW
*
pRow
=
getValidMemRow
(
&
pScanInfo
->
iter
,
pScanInfo
->
delSkyline
,
pReader
);
if
(
pRow
!=
NULL
)
{
key
=
TSDBROW_KEY
(
pRow
);
...
...
@@ -2204,7 +2204,7 @@ static int32_t moveToNextFile(STsdbReader* pReader, SBlockNumber* pBlockNum) {
return
code
;
}
if
(
taosArrayGetSize
(
pIndexList
)
>
0
||
pReader
->
pFileReader
->
pSet
->
nS
s
tF
>
0
)
{
if
(
taosArrayGetSize
(
pIndexList
)
>
0
||
pReader
->
pFileReader
->
pSet
->
nS
t
tF
>
0
)
{
code
=
doLoadFileBlock
(
pReader
,
pIndexList
,
pBlockNum
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
taosArrayDestroy
(
pIndexList
);
...
...
@@ -2314,7 +2314,7 @@ static int32_t doLoadLastBlockSequentially(STsdbReader* pReader) {
while
(
1
)
{
// load the last data block of current table
STableBlockScanInfo
*
pScanInfo
=
pStatus
->
pTableIter
;
bool
hasVal
=
initLastBlockReader
(
pLastBlockReader
,
pScanInfo
,
pReader
);
bool
hasVal
=
initLastBlockReader
(
pLastBlockReader
,
pScanInfo
,
pReader
);
if
(
!
hasVal
)
{
bool
hasNexTable
=
moveToNextTable
(
pOrderedCheckInfo
,
pStatus
);
if
(
!
hasNexTable
)
{
...
...
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
浏览文件 @
1e6caa26
...
...
@@ -226,13 +226,13 @@ int32_t tsdbDataFWriterOpen(SDataFWriter **ppWriter, STsdb *pTsdb, SDFileSet *pS
.
pHeadF
=
&
pWriter
->
fHead
,
.
pDataF
=
&
pWriter
->
fData
,
.
pSmaF
=
&
pWriter
->
fSma
,
.
nS
stF
=
pSet
->
nSs
tF
};
.
nS
ttF
=
pSet
->
nSt
tF
};
pWriter
->
fHead
=
*
pSet
->
pHeadF
;
pWriter
->
fData
=
*
pSet
->
pDataF
;
pWriter
->
fSma
=
*
pSet
->
pSmaF
;
for
(
int8_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
pWriter
->
wSet
.
aS
stF
[
iSst
]
=
&
pWriter
->
fSst
[
iSs
t
];
pWriter
->
fS
st
[
iSst
]
=
*
pSet
->
aSstF
[
iSs
t
];
for
(
int8_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
pWriter
->
wSet
.
aS
ttF
[
iStt
]
=
&
pWriter
->
fStt
[
iSt
t
];
pWriter
->
fS
tt
[
iStt
]
=
*
pSet
->
aSttF
[
iSt
t
];
}
// head
...
...
@@ -276,15 +276,15 @@ int32_t tsdbDataFWriterOpen(SDataFWriter **ppWriter, STsdb *pTsdb, SDFileSet *pS
pWriter
->
fSma
.
size
+=
TSDB_FHDR_SIZE
;
}
// s
s
t
ASSERT
(
pWriter
->
fS
st
[
pSet
->
nSs
tF
-
1
].
size
==
0
);
// s
t
t
ASSERT
(
pWriter
->
fS
tt
[
pSet
->
nSt
tF
-
1
].
size
==
0
);
flag
=
TD_FILE_READ
|
TD_FILE_WRITE
|
TD_FILE_CREATE
|
TD_FILE_TRUNC
;
tsdbS
stFileName
(
pTsdb
,
pWriter
->
wSet
.
diskId
,
pWriter
->
wSet
.
fid
,
&
pWriter
->
fSst
[
pSet
->
nSs
tF
-
1
],
fname
);
code
=
tsdbOpenFile
(
fname
,
szPage
,
flag
,
&
pWriter
->
pS
s
tFD
);
tsdbS
ttFileName
(
pTsdb
,
pWriter
->
wSet
.
diskId
,
pWriter
->
wSet
.
fid
,
&
pWriter
->
fStt
[
pSet
->
nSt
tF
-
1
],
fname
);
code
=
tsdbOpenFile
(
fname
,
szPage
,
flag
,
&
pWriter
->
pS
t
tFD
);
if
(
code
)
goto
_err
;
code
=
tsdbWriteFile
(
pWriter
->
pS
s
tFD
,
0
,
hdr
,
TSDB_FHDR_SIZE
);
code
=
tsdbWriteFile
(
pWriter
->
pS
t
tFD
,
0
,
hdr
,
TSDB_FHDR_SIZE
);
if
(
code
)
goto
_err
;
pWriter
->
fS
st
[
pWriter
->
wSet
.
nSs
tF
-
1
].
size
+=
TSDB_FHDR_SIZE
;
pWriter
->
fS
tt
[
pWriter
->
wSet
.
nSt
tF
-
1
].
size
+=
TSDB_FHDR_SIZE
;
*
ppWriter
=
pWriter
;
return
code
;
...
...
@@ -312,14 +312,14 @@ int32_t tsdbDataFWriterClose(SDataFWriter **ppWriter, int8_t sync) {
code
=
tsdbFsyncFile
((
*
ppWriter
)
->
pSmaFD
);
if
(
code
)
goto
_err
;
code
=
tsdbFsyncFile
((
*
ppWriter
)
->
pS
s
tFD
);
code
=
tsdbFsyncFile
((
*
ppWriter
)
->
pS
t
tFD
);
if
(
code
)
goto
_err
;
}
tsdbCloseFile
(
&
(
*
ppWriter
)
->
pHeadFD
);
tsdbCloseFile
(
&
(
*
ppWriter
)
->
pDataFD
);
tsdbCloseFile
(
&
(
*
ppWriter
)
->
pSmaFD
);
tsdbCloseFile
(
&
(
*
ppWriter
)
->
pS
s
tFD
);
tsdbCloseFile
(
&
(
*
ppWriter
)
->
pS
t
tFD
);
for
(
int32_t
iBuf
=
0
;
iBuf
<
sizeof
((
*
ppWriter
)
->
aBuf
)
/
sizeof
(
uint8_t
*
);
iBuf
++
)
{
tFree
((
*
ppWriter
)
->
aBuf
[
iBuf
]);
...
...
@@ -357,10 +357,10 @@ int32_t tsdbUpdateDFileSetHeader(SDataFWriter *pWriter) {
code
=
tsdbWriteFile
(
pWriter
->
pSmaFD
,
0
,
hdr
,
TSDB_FHDR_SIZE
);
if
(
code
)
goto
_err
;
// s
s
t ==============
// s
t
t ==============
memset
(
hdr
,
0
,
TSDB_FHDR_SIZE
);
tPutS
stFile
(
hdr
,
&
pWriter
->
fSst
[
pWriter
->
wSet
.
nSs
tF
-
1
]);
code
=
tsdbWriteFile
(
pWriter
->
pS
s
tFD
,
0
,
hdr
,
TSDB_FHDR_SIZE
);
tPutS
ttFile
(
hdr
,
&
pWriter
->
fStt
[
pWriter
->
wSet
.
nSt
tF
-
1
]);
code
=
tsdbWriteFile
(
pWriter
->
pS
t
tFD
,
0
,
hdr
,
TSDB_FHDR_SIZE
);
if
(
code
)
goto
_err
;
return
code
;
...
...
@@ -454,22 +454,22 @@ _err:
return
code
;
}
int32_t
tsdbWriteS
stBlk
(
SDataFWriter
*
pWriter
,
SArray
*
aSs
tBlk
)
{
int32_t
tsdbWriteS
ttBlk
(
SDataFWriter
*
pWriter
,
SArray
*
aSt
tBlk
)
{
int32_t
code
=
0
;
SS
stFile
*
pSstFile
=
&
pWriter
->
fSst
[
pWriter
->
wSet
.
nSs
tF
-
1
];
SS
ttFile
*
pSttFile
=
&
pWriter
->
fStt
[
pWriter
->
wSet
.
nSt
tF
-
1
];
int64_t
size
;
int64_t
n
;
// check
if
(
taosArrayGetSize
(
aS
s
tBlk
)
==
0
)
{
pS
stFile
->
offset
=
pSs
tFile
->
size
;
if
(
taosArrayGetSize
(
aS
t
tBlk
)
==
0
)
{
pS
ttFile
->
offset
=
pSt
tFile
->
size
;
goto
_exit
;
}
// size
size
=
0
;
for
(
int32_t
iBlockL
=
0
;
iBlockL
<
taosArrayGetSize
(
aS
s
tBlk
);
iBlockL
++
)
{
size
+=
tPutS
stBlk
(
NULL
,
taosArrayGet
(
aSs
tBlk
,
iBlockL
));
for
(
int32_t
iBlockL
=
0
;
iBlockL
<
taosArrayGetSize
(
aS
t
tBlk
);
iBlockL
++
)
{
size
+=
tPutS
ttBlk
(
NULL
,
taosArrayGet
(
aSt
tBlk
,
iBlockL
));
}
// alloc
...
...
@@ -478,21 +478,21 @@ int32_t tsdbWriteSstBlk(SDataFWriter *pWriter, SArray *aSstBlk) {
// encode
n
=
0
;
for
(
int32_t
iBlockL
=
0
;
iBlockL
<
taosArrayGetSize
(
aS
s
tBlk
);
iBlockL
++
)
{
n
+=
tPutS
stBlk
(
pWriter
->
aBuf
[
0
]
+
n
,
taosArrayGet
(
aSs
tBlk
,
iBlockL
));
for
(
int32_t
iBlockL
=
0
;
iBlockL
<
taosArrayGetSize
(
aS
t
tBlk
);
iBlockL
++
)
{
n
+=
tPutS
ttBlk
(
pWriter
->
aBuf
[
0
]
+
n
,
taosArrayGet
(
aSt
tBlk
,
iBlockL
));
}
// write
code
=
tsdbWriteFile
(
pWriter
->
pS
stFD
,
pSs
tFile
->
size
,
pWriter
->
aBuf
[
0
],
size
);
code
=
tsdbWriteFile
(
pWriter
->
pS
ttFD
,
pSt
tFile
->
size
,
pWriter
->
aBuf
[
0
],
size
);
if
(
code
)
goto
_err
;
// update
pS
stFile
->
offset
=
pSs
tFile
->
size
;
pS
s
tFile
->
size
+=
size
;
pS
ttFile
->
offset
=
pSt
tFile
->
size
;
pS
t
tFile
->
size
+=
size
;
_exit:
tsdbTrace
(
"vgId:%d tsdb write s
s
t block, loffset:%"
PRId64
" size:%"
PRId64
,
TD_VID
(
pWriter
->
pTsdb
->
pVnode
),
pS
s
tFile
->
offset
,
size
);
tsdbTrace
(
"vgId:%d tsdb write s
t
t block, loffset:%"
PRId64
" size:%"
PRId64
,
TD_VID
(
pWriter
->
pTsdb
->
pVnode
),
pS
t
tFile
->
offset
,
size
);
return
code
;
_err:
...
...
@@ -546,7 +546,7 @@ int32_t tsdbWriteBlockData(SDataFWriter *pWriter, SBlockData *pBlockData, SBlock
ASSERT
(
pBlockData
->
nRow
>
0
);
if
(
toLast
)
{
pBlkInfo
->
offset
=
pWriter
->
fS
st
[
pWriter
->
wSet
.
nSs
tF
-
1
].
size
;
pBlkInfo
->
offset
=
pWriter
->
fS
tt
[
pWriter
->
wSet
.
nSt
tF
-
1
].
size
;
}
else
{
pBlkInfo
->
offset
=
pWriter
->
fData
.
size
;
}
...
...
@@ -558,7 +558,7 @@ int32_t tsdbWriteBlockData(SDataFWriter *pWriter, SBlockData *pBlockData, SBlock
if
(
code
)
goto
_err
;
// write =================
STsdbFD
*
pFD
=
toLast
?
pWriter
->
pS
s
tFD
:
pWriter
->
pDataFD
;
STsdbFD
*
pFD
=
toLast
?
pWriter
->
pS
t
tFD
:
pWriter
->
pDataFD
;
pBlkInfo
->
szKey
=
aBufN
[
3
]
+
aBufN
[
2
];
pBlkInfo
->
szBlock
=
aBufN
[
0
]
+
aBufN
[
1
]
+
aBufN
[
2
]
+
aBufN
[
3
];
...
...
@@ -585,7 +585,7 @@ int32_t tsdbWriteBlockData(SDataFWriter *pWriter, SBlockData *pBlockData, SBlock
// update info
if
(
toLast
)
{
pWriter
->
fS
st
[
pWriter
->
wSet
.
nSs
tF
-
1
].
size
+=
pBlkInfo
->
szBlock
;
pWriter
->
fS
tt
[
pWriter
->
wSet
.
nSt
tF
-
1
].
size
+=
pBlkInfo
->
szBlock
;
}
else
{
pWriter
->
fData
.
size
+=
pBlkInfo
->
szBlock
;
}
...
...
@@ -664,9 +664,9 @@ int32_t tsdbDFileSetCopy(STsdb *pTsdb, SDFileSet *pSetFrom, SDFileSet *pSetTo) {
taosCloseFile
(
&
pOutFD
);
taosCloseFile
(
&
PInFD
);
// s
s
t
tsdbS
stFileName
(
pTsdb
,
pSetFrom
->
diskId
,
pSetFrom
->
fid
,
pSetFrom
->
aSs
tF
[
0
],
fNameFrom
);
tsdbS
stFileName
(
pTsdb
,
pSetTo
->
diskId
,
pSetTo
->
fid
,
pSetTo
->
aSs
tF
[
0
],
fNameTo
);
// s
t
t
tsdbS
ttFileName
(
pTsdb
,
pSetFrom
->
diskId
,
pSetFrom
->
fid
,
pSetFrom
->
aSt
tF
[
0
],
fNameFrom
);
tsdbS
ttFileName
(
pTsdb
,
pSetTo
->
diskId
,
pSetTo
->
fid
,
pSetTo
->
aSt
tF
[
0
],
fNameTo
);
pOutFD
=
taosOpenFile
(
fNameTo
,
TD_FILE_WRITE
|
TD_FILE_CREATE
|
TD_FILE_TRUNC
);
if
(
pOutFD
==
NULL
)
{
...
...
@@ -680,7 +680,7 @@ int32_t tsdbDFileSetCopy(STsdb *pTsdb, SDFileSet *pSetFrom, SDFileSet *pSetTo) {
goto
_err
;
}
n
=
taosFSendFile
(
pOutFD
,
PInFD
,
0
,
pSetFrom
->
aS
s
tF
[
0
]
->
size
);
n
=
taosFSendFile
(
pOutFD
,
PInFD
,
0
,
pSetFrom
->
aS
t
tF
[
0
]
->
size
);
if
(
n
<
0
)
{
code
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
...
...
@@ -750,10 +750,10 @@ int32_t tsdbDataFReaderOpen(SDataFReader **ppReader, STsdb *pTsdb, SDFileSet *pS
code
=
tsdbOpenFile
(
fname
,
szPage
,
TD_FILE_READ
,
&
pReader
->
pSmaFD
);
if
(
code
)
goto
_err
;
// s
s
t
for
(
int32_t
iS
st
=
0
;
iSst
<
pSet
->
nSstF
;
iSs
t
++
)
{
tsdbS
stFileName
(
pTsdb
,
pSet
->
diskId
,
pSet
->
fid
,
pSet
->
aSstF
[
iSs
t
],
fname
);
code
=
tsdbOpenFile
(
fname
,
szPage
,
TD_FILE_READ
,
&
pReader
->
aS
stFD
[
iSs
t
]);
// s
t
t
for
(
int32_t
iS
tt
=
0
;
iStt
<
pSet
->
nSttF
;
iSt
t
++
)
{
tsdbS
ttFileName
(
pTsdb
,
pSet
->
diskId
,
pSet
->
fid
,
pSet
->
aSttF
[
iSt
t
],
fname
);
code
=
tsdbOpenFile
(
fname
,
szPage
,
TD_FILE_READ
,
&
pReader
->
aS
ttFD
[
iSt
t
]);
if
(
code
)
goto
_err
;
}
...
...
@@ -779,10 +779,10 @@ int32_t tsdbDataFReaderClose(SDataFReader **ppReader) {
// sma
tsdbCloseFile
(
&
(
*
ppReader
)
->
pSmaFD
);
// s
s
t
for
(
int32_t
iS
st
=
0
;
iSst
<
TSDB_MAX_SST_FILE
;
iSs
t
++
)
{
if
((
*
ppReader
)
->
aS
stFD
[
iSs
t
])
{
tsdbCloseFile
(
&
(
*
ppReader
)
->
aS
stFD
[
iSs
t
]);
// s
t
t
for
(
int32_t
iS
tt
=
0
;
iStt
<
TSDB_MAX_STT_FILE
;
iSt
t
++
)
{
if
((
*
ppReader
)
->
aS
ttFD
[
iSt
t
])
{
tsdbCloseFile
(
&
(
*
ppReader
)
->
aS
ttFD
[
iSt
t
]);
}
}
...
...
@@ -835,13 +835,13 @@ _err:
return
code
;
}
int32_t
tsdbReadS
stBlk
(
SDataFReader
*
pReader
,
int32_t
iSst
,
SArray
*
aSs
tBlk
)
{
int32_t
tsdbReadS
ttBlk
(
SDataFReader
*
pReader
,
int32_t
iStt
,
SArray
*
aSt
tBlk
)
{
int32_t
code
=
0
;
SS
stFile
*
pSstFile
=
pReader
->
pSet
->
aSstF
[
iSs
t
];
int64_t
offset
=
pS
s
tFile
->
offset
;
int64_t
size
=
pS
s
tFile
->
size
-
offset
;
SS
ttFile
*
pSttFile
=
pReader
->
pSet
->
aSttF
[
iSt
t
];
int64_t
offset
=
pS
t
tFile
->
offset
;
int64_t
size
=
pS
t
tFile
->
size
-
offset
;
taosArrayClear
(
aS
s
tBlk
);
taosArrayClear
(
aS
t
tBlk
);
if
(
size
==
0
)
return
code
;
// alloc
...
...
@@ -849,16 +849,16 @@ int32_t tsdbReadSstBlk(SDataFReader *pReader, int32_t iSst, SArray *aSstBlk) {
if
(
code
)
goto
_err
;
// read
code
=
tsdbReadFile
(
pReader
->
aS
stFD
[
iSs
t
],
offset
,
pReader
->
aBuf
[
0
],
size
);
code
=
tsdbReadFile
(
pReader
->
aS
ttFD
[
iSt
t
],
offset
,
pReader
->
aBuf
[
0
],
size
);
if
(
code
)
goto
_err
;
// decode
int64_t
n
=
0
;
while
(
n
<
size
)
{
SS
stBlk
ss
tBlk
;
n
+=
tGetS
stBlk
(
pReader
->
aBuf
[
0
]
+
n
,
&
ss
tBlk
);
SS
ttBlk
st
tBlk
;
n
+=
tGetS
ttBlk
(
pReader
->
aBuf
[
0
]
+
n
,
&
st
tBlk
);
if
(
taosArrayPush
(
aS
stBlk
,
&
ss
tBlk
)
==
NULL
)
{
if
(
taosArrayPush
(
aS
ttBlk
,
&
st
tBlk
)
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
...
...
@@ -868,7 +868,7 @@ int32_t tsdbReadSstBlk(SDataFReader *pReader, int32_t iSst, SArray *aSstBlk) {
return
code
;
_err:
tsdbError
(
"vgId:%d read s
s
t blk failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
tsdbError
(
"vgId:%d read s
t
t blk failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
return
code
;
}
...
...
@@ -1107,25 +1107,25 @@ _err:
return
code
;
}
int32_t
tsdbReadS
stBlock
(
SDataFReader
*
pReader
,
int32_t
iSst
,
SSstBlk
*
pSs
tBlk
,
SBlockData
*
pBlockData
)
{
int32_t
tsdbReadS
ttBlock
(
SDataFReader
*
pReader
,
int32_t
iStt
,
SSttBlk
*
pSt
tBlk
,
SBlockData
*
pBlockData
)
{
int32_t
code
=
0
;
// alloc
code
=
tRealloc
(
&
pReader
->
aBuf
[
0
],
pS
s
tBlk
->
bInfo
.
szBlock
);
code
=
tRealloc
(
&
pReader
->
aBuf
[
0
],
pS
t
tBlk
->
bInfo
.
szBlock
);
if
(
code
)
goto
_err
;
// read
code
=
tsdbReadFile
(
pReader
->
aS
stFD
[
iSst
],
pSstBlk
->
bInfo
.
offset
,
pReader
->
aBuf
[
0
],
pSs
tBlk
->
bInfo
.
szBlock
);
code
=
tsdbReadFile
(
pReader
->
aS
ttFD
[
iStt
],
pSttBlk
->
bInfo
.
offset
,
pReader
->
aBuf
[
0
],
pSt
tBlk
->
bInfo
.
szBlock
);
if
(
code
)
goto
_err
;
// decmpr
code
=
tDecmprBlockData
(
pReader
->
aBuf
[
0
],
pS
s
tBlk
->
bInfo
.
szBlock
,
pBlockData
,
&
pReader
->
aBuf
[
1
]);
code
=
tDecmprBlockData
(
pReader
->
aBuf
[
0
],
pS
t
tBlk
->
bInfo
.
szBlock
,
pBlockData
,
&
pReader
->
aBuf
[
1
]);
if
(
code
)
goto
_err
;
return
code
;
_err:
tsdbError
(
"vgId:%d tsdb read s
s
t block failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
tsdbError
(
"vgId:%d tsdb read s
t
t block failed since %s"
,
TD_VID
(
pReader
->
pTsdb
->
pVnode
),
tstrerror
(
code
));
return
code
;
}
...
...
source/dnode/vnode/src/tsdb/tsdbRetention.c
浏览文件 @
1e6caa26
...
...
@@ -60,7 +60,7 @@ int32_t tsdbDoRetention(STsdb *pTsdb, int64_t now) {
if
(
expLevel
<
0
)
{
taosMemoryFree
(
pSet
->
pHeadF
);
taosMemoryFree
(
pSet
->
pDataF
);
taosMemoryFree
(
pSet
->
aS
s
tF
[
0
]);
taosMemoryFree
(
pSet
->
aS
t
tF
[
0
]);
taosMemoryFree
(
pSet
->
pSmaF
);
taosArrayRemove
(
fs
.
aDFileSet
,
iSet
);
iSet
--
;
...
...
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
浏览文件 @
1e6caa26
...
...
@@ -27,9 +27,9 @@ struct STsdbSnapReader {
int32_t
fid
;
SDataFReader
*
pDataFReader
;
SArray
*
aBlockIdx
;
// SArray<SBlockIdx>
SArray
*
aSstBlk
;
// SArray<SS
s
tBlk>
SArray
*
aSstBlk
;
// SArray<SS
t
tBlk>
SBlockIdx
*
pBlockIdx
;
SS
s
tBlk
*
pSstBlk
;
SS
t
tBlk
*
pSstBlk
;
int32_t
iBlockIdx
;
int32_t
iBlockL
;
...
...
@@ -64,7 +64,7 @@ static int32_t tsdbSnapReadData(STsdbSnapReader* pReader, uint8_t** ppData) {
code
=
tsdbReadBlockIdx
(
pReader
->
pDataFReader
,
pReader
->
aBlockIdx
);
if
(
code
)
goto
_err
;
code
=
tsdbReadS
s
tBlk
(
pReader
->
pDataFReader
,
0
,
pReader
->
aSstBlk
);
code
=
tsdbReadS
t
tBlk
(
pReader
->
pDataFReader
,
0
,
pReader
->
aSstBlk
);
if
(
code
)
goto
_err
;
// init
...
...
@@ -87,7 +87,7 @@ static int32_t tsdbSnapReadData(STsdbSnapReader* pReader, uint8_t** ppData) {
break
;
}
pReader
->
pSstBlk
=
(
SS
s
tBlk
*
)
taosArrayGet
(
pReader
->
aSstBlk
,
pReader
->
iBlockL
);
pReader
->
pSstBlk
=
(
SS
t
tBlk
*
)
taosArrayGet
(
pReader
->
aSstBlk
,
pReader
->
iBlockL
);
if
(
pReader
->
pSstBlk
->
minVer
<=
pReader
->
ever
&&
pReader
->
pSstBlk
->
maxVer
>=
pReader
->
sver
)
{
// TODO
break
;
...
...
@@ -151,7 +151,7 @@ static int32_t tsdbSnapReadData(STsdbSnapReader* pReader, uint8_t** ppData) {
// next
pReader
->
iBlockL
++
;
if
(
pReader
->
iBlockL
<
taosArrayGetSize
(
pReader
->
aSstBlk
))
{
pReader
->
pSstBlk
=
(
SS
s
tBlk
*
)
taosArrayGetSize
(
pReader
->
aSstBlk
);
pReader
->
pSstBlk
=
(
SS
t
tBlk
*
)
taosArrayGetSize
(
pReader
->
aSstBlk
);
}
else
{
pReader
->
pSstBlk
=
NULL
;
}
...
...
@@ -298,7 +298,7 @@ int32_t tsdbSnapReaderOpen(STsdb* pTsdb, int64_t sver, int64_t ever, int8_t type
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
pReader
->
aSstBlk
=
taosArrayInit
(
0
,
sizeof
(
SS
s
tBlk
));
pReader
->
aSstBlk
=
taosArrayInit
(
0
,
sizeof
(
SS
t
tBlk
));
if
(
pReader
->
aSstBlk
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
@@ -431,7 +431,7 @@ struct STsdbSnapWriter {
SBlockData
*
pBlockData
;
int32_t
iRow
;
SBlockData
bDataR
;
SArray
*
aSstBlk
;
// SArray<SS
s
tBlk>
SArray
*
aSstBlk
;
// SArray<SS
t
tBlk>
int32_t
iBlockL
;
SBlockData
lDataR
;
...
...
@@ -443,7 +443,7 @@ struct STsdbSnapWriter {
SMapData
mBlockW
;
// SMapData<SDataBlk>
SArray
*
aBlockIdxW
;
// SArray<SBlockIdx>
SArray
*
aBlockLW
;
// SArray<SS
s
tBlk>
SArray
*
aBlockLW
;
// SArray<SS
t
tBlk>
// for del file
SDelFReader
*
pDelFReader
;
...
...
@@ -845,7 +845,7 @@ static int32_t tsdbSnapWriteDataEnd(STsdbSnapWriter* pWriter) {
// write remain stuff
if
(
taosArrayGetSize
(
pWriter
->
aBlockLW
)
>
0
)
{
code
=
tsdbWriteS
s
tBlk
(
pWriter
->
pDataFWriter
,
pWriter
->
aBlockIdxW
);
code
=
tsdbWriteS
t
tBlk
(
pWriter
->
pDataFWriter
,
pWriter
->
aBlockIdxW
);
if
(
code
)
goto
_err
;
}
...
...
@@ -911,7 +911,7 @@ static int32_t tsdbSnapWriteData(STsdbSnapWriter* pWriter, uint8_t* pData, uint3
code
=
tsdbReadBlockIdx
(
pWriter
->
pDataFReader
,
pWriter
->
aBlockIdx
);
if
(
code
)
goto
_err
;
code
=
tsdbReadS
s
tBlk
(
pWriter
->
pDataFReader
,
0
,
pWriter
->
aSstBlk
);
code
=
tsdbReadS
t
tBlk
(
pWriter
->
pDataFReader
,
0
,
pWriter
->
aSstBlk
);
if
(
code
)
goto
_err
;
}
else
{
ASSERT
(
pWriter
->
pDataFReader
==
NULL
);
...
...
@@ -931,25 +931,25 @@ static int32_t tsdbSnapWriteData(STsdbSnapWriter* pWriter, uint8_t* pData, uint3
// write
SHeadFile
fHead
;
SDataFile
fData
;
SS
s
tFile
fLast
;
SS
t
tFile
fLast
;
SSmaFile
fSma
;
SDFileSet
wSet
=
{.
pHeadF
=
&
fHead
,
.
pDataF
=
&
fData
,
.
aS
s
tF
[
0
]
=
&
fLast
,
.
pSmaF
=
&
fSma
};
SDFileSet
wSet
=
{.
pHeadF
=
&
fHead
,
.
pDataF
=
&
fData
,
.
aS
t
tF
[
0
]
=
&
fLast
,
.
pSmaF
=
&
fSma
};
if
(
pSet
)
{
wSet
.
diskId
=
pSet
->
diskId
;
wSet
.
fid
=
fid
;
wSet
.
nS
s
tF
=
1
;
wSet
.
nS
t
tF
=
1
;
fHead
=
(
SHeadFile
){.
commitID
=
pWriter
->
commitID
,
.
offset
=
0
,
.
size
=
0
};
fData
=
*
pSet
->
pDataF
;
fLast
=
(
SS
s
tFile
){.
commitID
=
pWriter
->
commitID
,
.
size
=
0
};
fLast
=
(
SS
t
tFile
){.
commitID
=
pWriter
->
commitID
,
.
size
=
0
};
fSma
=
*
pSet
->
pSmaF
;
}
else
{
wSet
.
diskId
=
(
SDiskID
){.
level
=
0
,
.
id
=
0
};
wSet
.
fid
=
fid
;
wSet
.
nS
s
tF
=
1
;
wSet
.
nS
t
tF
=
1
;
fHead
=
(
SHeadFile
){.
commitID
=
pWriter
->
commitID
,
.
offset
=
0
,
.
size
=
0
};
fData
=
(
SDataFile
){.
commitID
=
pWriter
->
commitID
,
.
size
=
0
};
fLast
=
(
SS
s
tFile
){.
commitID
=
pWriter
->
commitID
,
.
size
=
0
,
.
offset
=
0
};
fLast
=
(
SS
t
tFile
){.
commitID
=
pWriter
->
commitID
,
.
size
=
0
,
.
offset
=
0
};
fSma
=
(
SSmaFile
){.
commitID
=
pWriter
->
commitID
,
.
size
=
0
};
}
...
...
@@ -1147,7 +1147,7 @@ int32_t tsdbSnapWriterOpen(STsdb* pTsdb, int64_t sver, int64_t ever, STsdbSnapWr
code
=
tBlockDataCreate
(
&
pWriter
->
bDataR
);
if
(
code
)
goto
_err
;
pWriter
->
aSstBlk
=
taosArrayInit
(
0
,
sizeof
(
SS
s
tBlk
));
pWriter
->
aSstBlk
=
taosArrayInit
(
0
,
sizeof
(
SS
t
tBlk
));
if
(
pWriter
->
aSstBlk
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
@@ -1161,7 +1161,7 @@ int32_t tsdbSnapWriterOpen(STsdb* pTsdb, int64_t sver, int64_t ever, STsdbSnapWr
code
=
tBlockDataCreate
(
&
pWriter
->
bDataW
);
if
(
code
)
goto
_err
;
pWriter
->
aBlockLW
=
taosArrayInit
(
0
,
sizeof
(
SS
s
tBlk
));
pWriter
->
aBlockLW
=
taosArrayInit
(
0
,
sizeof
(
SS
t
tBlk
));
if
(
pWriter
->
aBlockLW
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
...
...
source/dnode/vnode/src/tsdb/tsdbUtil.c
浏览文件 @
1e6caa26
...
...
@@ -214,7 +214,7 @@ int32_t tCmprBlockIdx(void const *lhs, void const *rhs) {
int32_t
tCmprBlockL
(
void
const
*
lhs
,
void
const
*
rhs
)
{
SBlockIdx
*
lBlockIdx
=
(
SBlockIdx
*
)
lhs
;
SS
stBlk
*
rBlockL
=
(
SSs
tBlk
*
)
rhs
;
SS
ttBlk
*
rBlockL
=
(
SSt
tBlk
*
)
rhs
;
if
(
lBlockIdx
->
suid
<
rBlockL
->
suid
)
{
return
-
1
;
...
...
@@ -311,41 +311,41 @@ bool tDataBlkHasSma(SDataBlk *pDataBlk) {
return
pDataBlk
->
smaInfo
.
size
>
0
;
}
// SS
s
tBlk ======================================================
int32_t
tPutS
s
tBlk
(
uint8_t
*
p
,
void
*
ph
)
{
// SS
t
tBlk ======================================================
int32_t
tPutS
t
tBlk
(
uint8_t
*
p
,
void
*
ph
)
{
int32_t
n
=
0
;
SS
stBlk
*
pSstBlk
=
(
SSs
tBlk
*
)
ph
;
n
+=
tPutI64
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
suid
);
n
+=
tPutI64
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
minUid
);
n
+=
tPutI64
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
maxUid
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
minKey
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
maxKey
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
minVer
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
maxVer
);
n
+=
tPutI32v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
nRow
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
bInfo
.
offset
);
n
+=
tPutI32v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
bInfo
.
szBlock
);
n
+=
tPutI32v
(
p
?
p
+
n
:
p
,
pS
s
tBlk
->
bInfo
.
szKey
);
SS
ttBlk
*
pSttBlk
=
(
SSt
tBlk
*
)
ph
;
n
+=
tPutI64
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
suid
);
n
+=
tPutI64
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
minUid
);
n
+=
tPutI64
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
maxUid
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
minKey
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
maxKey
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
minVer
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
maxVer
);
n
+=
tPutI32v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
nRow
);
n
+=
tPutI64v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
bInfo
.
offset
);
n
+=
tPutI32v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
bInfo
.
szBlock
);
n
+=
tPutI32v
(
p
?
p
+
n
:
p
,
pS
t
tBlk
->
bInfo
.
szKey
);
return
n
;
}
int32_t
tGetS
s
tBlk
(
uint8_t
*
p
,
void
*
ph
)
{
int32_t
tGetS
t
tBlk
(
uint8_t
*
p
,
void
*
ph
)
{
int32_t
n
=
0
;
SS
stBlk
*
pSstBlk
=
(
SSs
tBlk
*
)
ph
;
n
+=
tGetI64
(
p
+
n
,
&
pS
s
tBlk
->
suid
);
n
+=
tGetI64
(
p
+
n
,
&
pS
s
tBlk
->
minUid
);
n
+=
tGetI64
(
p
+
n
,
&
pS
s
tBlk
->
maxUid
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tBlk
->
minKey
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tBlk
->
maxKey
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tBlk
->
minVer
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tBlk
->
maxVer
);
n
+=
tGetI32v
(
p
+
n
,
&
pS
s
tBlk
->
nRow
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
s
tBlk
->
bInfo
.
offset
);
n
+=
tGetI32v
(
p
+
n
,
&
pS
s
tBlk
->
bInfo
.
szBlock
);
n
+=
tGetI32v
(
p
+
n
,
&
pS
s
tBlk
->
bInfo
.
szKey
);
SS
ttBlk
*
pSttBlk
=
(
SSt
tBlk
*
)
ph
;
n
+=
tGetI64
(
p
+
n
,
&
pS
t
tBlk
->
suid
);
n
+=
tGetI64
(
p
+
n
,
&
pS
t
tBlk
->
minUid
);
n
+=
tGetI64
(
p
+
n
,
&
pS
t
tBlk
->
maxUid
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tBlk
->
minKey
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tBlk
->
maxKey
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tBlk
->
minVer
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tBlk
->
maxVer
);
n
+=
tGetI32v
(
p
+
n
,
&
pS
t
tBlk
->
nRow
);
n
+=
tGetI64v
(
p
+
n
,
&
pS
t
tBlk
->
bInfo
.
offset
);
n
+=
tGetI32v
(
p
+
n
,
&
pS
t
tBlk
->
bInfo
.
szBlock
);
n
+=
tGetI32v
(
p
+
n
,
&
pS
t
tBlk
->
bInfo
.
szKey
);
return
n
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录