rename getRangeKeySample to sampleKeyRange patch by Jan Prach; reviewed by jbellis for CASSANDRA-4452
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06bdd3ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06bdd3ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06bdd3ea Branch: refs/heads/trunk Commit: 06bdd3ea8e6ec8ebf47b7bd813041550f99fa48b Parents: 6f384c5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jul 25 13:12:32 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jul 25 13:12:32 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/StorageService.java | 2 +- .../cassandra/service/StorageServiceMBean.java | 2 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/06bdd3ea/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 638574c..c160d69 100644 --- 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/06bdd3ea/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 28a3551..bfc8c81 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3080,7 +3080,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe /** * #{@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()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/06bdd3ea/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java index 72d03d1..0872e2b 100644 --- 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/06bdd3ea/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java index a8d3f55..b73e96a 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -922,7 +922,7 @@ public class NodeCmd 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); http://git-wip-us.apache.org/repos/asf/cassandra/blob/06bdd3ea/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index d1a615d..5c04eff 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -690,9 +690,9 @@ public class NodeProbe ssProxy.rebuild(sourceDc); } - public List<String> getRangeKeySample() + public List<String> sampleKeyRange() { - return ssProxy.getRangeKeySample(); + return ssProxy.sampleKeyRange(); } public void resetLocalSchema() throws IOException
