You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/03/02 14:24:07 UTC
[01/14] cassandra git commit: InvalidateKeys should have a weak ref
to the key cache
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 7877d6f85 -> 0129f70c4
refs/heads/cassandra-2.2 477014b8c -> d1f6a1d95
refs/heads/cassandra-3.0 841a80311 -> 3c8a09767
refs/heads/cassandra-3.5 57cbda0a4 -> 87992c3a4
refs/heads/trunk 57cbda0a4 -> 87992c3a4
InvalidateKeys should have a weak ref to the key cache
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-11176
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0129f70c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0129f70c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0129f70c
Branch: refs/heads/cassandra-2.1
Commit: 0129f70c47d4a6b684fbf0df4dbbfb8ffc097d59
Parents: 7877d6f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 25 08:57:35 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:18:44 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/0129f70c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82ee99e..eed9035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0129f70c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index af5d1d3..b56a5dc 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.io.sstable;
+import java.lang.ref.WeakReference;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
@@ -339,12 +340,12 @@ public class SSTableRewriter
private static final class InvalidateKeys implements Runnable
{
final List<KeyCacheKey> cacheKeys = new ArrayList<>();
- final InstrumentingCache<KeyCacheKey, ?> cache;
+ final WeakReference<InstrumentingCache<KeyCacheKey, ?>> cacheRef;
private InvalidateKeys(SSTableReader reader, Collection<DecoratedKey> invalidate)
{
- this.cache = reader.getKeyCache();
- if (cache != null)
+ this.cacheRef = new WeakReference<InstrumentingCache<KeyCacheKey, ?>>(reader.getKeyCache());
+ if (cacheRef.get() != null)
{
for (DecoratedKey key : invalidate)
cacheKeys.add(reader.getCacheKey(key));
@@ -354,7 +355,11 @@ public class SSTableRewriter
public void run()
{
for (KeyCacheKey key : cacheKeys)
- cache.remove(key);
+ {
+ InstrumentingCache<KeyCacheKey, ?> cache = cacheRef.get();
+ if (cache != null)
+ cache.remove(key);
+ }
}
}
[02/14] cassandra git commit: InvalidateKeys should have a weak ref
to the key cache
Posted by ma...@apache.org.
InvalidateKeys should have a weak ref to the key cache
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-11176
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0129f70c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0129f70c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0129f70c
Branch: refs/heads/cassandra-2.2
Commit: 0129f70c47d4a6b684fbf0df4dbbfb8ffc097d59
Parents: 7877d6f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 25 08:57:35 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:18:44 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/0129f70c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82ee99e..eed9035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0129f70c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index af5d1d3..b56a5dc 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.io.sstable;
+import java.lang.ref.WeakReference;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
@@ -339,12 +340,12 @@ public class SSTableRewriter
private static final class InvalidateKeys implements Runnable
{
final List<KeyCacheKey> cacheKeys = new ArrayList<>();
- final InstrumentingCache<KeyCacheKey, ?> cache;
+ final WeakReference<InstrumentingCache<KeyCacheKey, ?>> cacheRef;
private InvalidateKeys(SSTableReader reader, Collection<DecoratedKey> invalidate)
{
- this.cache = reader.getKeyCache();
- if (cache != null)
+ this.cacheRef = new WeakReference<InstrumentingCache<KeyCacheKey, ?>>(reader.getKeyCache());
+ if (cacheRef.get() != null)
{
for (DecoratedKey key : invalidate)
cacheKeys.add(reader.getCacheKey(key));
@@ -354,7 +355,11 @@ public class SSTableRewriter
public void run()
{
for (KeyCacheKey key : cacheKeys)
- cache.remove(key);
+ {
+ InstrumentingCache<KeyCacheKey, ?> cache = cacheRef.get();
+ if (cache != null)
+ cache.remove(key);
+ }
}
}
[04/14] cassandra git commit: InvalidateKeys should have a weak ref
to the key cache
Posted by ma...@apache.org.
InvalidateKeys should have a weak ref to the key cache
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-11176
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0129f70c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0129f70c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0129f70c
Branch: refs/heads/cassandra-3.0
Commit: 0129f70c47d4a6b684fbf0df4dbbfb8ffc097d59
Parents: 7877d6f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 25 08:57:35 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:18:44 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/0129f70c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82ee99e..eed9035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0129f70c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index af5d1d3..b56a5dc 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.io.sstable;
+import java.lang.ref.WeakReference;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
@@ -339,12 +340,12 @@ public class SSTableRewriter
private static final class InvalidateKeys implements Runnable
{
final List<KeyCacheKey> cacheKeys = new ArrayList<>();
- final InstrumentingCache<KeyCacheKey, ?> cache;
+ final WeakReference<InstrumentingCache<KeyCacheKey, ?>> cacheRef;
private InvalidateKeys(SSTableReader reader, Collection<DecoratedKey> invalidate)
{
- this.cache = reader.getKeyCache();
- if (cache != null)
+ this.cacheRef = new WeakReference<InstrumentingCache<KeyCacheKey, ?>>(reader.getKeyCache());
+ if (cacheRef.get() != null)
{
for (DecoratedKey key : invalidate)
cacheKeys.add(reader.getCacheKey(key));
@@ -354,7 +355,11 @@ public class SSTableRewriter
public void run()
{
for (KeyCacheKey key : cacheKeys)
- cache.remove(key);
+ {
+ InstrumentingCache<KeyCacheKey, ?> cache = cacheRef.get();
+ if (cache != null)
+ cache.remove(key);
+ }
}
}
[14/14] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87992c3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87992c3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87992c3a
Branch: refs/heads/trunk
Commit: 87992c3a4659b7813cd600452b84805a03c01b1d
Parents: 57cbda0 3c8a097
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:22:11 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:22:11 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/87992c3a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5d010c4,b77d811..a4b1aab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -72,9 -40,9 +72,10 @@@ 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) Support timezone conversion using pytz (CASSANDRA-10397)
* 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)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87992c3a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
[13/14] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87992c3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87992c3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87992c3a
Branch: refs/heads/cassandra-3.5
Commit: 87992c3a4659b7813cd600452b84805a03c01b1d
Parents: 57cbda0 3c8a097
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:22:11 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:22:11 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/87992c3a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5d010c4,b77d811..a4b1aab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -72,9 -40,9 +72,10 @@@ 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) Support timezone conversion using pytz (CASSANDRA-10397)
* 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)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87992c3a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
[11/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cassandra-3.0
Commit: 3c8a09767887941523e06ab68715866ccb560d9d
Parents: 841a803 d1f6a1d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:20:14 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
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));
[05/14] cassandra git commit: InvalidateKeys should have a weak ref
to the key cache
Posted by ma...@apache.org.
InvalidateKeys should have a weak ref to the key cache
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-11176
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0129f70c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0129f70c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0129f70c
Branch: refs/heads/cassandra-3.5
Commit: 0129f70c47d4a6b684fbf0df4dbbfb8ffc097d59
Parents: 7877d6f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 25 08:57:35 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:18:44 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/0129f70c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82ee99e..eed9035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0129f70c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index af5d1d3..b56a5dc 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.io.sstable;
+import java.lang.ref.WeakReference;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
@@ -339,12 +340,12 @@ public class SSTableRewriter
private static final class InvalidateKeys implements Runnable
{
final List<KeyCacheKey> cacheKeys = new ArrayList<>();
- final InstrumentingCache<KeyCacheKey, ?> cache;
+ final WeakReference<InstrumentingCache<KeyCacheKey, ?>> cacheRef;
private InvalidateKeys(SSTableReader reader, Collection<DecoratedKey> invalidate)
{
- this.cache = reader.getKeyCache();
- if (cache != null)
+ this.cacheRef = new WeakReference<InstrumentingCache<KeyCacheKey, ?>>(reader.getKeyCache());
+ if (cacheRef.get() != null)
{
for (DecoratedKey key : invalidate)
cacheKeys.add(reader.getCacheKey(key));
@@ -354,7 +355,11 @@ public class SSTableRewriter
public void run()
{
for (KeyCacheKey key : cacheKeys)
- cache.remove(key);
+ {
+ InstrumentingCache<KeyCacheKey, ?> cache = cacheRef.get();
+ if (cache != null)
+ cache.remove(key);
+ }
}
}
[10/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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 <ma...@apache.org>
Authored: Wed Mar 2 14:20:14 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
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));
[03/14] cassandra git commit: InvalidateKeys should have a weak ref
to the key cache
Posted by ma...@apache.org.
InvalidateKeys should have a weak ref to the key cache
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-11176
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0129f70c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0129f70c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0129f70c
Branch: refs/heads/trunk
Commit: 0129f70c47d4a6b684fbf0df4dbbfb8ffc097d59
Parents: 7877d6f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 25 08:57:35 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:18:44 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/0129f70c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82ee99e..eed9035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0129f70c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index af5d1d3..b56a5dc 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.io.sstable;
+import java.lang.ref.WeakReference;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
@@ -339,12 +340,12 @@ public class SSTableRewriter
private static final class InvalidateKeys implements Runnable
{
final List<KeyCacheKey> cacheKeys = new ArrayList<>();
- final InstrumentingCache<KeyCacheKey, ?> cache;
+ final WeakReference<InstrumentingCache<KeyCacheKey, ?>> cacheRef;
private InvalidateKeys(SSTableReader reader, Collection<DecoratedKey> invalidate)
{
- this.cache = reader.getKeyCache();
- if (cache != null)
+ this.cacheRef = new WeakReference<InstrumentingCache<KeyCacheKey, ?>>(reader.getKeyCache());
+ if (cacheRef.get() != null)
{
for (DecoratedKey key : invalidate)
cacheKeys.add(reader.getCacheKey(key));
@@ -354,7 +355,11 @@ public class SSTableRewriter
public void run()
{
for (KeyCacheKey key : cacheKeys)
- cache.remove(key);
+ {
+ InstrumentingCache<KeyCacheKey, ?> cache = cacheRef.get();
+ if (cache != null)
+ cache.remove(key);
+ }
}
}
[07/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f6a1d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f6a1d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f6a1d9
Branch: refs/heads/cassandra-2.2
Commit: d1f6a1d95168534ab8e144b821e864e0a4c25b09
Parents: 477014b 0129f70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:19:16 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:19:16 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/d1f6a1d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a50f256,eed9035..481916b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
-2.1.14
+2.2.6
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * 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)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (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)
+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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f6a1d9/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
[08/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f6a1d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f6a1d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f6a1d9
Branch: refs/heads/cassandra-3.0
Commit: d1f6a1d95168534ab8e144b821e864e0a4c25b09
Parents: 477014b 0129f70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:19:16 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:19:16 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/d1f6a1d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a50f256,eed9035..481916b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
-2.1.14
+2.2.6
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * 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)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (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)
+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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f6a1d9/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
[09/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f6a1d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f6a1d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f6a1d9
Branch: refs/heads/cassandra-3.5
Commit: d1f6a1d95168534ab8e144b821e864e0a4c25b09
Parents: 477014b 0129f70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:19:16 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:19:16 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/d1f6a1d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a50f256,eed9035..481916b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
-2.1.14
+2.2.6
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * 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)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (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)
+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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f6a1d9/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
[12/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cassandra-3.5
Commit: 3c8a09767887941523e06ab68715866ccb560d9d
Parents: 841a803 d1f6a1d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:20:14 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
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));
[06/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f6a1d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f6a1d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f6a1d9
Branch: refs/heads/trunk
Commit: d1f6a1d95168534ab8e144b821e864e0a4c25b09
Parents: 477014b 0129f70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:19:16 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:19:16 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/d1f6a1d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a50f256,eed9035..481916b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
-2.1.14
+2.2.6
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * 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)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (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)
+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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f6a1d9/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------