From bd4df60df6a1a42fe1b31e86526d2f5b46705a49 Mon Sep 17 00:00:00 2001 From: Jianfei Hu Date: Thu, 20 Apr 2023 21:37:50 +0000 Subject: [PATCH] fix merges Signed-off-by: Jianfei Hu --- src/Storages/MergeTree/MergeList.cpp | 5 ++++- src/Storages/MergeTree/MergeList.h | 1 + src/Storages/System/StorageSystemMerges.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp index 0950f5fc961..7d8a6434789 100644 --- a/src/Storages/MergeTree/MergeList.cpp +++ b/src/Storages/MergeTree/MergeList.cpp @@ -27,6 +27,7 @@ MergeListElement::MergeListElement( { WriteBufferFromOwnString out; FormatSettings format_settings; + bool partition_initialized = false; for (const auto & source_part : future_part->parts) { source_part_names.emplace_back(source_part->name); @@ -36,7 +37,8 @@ MergeListElement::MergeListElement( total_size_bytes_uncompressed += source_part->getTotalColumnsSize().data_uncompressed; total_size_marks += source_part->getMarksCount(); total_rows_count += source_part->index_granularity.getTotalRows(); - if (partition.empty()) { + if (partition_initialized) { + partition_initialized = true; future_part->getPartition().serializeText(source_part->storage, out, format_settings); partition = out.str(); } @@ -59,6 +61,7 @@ MergeInfo MergeListElement::getInfo() const res.result_part_name = result_part_name; res.result_part_path = result_part_path; res.partition_id = partition_id; + res.partition = partition; res.is_mutation = is_mutation; res.elapsed = watch.elapsedSeconds(); res.progress = progress.load(std::memory_order_relaxed); diff --git a/src/Storages/MergeTree/MergeList.h b/src/Storages/MergeTree/MergeList.h index fe95053f79d..62177ccdc9d 100644 --- a/src/Storages/MergeTree/MergeList.h +++ b/src/Storages/MergeTree/MergeList.h @@ -35,6 +35,7 @@ struct MergeInfo Array source_part_names; Array source_part_paths; std::string partition_id; + std::string partition; bool is_mutation; Float64 elapsed; Float64 progress; diff --git a/src/Storages/System/StorageSystemMerges.cpp b/src/Storages/System/StorageSystemMerges.cpp index 889fa9e94db..2dbe2964eb9 100644 --- a/src/Storages/System/StorageSystemMerges.cpp +++ b/src/Storages/System/StorageSystemMerges.cpp @@ -59,7 +59,7 @@ void StorageSystemMerges::fillData(MutableColumns & res_columns, ContextPtr cont res_columns[i++]->insert(merge.source_part_paths); res_columns[i++]->insert(merge.result_part_path); res_columns[i++]->insert(merge.partition_id); - // res_columns[i++]->insert(context->getMergeList().get().; + res_columns[i++]->insert(merge.partition); res_columns[i++]->insert(merge.is_mutation); res_columns[i++]->insert(merge.total_size_bytes_compressed); res_columns[i++]->insert(merge.total_size_bytes_uncompressed);