cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Sat, 13 Sep 2014 17:17:29 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/319d9e13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/319d9e13
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/319d9e13

Branch: refs/heads/trunk
Commit: 319d9e13c98f11d1769cfa6940f8d805dd5a9406
Parents: 57016e6 1cef273
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Sat Sep 13 12:17:18 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Sat Sep 13 12:17:18 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/tools/NodeTool.java    | 73 ++++++++++++++------
 2 files changed, 51 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/319d9e13/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d04814e,7f10ca5..488f4fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +3.0
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * Add human readable option to nodetool commands (CASSANDRA-5433)
   * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
   * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
   * (cqlsh) tab-completion for triggers (CASSANDRA-7824)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/319d9e13/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeTool.java
index 9fbee9c,cc38107..8f0dcef
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@@ -605,15 -616,20 +616,20 @@@ public class NodeToo
          }
      }
  
 -    @Command(name = "cfstats", description = "Print statistics on column families")
 +    @Command(name = "cfstats", description = "Print statistics on tables")
      public static class CfStats extends NodeToolCmd
      {
 -        @Arguments(usage = "[<keyspace.cfname>...]", description = "List of column
families (or keyspace) names")
 +        @Arguments(usage = "[<keyspace.table>...]", description = "List of tables
(or keyspace) names")
          private List<String> cfnames = new ArrayList<>();
  
 -        @Option(name = "-i", description = "Ignore the list of column families and display
the remaining cfs")
 +        @Option(name = "-i", description = "Ignore the list of tables and display the remaining
cfs")
          private boolean ignore = false;
  
+         @Option(title = "human_readable",
+                 name = {"-H", "--human-readable"},
+                 description = "Display bytes in human readable form, i.e. KB, MB, GB, TB")
+         private boolean humanReadable = false;
+ 
          @Override
          public void execute(NodeProbe probe)
          {


Mime
View raw message