mutation: use fmtlib to print range_stombstone{_change,}

prepare for removing `operator<<(std::ostream&, const range_tombstone&)` and `operator<<(std::ostream& out, const range_tombstone_change&)`. Refs scylladb#13245 Signed-off-by: Kefu Chai <[email protected]>
sarvex · Mar 21, 2023 · d146535 · d146535
1 parent 755aea8
commit d146535
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/mutation/mutation_fragment.cc b/mutation/mutation_fragment.cc
@@ -310,7 +310,7 @@ std::ostream& operator<<(std::ostream& os, const mutation_fragment::printer& p)
     mf.visit(make_visitor(
         [&] (const clustering_row& cr) { os << clustering_row::printer(p._schema, cr); },
         [&] (const static_row& sr) { os << static_row::printer(p._schema, sr); },
-        [&] (const auto& what) -> void { os << what; }
+        [&] (const auto& what) -> void { fmt::print(os, "{}", what); }
     ));
     os << "}";
     return os;
@@ -371,7 +371,7 @@ std::ostream& operator<<(std::ostream& os, const mutation_fragment_v2::printer&
     mf.visit(make_visitor(
         [&] (const clustering_row& cr) { os << clustering_row::printer(p._schema, cr); },
         [&] (const static_row& sr) { os << static_row::printer(p._schema, sr); },
-        [&] (const auto& what) -> void { os << what; }
+        [&] (const auto& what) -> void { fmt::print(os, "{}", what); }
     ));
     os << "}";
     return os;

diff --git a/mutation/range_tombstone.cc b/mutation/range_tombstone.cc
@@ -21,7 +21,8 @@ std::ostream& operator<<(std::ostream& out, const range_tombstone& rt) {
 }
 
 std::ostream& operator<<(std::ostream& out, const range_tombstone_change& rt) {
-    return out << "{range_tombstone_change: pos=" << rt.position() << ", " << rt.tombstone() << "}";
+    fmt::print(out, "{{range_tombstone_change: pos={}, {}}}", rt.position(), rt.tombstone());
+    return out;
 }
 
 std::optional<range_tombstone> range_tombstone::apply(const schema& s, range_tombstone&& src)

diff --git a/mutation/range_tombstone_list.cc b/mutation/range_tombstone_list.cc
@@ -430,7 +430,8 @@ std::ostream& operator<<(std::ostream& out, const range_tombstone_list& list) {
 }
 
 std::ostream& operator<<(std::ostream& out, const range_tombstone_entry& rt) {
-    return out << rt._tombstone;
+    fmt::print(out, "{}", rt._tombstone);
+    return out;
 }
 
 bool range_tombstone_list::equal(const schema& s, const range_tombstone_list& other) const {

diff --git a/test/boost/range_tombstone_list_test.cc b/test/boost/range_tombstone_list_test.cc
@@ -519,11 +519,11 @@ BOOST_AUTO_TEST_CASE(test_random_list_is_not_overlapped) {
         if (!assert_valid(l)) {
             std::cout << "For input:" << std::endl;
             for (auto&& rt : input) {
-                std::cout << rt << std::endl;
+                fmt::print(std::cout, "{}\n", rt);
             }
             std::cout << "Produced:" << std::endl;
             for (auto&& rt : l) {
-                std::cout << rt << std::endl;
+                fmt::print(std::cout, "{}\n", rt);
             }
             BOOST_REQUIRE(false);
         }