Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4ea58e56
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
4ea58e56
编写于
8月 16, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: do some internal refactor.
上级
6609882f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
12 deletion
+24
-12
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
+20
-8
source/dnode/vnode/src/tsdb/tsdbRead2.c
source/dnode/vnode/src/tsdb/tsdbRead2.c
+4
-4
未找到文件。
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
浏览文件 @
4ea58e56
...
@@ -116,16 +116,17 @@ void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) {
...
@@ -116,16 +116,17 @@ void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) {
return
NULL
;
return
NULL
;
}
}
for
(
int32_t
i
=
0
;
i
<
1
;
++
i
)
{
pLoadInfo
->
currentLoadBlockIndex
=
1
;
pLoadInfo
[
i
].
currentLoadBlockIndex
=
1
;
pLoadInfo
->
blockIndex
[
0
]
=
-
1
;
pLoadInfo
[
i
].
blockIndex
[
0
]
=
-
1
;
pLoadInfo
->
blockIndex
[
1
]
=
-
1
;
pLoadInfo
[
i
].
blockIndex
[
1
]
=
-
1
;
tBlockDataDestroy
(
&
pLoadInfo
[
i
].
blockData
[
0
]
);
tStatisBlockDestroy
(
pLoadInfo
->
statisBlock
);
tBlockDataDestroy
(
&
pLoadInfo
[
i
].
blockData
[
1
]
);
TARRAY2_DESTROY
((
TStatisBlkArray
*
)
pLoadInfo
->
pSttStatisBlkArray
,
NULL
);
taosArrayDestroy
(
pLoadInfo
[
i
].
aSttBlk
);
tBlockDataDestroy
(
&
pLoadInfo
->
blockData
[
0
]);
}
tBlockDataDestroy
(
&
pLoadInfo
->
blockData
[
1
]);
taosArrayDestroy
(
pLoadInfo
->
aSttBlk
);
taosMemoryFree
(
pLoadInfo
);
taosMemoryFree
(
pLoadInfo
);
return
NULL
;
return
NULL
;
...
@@ -396,14 +397,25 @@ static bool existsFromSttBlkStatis(SSttBlockLoadInfo *pBlockLoadInfo, uint64_t s
...
@@ -396,14 +397,25 @@ static bool existsFromSttBlkStatis(SSttBlockLoadInfo *pBlockLoadInfo, uint64_t s
if
(
pBlockLoadInfo
->
statisBlock
==
NULL
)
{
if
(
pBlockLoadInfo
->
statisBlock
==
NULL
)
{
pBlockLoadInfo
->
statisBlock
=
taosMemoryCalloc
(
1
,
sizeof
(
STbStatisBlock
));
pBlockLoadInfo
->
statisBlock
=
taosMemoryCalloc
(
1
,
sizeof
(
STbStatisBlock
));
int64_t
st
=
taosGetTimestampMs
();
tsdbSttFileReadStatisBlock
(
pReader
,
p
,
pBlockLoadInfo
->
statisBlock
);
tsdbSttFileReadStatisBlock
(
pReader
,
p
,
pBlockLoadInfo
->
statisBlock
);
pBlockLoadInfo
->
statisBlockIndex
=
i
;
pBlockLoadInfo
->
statisBlockIndex
=
i
;
double
el
=
(
taosGetTimestampMs
()
-
st
)
/
1000
.
0
;
pBlockLoadInfo
->
cost
.
loadStatisBlocks
+=
1
;
pBlockLoadInfo
->
cost
.
loadStatisBlocks
+=
1
;
pBlockLoadInfo
->
cost
.
statisElapsedTime
+=
el
;
}
else
if
(
pBlockLoadInfo
->
statisBlockIndex
!=
i
)
{
}
else
if
(
pBlockLoadInfo
->
statisBlockIndex
!=
i
)
{
tStatisBlockDestroy
(
pBlockLoadInfo
->
statisBlock
);
tStatisBlockDestroy
(
pBlockLoadInfo
->
statisBlock
);
int64_t
st
=
taosGetTimestampMs
();
tsdbSttFileReadStatisBlock
(
pReader
,
p
,
pBlockLoadInfo
->
statisBlock
);
tsdbSttFileReadStatisBlock
(
pReader
,
p
,
pBlockLoadInfo
->
statisBlock
);
pBlockLoadInfo
->
statisBlockIndex
=
i
;
pBlockLoadInfo
->
statisBlockIndex
=
i
;
double
el
=
(
taosGetTimestampMs
()
-
st
)
/
1000
.
0
;
pBlockLoadInfo
->
cost
.
loadStatisBlocks
+=
1
;
pBlockLoadInfo
->
cost
.
loadStatisBlocks
+=
1
;
pBlockLoadInfo
->
cost
.
statisElapsedTime
+=
el
;
}
}
STbStatisBlock
*
pBlock
=
pBlockLoadInfo
->
statisBlock
;
STbStatisBlock
*
pBlock
=
pBlockLoadInfo
->
statisBlock
;
...
...
source/dnode/vnode/src/tsdb/tsdbRead2.c
浏览文件 @
4ea58e56
...
@@ -4072,13 +4072,13 @@ void tsdbReaderClose2(STsdbReader* pReader) {
...
@@ -4072,13 +4072,13 @@ void tsdbReaderClose2(STsdbReader* pReader) {
"%p :io-cost summary: head-file:%"
PRIu64
", head-file time:%.2f ms, SMA:%"
PRId64
"%p :io-cost summary: head-file:%"
PRIu64
", head-file time:%.2f ms, SMA:%"
PRId64
" SMA-time:%.2f ms, fileBlocks:%"
PRId64
" SMA-time:%.2f ms, fileBlocks:%"
PRId64
", fileBlocks-load-time:%.2f ms, "
", fileBlocks-load-time:%.2f ms, "
"build in-memory-block-time:%.2f ms, sttBlocks:%"
PRId64
", sttStatisBlock:%"
PRId64
"build in-memory-block-time:%.2f ms, sttBlocks:%"
PRId64
", stt
Blocks-time:%.2f ms, stt
StatisBlock:%"
PRId64
", stt
Blocks-time:%.2f ms, stt
-statis-Block-time:%.2f ms, composed-blocks:%"
PRId64
", stt-statis-Block-time:%.2f ms, composed-blocks:%"
PRId64
", composed-blocks-time:%.2fms, STableBlockScanInfo size:%.2f Kb, createTime:%.2f ms,createSkylineIterTime:%.2f "
", composed-blocks-time:%.2fms, STableBlockScanInfo size:%.2f Kb, createTime:%.2f ms,createSkylineIterTime:%.2f "
"ms, initLastBlockReader:%.2fms, %s"
,
"ms, initLastBlockReader:%.2fms, %s"
,
pReader
,
pCost
->
headFileLoad
,
pCost
->
headFileLoadTime
,
pCost
->
smaDataLoad
,
pCost
->
smaLoadTime
,
pCost
->
numOfBlocks
,
pReader
,
pCost
->
headFileLoad
,
pCost
->
headFileLoadTime
,
pCost
->
smaDataLoad
,
pCost
->
smaLoadTime
,
pCost
->
numOfBlocks
,
pCost
->
blockLoadTime
,
pCost
->
buildmemBlock
,
pCost
->
sttCost
.
loadBlocks
,
pCost
->
sttCost
.
loadStatisBlocks
,
pCost
->
blockLoadTime
,
pCost
->
buildmemBlock
,
pCost
->
sttCost
.
loadBlocks
,
pCost
->
sttCost
.
blockElapsedTime
,
pCost
->
sttCost
.
blockElapsedTime
,
pCost
->
sttCost
.
statisElapsedTime
,
pCost
->
composedBlocks
,
pCost
->
sttCost
.
loadStatisBlocks
,
pCost
->
sttCost
.
statisElapsedTime
,
pCost
->
composedBlocks
,
pCost
->
buildComposedBlockTime
,
numOfTables
*
sizeof
(
STableBlockScanInfo
)
/
1000
.
0
,
pCost
->
createScanInfoList
,
pCost
->
buildComposedBlockTime
,
numOfTables
*
sizeof
(
STableBlockScanInfo
)
/
1000
.
0
,
pCost
->
createScanInfoList
,
pCost
->
createSkylineIterTime
,
pCost
->
initLastBlockReader
,
pReader
->
idStr
);
pCost
->
createSkylineIterTime
,
pCost
->
initLastBlockReader
,
pReader
->
idStr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录