ceph-dencoder: coll_t

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index de88f7b9c38eab7cc60a2cea3404d2602d88661b..d7ce0ed3f966dfb852e31fd30e5de4652273f740 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -191,6 +191,20 @@ void coll_t::decode(bufferlist::iterator& bl)
   }
 }
 
+void coll_t::dump(Formatter *f) const
+{
+  f->dump_string("name", str);
+}
+
+void coll_t::generate_test_instances(list<coll_t*>& o)
+{
+  o.push_back(new coll_t);
+  o.push_back(new coll_t("meta"));
+  o.push_back(new coll_t("temp"));
+  o.push_back(new coll_t("foo"));
+  o.push_back(new coll_t("bar"));
+}
+
 // ---
 
 std::string pg_state_string(int state)

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 261908aaae382bac9ebbd6c50b700272e74c15b9..e08ace42be086e3defdca278063c618b2fd2bdff 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -284,6 +284,9 @@ public:
     return str != rhs.str;
   }
 
+  void dump(Formatter *f) const;
+  static void generate_test_instances(list<coll_t*>& o);
+
 private:
   static std::string pg_and_snap_to_str(pg_t p, snapid_t s) {
     std::ostringstream oss;

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index b5efbf35aa5a6f3ccb6c078feaee2daed582823f..28fa947977a10d351e496f6198ee8c565b220841 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -22,6 +22,7 @@ TYPE(PG::OndiskLog)
 
 #include "osd/osd_types.h"
 TYPE(pg_t)
+TYPE(coll_t)
 TYPE(osd_stat_t)
 TYPE(OSDSuperblock)
 TYPE(pool_snap_info_t)