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

cdc: generation: use default-generated operator==

Browse Source 
now that C++20 generates operator== for us, these is no need to
handcraft it manually. also, in C++17, the standard library offers
default implementation of operator== for `std::variant<>`, so no need
to implement it by ourselves.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes #13625
This commit is contained in:
Kefu Chai
2023-04-23 16:46:09 +08:00
committed by Botond Dénes
parent 2d8d8043be
commit c06b20431e
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cdc/generation.cc
View File

@@ -1098,15 +1098,6 @@ std::ostream& operator<<(std::ostream& os, const generation_id& gen_id) {
return os;
}
bool operator==(const generation_id& a, const generation_id& b) {
return std::visit(make_visitor(
[] (const generation_id_v1& a, const generation_id_v1& b) { return a.ts == b.ts; },
[] (const generation_id_v2& a, const generation_id_v2& b) { return a.ts == b.ts && a.id == b.id; },
[] (const generation_id_v1& a, const generation_id_v2& b) { return false; },
[] (const generation_id_v2& a, const generation_id_v1& b) { return false; }
), a, b);
}
db_clock::time_point get_ts(const generation_id& gen_id) {
return std::visit(make_visitor(
[] (const generation_id_v1& id) { return id.ts; },

3
cdc/generation_id.hh
View File

@@ -17,17 +17,18 @@ namespace cdc {
struct generation_id_v1 {
db_clock::time_point ts;
bool operator==(const generation_id_v1&) const = default;
};
struct generation_id_v2 {
db_clock::time_point ts;
utils::UUID id;
bool operator==(const generation_id_v2&) const = default;
};
using generation_id = std::variant<generation_id_v1, generation_id_v2>;
std::ostream& operator<<(std::ostream&, const generation_id&);
bool operator==(const generation_id&, const generation_id&);
db_clock::time_point get_ts(const generation_id&);
} // namespace cdc