From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 16 Oct 2019 23:52:09 +0000 (-0700)
Subject: rgw: json dump sync groups map as vector
X-Git-Tag: v15.1.0~22^2~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30882796af0b402b5fd27e5a3b0bd12fe5afa10f;p=ceph.git

rgw: json dump sync groups map as vector

looks nicer

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 506fcccd5f9..d382c336109 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -933,12 +933,21 @@ void rgw_sync_policy_group::decode_json(JSONObj *obj)
 
 void rgw_sync_policy_info::dump(Formatter *f) const
 {
-  encode_json("groups", groups, f);
+  Formatter::ArraySection section(*f, "groups");
+  for (auto& group : groups ) {
+    encode_json("group", group.second, f);
+  }
 }
 
 void rgw_sync_policy_info::decode_json(JSONObj *obj)
 {
-  JSONDecoder::decode_json("groups", groups, obj);
+  vector<rgw_sync_policy_group> groups_vec;
+
+  JSONDecoder::decode_json("groups", groups_vec, obj);
+
+  for (auto& group : groups_vec) {
+    groups.emplace(std::make_pair(group.id, std::move(group)));
+  }
 }
 
 void RGWBucketSyncPolicyHandler::peer_info::dump(Formatter *f) const