thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 01:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Alexander Gololobov 2024-09-03 13:09:18 +02:00
parent d28cba981c
commit 6a6935cb84
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1466,7 +1466,7 @@ public:
subqueries_for_sets = transform->getSubqueries(); subqueries_for_sets = transform->getSubqueries();
} }
String getName() const override { return "Materializing"; } String getName() const override { return "TTL"; }
PreparedSets::Subqueries getSubqueries() { return std::move(subqueries_for_sets); } PreparedSets::Subqueries getSubqueries() { return std::move(subqueries_for_sets); }
@ -1524,9 +1524,8 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
std::vector<QueryPlanPtr> plans; std::vector<QueryPlanPtr> plans;
for (const auto & part : global_ctx->future_part->parts) for (const auto & part : global_ctx->future_part->parts)
{ {
/// TODO: this is just for debugging purposes, remove it later
if (part->getMarksCount() == 0) if (part->getMarksCount() == 0)
LOG_DEBUG(ctx->log, "Part {} is empty", part->name); LOG_TRACE(ctx->log, "Part {} is empty", part->name);
auto plan_for_part = std::make_unique<QueryPlan>(); auto plan_for_part = std::make_unique<QueryPlan>();
createReadFromPartStep( createReadFromPartStep(
@ -1613,12 +1612,12 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
/// If deduplicate_by_columns is empty, add all columns except virtuals. /// If deduplicate_by_columns is empty, add all columns except virtuals.
if (global_ctx->deduplicate_by_columns.empty()) if (global_ctx->deduplicate_by_columns.empty())
{ {
for (const auto & column_name : global_ctx->merging_columns.getNames()) for (const auto & column : global_ctx->merging_columns)
{ {
if (virtuals.tryGet(column_name, VirtualsKind::Persistent)) if (virtuals.tryGet(column.name, VirtualsKind::Persistent))
continue; continue;
global_ctx->deduplicate_by_columns.emplace_back(column_name); global_ctx->deduplicate_by_columns.emplace_back(column.name);
} }
} }