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/3c8a0976 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c8a0976 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c8a0976 Branch: refs/heads/trunk Commit: 3c8a09767887941523e06ab68715866ccb560d9d Parents: 841a803 d1f6a1d Author: Marcus Eriksson <[email protected]> Authored: Wed Mar 2 14:20:14 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Wed Mar 2 14:22:04 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableRewriter.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c8a0976/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 425cc58,481916b..b77d811 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -40,10 -19,11 +40,11 @@@ Merged from 2.2 * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) Merged from 2.1: + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371) * Only notify if repair status changed (CASSANDRA-11172) - * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888) * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714) * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c8a0976/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java index 3632a60,c243904..e652b9d --- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java @@@ -255,8 -260,8 +256,8 @@@ public class SSTableRewriter extends Tr private InvalidateKeys(SSTableReader reader, Collection<DecoratedKey> invalidate) { - this.cache = reader.getKeyCache(); - if (cache != null) - this.cacheRef = new WeakReference<InstrumentingCache<KeyCacheKey, ?>>(reader.getKeyCache()); ++ this.cacheRef = new WeakReference<>(reader.getKeyCache()); + if (cacheRef.get() != null) { for (DecoratedKey key : invalidate) cacheKeys.add(reader.getCacheKey(key));
