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

fix initialization of the name of the merged part

Browse Source
This commit is contained in:
Alexey Zatelepin 2018-05-07 14:53:10 +03:00
parent 9f4377b771
commit b1ebc6da46
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
View File

@ -92,6 +92,7 @@ void MergeTreeDataMerger::FuturePart::assign(MergeTreeData::DataPartsVector part
part_info.min_block = parts.front()->info.min_block; part_info.min_block = parts.front()->info.min_block;
part_info.max_block = parts.back()->info.max_block; part_info.max_block = parts.back()->info.max_block;
part_info.level = max_level + 1; part_info.level = max_level + 1;
part_info.version = parts.front()->info.version;
if (parts.front()->storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING) if (parts.front()->storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
{ {

5
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -388,11 +388,6 @@ bool StorageMergeTree::merge(
if (!selected) if (!selected)
return false; return false;
/// TODO: move to FuturePart initialization.
Int64 mutation_version = getCurrentMutationVersion(future_part.parts.front(), lock);
if (future_part.part_info.min_block < mutation_version)
future_part.part_info.version = mutation_version;
merging_tagger.emplace(future_part.parts, MergeTreeDataMerger::estimateDiskSpaceForMerge(future_part.parts), *this); merging_tagger.emplace(future_part.parts, MergeTreeDataMerger::estimateDiskSpaceForMerge(future_part.parts), *this);
} }