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

Initialize weight/slot_to_shards for cluster not from xml correcty

Browse Source 
This is:
- clusterAllReplicas
- copier
- some distributed cases

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
This commit is contained in:
Azat Khuzhin 2023-06-28 17:57:53 +02:00
parent c9adfe1efd
commit 2a12fb4246
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Interpreters/Cluster.cpp
View File

@ -525,7 +525,7 @@ Cluster::Cluster(
addresses_with_failover.emplace_back(current); addresses_with_failover.emplace_back(current);
addShard(settings, std::move(current), params.treat_local_as_remote, current_shard_num); addShard(settings, std::move(current), params.treat_local_as_remote, current_shard_num, /* insert_paths= */ {}, /* weight= */ 1);
++current_shard_num; ++current_shard_num;
} }
@ -553,7 +553,7 @@ Cluster::Cluster(
addresses_with_failover.emplace_back(current); addresses_with_failover.emplace_back(current);
addShard(settings, std::move(current), params.treat_local_as_remote, current_shard_num); addShard(settings, std::move(current), params.treat_local_as_remote, current_shard_num, /* insert_paths= */ {}, /* weight= */ 1);
++current_shard_num; ++current_shard_num;
} }
@ -715,6 +715,7 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
ShardInfo info; ShardInfo info;
info.shard_num = ++shard_num; info.shard_num = ++shard_num;
info.weight = 1;
if (address.is_local) if (address.is_local)
info.local_addresses.push_back(address); info.local_addresses.push_back(address);
@ -740,6 +741,8 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
info.per_replica_pools = {std::move(pool)}; info.per_replica_pools = {std::move(pool)};
addresses_with_failover.emplace_back(Addresses{address}); addresses_with_failover.emplace_back(Addresses{address});
slot_to_shard.insert(std::end(slot_to_shard), info.weight, shards_info.size());
shards_info.emplace_back(std::move(info)); shards_info.emplace_back(std::move(info));
} }
}; };
@ -769,7 +772,11 @@ Cluster::Cluster(Cluster::SubclusterTag, const Cluster & from, const std::vector
{ {
for (size_t index : indices) for (size_t index : indices)
{ {
shards_info.emplace_back(from.shards_info.at(index)); const auto & from_shard = from.shards_info.at(index);
if (from_shard.weight)
slot_to_shard.insert(std::end(slot_to_shard), from_shard.weight, shards_info.size());
shards_info.emplace_back(from_shard);
if (!from.addresses_with_failover.empty()) if (!from.addresses_with_failover.empty())
addresses_with_failover.emplace_back(from.addresses_with_failover.at(index)); addresses_with_failover.emplace_back(from.addresses_with_failover.at(index));