Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
207d69e6
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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,发现更多精彩内容 >>
提交
207d69e6
编写于
9月 07, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refact code
上级
efb429eb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
29 deletion
+30
-29
source/dnode/vnode/src/tsdb/tsdbCommit.c
source/dnode/vnode/src/tsdb/tsdbCommit.c
+30
-29
未找到文件。
source/dnode/vnode/src/tsdb/tsdbCommit.c
浏览文件 @
207d69e6
...
...
@@ -554,43 +554,44 @@ _err:
static
int32_t
tsdbCommitDataBlock
(
SCommitter
*
pCommitter
)
{
int32_t
code
=
0
;
SBlockData
*
pBlockData
=
&
pCommitter
->
dWriter
.
bData
;
SDataBlk
bloc
k
;
SDataBlk
dataBl
k
;
ASSERT
(
pBlockData
->
nRow
>
0
);
tDataBlkReset
(
&
bloc
k
);
tDataBlkReset
(
&
dataBl
k
);
// info
bloc
k
.
nRow
+=
pBlockData
->
nRow
;
dataBl
k
.
nRow
+=
pBlockData
->
nRow
;
for
(
int32_t
iRow
=
0
;
iRow
<
pBlockData
->
nRow
;
iRow
++
)
{
TSDBKEY
key
=
{.
ts
=
pBlockData
->
aTSKEY
[
iRow
],
.
version
=
pBlockData
->
aVersion
[
iRow
]};
if
(
iRow
==
0
)
{
if
(
tsdbKeyCmprFn
(
&
bloc
k
.
minKey
,
&
key
)
>
0
)
{
bloc
k
.
minKey
=
key
;
if
(
tsdbKeyCmprFn
(
&
dataBl
k
.
minKey
,
&
key
)
>
0
)
{
dataBl
k
.
minKey
=
key
;
}
}
else
{
if
(
pBlockData
->
aTSKEY
[
iRow
]
==
pBlockData
->
aTSKEY
[
iRow
-
1
])
{
bloc
k
.
hasDup
=
1
;
dataBl
k
.
hasDup
=
1
;
}
}
if
(
iRow
==
pBlockData
->
nRow
-
1
&&
tsdbKeyCmprFn
(
&
bloc
k
.
maxKey
,
&
key
)
<
0
)
{
bloc
k
.
maxKey
=
key
;
if
(
iRow
==
pBlockData
->
nRow
-
1
&&
tsdbKeyCmprFn
(
&
dataBl
k
.
maxKey
,
&
key
)
<
0
)
{
dataBl
k
.
maxKey
=
key
;
}
block
.
minVer
=
TMIN
(
bloc
k
.
minVer
,
key
.
version
);
block
.
maxVer
=
TMAX
(
bloc
k
.
maxVer
,
key
.
version
);
dataBlk
.
minVer
=
TMIN
(
dataBl
k
.
minVer
,
key
.
version
);
dataBlk
.
maxVer
=
TMAX
(
dataBl
k
.
maxVer
,
key
.
version
);
}
// write
block
.
nSubBlock
++
;
code
=
tsdbWriteBlockData
(
pCommitter
->
dWriter
.
pWriter
,
pBlockData
,
&
block
.
aSubBlock
[
block
.
nSubBlock
-
1
],
((
block
.
nSubBlock
==
1
)
&&
!
block
.
hasDup
)
?
&
block
.
smaInfo
:
NULL
,
pCommitter
->
cmprAlg
,
0
);
dataBlk
.
nSubBlock
++
;
code
=
tsdbWriteBlockData
(
pCommitter
->
dWriter
.
pWriter
,
pBlockData
,
&
dataBlk
.
aSubBlock
[
dataBlk
.
nSubBlock
-
1
],
((
dataBlk
.
nSubBlock
==
1
)
&&
!
dataBlk
.
hasDup
)
?
&
dataBlk
.
smaInfo
:
NULL
,
pCommitter
->
cmprAlg
,
0
);
if
(
code
)
goto
_err
;
// put SDataBlk
code
=
tMapDataPutItem
(
&
pCommitter
->
dWriter
.
mBlock
,
&
bloc
k
,
tPutDataBlk
);
code
=
tMapDataPutItem
(
&
pCommitter
->
dWriter
.
mBlock
,
&
dataBl
k
,
tPutDataBlk
);
if
(
code
)
goto
_err
;
// clear
...
...
@@ -605,33 +606,33 @@ _err:
static
int32_t
tsdbCommitLastBlock
(
SCommitter
*
pCommitter
)
{
int32_t
code
=
0
;
SSttBlk
blockL
;
SSttBlk
sstBlk
;
SBlockData
*
pBlockData
=
&
pCommitter
->
dWriter
.
bDatal
;
ASSERT
(
pBlockData
->
nRow
>
0
);
// info
blockL
.
suid
=
pBlockData
->
suid
;
blockL
.
nRow
=
pBlockData
->
nRow
;
blockL
.
minKey
=
TSKEY_MAX
;
blockL
.
maxKey
=
TSKEY_MIN
;
blockL
.
minVer
=
VERSION_MAX
;
blockL
.
maxVer
=
VERSION_MIN
;
sstBlk
.
suid
=
pBlockData
->
suid
;
sstBlk
.
nRow
=
pBlockData
->
nRow
;
sstBlk
.
minKey
=
TSKEY_MAX
;
sstBlk
.
maxKey
=
TSKEY_MIN
;
sstBlk
.
minVer
=
VERSION_MAX
;
sstBlk
.
maxVer
=
VERSION_MIN
;
for
(
int32_t
iRow
=
0
;
iRow
<
pBlockData
->
nRow
;
iRow
++
)
{
blockL
.
minKey
=
TMIN
(
blockL
.
minKey
,
pBlockData
->
aTSKEY
[
iRow
]);
blockL
.
maxKey
=
TMAX
(
blockL
.
maxKey
,
pBlockData
->
aTSKEY
[
iRow
]);
blockL
.
minVer
=
TMIN
(
blockL
.
minVer
,
pBlockData
->
aVersion
[
iRow
]);
blockL
.
maxVer
=
TMAX
(
blockL
.
maxVer
,
pBlockData
->
aVersion
[
iRow
]);
sstBlk
.
minKey
=
TMIN
(
sstBlk
.
minKey
,
pBlockData
->
aTSKEY
[
iRow
]);
sstBlk
.
maxKey
=
TMAX
(
sstBlk
.
maxKey
,
pBlockData
->
aTSKEY
[
iRow
]);
sstBlk
.
minVer
=
TMIN
(
sstBlk
.
minVer
,
pBlockData
->
aVersion
[
iRow
]);
sstBlk
.
maxVer
=
TMAX
(
sstBlk
.
maxVer
,
pBlockData
->
aVersion
[
iRow
]);
}
blockL
.
minUid
=
pBlockData
->
uid
?
pBlockData
->
uid
:
pBlockData
->
aUid
[
0
];
blockL
.
maxUid
=
pBlockData
->
uid
?
pBlockData
->
uid
:
pBlockData
->
aUid
[
pBlockData
->
nRow
-
1
];
sstBlk
.
minUid
=
pBlockData
->
uid
?
pBlockData
->
uid
:
pBlockData
->
aUid
[
0
];
sstBlk
.
maxUid
=
pBlockData
->
uid
?
pBlockData
->
uid
:
pBlockData
->
aUid
[
pBlockData
->
nRow
-
1
];
// write
code
=
tsdbWriteBlockData
(
pCommitter
->
dWriter
.
pWriter
,
pBlockData
,
&
blockL
.
bInfo
,
NULL
,
pCommitter
->
cmprAlg
,
1
);
code
=
tsdbWriteBlockData
(
pCommitter
->
dWriter
.
pWriter
,
pBlockData
,
&
sstBlk
.
bInfo
,
NULL
,
pCommitter
->
cmprAlg
,
1
);
if
(
code
)
goto
_err
;
// push SSttBlk
if
(
taosArrayPush
(
pCommitter
->
dWriter
.
aSttBlk
,
&
blockL
)
==
NULL
)
{
if
(
taosArrayPush
(
pCommitter
->
dWriter
.
aSttBlk
,
&
sstBlk
)
==
NULL
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_err
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录