thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39091 from ClickHouse/tavplubix-patch-1

Browse Source 
Follow-up to #39036
This commit is contained in:
Alexander Tokmakov 2022-07-12 13:47:37 +03:00 committed by GitHub
commit b35ad0dbdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -3143,6 +3143,23 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
error_parts += (*it)->getNameWithState() + " "; error_parts += (*it)->getNameWithState() + " ";
}; };
auto activate_part = [this, &restored_active_part](auto it)
{
/// It's not clear what to do if we try to activate part that was removed in transaction.
/// It may happen only in ReplicatedMergeTree, so let's simply throw LOGICAL_ERROR for now.
chassert((*it)->version.isRemovalTIDLocked());
if ((*it)->version.removal_tid_lock == Tx::PrehistoricTID.getHash())
(*it)->version.unlockRemovalTID(Tx::PrehistoricTID, TransactionInfoContext{getStorageID(), (*it)->name});
else
throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot activate part {} that was removed by transaction ({})",
(*it)->name, (*it)->version.removal_tid_lock);
addPartContributionToColumnAndSecondaryIndexSizes(*it);
addPartContributionToDataVolume(*it);
modifyPartState(it, DataPartState::Active); /// iterator is not invalidated here
restored_active_part = true;
};
auto it_middle = data_parts_by_info.lower_bound(part->info); auto it_middle = data_parts_by_info.lower_bound(part->info);
/// Restore the leftmost part covered by the part /// Restore the leftmost part covered by the part
@ -3157,12 +3174,7 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
update_error(it); update_error(it);
if ((*it)->getState() != DataPartState::Active) if ((*it)->getState() != DataPartState::Active)
{ activate_part(it);
addPartContributionToColumnAndSecondaryIndexSizes(*it);
addPartContributionToDataVolume(*it);
modifyPartState(it, DataPartState::Active); // iterator is not invalidated here
restored_active_part = true;
}
pos = (*it)->info.max_block + 1; pos = (*it)->info.max_block + 1;
restored.push_back((*it)->name); restored.push_back((*it)->name);
@ -3189,21 +3201,7 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
update_error(it); update_error(it);
if ((*it)->getState() != DataPartState::Active) if ((*it)->getState() != DataPartState::Active)
{ activate_part(it);
/// It's not clear what to do if we try to activate part that was removed in transaction.
/// It may happen only in ReplicatedMergeTree, so let's simply throw LOGICAL_ERROR for now.
chassert((*it)->version.isRemovalTIDLocked());
if ((*it)->version.removal_tid_lock == Tx::PrehistoricTID.getHash())
(*it)->version.unlockRemovalTID(Tx::PrehistoricTID, TransactionInfoContext{getStorageID(), (*it)->name});
else
throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot activate part {} that was removed by transaction ({})",
(*it)->name, (*it)->version.removal_tid_lock);
addPartContributionToColumnAndSecondaryIndexSizes(*it);
addPartContributionToDataVolume(*it);
modifyPartState(it, DataPartState::Active);
restored_active_part = true;
}
pos = (*it)->info.max_block + 1; pos = (*it)->info.max_block + 1;
restored.push_back((*it)->name); restored.push_back((*it)->name);