Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1b9754f1
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,发现更多精彩内容 >>
提交
1b9754f1
编写于
7月 17, 2023
作者:
S
slzhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enhance: add log with info level. change to debug later
上级
655233fd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+1
-4
source/libs/executor/src/tsort.c
source/libs/executor/src/tsort.c
+5
-2
未找到文件。
source/libs/executor/src/scanoperator.c
浏览文件 @
1b9754f1
...
...
@@ -2840,10 +2840,7 @@ int32_t startGroupTableMergeScan(SOperatorInfo* pOperator) {
int32_t
tableStartIdx
=
pInfo
->
tableStartIndex
;
int32_t
tableEndIdx
=
pInfo
->
tableEndIndex
;
// todo the total available buffer should be determined by total capacity of buffer of this task.
// the additional one is reserved for merge result
pInfo
->
sortBufSize
=
pInfo
->
bufPageSize
*
(
tableEndIdx
-
tableStartIdx
+
1
+
1
);
pInfo
->
sortBufSize
=
2048
*
pInfo
->
bufPageSize
;
int32_t
numOfBufPage
=
pInfo
->
sortBufSize
/
pInfo
->
bufPageSize
;
pInfo
->
pSortHandle
=
tsortCreateSortHandle
(
pInfo
->
pSortInfo
,
SORT_TABLE_MERGE_SCAN
,
pInfo
->
bufPageSize
,
numOfBufPage
,
pInfo
->
pSortInputBlock
,
pTaskInfo
->
id
.
str
,
0
,
0
,
0
);
...
...
source/libs/executor/src/tsort.c
浏览文件 @
1b9754f1
...
...
@@ -473,6 +473,7 @@ static int32_t adjustMergeTreeForNextTuple(SSortSource* pSource, SMultiwayMergeT
pSource
->
src
.
rowIndex
=
-
1
;
pSource
->
pageIndex
=
-
1
;
pSource
->
src
.
pBlock
=
blockDataDestroy
(
pSource
->
src
.
pBlock
);
uInfo
(
"adjust merge tree. %d source completed"
,
*
numOfCompleted
);
}
else
{
int32_t
*
pPgId
=
taosArrayGet
(
pSource
->
pageIdList
,
pSource
->
pageIndex
);
...
...
@@ -668,6 +669,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
);
pHandle
->
sourceId
+=
1
;
int32_t
end
=
(
i
+
1
)
*
numOfInputSources
-
1
;
...
...
@@ -1001,7 +1003,6 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
size_t
nSrc
=
taosArrayGetSize
(
pHandle
->
pOrderedSource
);
SArray
*
aExtSrc
=
taosArrayInit
(
nSrc
,
POINTER_BYTES
);
pHandle
->
numOfPages
=
1024
;
//todo check sortbufsize
size_t
maxBufSize
=
pHandle
->
numOfPages
*
pHandle
->
pageSize
;
createPageBuf
(
pHandle
);
...
...
@@ -1021,6 +1022,8 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
if
(
szSort
>
maxBufSize
)
{
sortBlocksToExtSource
(
pHandle
,
aBlkSort
,
pOrder
,
aExtSrc
);
uInfo
(
"initial source %zu created for %zu blocks"
,
taosArrayGetSize
(
aExtSrc
),
taosArrayGetSize
(
aBlkSort
));
for
(
int
i
=
0
;
i
<
taosArrayGetSize
(
aBlkSort
);
++
i
)
{
blockDataDestroy
(
taosArrayGetP
(
aBlkSort
,
i
));
}
...
...
@@ -1042,7 +1045,7 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
taosArrayDestroy
(
aExtSrc
);
pHandle
->
type
=
SORT_SINGLESOURCE_SORT
;
uInfo
(
"create initial sources for table merge scan ended"
);
}
return
code
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录