Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
a205eba2
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,发现更多精彩内容 >>
提交
a205eba2
编写于
7月 25, 2023
作者:
S
slzhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: choose heap sort for table merge scan when row size is big and has limit
上级
1d24b96e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
15 deletion
+23
-15
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+16
-8
source/libs/executor/src/sortoperator.c
source/libs/executor/src/sortoperator.c
+7
-7
未找到文件。
source/libs/executor/src/scanoperator.c
浏览文件 @
a205eba2
...
...
@@ -2837,15 +2837,23 @@ int32_t startGroupTableMergeScan(SOperatorInfo* pOperator) {
int32_t
tableStartIdx
=
pInfo
->
tableStartIndex
;
int32_t
tableEndIdx
=
pInfo
->
tableEndIndex
;
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
);
bool
hasLimit
=
pInfo
->
limitInfo
.
limit
.
limit
!=
-
1
||
pInfo
->
limitInfo
.
limit
.
offset
!=
-
1
;
int64_t
mergeLimit
=
-
1
;
if
(
pInfo
->
limitInfo
.
limit
.
limit
!=
-
1
||
pInfo
->
limitInfo
.
limit
.
offset
!=
-
1
)
{
mergeLimit
=
pInfo
->
limitInfo
.
limit
.
limit
+
pInfo
->
limitInfo
.
limit
.
offset
;
}
tsortSetMergeLimit
(
pInfo
->
pSortHandle
,
mergeLimit
);
if
(
hasLimit
)
{
mergeLimit
=
pInfo
->
limitInfo
.
limit
.
limit
+
pInfo
->
limitInfo
.
limit
.
offset
;
}
size_t
szRow
=
blockDataGetRowSize
(
pInfo
->
pResBlock
);
if
(
szRow
>
1024
&&
hasLimit
)
{
pInfo
->
pSortHandle
=
tsortCreateSortHandle
(
pInfo
->
pSortInfo
,
SORT_SINGLESOURCE_SORT
,
-
1
,
-
1
,
NULL
,
pTaskInfo
->
id
.
str
,
mergeLimit
,
szRow
+
8
,
tsPQSortMemThreshold
*
1024
*
1024
);
}
else
{
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
);
tsortSetMergeLimit
(
pInfo
->
pSortHandle
,
mergeLimit
);
}
tsortSetFetchRawDataFp
(
pInfo
->
pSortHandle
,
getTableDataBlockImpl
,
NULL
,
NULL
);
// one table has one data block
...
...
source/libs/executor/src/sortoperator.c
浏览文件 @
a205eba2
...
...
@@ -54,19 +54,19 @@ SOperatorInfo* createSortOperatorInfo(SOperatorInfo* downstream, SSortPhysiNode*
int32_t
numOfCols
=
0
;
pOperator
->
exprSupp
.
pExprInfo
=
createExprInfo
(
pSortNode
->
pExprs
,
NULL
,
&
numOfCols
);
pOperator
->
exprSupp
.
numOfExprs
=
numOfCols
;
calcSortOperMaxTupleLength
(
pInfo
,
pSortNode
->
pSortKeys
);
pInfo
->
maxRows
=
-
1
;
if
(
pSortNode
->
node
.
pLimit
)
{
SLimitNode
*
pLimit
=
(
SLimitNode
*
)
pSortNode
->
node
.
pLimit
;
if
(
pLimit
->
limit
>
0
)
pInfo
->
maxRows
=
pLimit
->
limit
;
}
int32_t
numOfOutputCols
=
0
;
int32_t
code
=
extractColMatchInfo
(
pSortNode
->
pTargets
,
pDescNode
,
&
numOfOutputCols
,
COL_MATCH_FROM_SLOT_ID
,
&
pInfo
->
matchInfo
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
goto
_error
;
}
calcSortOperMaxTupleLength
(
pInfo
,
pSortNode
->
pSortKeys
);
pInfo
->
maxRows
=
-
1
;
if
(
pSortNode
->
node
.
pLimit
)
{
SLimitNode
*
pLimit
=
(
SLimitNode
*
)
pSortNode
->
node
.
pLimit
;
if
(
pLimit
->
limit
>
0
)
pInfo
->
maxRows
=
pLimit
->
limit
+
pLimit
->
offset
;
}
pOperator
->
exprSupp
.
pCtx
=
createSqlFunctionCtx
(
pOperator
->
exprSupp
.
pExprInfo
,
numOfCols
,
&
pOperator
->
exprSupp
.
rowEntryInfoOffset
,
&
pTaskInfo
->
storageAPI
.
functionStore
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录