Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1a0031a4
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,发现更多精彩内容 >>
提交
1a0031a4
编写于
7月 20, 2023
作者:
S
slzhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enhance: uinfo to qdebug and increase pages num to 2048
上级
5d9f6fd4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
12 deletion
+8
-12
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+1
-1
source/libs/executor/src/tsort.c
source/libs/executor/src/tsort.c
+7
-11
未找到文件。
source/libs/executor/src/scanoperator.c
浏览文件 @
1a0031a4
...
...
@@ -2840,7 +2840,7 @@ int32_t startGroupTableMergeScan(SOperatorInfo* pOperator) {
int32_t
tableStartIdx
=
pInfo
->
tableStartIndex
;
int32_t
tableEndIdx
=
pInfo
->
tableEndIndex
;
pInfo
->
sortBufSize
=
1024
*
pInfo
->
bufPageSize
;
pInfo
->
sortBufSize
=
2048
*
pInfo
->
bufPageSize
;
int32_t
numOfBufPage
=
pInfo
->
sortBufSize
/
pInfo
->
bufPageSize
;
pInfo
->
pSortHandle
=
tsortCreateSortHandle
(
pInfo
->
pSortInfo
,
SORT_BLOCK_TS_MERGE
,
pInfo
->
bufPageSize
,
numOfBufPage
,
pInfo
->
pSortInputBlock
,
pTaskInfo
->
id
.
str
,
0
,
0
,
0
);
...
...
source/libs/executor/src/tsort.c
浏览文件 @
1a0031a4
...
...
@@ -480,13 +480,13 @@ static int32_t adjustMergeTreeForNextTuple(SSortSource* pSource, SMultiwayMergeT
if
(
pHandle
->
type
==
SORT_SINGLESOURCE_SORT
)
{
pSource
->
pageIndex
++
;
if
(
pSource
->
pageIndex
>=
taosArrayGetSize
(
pSource
->
pageIdList
))
{
uInfo
(
"adjust merge tree. %d source completed %d"
,
*
numOfCompleted
,
pSource
->
pageIndex
);
qDebug
(
"adjust merge tree. %d source completed %d"
,
*
numOfCompleted
,
pSource
->
pageIndex
);
(
*
numOfCompleted
)
+=
1
;
pSource
->
src
.
rowIndex
=
-
1
;
pSource
->
pageIndex
=
-
1
;
pSource
->
src
.
pBlock
=
blockDataDestroy
(
pSource
->
src
.
pBlock
);
}
else
{
if
(
pSource
->
pageIndex
%
512
==
0
)
uInfo
(
"begin source %p page %d"
,
pSource
,
pSource
->
pageIndex
);
if
(
pSource
->
pageIndex
%
512
==
0
)
qDebug
(
"begin source %p page %d"
,
pSource
,
pSource
->
pageIndex
);
int32_t
*
pPgId
=
taosArrayGet
(
pSource
->
pageIdList
,
pSource
->
pageIndex
);
...
...
@@ -510,7 +510,7 @@ static int32_t adjustMergeTreeForNextTuple(SSortSource* pSource, SMultiwayMergeT
if
(
pSource
->
src
.
pBlock
==
NULL
)
{
(
*
numOfCompleted
)
+=
1
;
pSource
->
src
.
rowIndex
=
-
1
;
uInfo
(
"adjust merge tree. %d source completed"
,
*
numOfCompleted
);
qDebug
(
"adjust merge tree. %d source completed"
,
*
numOfCompleted
);
}
}
}
...
...
@@ -692,7 +692,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
// Only *numOfInputSources* can be loaded into buffer to perform the external sort.
for
(
int32_t
i
=
0
;
i
<
sortGroup
;
++
i
)
{
uInfo
(
"internal merge sort pass %d group %d. num input sources %d "
,
t
,
i
,
numOfInputSources
);
qDebug
(
"internal merge sort pass %d group %d. num input sources %d "
,
t
,
i
,
numOfInputSources
);
pHandle
->
sourceId
+=
1
;
int32_t
end
=
(
i
+
1
)
*
numOfInputSources
-
1
;
...
...
@@ -716,7 +716,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
}
int
nMergedRows
=
0
;
SArray
*
pPageIdList
=
taosArrayInit
(
4
,
sizeof
(
int32_t
));
while
(
1
)
{
if
(
tsortIsClosed
(
pHandle
))
{
...
...
@@ -1014,7 +1014,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
}
taosArrayClear
(
aBlkSort
);
szSort
=
0
;
uInfo
(
"source %zu created"
,
taosArrayGetSize
(
aExtSrc
));
qDebug
(
"source %zu created"
,
taosArrayGetSize
(
aExtSrc
));
}
if
(
pBlk
==
NULL
)
{
break
;
...
...
@@ -1146,11 +1146,7 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
}
else
if
(
pHandle
->
type
==
SORT_BLOCK_TS_MERGE
)
{
code
=
createBlocksMergeSortInitialSources
(
pHandle
);
}
uInfo
(
"%zu sources created"
,
taosArrayGetSize
(
pHandle
->
pOrderedSource
));
for
(
int
i
=
0
;
i
<
taosArrayGetSize
(
pHandle
->
pOrderedSource
);
++
i
)
{
SSortSource
*
pSrc
=
taosArrayGetP
(
pHandle
->
pOrderedSource
,
i
);
uInfo
(
"source %d, num of pages %zu"
,
i
,
taosArrayGetSize
(
pSrc
->
pageIdList
));
}
qDebug
(
"%zu sources created"
,
taosArrayGetSize
(
pHandle
->
pOrderedSource
));
return
code
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录