thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 18:42:26 +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

10
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,10 +4516,11 @@ 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)
return;
/// we have to wait /// we have to wait
if (mutations_sync != 0) auto zookeeper = getZooKeeper();
{
Strings replicas; Strings replicas;
if (mutations_sync == 2) /// wait for all replicas if (mutations_sync == 2) /// wait for all replicas
replicas = zookeeper->getChildren(zookeeper_path + "/replicas"); replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
@ -4530,7 +4529,6 @@ void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t
waitMutationToFinishOnReplicas(replicas, znode_name); waitMutationToFinishOnReplicas(replicas, znode_name);
} }
}
std::vector<MergeTreeMutationStatus> StorageReplicatedMergeTree::getMutationsStatus() const std::vector<MergeTreeMutationStatus> StorageReplicatedMergeTree::getMutationsStatus() const
{ {