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

Style

Browse Source
This commit is contained in:
alesapin 2022-06-24 14:51:47 +02:00
parent 37310dc9df
commit c57e07cb49
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2809,7 +2809,7 @@ bool MergeTreeData::renameTempPartAndReplaceImpl(
MutableDataPartPtr & part,
SimpleIncrement * increment,
Transaction & out_transaction,
std::unique_lock<std::mutex> & lock,
DataPartsLock & lock,
DataPartsVector * out_covered_parts,
MergeTreeDeduplicationLog * deduplication_log,
std::string_view deduplication_token)
@ -2820,9 +2820,6 @@ bool MergeTreeData::renameTempPartAndReplaceImpl(
part->assertState({DataPartState::Temporary});
MergeTreePartInfo part_info = part->info;
String part_name;
if (DataPartPtr existing_part_in_partition = getAnyPartInPartition(part->info.partition_id, lock))
{
if (part->partition.value != existing_part_in_partition->partition.value)
@ -2832,6 +2829,9 @@ bool MergeTreeData::renameTempPartAndReplaceImpl(
ErrorCodes::CORRUPTED_DATA);
}
MergeTreePartInfo part_info = part->info;
String part_name;
/** It is important that obtaining new block number and adding that block to parts set is done atomically.
* Otherwise there is race condition - merge of blocks could happen in interval that doesn't yet contain new part.
*/
@ -2935,10 +2935,7 @@ void MergeTreeData::renameTempPartsAndReplace(
renameTempPartAndReplaceImpl(part, increment, out_transaction, lock);
}
void MergeTreeData::removePartsFromWorkingSet(MergeTreeTransaction * txn, const MergeTreeData::DataPartsVector & remove, bool clear_without_timeout, DataPartsLock & acquired_lock)
{
if (txn)
transactions_enabled.store(true);