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

Fixed strange whitespaces

Browse Source
This commit is contained in:
Alexey Milovidov 2020-03-20 05:49:47 +03:00
parent a0f2940cb1
commit de5f559304
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,7 +253,6 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
metadata_version = metadata_stat.version; metadata_version = metadata_stat.version;
createReplica(); createReplica();
} }
else else
{ {
@ -299,7 +298,6 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
zkutil::EventPtr wait_event = std::make_shared<Poco::Event>(); zkutil::EventPtr wait_event = std::make_shared<Poco::Event>();
std::set<String> inactive_replicas; std::set<String> inactive_replicas;
for (const String & replica : replicas) for (const String & replica : replicas)
{ {
@ -4518,18 +4516,18 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const
void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t mutations_sync) const void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t mutations_sync) const
{ {
auto zookeeper = getZooKeeper(); if (!mutations_sync)
/// we have to wait return;
if (mutations_sync != 0)
{
Strings replicas;
if (mutations_sync == 2) /// wait for all replicas
replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
else if (mutations_sync == 1) /// just wait for ourself
replicas.push_back(replica_name);
waitMutationToFinishOnReplicas(replicas, znode_name); /// we have to wait
} auto zookeeper = getZooKeeper();
Strings replicas;
if (mutations_sync == 2) /// wait for all replicas
replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
else if (mutations_sync == 1) /// just wait for ourself
replicas.push_back(replica_name);
waitMutationToFinishOnReplicas(replicas, znode_name);
} }
std::vector<MergeTreeMutationStatus> StorageReplicatedMergeTree::getMutationsStatus() const std::vector<MergeTreeMutationStatus> StorageReplicatedMergeTree::getMutationsStatus() const