thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 19:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix style

Browse Source
This commit is contained in:
alesapin 2020-03-20 15:45:05 +03:00
parent 5a3216b26f
commit 90c436f940
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
View File

@ -1037,7 +1037,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
need_remove_expired_values = true;
/// All columns from part are changed and may be some more that were missing before in part
if (source_part->getColumns().isSubsetOf(updated_header.getNamesAndTypesList()) || isCompactPart(source_part))
if (isCompactPart(source_part) || source_part->getColumns().isSubsetOf(updated_header.getNamesAndTypesList()))
{
mutateAllPartColumns(
new_data_part,

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

@ -768,9 +768,7 @@ BackgroundProcessingPoolTaskResult StorageMergeTree::mergeMutateTask()
return BackgroundProcessingPoolTaskResult::ERROR;
if (merger_mutator.merges_blocker.isCancelled())
{
return BackgroundProcessingPoolTaskResult::NOTHING_TO_DO;
}
try
{
@ -783,7 +781,6 @@ BackgroundProcessingPoolTaskResult StorageMergeTree::mergeMutateTask()
clearOldPartsFromFilesystem();
clearOldTemporaryDirectories();
}
clearOldMutations();
}