You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/31 15:24:25 UTC
[1/3] git commit: Fix repair assertionerror when tombstones expire
patch by jbellis for CASSANDRA-6277
Updated Branches:
refs/heads/cassandra-2.0 7015a7a6b -> cf8fa6e11
refs/heads/trunk d64aa99a9 -> 327cab8ab
Fix repair assertionerror when tombstones expire
patch by jbellis for CASSANDRA-6277
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf8fa6e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf8fa6e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf8fa6e1
Branch: refs/heads/cassandra-2.0
Commit: cf8fa6e11bf16ffed84a8805c4bc63077d6a7bcf
Parents: 7015a7a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 31 09:23:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 31 09:23:40 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf8fa6e1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a44d8e..d439032 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.3
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
* Skip loading corrupt key cache (CASSANDRA-6260)
* Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
* Compact hottest sstables first and optionally omit coldest from
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf8fa6e1/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 15ae0b8..b225f53 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -168,7 +168,9 @@ public class PrecompactedRow extends AbstractCompactedRow
public void update(MessageDigest digest)
{
- assert compactedCf != null;
+ if (compactedCf == null)
+ return;
+
DataOutputBuffer buffer = new DataOutputBuffer();
try
{
[3/3] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/327cab8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/327cab8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/327cab8a
Branch: refs/heads/trunk
Commit: 327cab8ab0fc4b7944df77beddca34a89bf41a56
Parents: d64aa99 cf8fa6e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 31 09:24:16 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 31 09:24:16 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/327cab8a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ee4704c,d439032..cc878e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
+2.1
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+
+
2.0.3
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
* Skip loading corrupt key cache (CASSANDRA-6260)
* Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
* Compact hottest sstables first and optionally omit coldest from
[2/3] git commit: Fix repair assertionerror when tombstones expire
patch by jbellis for CASSANDRA-6277
Posted by jb...@apache.org.
Fix repair assertionerror when tombstones expire
patch by jbellis for CASSANDRA-6277
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf8fa6e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf8fa6e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf8fa6e1
Branch: refs/heads/trunk
Commit: cf8fa6e11bf16ffed84a8805c4bc63077d6a7bcf
Parents: 7015a7a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 31 09:23:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 31 09:23:40 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf8fa6e1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a44d8e..d439032 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.3
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
* Skip loading corrupt key cache (CASSANDRA-6260)
* Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
* Compact hottest sstables first and optionally omit coldest from
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf8fa6e1/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 15ae0b8..b225f53 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -168,7 +168,9 @@ public class PrecompactedRow extends AbstractCompactedRow
public void update(MessageDigest digest)
{
- assert compactedCf != null;
+ if (compactedCf == null)
+ return;
+
DataOutputBuffer buffer = new DataOutputBuffer();
try
{