thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move sorting key calculation step outside the loop

Browse Source
This commit is contained in:
Alexander Gololobov 2024-09-09 16:01:00 +02:00
parent 8c1f434b1a
commit 4da1e10ac6
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Storages/MergeTree/MergeTask.cpp
View File

@ -1540,8 +1540,6 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
global_ctx->horizontal_stage_progress = std::make_unique<MergeStageProgress>( global_ctx->horizontal_stage_progress = std::make_unique<MergeStageProgress>(
ctx->column_sizes ? ctx->column_sizes->keyColumnsWeight() : 1.0); ctx->column_sizes ? ctx->column_sizes->keyColumnsWeight() : 1.0);
auto sorting_key_expression_dag = global_ctx->metadata_snapshot->getSortingKey().expression->getActionsDAG().clone();
/// Read from all parts /// Read from all parts
std::vector<QueryPlanPtr> plans; std::vector<QueryPlanPtr> plans;
for (size_t i = 0; i < global_ctx->future_part->parts.size(); ++i) for (size_t i = 0; i < global_ctx->future_part->parts.size(); ++i)
@ -1566,15 +1564,6 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
global_ctx->context, global_ctx->context,
ctx->log); ctx->log);
if (global_ctx->metadata_snapshot->hasSortingKey())
{
/// Calculate sorting key expressions so that they are available for merge sorting.
auto calculate_sorting_key_expression_step = std::make_unique<ExpressionStep>(
plan_for_part->getCurrentDataStream(),
sorting_key_expression_dag.clone()); /// TODO: can we avoid cloning here?
plan_for_part->addStep(std::move(calculate_sorting_key_expression_step));
}
plans.emplace_back(std::move(plan_for_part)); plans.emplace_back(std::move(plan_for_part));
} }
@ -1591,6 +1580,16 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
merge_parts_query_plan.unitePlans(std::move(union_step), std::move(plans)); merge_parts_query_plan.unitePlans(std::move(union_step), std::move(plans));
} }
if (global_ctx->metadata_snapshot->hasSortingKey())
{
/// Calculate sorting key expressions so that they are available for merge sorting.
auto sorting_key_expression_dag = global_ctx->metadata_snapshot->getSortingKey().expression->getActionsDAG().clone();
auto calculate_sorting_key_expression_step = std::make_unique<ExpressionStep>(
merge_parts_query_plan.getCurrentDataStream(),
std::move(sorting_key_expression_dag));
merge_parts_query_plan.addStep(std::move(calculate_sorting_key_expression_step));
}
/// Merge /// Merge
{ {
Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns(); Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();