thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 13:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update InterpreterSelectQuery.cpp

Browse Source
This commit is contained in:
alexey-milovidov 2019-05-05 23:29:17 +03:00 committed by GitHub
parent 125fce3303
commit e1158f53ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -1432,7 +1432,7 @@ static SortDescription getSortDescription(const ASTSelectQuery & query)
} }
void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo& query_info) void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo & query_info)
{ {
auto & query = getSelectQuery(); auto & query = getSelectQuery();
SortDescription order_descr = getSortDescription(query); SortDescription order_descr = getSortDescription(query);
@ -1440,7 +1440,7 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo&
UInt64 limit = getLimitForSorting(query, context); UInt64 limit = getLimitForSorting(query, context);
const Settings & settings = context.getSettingsRef(); const Settings & settings = context.getSettingsRef();
const auto& order_direction = order_descr.at(0).direction; const auto & order_direction = order_descr.at(0).direction;
auto optimize_pk_order = [&](auto & merge_tree) auto optimize_pk_order = [&](auto & merge_tree)
{ {
@ -1456,7 +1456,8 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo&
{ {
need_sorting = true; need_sorting = true;
break; break;
} else }
else
{ {
prefix_order_descr.push_back(order_descr[i]); prefix_order_descr.push_back(order_descr[i]);
} }
@ -1490,20 +1491,15 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo&
} }
executeUnion(pipeline); executeUnion(pipeline);
pipeline.firstStream() = std::make_shared<MergeSortingBlockInputStream>( pipeline.firstStream() = std::make_shared<MergeSortingBlockInputStream>(
pipeline.firstStream(), order_descr, settings.max_block_size, limit, pipeline.firstStream(), order_descr, settings.max_block_size, limit,
settings.max_bytes_before_remerge_sort, settings.max_bytes_before_remerge_sort,
settings.max_bytes_before_external_sort, context.getTemporaryPath()); settings.max_bytes_before_external_sort, context.getTemporaryPath());
}; };
if (settings.optimize_pk_order) if (settings.optimize_pk_order)
{ {
if (const StorageMergeTree * merge_tree = dynamic_cast<const StorageMergeTree *>(storage.get())) if (const auto * merge_tree = dynamic_cast<const MergeTreeData *>(storage.get()))
{
optimize_pk_order(*merge_tree); optimize_pk_order(*merge_tree);
} else if (const StorageReplicatedMergeTree * replicated_merge_tree = dynamic_cast<const StorageReplicatedMergeTree *>(storage.get()))
{
optimize_pk_order(*replicated_merge_tree);
}
return; return;
} }