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

Rename merge_selecting_handle with merge_selecting_task_handle for consistency

Browse Source
This commit is contained in:
Silviu Caragea 2018-03-26 23:18:19 +03:00
parent 0aa9b9efbe
commit 1418e339e4
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
View File

@ -369,7 +369,7 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(zkutil::ZooKeeperPtr & zoo
if (info.code == ZOK)
{
transaction.commit();
storage.merge_selecting_handle->schedule();
storage.merge_selecting_task_handle->schedule();
/// Lock nodes have been already deleted, do not delete them in destructor
block_number_lock.assumeUnlocked();

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

@ -148,7 +148,7 @@ void ReplicatedMergeTreeRestartingThread::run()
storage.is_leader_node = false;
CurrentMetrics::sub(CurrentMetrics::LeaderReplica);
storage.merge_selecting_handle->deactivate();
storage.merge_selecting_task_handle->deactivate();
storage.leader_election->yield();
}
}
@ -368,7 +368,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown()
if (storage.is_leader_node.compare_exchange_strong(old_val, false))
{
CurrentMetrics::sub(CurrentMetrics::LeaderReplica);
storage.merge_selecting_handle->deactivate();
storage.merge_selecting_task_handle->deactivate();
}
}

16
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -211,7 +211,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
replica_path = zookeeper_path + "/replicas/" + replica_name;
initMergeSelectSession();
merge_selecting_handle = context_.getSchedulePool().addTask("StorageReplicatedMergeTree::mergeSelectingThread", [this] { mergeSelectingThread(); });
merge_selecting_task_handle = context_.getSchedulePool().addTask("StorageReplicatedMergeTree::mergeSelectingThread", [this] { mergeSelectingThread(); });
bool skip_sanity_checks = false;
@ -1228,7 +1228,7 @@ void StorageReplicatedMergeTree::tryExecuteMerge(const StorageReplicatedMergeTre
/** With `ZCONNECTIONLOSS` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
* This is not a problem, because in this case the merge will remain in the queue, and we will try again.
*/
merge_selecting_handle->schedule();
merge_selecting_task_handle->schedule();
ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
write_part_log({});
@ -1898,9 +1898,9 @@ void StorageReplicatedMergeTree::mergeSelectingThread()
return;
if (!success)
merge_selecting_handle->scheduleAfter(MERGE_SELECTING_SLEEP_MS);
merge_selecting_task_handle->scheduleAfter(MERGE_SELECTING_SLEEP_MS);
else
merge_selecting_handle->schedule();
merge_selecting_task_handle->schedule();
}
@ -2007,10 +2007,10 @@ void StorageReplicatedMergeTree::becomeLeader()
LOG_INFO(log, "Became leader");
is_leader_node = false;
merge_selecting_handle->activate();
merge_selecting_task_handle->activate();
initMergeSelectSession();
is_leader_node = true;
merge_selecting_handle->schedule();
merge_selecting_task_handle->schedule();
}
@ -2287,7 +2287,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Strin
if (quorum)
updateQuorum(part_name);
merge_selecting_handle->schedule();
merge_selecting_task_handle->schedule();
for (const auto & replaced_part : replaced_parts)
{
@ -2375,7 +2375,7 @@ StorageReplicatedMergeTree::~StorageReplicatedMergeTree()
tryLogCurrentException(__PRETTY_FUNCTION__);
}
context.getSchedulePool().removeTask(merge_selecting_handle);
context.getSchedulePool().removeTask(merge_selecting_task_handle);
}

2
dbms/src/Storages/StorageReplicatedMergeTree.h
View File

@ -261,7 +261,7 @@ private:
BackgroundProcessingPool::TaskHandle queue_task_handle;
/// A task that selects parts to merge.
BackgroundSchedulePool::TaskHandle merge_selecting_handle;
BackgroundSchedulePool::TaskHandle merge_selecting_task_handle;
bool merge_sel_deduplicate;
std::function<bool(const MergeTreeData::DataPartPtr &, const MergeTreeData::DataPartPtr &)> merge_sel_uncached_merging_predicate;
std::function<std::pair<String, String>(const MergeTreeData::DataPartPtr &, const MergeTreeData::DataPartPtr &)> merge_sel_merging_predicate_args_to_key;