Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f55d2d49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f55d2d49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f55d2d49 Branch: refs/heads/trunk Commit: f55d2d494fe6f4e170373a341a89eeda5ddf2fa9 Parents: 61c988e f000ff0 Author: Yuki Morishita <[email protected]> Authored: Tue May 31 17:03:29 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue May 31 17:03:29 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/nodetool/TableStats.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f55d2d49/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f55d2d49/src/java/org/apache/cassandra/tools/nodetool/TableStats.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/nodetool/TableStats.java index 96457ea,c457fb5..ec729a5 --- a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java @@@ -158,12 -156,14 +158,18 @@@ public class TableStats extends NodeToo statsTable.offHeapMemoryUsedTotal = format(offHeapSize, humanReadable); } + if (percentRepaired != null) + { + statsTable.percentRepaired = Math.round(100 * percentRepaired) / 100.0; + } statsTable.sstableCompressionRatio = probe.getColumnFamilyMetric(keyspaceName, tableName, "CompressionRatio"); - statsTable.numberOfKeysEstimate = probe.getColumnFamilyMetric(keyspaceName, tableName, "EstimatedPartitionCount"); + Object estimatedPartitionCount = probe.getColumnFamilyMetric(keyspaceName, tableName, "EstimatedPartitionCount"); + if (Long.valueOf(-1L).equals(estimatedPartitionCount)) + { + estimatedPartitionCount = 0L; + } + statsTable.numberOfKeysEstimate = estimatedPartitionCount; + statsTable.memtableCellCount = probe.getColumnFamilyMetric(keyspaceName, tableName, "MemtableColumnsCount"); statsTable.memtableDataSize = format((Long) probe.getColumnFamilyMetric(keyspaceName, tableName, "MemtableLiveDataSize"), humanReadable); if (memtableOffHeapSize != null)
