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

tablets: Introduce substract_sets()

Browse Source 
There are several places in code that calculate replica sets associated
with specific tablet transision. Having a helper to substract two sets
improves code readability.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes scylladb/scylladb#18033
This commit is contained in:
Pavel Emelyanov
2024-03-26 17:00:04 +03:00
committed by Avi Kivity
parent 042a4b7627
commit 04370dc8a4
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
locator/tablets.cc
View File

@@ -99,14 +99,8 @@ tablet_migration_streaming_info get_migration_streaming_info(const locator::topo
tablet_migration_streaming_info result;
switch (trinfo.transition) {
case tablet_transition_kind::migration:
result.read_from = std::unordered_set<tablet_replica>(tinfo.replicas.begin(), tinfo.replicas.end());
result.written_to = std::unordered_set<tablet_replica>(trinfo.next.begin(), trinfo.next.end());
for (auto&& r : trinfo.next) {
result.read_from.erase(r);
}
for (auto&& r : tinfo.replicas) {
result.written_to.erase(r);
}
result.read_from = substract_sets(tinfo.replicas, trinfo.next);
result.written_to = substract_sets(trinfo.next, tinfo.replicas);
return result;
case tablet_transition_kind::rebuild:
result.written_to.insert(trinfo.pending_replica);
@@ -124,10 +118,7 @@ tablet_migration_streaming_info get_migration_streaming_info(const locator::topo
}
tablet_replica get_leaving_replica(const tablet_info& tinfo, const tablet_transition_info& trinfo) {
std::unordered_set<tablet_replica> leaving(tinfo.replicas.begin(), tinfo.replicas.end());
for (auto&& r : trinfo.next) {
leaving.erase(r);
}
auto leaving = substract_sets(tinfo.replicas, trinfo.next);
if (leaving.empty()) {
throw std::runtime_error(format("No leaving replicas"));
}

11
locator/tablets.hh
View File

@@ -113,6 +113,17 @@ tablet_replica_set replace_replica(const tablet_replica_set& rs, tablet_replica
return result;
}
/// Substracts 'sub' from 'rs' and returns the result
/// Replicas from 'sub' that are missing in 'rs' are ignored
inline
std::unordered_set<tablet_replica> substract_sets(const tablet_replica_set& rs, const tablet_replica_set& sub) {
std::unordered_set<tablet_replica> result(rs.begin(), rs.end());
for (auto&& r : sub) {
result.erase(r);
}
return result;
}
inline
bool contains(const tablet_replica_set& rs, host_id host) {
for (auto replica : rs) {