MB-30041: Complete client connection stats migration

Complete the migration of the client connection stats function
to nlohmann::json by renaming the "overload" to the old name.

Change-Id: Ia6dbb1ab162946936ca70f2c89db55adf8f6a0de
Reviewed-on: http://review.couchbase.org/104148
Tested-by: Build Bot <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>

Author: BenHuddleston

programs/mcctl/mcctl.cc

@@ -46,7 +46,7 @@
  * @param bio connection to the server.
  */
 static int get_verbosity(MemcachedConnection& connection) {
-    auto stats = connection.statsN("settings");
+    auto stats = connection.stats("settings");
     if (stats) {
         auto verbosity = stats.find("verbosity");
         if (verbosity == stats.end()) {

programs/mcstat/mcstat.cc

@@ -38,7 +38,7 @@ static void request_stat(MemcachedConnection& connection,
                          bool format) {
     try {
         if (json) {
-            auto stats = connection.statsN(key);
+            auto stats = connection.stats(key);
             std::cout << stats.dump(format ? 1 : -1, '\t') << std::endl;
         } else {
             connection.stats(

protocol/connection/client_connection.cc

@@ -587,29 +587,7 @@ void MemcachedConnection::read(Frame& frame, size_t bytes) {
     }
 }
 
-unique_cJSON_ptr MemcachedConnection::stats(const std::string& subcommand) {
-    unique_cJSON_ptr ret(cJSON_CreateObject());
-
-    for (auto& pair : statsMap(subcommand)) {
-        const std::string& key = pair.first;
-        const std::string& value = pair.second;
-        if (value == "false") {
-            cJSON_AddFalseToObject(ret.get(), key.c_str());
-        } else if (value == "true") {
-            cJSON_AddTrueToObject(ret.get(), key.c_str());
-        } else {
-            try {
-                int64_t val = std::stoll(value);
-                cJSON_AddNumberToObject(ret.get(), key.c_str(), val);
-            } catch (...) {
-                cJSON_AddStringToObject(ret.get(), key.c_str(), value.c_str());
-            }
-        }
-    }
-    return ret;
-}
-
-nlohmann::json MemcachedConnection::statsN(const std::string& subcommand) {
+nlohmann::json MemcachedConnection::stats(const std::string& subcommand) {
     nlohmann::json ret;
 
     for (auto& pair : statsMap(subcommand)) {

protocol/connection/client_connection.h

@@ -19,8 +19,6 @@
 #include "config.h"
 
 #include <boost/optional/optional_fwd.hpp>
-#include <cJSON.h>
-#include <cJSON_utils.h>
 #include <engines/ewouldblock_engine/ewouldblock_engine.h>
 #include <memcached/engine_error.h>
 #include <memcached/openssl.h>
@@ -487,8 +485,7 @@ class MemcachedConnection {
      */
     std::map<std::string, std::string> statsMap(const std::string& subcommand);
 
-    unique_cJSON_ptr stats(const std::string& subcommand);
-    nlohmann::json statsN(const std::string& subcommand);
+    nlohmann::json stats(const std::string& subcommand);
 
     /**
      * Instruct the audit daemon to reload the configuration

protocol/connection/client_connection_map.h

@@ -17,6 +17,7 @@
 #pragma once
 
 #include "client_connection.h"
+#include <cJSON_utils.h>
 
 class ConnectionMap {
 public:

tests/testapp/testapp.cc

@@ -1311,7 +1311,7 @@ BinprotSubdocResponse TestappTest::getXattr(const std::string& path,
 }
 
 int TestappTest::getResponseCount(cb::mcbp::Status statusCode) {
-    auto stats = getConnection().statsN("responses detailed");
+    auto stats = getConnection().stats("responses detailed");
     auto responses =
             nlohmann::json::parse(stats["responses"].get<std::string>());
     std::stringstream stream;

tests/testapp/testapp_bucket.cc

@@ -245,7 +245,7 @@ TEST_P(BucketTest, MB19981TestDeleteWhileClientConnectedAndEWouldBlocked) {
             while (!deleting) {
                 usleep(10);  // Avoid busy-wait ;-)
                 auto details = nlohmann::json::parse(
-                        connection->statsN("bucket_details")
+                        connection->stats("bucket_details")
                                 .begin()
                                 ->get<std::string>());
                 auto bucketDetails = details["buckets"];
@@ -325,7 +325,7 @@ TEST_P(BucketTest, MB19748TestDeleteWhileConnShipLogAndFullWriteBuffer) {
          std::this_thread::sleep_for(std::chrono::milliseconds(500))) {
         // Get stats for all connections, then locate this connection
         // - should be the one with dcp:true.
-        auto all_stats = conn.statsN("connections");
+        auto all_stats = conn.stats("connections");
         boost::optional<nlohmann::json> my_conn_stats;
 
         for (const auto conn_str : all_stats) {
@@ -398,7 +398,7 @@ intptr_t getConnectionId(MemcachedConnection& conn) {
     const std::string agent_name{"getConnectionId 1.0"};
     conn.hello("getConnectionId", "1.0", "test connections test");
 
-    auto stats = conn.statsN("connections");
+    auto stats = conn.stats("connections");
     if (stats.empty()) {
         throw std::runtime_error("getConnectionId: stats connections failed");
     }
@@ -434,7 +434,7 @@ int64_t getTotalSent(const nlohmann::json& payload) {
 
 static nlohmann::json getConnectionStats(MemcachedConnection& conn,
                                          intptr_t id) {
-    const auto stats = conn.statsN("connections " + std::to_string(id));
+    const auto stats = conn.stats("connections " + std::to_string(id));
     if (stats.empty()) {
         throw std::runtime_error("getConnectionStats(): nothing returned");
     }

tests/testapp/testapp_hello.cc

@@ -58,7 +58,7 @@ TEST_F(HelloTest, AgentName) {
     conn.executeCommand(cmd, resp);
     ASSERT_TRUE(resp.isSuccess());
 
-    auto stats = conn.statsN("connections");
+    auto stats = conn.stats("connections");
     bool found = false;
 
     // look over all of the entries and verify that it's set :)
@@ -89,7 +89,7 @@ TEST_F(HelloTest, JsonAgentInformation) {
     conn.executeCommand(cmd, resp);
     ASSERT_TRUE(resp.isSuccess());
 
-    auto stats = conn.statsN("connections");
+    auto stats = conn.stats("connections");
     bool found = false;
 
     // look over all of the entries and verify that it's set :)
@@ -134,7 +134,7 @@ TEST_F(HelloTest, JsonAgentInformationStringsTruncated) {
     conn.executeCommand(cmd, resp);
     ASSERT_TRUE(resp.isSuccess());
 
-    auto stats = conn.statsN("connections");
+    auto stats = conn.stats("connections");
     bool found = false;
 
     // look over all of the entries and verify that it's set :)