diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp index 1c468f859c1..50f2b9c3ffa 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp @@ -195,7 +195,7 @@ void ReplicatedMergeTreeQueue::updateTimesInZooKeeper( } -void ReplicatedMergeTreeQueue::remove(zkutil::ZooKeeperPtr zookeeper, LogEntryPtr & entry) +void ReplicatedMergeTreeQueue::removeProcessedEntry(zkutil::ZooKeeperPtr zookeeper, LogEntryPtr & entry) { auto code = zookeeper->tryRemove(replica_path + "/queue/" + entry->znode_name); @@ -891,7 +891,7 @@ bool ReplicatedMergeTreeQueue::processEntry( try { if (func(entry)) - remove(get_zookeeper(), entry); + removeProcessedEntry(get_zookeeper(), entry); } catch (...) { diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h index 5a6a99e7da3..cacdab7c288 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h @@ -139,7 +139,7 @@ private: std::lock_guard & target_state_lock, std::lock_guard & queue_lock); - void remove(zkutil::ZooKeeperPtr zookeeper, LogEntryPtr & entry); + void removeProcessedEntry(zkutil::ZooKeeperPtr zookeeper, LogEntryPtr & entry); /** Can I now try this action. If not, you need to leave it in the queue and try another one. * Called under the queue_mutex.