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

Merge 'compound_compat: replace operator<<(..) with fmt formatter ' from Kefu Chai

Browse Source 
this is a part of a series migrating from `operator<<(ostream&, ..)` based formatting to fmtlib based formatting. the goal here is to enable fmtlib to print `composite` and `composite_view` without using ostream<<. also, this change removes `operator<<(ostream, const composite&)` ,  `operator<<(ostream, const composite_view&)` along with their callers.

Refs #13245

Closes #13360

* github.com:scylladb/scylladb:
  compound_compat: remove operator<<(ostream, composite)
  compound_compat: remove operator<<(ostream, composite_view)
  sstables: do not use operator<< to print composite_view
  compound_compat.hh: specialize fmt::formatter<composite>
  compound_compat.hh: specialize fmt::formatter<composite_view>
  compound_compat.hh: specialize fmt::formatter<component_view>
This commit is contained in:
Botond Dénes
2023-03-30 08:47:17 +03:00
parent 972b24a969 57f51603dc
commit 164afe14ad
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
compound_compat.hh
View File

@@ -516,11 +516,10 @@ public:
template <typename Component>
friend inline std::ostream& operator<<(std::ostream& os, const std::pair<Component, eoc>& c) {
return os << "{value=" << c.first << "; eoc=" << format("0x{:02x}", eoc_type(c.second) & 0xff) << "}";
fmt::print(os, "{}", c);
return os;
}
friend std::ostream& operator<<(std::ostream& os, const composite& v);
struct tri_compare {
const std::vector<data_type>& _types;
tri_compare(const std::vector<data_type>& types) : _types(types) {}
@@ -529,6 +528,20 @@ public:
};
};
template <typename Component>
struct fmt::formatter<std::pair<Component, composite::eoc>> : fmt::formatter<std::string_view> {
template <typename FormatContext>
auto format(const std::pair<Component, composite::eoc>& c, FormatContext& ctx) const {
if constexpr (std::same_as<Component, bytes_view>) {
return fmt::format_to(ctx.out(), "{{value={}; eoc={:#02x}}}",
fmt_hex(c.first), composite::eoc_type(c.second) & 0xff);
} else {
return fmt::format_to(ctx.out(), "{{value={}; eoc={:#02x}}}",
c.first, composite::eoc_type(c.second) & 0xff);
}
}
};
class composite_view final {
friend class composite;
bytes_view _bytes;
@@ -625,9 +638,15 @@ public:
bool operator==(const composite_view& k) const { return k._bytes == _bytes && k._is_compound == _is_compound; }
bool operator!=(const composite_view& k) const { return !(k == *this); }
friend inline std::ostream& operator<<(std::ostream& os, composite_view v) {
fmt::print(os, "{{{}, compound={}, static={}}}", fmt::join(v.components(), ", "), v._is_compound, v.is_static());
return os;
friend fmt::formatter<composite_view>;
};
template <>
struct fmt::formatter<composite_view> : fmt::formatter<std::string_view> {
template <typename FormatContext>
auto format(const composite_view& v, FormatContext& ctx) const {
return fmt::format_to(ctx.out(), "{{{}, compound={}, static={}}}",
fmt::join(v.components(), ", "), v._is_compound, v.is_static());
}
};
@@ -636,10 +655,13 @@ composite::composite(const composite_view& v)
: composite(bytes(v._bytes), v._is_compound)
{ }
inline
std::ostream& operator<<(std::ostream& os, const composite& v) {
return os << composite_view(v);
}
template <>
struct fmt::formatter<composite> : fmt::formatter<std::string_view> {
template <typename FormatContext>
auto format(const composite& v, FormatContext& ctx) const {
return fmt::format_to(ctx.out(), "{}", composite_view(v));
}
};
inline
std::strong_ordering composite::tri_compare::operator()(const composite& v1, const composite& v2) const {

4
sstables/index_entry.hh
View File

@@ -310,11 +310,11 @@ using index_list = partition_index_page;
}
inline std::ostream& operator<<(std::ostream& out, const sstables::promoted_index_block_position_view& pos) {
std::visit([&out] (const auto& pos) mutable { out << pos; }, pos);
std::visit([&out] (const auto& pos) mutable { fmt::print(out, "{}", pos); }, pos);
return out;
}
inline std::ostream& operator<<(std::ostream& out, const sstables::promoted_index_block_position& pos) {
std::visit([&out] (const auto& pos) mutable { out << pos; }, pos);
std::visit([&out] (const auto& pos) mutable { fmt::print(out, "{}", pos); }, pos);
return out;
}