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

Merge

Browse Source
This commit is contained in:
Alexey Arno 2015-10-16 18:00:50 +03:00
parent 8385861bd9
commit a5c49720fc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/src/Interpreters/Cluster.cpp
View File

@ -176,7 +176,6 @@ Cluster::Cluster(const Settings & settings, const String & cluster_name)
replicas.reserve(shard.size());
bool has_local_replica = false;
bool has_remote_replica = false;
for (const auto & replica : shard)
{
@ -184,10 +183,10 @@ Cluster::Cluster(const Settings & settings, const String & cluster_name)
{
has_local_replica = true;
local_addresses.push_back(replica);
break;
}
else
{
has_remote_replica = true;
replicas.emplace_back(new ConnectionPool(
settings.distributed_connections_pool_size,
replica.host_name, replica.port, replica.resolved_address,
@ -201,7 +200,7 @@ Cluster::Cluster(const Settings & settings, const String & cluster_name)
if (has_local_replica)
++local_nodes_num;
if (has_remote_replica)
else
pools.emplace_back(new ConnectionPoolWithFailover(replicas, settings.load_balancing, settings.connections_with_failover_max_tries));
}
}