mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-22 09:40:49 +00:00
Merge
This commit is contained in:
parent
45dcf66dd8
commit
2b7cdfd950
@ -134,6 +134,8 @@ void StorageMergeTree::mergeThread(bool while_can, bool aggressive)
|
||||
{
|
||||
while (!shutdown_called)
|
||||
{
|
||||
auto structure_lock = lockStructure(false);
|
||||
|
||||
/// Удаляем старые куски. На случай, если в слиянии что-то сломано, и из следующего блока вылетит исключение.
|
||||
data.clearOldParts();
|
||||
|
||||
@ -161,17 +163,13 @@ void StorageMergeTree::mergeThread(bool while_can, bool aggressive)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto structure_lock = lockStructure(false);
|
||||
if (!merger.selectPartsToMerge(parts, disk_space, false, aggressive, only_small, can_merge) &&
|
||||
!merger.selectPartsToMerge(parts, disk_space, true, aggressive, only_small, can_merge))
|
||||
break;
|
||||
}
|
||||
if (!merger.selectPartsToMerge(parts, disk_space, false, aggressive, only_small, can_merge) &&
|
||||
!merger.selectPartsToMerge(parts, disk_space, true, aggressive, only_small, can_merge))
|
||||
break;
|
||||
|
||||
merging_tagger = new CurrentlyMergingPartsTagger(parts, merger.estimateDiskSpaceForMerge(parts), *this);
|
||||
}
|
||||
|
||||
auto structure_lock = lockStructure(true);
|
||||
merger.mergeParts(merging_tagger->parts);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user