osd,test: making use of the new Formatter::make_unique()

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index c8f32bfb9b18c70aa1f069569f21488c56e642d4..ab1c73ec12190c157ba5c738c69a7c78091afab9 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1001,8 +1001,7 @@ void PrimaryLogPG::do_command(
 {
   string format;
   cmd_getval(cmdmap, "format", format);
-  std::unique_ptr<Formatter> f(Formatter::create(
-                                format, "json-pretty", "json-pretty"));
+  auto f(Formatter::create_unique(format, "json-pretty", "json-pretty"));
   int ret = 0;
   stringstream ss;   // stderr error message stream
   bufferlist outbl;  // if empty at end, we'll dump formatter as output
@@ -15074,12 +15073,11 @@ bool PrimaryLogPG::agent_maybe_evict(ObjectContextRef& obc, bool after_flush)
             << ", evict_effort " << agent_state->evict_effort
             << dendl;
     dout(30) << "agent_state:\n";
-    Formatter *f = Formatter::create("");
+    auto f = Formatter::create_unique("");
     f->open_object_section("agent_state");
-    agent_state->dump(f);
+    agent_state->dump(f.get());
     f->close_section();
     f->flush(*_dout);
-    delete f;
     *_dout << dendl;
 
     if (1000000 - temp_upper >= agent_state->evict_effort)

diff --git a/src/test/common/get_command_descriptions.cc b/src/test/common/get_command_descriptions.cc
index 88bc181912faa3712b0fa1dbfcd414ed914de187..003ebb35cd1c0d2c60403d64ca5f2252c5996de5 100644 (file)
--- a/src/test/common/get_command_descriptions.cc
+++ b/src/test/common/get_command_descriptions.cc
@@ -46,10 +46,9 @@ static void usage(ostream &out)
 static void json_print(const std::vector<MonCommand> &mon_commands)
 {
   bufferlist rdata;
-  Formatter *f = Formatter::create("json");
-  Monitor::format_command_descriptions(mon_commands, f,
+  auto f = Formatter::create_unique("json");
+  Monitor::format_command_descriptions(mon_commands, f.get(),
                                        CEPH_FEATURES_ALL, &rdata);
-  delete f;
   string data(rdata.c_str(), rdata.length());
   cout << data << std::endl;
 }

diff --git a/src/test/common/test_context.cc b/src/test/common/test_context.cc
index f95c03853036c02ee5b8560ede04aec3d6fdba74..2c846a9ae7240bada6afb17ec4c7a374adf2b340 100644 (file)
--- a/src/test/common/test_context.cc
+++ b/src/test/common/test_context.cc
@@ -43,7 +43,7 @@ TEST(CephContext, do_command)
   {
     stringstream ss;
     bufferlist out;
-    std::unique_ptr<Formatter> f(Formatter::create("xml", "xml"));
+    std::unique_ptr<Formatter> f{Formatter::create_unique("xml", "xml")};
     cct->do_command("config get", cmdmap, f.get(), ss, &out);
     f->flush(out);
     string s(out.c_str(), out.length());
@@ -54,7 +54,7 @@ TEST(CephContext, do_command)
     stringstream ss;
     bufferlist out;
     cmdmap_t bad_cmdmap; // no 'var' field
-    std::unique_ptr<Formatter> f(Formatter::create("xml", "xml"));
+    std::unique_ptr<Formatter> f{Formatter::create_unique("xml", "xml")};
     int r = cct->do_command("config get", bad_cmdmap, f.get(), ss, &out);
     if (r >= 0) {
       f->flush(out);
@@ -69,7 +69,7 @@ TEST(CephContext, do_command)
     bufferlist out;
     cmdmap_t bad_cmdmap;
     bad_cmdmap["var"] = string("doesnotexist123");
-    std::unique_ptr<Formatter> f(Formatter::create("xml", "xml"));
+    std::unique_ptr<Formatter> f{Formatter::create_unique("xml", "xml")};
     int r = cct->do_command("config help", bad_cmdmap, f.get(), ss, &out);
     if (r >= 0) {
       f->flush(out);
@@ -83,7 +83,7 @@ TEST(CephContext, do_command)
   {
     stringstream ss;
     bufferlist out;
-    std::unique_ptr<Formatter> f(Formatter::create("xml", "xml"));
+    std::unique_ptr<Formatter> f{Formatter::create_unique("xml", "xml")};
     cct->do_command("config diff get", cmdmap, f.get(), ss, &out);
     f->flush(out);
     string s(out.c_str(), out.length());

diff --git a/src/test/common/test_sloppy_crc_map.cc b/src/test/common/test_sloppy_crc_map.cc
index 3eb855130aabd1a6b0416c86877d04244b72066c..9d9130cb7cc765bc6ebc31369a948c5883d60ef1 100644 (file)
--- a/src/test/common/test_sloppy_crc_map.cc
+++ b/src/test/common/test_sloppy_crc_map.cc
@@ -11,12 +11,11 @@ using namespace std;
 
 void dump(const SloppyCRCMap& scm)
 {
-  Formatter *f = Formatter::create("json-pretty");
+  auto f = Formatter::create_unique("json-pretty");
   f->open_object_section("map");
-  scm.dump(f);
+  scm.dump(f.get());
   f->close_section();
   f->flush(cout);
-  delete f;
 }
 
 TEST(SloppyCRCMap, basic) {

diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc
index 6a401233882b4e2d31b1c8dabadee8c22dabfdcb..7989de38670d42a02816c262cd50f24b24117c14 100644 (file)
--- a/src/test/crush/CrushWrapper.cc
+++ b/src/test/crush/CrushWrapper.cc
@@ -901,13 +901,12 @@ TEST_F(CrushWrapperTest, dump_rules) {
 
   // no rule by default
   {
-    Formatter *f = Formatter::create("json-pretty");
+    auto f = Formatter::create_unique("json-pretty");
     f->open_array_section("rules");
-    c->dump_rules(f);
+    c->dump_rules(f.get());
     f->close_section();
     stringstream ss;
     f->flush(ss);
-    delete f;
     EXPECT_EQ("[]\n", ss.str());
   }
 
@@ -917,20 +916,18 @@ TEST_F(CrushWrapperTest, dump_rules) {
   EXPECT_EQ(0, rule);
 
   {
-    Formatter *f = Formatter::create("xml");
-    c->dump_rules(f);
+    auto f = Formatter::create_unique("xml");
+    c->dump_rules(f.get());
     stringstream ss;
     f->flush(ss);
-    delete f;
     EXPECT_EQ((unsigned)0, ss.str().find("<rule><rule_id>0</rule_id><rule_name>NAME</rule_name>"));
   }
 
   {
-    Formatter *f = Formatter::create("xml");
-    c->dump_rule(rule, f);
+    auto f = Formatter::create_unique("xml");
+    c->dump_rule(rule, f.get());
     stringstream ss;
     f->flush(ss);
-    delete f;
     EXPECT_EQ((unsigned)0, ss.str().find("<rule><rule_id>0</rule_id><rule_name>NAME</rule_name>"));
     EXPECT_NE(string::npos,
              ss.str().find("<item_name>default</item_name></step>"));

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index 2d3fbd97c49e10b16506ebc061d58dfa459f8ce5..18ccaff913d2ae421f3fd830870fee82cf56c4f0 100644 (file)
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -56,13 +56,12 @@ TEST(bluestore, sizeof) {
 void dump_mempools()
 {
   ostringstream ostr;
-  Formatter* f = Formatter::create("json-pretty", "json-pretty", "json-pretty");
+  auto f = Formatter::create_unique("json-pretty", "json-pretty", "json-pretty");
   ostr << "Mempools: ";
   f->open_object_section("mempools");
-  mempool::dump(f);
+  mempool::dump(f.get());
   f->close_section();
   f->flush(ostr);
-  delete f;
   cout << ostr.str() << std::endl;
 }
 /*void get_mempool_stats(uint64_t* total_bytes, uint64_t* total_items)