thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-05 15:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix datarace in stress test in storagemergetree

Browse Source
This commit is contained in:
Nikita Mikhaylov 2019-10-01 21:04:42 +03:00 committed by GitHub
parent fe5df2c1ed
commit 0e9cad2276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1222,13 +1222,14 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
{ {
Transaction transaction(*dest_table_storage); Transaction transaction(*dest_table_storage);
auto data_parts_lock = lockParts(); auto src_data_parts_lock = lockParts();
auto dest_data_parts_lock = dest_table_storage->lockParts();
for (MutableDataPartPtr & part : dst_parts) for (MutableDataPartPtr & part : dst_parts)
dest_table_storage->renameTempPartAndReplace(part, &increment, &transaction, data_parts_lock); dest_table_storage->renameTempPartAndReplace(part, &increment, &transaction, dest_data_parts_lock);
transaction.commit(&data_parts_lock); transaction.commit(&src_data_parts_lock);
removePartsFromWorkingSet(src_parts, true, data_parts_lock); removePartsFromWorkingSet(src_parts, true, src_data_parts_lock);
} }
clearOldMutations(true); clearOldMutations(true);