From 30882796af0b402b5fd27e5a3b0bd12fe5afa10f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 16 Oct 2019 16:52:09 -0700 Subject: [PATCH] rgw: json dump sync groups map as vector looks nicer Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_json_enc.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 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 -- 2.39.5