From d74ecfbc295e947c99893b388bb538263de36353 Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Tue, 21 Sep 2021 13:46:24 +0300 Subject: [PATCH] abstract_replication_strategy: get rid of legacy get_natural_endpoints implementation Now that all users of it were converted to use the effective_replication_map, the legacy abstract_replication_strategy::get_natural_endpoints method can be deleted. Signed-off-by: Benny Halevy --- locator/abstract_replication_strategy.cc | 4 ---- locator/abstract_replication_strategy.hh | 1 - 2 files changed, 5 deletions(-) diff --git a/locator/abstract_replication_strategy.cc b/locator/abstract_replication_strategy.cc index dcd76af4ec..b64a844f81 100644 --- a/locator/abstract_replication_strategy.cc +++ b/locator/abstract_replication_strategy.cc @@ -81,10 +81,6 @@ inet_address_vector_replica_set abstract_replication_strategy::do_calculate_natu } } -inet_address_vector_replica_set abstract_replication_strategy::get_natural_endpoints(const token& search_token, can_yield can_yield) { - return do_get_natural_endpoints(search_token, *_shared_token_metadata.get(), can_yield); -} - inet_address_vector_replica_set abstract_replication_strategy::do_get_natural_endpoints(const token& search_token, const token_metadata& tm, can_yield can_yield) { const token& key_token = tm.first_token(search_token); auto& cached_endpoints = get_cached_endpoints(tm); diff --git a/locator/abstract_replication_strategy.hh b/locator/abstract_replication_strategy.hh index 8a6630dd84..c2e57248c0 100644 --- a/locator/abstract_replication_strategy.hh +++ b/locator/abstract_replication_strategy.hh @@ -111,7 +111,6 @@ public: const shared_token_metadata& stm, const replication_strategy_config_options& config_options); static void validate_replication_factor(sstring rf); - inet_address_vector_replica_set get_natural_endpoints(const token& search_token, can_yield = can_yield::no); virtual inet_address_vector_replica_set get_natural_endpoints(const token& search_token, const effective_replication_map& erm) const; inet_address_vector_replica_set get_natural_endpoints_without_node_being_replaced(const token& search_token, can_yield = can_yield::no); virtual void validate_options() const = 0;