hobject_t: decode json

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

diff --git a/src/os/hobject.cc b/src/os/hobject.cc
index dabdb0ce6a047e9e07dcc1e0018e0e763c642bf0..77d576870bc64e53576e21d74c41ec9dfb062470 100644 (file)
--- a/src/os/hobject.cc
+++ b/src/os/hobject.cc
@@ -29,6 +29,25 @@ void hobject_t::decode(bufferlist::iterator& bl)
   DECODE_FINISH(bl);
 }
 
+void hobject_t::decode(json_spirit::Value& v)
+{
+  using namespace json_spirit;
+  Object& o = v.get_obj();
+  for (Object::size_type i=0; i<o.size(); i++) {
+    Pair& p = o[i];
+    if (p.name_ == "oid")
+      oid.name = p.value_.get_str();
+    else if (p.name_ == "key")
+      key = p.value_.get_str();
+    else if (p.name_ == "snapid")
+      snap = p.value_.get_uint64();
+    else if (p.name_ == "hash")
+      hash = p.value_.get_int();
+    else if (p.name_ == "max")
+      max = p.value_.get_int();
+  }
+}
+
 void hobject_t::dump(Formatter *f) const
 {
   f->dump_string("oid", oid.name);

diff --git a/src/os/hobject.h b/src/os/hobject.h
index 180ebcf3d44b82788561a6dba4ae7705e40f6adb..ee50f5b1d907c2a08a4df3630772c1084b8180c1 100644 (file)
--- a/src/os/hobject.h
+++ b/src/os/hobject.h
@@ -17,6 +17,7 @@
 
 #include "include/object.h"
 #include "include/cmp.h"
+#include "json_spirit/json_spirit_value.h"
 
 typedef uint64_t filestore_hobject_key_t;
 
@@ -102,6 +103,7 @@ public:
 
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator& bl);
+  void decode(json_spirit::Value& v);
   void dump(Formatter *f) const;
   static void generate_test_instances(list<hobject_t*>& o);
 };