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 branch 'secure_password' of https://github.com/millb/ClickHouse into secure_password

Browse Source
This commit is contained in:
Mikhail Korotov 2020-02-12 13:08:10 +03:00
commit 5bd74b464d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,8 @@ String Cluster::Address::toFullString() const
{ {
return return
((shard_index == 0) ? "" : "shard" + std::to_string(shard_index)) + ((shard_index == 0) ? "" : "shard" + std::to_string(shard_index)) +
((replica_index == 0) ? "" : "_replica" + std::to_string(replica_index)); ((replica_index == 0) ? "" : "_replica" + std::to_string(replica_index)) +
((secure == Protocol::Secure::Enable) ? "+secure" : "");
} }
Cluster::Address Cluster::Address::fromFullString(const String & full_string) Cluster::Address Cluster::Address::fromFullString(const String & full_string)

4
dbms/src/Storages/Distributed/DirectoryMonitor.cpp
View File

@ -190,10 +190,10 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
const auto & shards_info = cluster->getShardsInfo(); const auto & shards_info = cluster->getShardsInfo();
const auto & shards_addresses = cluster->getShardsAddresses(); const auto & shards_addresses = cluster->getShardsAddresses();
/// check format shard{shard_index}_number{number_index} /// check new format shard{shard_index}_number{number_index}
if (address.shard_index != 0) if (address.shard_index != 0)
{ {
return shards_info[address.shard_index].per_replica_pools[address.replica_index]; return shards_info[address.shard_index - 1].per_replica_pools[address.replica_index - 1];
} }
/// existing connections pool have a higher priority /// existing connections pool have a higher priority