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

Renamed ApplyMergeStep into MergePartsStep

Browse Source
This commit is contained in:
Alexander Gololobov 2024-09-09 15:30:19 +02:00
parent 2df5edc1c1
commit 1bcc4ba823
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1321,10 +1321,10 @@ bool MergeTask::execute()
/// Apply merge strategy (Ordinary, Colapsing, Aggregating, etc) to the stream
class ApplyMergeStep : public ITransformingStep
class MergePartsStep : public ITransformingStep
{
public:
ApplyMergeStep(
MergePartsStep(
const DataStream & input_stream_,
const SortDescription & sort_description_,
const Names partition_key_columns_,
@ -1347,7 +1347,7 @@ public:
, time_of_merge(time_of_merge_)
{}
String getName() const override { return "ApplyMergePolicy"; }
String getName() const override { return "MergeParts"; }
void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & /*pipelineSettings*/) override
{
@ -1651,7 +1651,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
if (global_ctx->cleanup && !data_settings->allow_experimental_replacing_merge_with_cleanup)
throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Experimental merges with CLEANUP are not allowed");
auto merge_step = std::make_unique<ApplyMergeStep>(
auto merge_step = std::make_unique<MergePartsStep>(
merge_parts_query_plan.getCurrentDataStream(),
sort_description,
partition_key_columns,