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

rename method for clarity

Browse Source
This commit is contained in:
Alexey Zatelepin 2018-06-06 22:15:10 +03:00
parent 4ee581117b
commit b60a2a90fa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
View File

@ -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 (...)
{

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
View File

@ -139,7 +139,7 @@ private:
std::lock_guard<std::mutex> & target_state_lock,
std::lock_guard<std::mutex> & 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.