rename getRangeKeySample to sampleKeyRange

patch by Jan Prach; reviewed by jbellis for CASSANDRA-4452
apache · Jul 25, 2012 · 06bdd3e · 06bdd3e
1 parent 6f384c5
commit 06bdd3e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,6 @@
 1.1.3
+ * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
+   multi-MB results as an attribute (CASSANDRA-4452)
  * flush based on data size, not throughput; overwritten columns no 
    longer artificially inflate liveRatio (CASSANDRA-4399)
  * update default commitlog segment size to 32MB and total commitlog

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3080,7 +3080,7 @@ public void loadNewSSTables(String ksName, String cfName)
     /**
      * #{@inheritDoc}
      */
-    public List<String> getRangeKeySample()
+    public List<String> sampleKeyRange() // do not rename to getter - see CASSANDRA-4452 for details
     {
         List<DecoratedKey> keys = keySamples(ColumnFamilyStore.allUserDefined(), getLocalPrimaryRange());
 

diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -406,7 +406,7 @@ public interface StorageServiceMBean
      *
      * @return set of Tokens as Strings
      */
-    public List<String> getRangeKeySample();
+    public List<String> sampleKeyRange();
 
     /**
      * rebuild the specified indexes

diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -922,7 +922,7 @@ private void printDescribeRing(String keyspaceName, PrintStream out)
     private void printRangeKeySample(PrintStream outs)
     {
         outs.println("RangeKeySample: ");
-        List<String> tokenStrings = this.probe.getRangeKeySample();
+        List<String> tokenStrings = this.probe.sampleKeyRange();
         for (String tokenString : tokenStrings)
         {
             outs.println("\t" + tokenString);

diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -690,9 +690,9 @@ public void rebuild(String sourceDc)
         ssProxy.rebuild(sourceDc);
     }
 
-    public List<String> getRangeKeySample()
+    public List<String> sampleKeyRange()
     {
-        return ssProxy.getRangeKeySample();
+        return ssProxy.sampleKeyRange();
     }
 
     public void resetLocalSchema() throws IOException