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

abstract_replication_strategy: recognized_options: return unordered_set

Browse Source 
An unordered_set is more efficient and there is no need
to return an ordered set for this purpose.

This change facilitates a follow-up change of adding
topology::get_datacenters(), returning an unordered_set
of datacenter names.

Refs #11987

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>

Closes #12003
This commit is contained in:
Benny Halevy
2022-11-13 21:01:05 +02:00
committed by Avi Kivity
parent e925c41f02
commit 1e2741d2fe
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locator/abstract_replication_strategy.hh
View File

@@ -101,7 +101,7 @@ public:
virtual inet_address_vector_replica_set get_natural_endpoints(const token& search_token, const effective_replication_map& erm) const;
virtual void validate_options() const = 0;
virtual std::optional<std::set<sstring>> recognized_options(const topology&) const = 0;
virtual std::optional<std::unordered_set<sstring>> recognized_options(const topology&) const = 0;
virtual size_t get_replication_factor(const token_metadata& tm) const = 0;
// Decide if the replication strategy allow removing the node being
// replaced from the natural endpoints when a node is being replaced in the

2
locator/everywhere_replication_strategy.hh
View File

@@ -24,7 +24,7 @@ public:
virtual void validate_options() const override { /* noop */ }
std::optional<std::set<sstring>> recognized_options(const topology&) const override {
std::optional<std::unordered_set<sstring>> recognized_options(const topology&) const override {
// We explicitely allow all options
return std::nullopt;
}

2
locator/local_strategy.cc
View File

@@ -24,7 +24,7 @@ future<endpoint_set> local_strategy::calculate_natural_endpoints(const token& t,
void local_strategy::validate_options() const {
}
std::optional<std::set<sstring>> local_strategy::recognized_options(const topology&) const {
std::optional<std::unordered_set<sstring>> local_strategy::recognized_options(const topology&) const {
// LocalStrategy doesn't expect any options.
return {};
}

2
locator/local_strategy.hh
View File

@@ -33,7 +33,7 @@ public:
virtual void validate_options() const override;
virtual std::optional<std::set<sstring>> recognized_options(const topology&) const override;
virtual std::optional<std::unordered_set<sstring>> recognized_options(const topology&) const override;
virtual bool allow_remove_node_being_replaced_from_natural_endpoints() const override {
return false;

4
locator/network_topology_strategy.cc
View File

@@ -266,8 +266,8 @@ void network_topology_strategy::validate_options() const {
}
}
std::optional<std::set<sstring>> network_topology_strategy::recognized_options(const topology& topology) const {
std::set<sstring> datacenters;
std::optional<std::unordered_set<sstring>> network_topology_strategy::recognized_options(const topology& topology) const {
std::unordered_set<sstring> datacenters;
for (const auto& [dc_name, endpoints] : topology.get_datacenter_endpoints()) {
datacenters.insert(dc_name);
}

2
locator/network_topology_strategy.hh
View File

@@ -49,7 +49,7 @@ protected:
virtual void validate_options() const override;
virtual std::optional<std::set<sstring>> recognized_options(const topology&) const override;
virtual std::optional<std::unordered_set<sstring>> recognized_options(const topology&) const override;
private:
// map: data centers -> replication factor

2
locator/simple_strategy.cc
View File

@@ -75,7 +75,7 @@ void simple_strategy::validate_options() const {
validate_replication_factor(it->second);
}
std::optional<std::set<sstring>>simple_strategy::recognized_options(const topology&) const {
std::optional<std::unordered_set<sstring>>simple_strategy::recognized_options(const topology&) const {
return {{ "replication_factor" }};
}

2
locator/simple_strategy.hh
View File

@@ -21,7 +21,7 @@ public:
virtual ~simple_strategy() {};
virtual size_t get_replication_factor(const token_metadata& tm) const override;
virtual void validate_options() const override;
virtual std::optional<std::set<sstring>> recognized_options(const topology&) const override;
virtual std::optional<std::unordered_set<sstring>> recognized_options(const topology&) const override;
virtual bool allow_remove_node_being_replaced_from_natural_endpoints() const override {
return true;
}