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 <[email protected]> Authored: Thu Oct 31 09:23:40 2013 -0500 Committer: Jonathan Ellis <[email protected]> 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 {
