thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-15 12:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review fixes.

Browse Source
This commit is contained in:
Nikolai Kochetov 2024-09-26 12:44:06 +00:00
parent e0599ff1e1
commit dfe8eb059c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Processors/QueryPlan/DistinctStep.h
View File

@ -14,7 +14,7 @@ public:
const SizeLimits & set_size_limits_,
UInt64 limit_hint_,
const Names & columns_,
/// If is enabled, execute distinct for separate streams. Otherwise, merge streams.
/// If is enabled, execute distinct for separate streams, otherwise for merged streams.
bool pre_distinct_);
String getName() const override { return "Distinct"; }

1
src/Processors/QueryPlan/ITransformingStep.cpp
View File

@ -13,6 +13,7 @@ ITransformingStep::ITransformingStep(DataStream input_stream, Block output_heade
output_stream = createOutputStream(input_streams.front(), std::move(output_header), data_stream_traits);
}
/// TODO: cleanup in the following PR.
DataStream ITransformingStep::createOutputStream(
[[maybe_unused]] const DataStream & input_stream,
Block output_header,

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

@ -1639,10 +1639,10 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
merge_parts_query_plan.addStep(std::move(calculate_sorting_key_expression_step));
}
SortDescription sort_description;
/// Merge
{
Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();
SortDescription sort_description;
sort_description.compile_sort_description = global_ctx->data->getContext()->getSettingsRef()[Setting::compile_sort_description];
sort_description.min_count_to_compile_sort_description = global_ctx->data->getContext()->getSettingsRef()[Setting::min_count_to_compile_sort_description];
@ -1699,6 +1699,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
global_ctx->deduplicate_by_columns,
false /*pre_distinct*/);
deduplication_step->setStepDescription("Deduplication step");
deduplication_step->applyOrder(sort_description); // Distinct-in-order.
merge_parts_query_plan.addStep(std::move(deduplication_step));
}