From aaca88a1e702ee612d8ff2126bac38ef35647f8a Mon Sep 17 00:00:00 2001
From: Asias He <asias@scylladb.com>
Date: Mon, 30 Nov 2015 09:26:08 +0800
Subject: [PATCH] token_metadata: Add print_pending_ranges for debug print

Signed-off-by: Pekka Enberg <penberg@scylladb.com>
---
 locator/token_metadata.cc | 17 +++++++++++++++--
 locator/token_metadata.hh | 18 ++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/locator/token_metadata.cc b/locator/token_metadata.cc
index 59bd298b71..8385c7facc 100644
--- a/locator/token_metadata.cc
+++ b/locator/token_metadata.cc
@@ -461,10 +461,23 @@ void token_metadata::calculate_pending_ranges(abstract_replication_strategy& str
     _pending_ranges[keyspace_name] = std::move(new_pending_ranges);
 
     if (logger.is_enabled(logging::log_level::debug)) {
-        // TODO: Enable printPendingRanges
-        // logger.debug("Pending ranges: {}", (_pending_ranges.empty() ? "<empty>" : printPendingRanges()));
+        logger.debug("Pending ranges: {}", (_pending_ranges.empty() ? "<empty>" : print_pending_ranges()));
     }
 }
+sstring token_metadata::print_pending_ranges() {
+    std::stringstream ss;
+
+    for (auto& x : _pending_ranges) {
+        auto& keyspace_name = x.first;
+        ss << "\nkeyspace_name = " << keyspace_name << " {\n";
+        for (auto& m : x.second) {
+            ss << m.second << " : " << m.first << "\n";
+        }
+        ss << "}\n";
+    }
+
+    return sstring(ss.str());
+}
 
 void token_metadata::add_leaving_endpoint(inet_address endpoint) {
      _leaving_endpoints.emplace(endpoint);
diff --git a/locator/token_metadata.hh b/locator/token_metadata.hh
index 750ebc4e3e..09fee66a16 100644
--- a/locator/token_metadata.hh
+++ b/locator/token_metadata.hh
@@ -865,23 +865,9 @@ public:
 
         return sb.toString();
     }
-
-    private String printPendingRanges()
-    {
-        StringBuilder sb = new StringBuilder();
-
-        for (Map.Entry<String, Multimap<Range<Token>, InetAddress>> entry : _pending_ranges.entrySet())
-        {
-            for (Map.Entry<Range<Token>, InetAddress> rmap : entry.getValue().entries())
-            {
-                sb.append(rmap.getValue()).append(":").append(rmap.getKey());
-                sb.append(System.getProperty("line.separator"));
-            }
-        }
-
-        return sb.toString();
-    }
 #endif
+    sstring print_pending_ranges();
+public:
     std::vector<gms::inet_address> pending_endpoints_for(const token& token, const sstring& keyspace_name);
 #if 0
     /**