Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4aaf2b34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4aaf2b34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4aaf2b34 Branch: refs/heads/cassandra-3.7 Commit: 4aaf2b34f0ed76523e738937125598f63651354b Parents: 15ec930 39b86e3 Author: Yuki Morishita <yu...@apache.org> Authored: Tue May 31 16:35:07 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue May 31 16:35:07 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/nodetool/TableStats.java | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4aaf2b34/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 80a07a2,7c66125..4cdc031 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.2.7 +3.0.7 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912) + * Fix sstables not being protected from removal during index build (CASSANDRA-11905) + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) + * Remove unneeded code to repair index summaries that have + been improperly down-sampled (CASSANDRA-11127) + * Avoid WriteTimeoutExceptions during commit log replay due to materialized + view lock contention (CASSANDRA-11891) + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530) + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705) + * Allow compaction strategies to disable early open (CASSANDRA-11754) + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +Merged from 2.2: + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587) * Fix possible race condition in CommitLog.recover (CASSANDRA-11743) * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) * Possible memory leak in NIODataInputStream (CASSANDRA-11867) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4aaf2b34/src/java/org/apache/cassandra/tools/nodetool/TableStats.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/nodetool/TableStats.java index fe664ff,a1d2038..bb7f192 --- a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java @@@ -185,7 -185,15 +185,14 @@@ public class TableStats extends NodeToo if (offHeapSize != null) System.out.println("\t\tOff heap memory used (total): " + format(offHeapSize, humanReadable)); System.out.println("\t\tSSTable Compression Ratio: " + probe.getColumnFamilyMetric(keyspaceName, tableName, "CompressionRatio")); - System.out.println("\t\tNumber of keys (estimate): " + probe.getColumnFamilyMetric(keyspaceName, tableName, "EstimatedPartitionCount")); + - Object estimatedRowCount = probe.getColumnFamilyMetric(keyspaceName, tableName, "EstimatedRowCount"); - if (Long.valueOf(-1L).equals(estimatedRowCount)) ++ Object estimatedPartitionCount = probe.getColumnFamilyMetric(keyspaceName, tableName, "EstimatedPartitionCount"); ++ if (Long.valueOf(-1L).equals(estimatedPartitionCount)) + { - estimatedRowCount = 0L; ++ estimatedPartitionCount = 0L; + } - - System.out.println("\t\tNumber of keys (estimate): " + estimatedRowCount); ++ System.out.println("\t\tNumber of keys (estimate): " + estimatedPartitionCount); + System.out.println("\t\tMemtable cell count: " + probe.getColumnFamilyMetric(keyspaceName, tableName, "MemtableColumnsCount")); System.out.println("\t\tMemtable data size: " + format((Long) probe.getColumnFamilyMetric(keyspaceName, tableName, "MemtableLiveDataSize"), humanReadable)); if (memtableOffHeapSize != null)