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

fix

Browse Source
This commit is contained in:
Alexander Tokmakov 2021-05-13 17:23:00 +03:00
parent 2da12f0b59
commit eaffe6848b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -2175,10 +2175,13 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
auto metadata_snapshot = getInMemoryMetadataPtr();
MergeTreePartInfo drop_range = MergeTreePartInfo::fromPartName(entry_replace.drop_range_part_name, format_version);
/// Range with only one block has special meaning ATTACH PARTITION
bool replace = drop_range.getBlocksCount() > 1; //FIXME
/// Range with only one block has special meaning: it's ATTACH PARTITION or MOVE PARTITION, so there is no drop range
bool replace = drop_range.getBlocksCount() > 1;
queue.removePartProducingOpsInRange(getZooKeeper(), drop_range, entry); //FIXME
if (replace)
queue.removePartProducingOpsInRange(getZooKeeper(), drop_range, entry);
else
drop_range = {};
struct PartDescription
{
@ -6233,9 +6236,9 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
if (auto txn = query_context->getZooKeeperMetadataTransaction())
txn->moveOpsTo(ops);
delimiting_block_lock->getUnlockOps(ops);
ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1)); /// Just update version
ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
delimiting_block_lock->getUnlockOps(ops);
Transaction transaction(*this);
{

2
tests/queries/0_stateless/01154_move_partition.sh
View File

@ -92,7 +92,7 @@ export -f replace_partition_src_src_thread;
export -f drop_partition_thread;
export -f optimize_thread;
TIMEOUT=100
TIMEOUT=60
#timeout $TIMEOUT bash -c "create_drop_thread ${engines[@]}" &
timeout $TIMEOUT bash -c 'insert_thread src' &