From: Ronen Friedman <rfriedma@redhat.com>
Date: Fri, 4 Aug 2023 16:11:18 +0000 (-0500)
Subject: osd: formatter for pg_log_op_return_item_t
X-Git-Tag: v19.0.0~637^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6590e56b42bbe77e36fec04e6e22197701236765;p=ceph.git

osd: formatter for pg_log_op_return_item_t

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 8f99cdfbdf6..b258eeb944e 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4223,6 +4223,16 @@ struct pg_log_op_return_item_t {
   }
 };
 WRITE_CLASS_ENCODER(pg_log_op_return_item_t)
+namespace fmt {
+template <>
+struct formatter<pg_log_op_return_item_t> {
+  constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
+  template <typename FormatContext>
+  auto format(const pg_log_op_return_item_t& litm, FormatContext& ctx) const {
+    return fmt::format_to(ctx.out(), "r={}+{}b", litm.rval, litm.bl.length());
+  }
+};
+} // namespace fmt
 
 /**
  * pg_log_entry_t - single entry/event in pg log
diff --git a/src/osd/osd_types_fmt.h b/src/osd/osd_types_fmt.h
index 729baf01a57..c10877cf3aa 100644
--- a/src/osd/osd_types_fmt.h
+++ b/src/osd/osd_types_fmt.h
@@ -329,7 +329,6 @@ struct fmt::formatter<ScrubMap> {
 };
 
 #if FMT_VERSION >= 90000
-template <> struct fmt::formatter<pg_log_op_return_item_t> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<watch_info_t> : fmt::ostream_formatter {};
 template <bool TrackChanges> struct fmt::formatter<pg_missing_set<TrackChanges>> : fmt::ostream_formatter {};
 #endif