From ca706490664a44246bc8a84f8e4a7380a74a71b6 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Tue, 1 Dec 2020 00:45:51 +0000 Subject: [PATCH] Fix review comments Signed-off-by: Stephen Sun --- common/json.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/common/json.cpp b/common/json.cpp index fe7b3af93..cd2357eb0 100644 --- a/common/json.cpp +++ b/common/json.cpp @@ -63,14 +63,16 @@ bool JSon::loadJsonFromFile(ifstream &fs, vector &db_ite return false; } - db_items.push_back(KeyOpFieldsValuesTuple()); - auto &cur_db_item = db_items[db_items.size() - 1]; + db_items.emplace_back(KeyOpFieldsValuesTuple()); + auto &cur_db_item = db_items.back(); - for (nlohmann::json::iterator child_it = arr_item.begin(); child_it != arr_item.end(); child_it++) { + for (auto child_it = arr_item.begin(); child_it != arr_item.end(); child_it++) + { auto cur_obj_key = child_it.key(); auto &cur_obj = child_it.value(); - if (cur_obj.is_object()) { + if (cur_obj.is_object()) + { kfvKey(cur_db_item) = cur_obj_key; for (nlohmann::json::iterator cur_obj_it = cur_obj.begin(); cur_obj_it != cur_obj.end(); cur_obj_it++) { @@ -80,12 +82,13 @@ bool JSon::loadJsonFromFile(ifstream &fs, vector &db_ite value_str = to_string((*cur_obj_it).get()); else if ((*cur_obj_it).is_string()) value_str = (*cur_obj_it).get(); - kfvFieldsValues(cur_db_item).push_back(FieldValueTuple(field_str, value_str)); + kfvFieldsValues(cur_db_item).emplace_back(FieldValueTuple(field_str, value_str)); } } else { auto op = cur_obj.get(); + if (op != "SET") { SWSS_LOG_ERROR("Child elements'op field must be SET, but got %s, ignored", op.c_str());