Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/571659fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/571659fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/571659fc
Branch: refs/heads/trunk
Commit: 571659fcdaf24cc7d0bef60131869ea9bb38c621
Parents: 2be4241 1a50215
Author: Vijay Parthasarathy <[email protected]>
Authored: Sat Aug 31 11:43:44 2013 -0700
Committer: Vijay Parthasarathy <[email protected]>
Committed: Sat Aug 31 11:43:44 2013 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/571659fc/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index c316d0f,7a770bb..2d31232
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -865,23 -890,24 +865,24 @@@ public class NodeCm
outs.println("]");
}
}
- outs.println("\t\tSpace used (live): " +
cfstore.getLiveDiskSpaceUsed());
- outs.println("\t\tSpace used (total): " +
cfstore.getTotalDiskSpaceUsed());
+ outs.println("\t\tSpace used (live), bytes: " +
cfstore.getLiveDiskSpaceUsed());
+ outs.println("\t\tSpace used (total), bytes: " +
cfstore.getTotalDiskSpaceUsed());
+ outs.println("\t\tSSTable Compression Ratio: " +
cfstore.getCompressionRatio());
- outs.println("\t\tNumber of Keys (estimate): " +
cfstore.estimateKeys());
- outs.println("\t\tMemtable Columns Count: " +
cfstore.getMemtableColumnsCount());
- outs.println("\t\tMemtable Data Size: " +
cfstore.getMemtableDataSize());
- outs.println("\t\tMemtable Switch Count: " +
cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead Count: " + cfstore.getReadCount());
- outs.println("\t\tRead Latency: " + String.format("%01.3f",
cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite Count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite Latency: " + String.format("%01.3f",
cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tPending Tasks: " +
cfstore.getPendingTasks());
- outs.println("\t\tBloom Filter False Positives: " +
cfstore.getBloomFilterFalsePositives());
- outs.println("\t\tBloom Filter False Ratio: " +
String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
- outs.println("\t\tBloom Filter Space Used: " +
cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted row minimum size: " +
cfstore.getMinRowSize());
- outs.println("\t\tCompacted row maximum size: " +
cfstore.getMaxRowSize());
- outs.println("\t\tCompacted row mean size: " +
cfstore.getMeanRowSize());
+ outs.println("\t\tNumber of keys (estimate): " +
cfstore.estimateKeys());
+ outs.println("\t\tMemtable cell count: " +
cfstore.getMemtableColumnsCount());
+ outs.println("\t\tMemtable data size, bytes: " +
cfstore.getMemtableDataSize());
+ outs.println("\t\tMemtable switch count: " +
cfstore.getMemtableSwitchCount());
+ outs.println("\t\tRead count: " + cfstore.getReadCount());
+ outs.println("\t\tRead latency, micros: " +
String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tWrite count: " + cfstore.getWriteCount());
+ outs.println("\t\tWrite latency, micros: " +
String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tPending tasks: " +
cfstore.getPendingTasks());
+ outs.println("\t\tBloom filter false positives: " +
cfstore.getBloomFilterFalsePositives());
+ outs.println("\t\tBloom filter false ratio: " +
String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
+ outs.println("\t\tBloom filter space used, bytes: " +
cfstore.getBloomFilterDiskSpaceUsed());
+ outs.println("\t\tCompacted partition minimum size, bytes: "
+ cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum size, bytes: "
+ cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean size, bytes: " +
cfstore.getMeanRowSize());
outs.println("");
}
