mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdc: add formatter for cdc::image_mode and cdc::delta_mode

Browse Source 
before this change, we rely on the default-generated fmt::formatter
created from operator<<, but fmt v10 dropped the default-generated
formatter.

in this change, we define formatters for
cdc::image_mode and cdc::delta_mode, and drop their operator<<:s.

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

Closes scylladb/scylladb#17381
This commit is contained in:
Kefu Chai
2024-02-18 11:05:27 +08:00
committed by Avi Kivity
parent 9bb4482ad0
commit af2553e8bc
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cdc/cdc_options.hh
View File

@@ -33,9 +33,6 @@ enum class image_mode : uint8_t {
full,
};
std::ostream& operator<<(std::ostream& os, delta_mode);
std::ostream& operator<<(std::ostream& os, image_mode);
class options final {
std::optional<bool> _enabled;
image_mode _preimage = image_mode::off;
@@ -68,3 +65,11 @@ public:
};
} // namespace cdc
template <> struct fmt::formatter<cdc::image_mode> : fmt::formatter<string_view> {
auto format(cdc::image_mode, fmt::format_context& ctx) const -> decltype(ctx.out());
};
template <> struct fmt::formatter<cdc::delta_mode> : fmt::formatter<string_view> {
auto format(cdc::delta_mode, fmt::format_context& ctx) const -> decltype(ctx.out());
};

48
cdc/log.cc
View File

@@ -296,38 +296,40 @@ future<> cdc::cdc_service::stop() {
cdc::cdc_service::~cdc_service() = default;
namespace {
static const sstring delta_mode_string_keys = "keys";
static const sstring delta_mode_string_full = "full";
static constexpr std::string_view delta_mode_string_keys = "keys";
static constexpr std::string_view delta_mode_string_full = "full";
static const std::string_view image_mode_string_full = delta_mode_string_full;
static constexpr std::string_view image_mode_string_full = delta_mode_string_full;
sstring to_string(cdc::delta_mode dm) {
switch (dm) {
case cdc::delta_mode::keys : return delta_mode_string_keys;
case cdc::delta_mode::full : return delta_mode_string_full;
} // anon. namespace
auto fmt::formatter<cdc::delta_mode>::format(cdc::delta_mode m, fmt::format_context& ctx) const
-> decltype(ctx.out()) {
using enum cdc::delta_mode;
switch (m) {
case keys:
return fmt::format_to(ctx.out(), delta_mode_string_keys);
case full:
return fmt::format_to(ctx.out(), delta_mode_string_full);
}
throw std::logic_error("Impossible value of cdc::delta_mode");
}
sstring to_string(cdc::image_mode m) {
auto fmt::formatter<cdc::image_mode>::format(cdc::image_mode m, fmt::format_context& ctx) const
-> decltype(ctx.out()) {
using enum cdc::image_mode;
switch (m) {
case cdc::image_mode::off : return "false";
case cdc::image_mode::on : return "true";
case cdc::image_mode::full : return sstring(image_mode_string_full);
case off:
return fmt::format_to(ctx.out(), "false");
case on:
return fmt::format_to(ctx.out(), "true");
break;
case full:
return fmt::format_to(ctx.out(), image_mode_string_full);
}
throw std::logic_error("Impossible value of cdc::image_mode");
}
} // anon. namespace
std::ostream& cdc::operator<<(std::ostream& os, delta_mode m) {
return os << to_string(m);
}
std::ostream& cdc::operator<<(std::ostream& os, image_mode m) {
return os << to_string(m);
}
cdc::options::options(const std::map<sstring, sstring>& map) {
for (auto& p : map) {
auto key = p.first;
@@ -391,9 +393,9 @@ std::map<sstring, sstring> cdc::options::to_map() const {
return {
{ "enabled", enabled() ? "true" : "false" },
{ "preimage", to_string(_preimage) },
{ "preimage", fmt::format("{}", _preimage) },
{ "postimage", _postimage ? "true" : "false" },
{ "delta", to_string(_delta_mode) },
{ "delta", fmt::format("{}", _delta_mode) },
{ "ttl", std::to_string(_ttl) },
};
}