You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/07/23 02:43:12 UTC
git commit: Sort nodetool help output patch by mmainali reviewed by
dbrosius for cassandra-5776
Updated Branches:
refs/heads/cassandra-1.2 b0f7bab7d -> 0f0a11c97
Sort nodetool help output
patch by mmainali reviewed by dbrosius for cassandra-5776
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f0a11c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f0a11c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f0a11c9
Branch: refs/heads/cassandra-1.2
Commit: 0f0a11c979d5ed8503dbba87894e685245cc1b41
Parents: b0f7bab
Author: Dave Brosius <db...@apache.org>
Authored: Mon Jul 22 20:41:31 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Jul 22 20:41:31 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeCmd.java | 8 ++++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f0a11c9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5d74d67..da03306 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@
* Fix formatting of sstable2json with multiple -k arguments (CASSANDRA-5781)
* Don't rely on row marker for queries in general to hide lost markers
after TTL expires (CASSANDRA-5762)
+ * Sort nodetool help output (CASSANDRA-5776)
1.2.6
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f0a11c9/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 dce83b8..0bedd4e 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -172,6 +172,14 @@ public class NodeCmd
StringBuilder header = new StringBuilder(512);
header.append("\nAvailable commands\n");
final NodeToolHelp ntHelp = loadHelp();
+ Collections.sort(ntHelp.commands, new Comparator<NodeToolHelp.NodeToolCommand>()
+ {
+ @Override
+ public int compare(NodeToolHelp.NodeToolCommand o1, NodeToolHelp.NodeToolCommand o2)
+ {
+ return o1.name.compareTo(o2.name);
+ }
+ });
for(NodeToolHelp.NodeToolCommand cmd : ntHelp.commands)
addCmdHelp(header, cmd);
String usage = String.format("java %s --host <arg> <command>%n", NodeCmd.class.getName());