You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/12/12 15:14:47 UTC
[1/2] cassandra git commit: Fix NPE after dropping a keyspace
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 6c579a010 -> cd714a1de
Fix NPE after dropping a keyspace
Patch by tjake; reviewed by Chris Lohfink for CASSANDRA-8332
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac9cfbd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac9cfbd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac9cfbd9
Branch: refs/heads/cassandra-2.1
Commit: ac9cfbd9aeb91c3391d78724fe8cb1e49ada55aa
Parents: 451c514
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Dec 12 09:10:33 2014 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Dec 12 09:10:33 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/io/compress/CompressionParameters.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac9cfbd9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cd302fb..c25caf9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Fix NPE after dropping a keyspace (CASSANDRA-8332)
* Fix error message on read repair timeouts (CASSANDRA-7947)
* Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417)
* Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac9cfbd9/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
index 2df64b4..98f01d4 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
@@ -105,6 +105,9 @@ public class CompressionParameters
public void setLiveMetadata(final CFMetaData liveMetadata)
{
+ if (liveMetadata == null)
+ return;
+
assert this.liveMetadata == null || this.liveMetadata == liveMetadata;
this.liveMetadata = liveMetadata;
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd714a1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd714a1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd714a1d
Branch: refs/heads/cassandra-2.1
Commit: cd714a1de662ee00fa4214e4afaab47c16dea3e8
Parents: 6c579a0 ac9cfbd
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Dec 12 09:14:32 2014 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Dec 12 09:14:32 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/io/compress/CompressionParameters.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd714a1d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 25140a8,c25caf9..641b1f9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,29 @@@
-2.0.12:
+2.1.3
+ * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
+ * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
+ * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383)
+ * Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Fix NPE after dropping a keyspace (CASSANDRA-8332)
* Fix error message on read repair timeouts (CASSANDRA-7947)
* Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417)
* Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd714a1d/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
----------------------------------------------------------------------