From: David Zafman <david.zafman@inktank.com>
Date: Wed, 14 May 2014 22:30:11 +0000 (-0700)
Subject: common: Add missing ghobject_t::decode() for json
X-Git-Tag: v0.80.10~69^2~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4aedeb833f23bf4ce6187cb82910ab2e71d48e5;p=ceph.git

common: Add missing ghobject_t::decode() for json

Signed-off-by: David Zafman <david.zafman@inktank.com>
(cherry picked from commit c05f895d15a1d0e78ff5e9ae1a83f0a5424103d0)

Changes:
	Adjusted for older shard_t
---

diff --git a/src/common/hobject.cc b/src/common/hobject.cc
index 28cb86a5c491..e41908640efc 100644
--- a/src/common/hobject.cc
+++ b/src/common/hobject.cc
@@ -235,6 +235,20 @@ void ghobject_t::decode(bufferlist::iterator& bl)
   DECODE_FINISH(bl);
 }
 
+void ghobject_t::decode(json_spirit::Value& v)
+{
+  hobj.decode(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_ == "generation")
+      generation = p.value_.get_uint64();
+    else if (p.name_ == "shard_id")
+      shard_id = p.value_.get_int();
+  }
+}
+
 void ghobject_t::dump(Formatter *f) const
 {
   hobj.dump(f);