bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

locator: replication strategies: use locator::topology rather than fb_utilities

Browse Source 
Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2023-11-30 09:47:13 +02:00
parent 86716b2048
commit 4d461fc788
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
locator/everywhere_replication_strategy.cc
View File

@@ -11,7 +11,6 @@
#include "locator/everywhere_replication_strategy.hh"
#include "utils/class_registrator.hh"
#include "utils/fb_utilities.hh"
#include "locator/token_metadata.hh"
namespace locator {
@@ -23,7 +22,7 @@ everywhere_replication_strategy::everywhere_replication_strategy(const replicati
future<endpoint_set> everywhere_replication_strategy::calculate_natural_endpoints(const token& search_token, const token_metadata& tm) const {
if (tm.sorted_tokens().empty()) {
endpoint_set result{inet_address_vector_replica_set({utils::fb_utilities::get_broadcast_address()})};
endpoint_set result{inet_address_vector_replica_set({tm.get_topology().my_address()})};
return make_ready_future<endpoint_set>(std::move(result));
}
const auto& all_endpoints = tm.get_all_endpoints();

3
locator/local_strategy.cc
View File

@@ -9,7 +9,6 @@
#include <algorithm>
#include "local_strategy.hh"
#include "utils/class_registrator.hh"
#include "utils/fb_utilities.hh"
namespace locator {
@@ -20,7 +19,7 @@ local_strategy::local_strategy(const replication_strategy_config_options& config
}
future<endpoint_set> local_strategy::calculate_natural_endpoints(const token& t, const token_metadata& tm) const {
return make_ready_future<endpoint_set>(endpoint_set({utils::fb_utilities::get_broadcast_address()}));
return make_ready_future<endpoint_set>(endpoint_set({tm.get_topology().my_address()}));
}
void local_strategy::validate_options(const gms::feature_service&) const {

1
locator/network_topology_strategy.cc
View File

@@ -15,7 +15,6 @@
#include "locator/network_topology_strategy.hh"
#include "locator/load_sketch.hh"
#include "utils/fb_utilities.hh"
#include <boost/algorithm/string.hpp>
#include "utils/hash.hh"