json: bug fix of json decode & encode (#86)

XiaoMi · Jun 8, 2018 · 9377c4c · 9377c4c
1 parent ad87a6d
commit 9377c4c
Show file tree

Hide file tree

Showing 9 changed files with 683 additions and 362 deletions.
diff --git a/include/dsn/cpp/json_helper.h b/include/dsn/cpp/json_helper.h
diff --git a/include/dsn/dist/replication/duplication_common.h b/include/dsn/dist/replication/duplication_common.h
@@ -54,12 +54,12 @@ inline const char *duplication_status_to_string(const duplication_status::type &
     return it->second;
 }
 
-inline void json_encode(std::stringstream &out, const duplication_status::type &s)
+inline void json_encode(dsn::json::JsonWriter &out, const duplication_status::type &s)
 {
-    out << duplication_status_to_string(s);
+    json_encode(out, duplication_status_to_string(s));
 }
 
-inline bool json_decode(::dsn::json::string_tokenizer &in, duplication_status::type &s)
+inline bool json_decode(const dsn::json::JsonObject &in, duplication_status::type &s)
 {
     static const std::map<std::string, duplication_status::type>
         _duplication_status_NAMES_TO_VALUES = {

diff --git a/src/core/core/perf_counters.cpp b/src/core/core/perf_counters.cpp
@@ -206,7 +206,7 @@ std::string perf_counters::list_counter_internal(const std::vector<std::string>
     }
 
     std::stringstream ss;
-    dsn::json::json_encode(ss, counters);
+    dsn::json::json_forwarder<decltype(counters)>::encode(ss, counters);
     return ss.str();
 }
 
@@ -218,7 +218,7 @@ std::string perf_counters::get_counter_value(const std::vector<std::string> &arg
     double value = 0;
 
     if (args.size() < 1) {
-        value_resp{value, ts, std::string()}.encode_json_state(ss);
+        dsn::json::json_forwarder<value_resp>::encode(ss, value_resp{value, ts, std::string()});
         return ss.str();
     }