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/34b07a74 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34b07a74 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34b07a74 Branch: refs/heads/trunk Commit: 34b07a74fbde87d2a671ace8bf10d32057817f9a Parents: 1543290 6e0395e Author: Yuki Morishita <[email protected]> Authored: Mon Mar 7 12:45:55 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Mon Mar 7 12:45:55 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../tools/nodetool/TableHistograms.java | 10 ++++------ .../cassandra/utils/EstimatedHistogram.java | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4eef41f,89fa904..38bf2ee --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,11 +1,39 @@@ -2.2.6 +3.0.5 + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) - * Fix filtering on non-primary key columns for thrift static column families - (CASSANDRA-6377) * Only log yaml config once, at startup (CASSANDRA-11217) - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) * Reference leak with parallel repairs on the same table (CASSANDRA-11215) +Merged from 2.1: + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) + + +3.0.4 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * MV should only query complex columns included in the view (CASSANDRA-11069) + * Failed aggregate creation breaks server permanently (CASSANDRA-11064) + * Add sstabledump tool (CASSANDRA-7464) + * Introduce backpressure for hints (CASSANDRA-10972) + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158) + * Prevent logging in sandboxed state (CASSANDRA-11033) + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239) +Merged from 2.2: + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java index 23f1c43,207a74e..be3f799 --- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java @@@ -66,14 -66,12 +66,12 @@@ public class TableHistograms extends No } else { - long[] partitionSizeBucketOffsets = new EstimatedHistogram(estimatedPartitionSize.length).getBucketOffsets(); - long[] columnCountBucketOffsets = new EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets(); - EstimatedHistogram partitionSizeHist = new EstimatedHistogram(partitionSizeBucketOffsets, estimatedPartitionSize); - EstimatedHistogram columnCountHist = new EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount); - EstimatedHistogram rowSizeHist = new EstimatedHistogram(estimatedRowSize); ++ EstimatedHistogram partitionSizeHist = new EstimatedHistogram(estimatedPartitionSize); + EstimatedHistogram columnCountHist = new EstimatedHistogram(estimatedColumnCount); - if (rowSizeHist.isOverflowed()) + if (partitionSizeHist.isOverflowed()) { - System.err.println(String.format("Row sizes are larger than %s, unable to calculate percentiles", partitionSizeBucketOffsets[partitionSizeBucketOffsets.length - 1])); - System.err.println(String.format("Row sizes are larger than %s, unable to calculate percentiles", rowSizeHist.getLargestBucketOffset())); ++ System.err.println(String.format("Row sizes are larger than %s, unable to calculate percentiles", partitionSizeHist.getLargestBucketOffset())); for (int i = 0; i < offsetPercentiles.length; i++) estimatedRowSizePercentiles[i] = Double.NaN; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/src/java/org/apache/cassandra/utils/EstimatedHistogram.java ----------------------------------------------------------------------
