Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 806ac77ee -> 52bf7acb0 refs/heads/cassandra-3.11 0b489776c -> e63c7a0ac refs/heads/cassandra-3.X 92cb311f9 -> e7c19c609 refs/heads/trunk 7843d8cc2 -> 39d7cf50e
Fix assertion for certain legacy range tombstone pattern patch by yukim; reviewed by pcmanus for CASSANDRA-12203 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52bf7acb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52bf7acb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52bf7acb Branch: refs/heads/cassandra-3.0 Commit: 52bf7acb0520411f420ccf36b9a3770674f604f6 Parents: 806ac77 Author: Yuki Morishita <yu...@apache.org> Authored: Mon Jan 16 10:23:46 2017 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Jan 16 10:26:23 2017 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 034ac31..e4afc3c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.11 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) * Set javac encoding to utf-8 (CASSANDRA-11077) * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java index bf9c2b8..a2d51e13 100644 --- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java +++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java @@ -647,7 +647,7 @@ public abstract class UnfilteredDeserializer // If the new tombstone don't supersedes the currently open tombstone, we don't have anything to return, we // just add the new tombstone (because we know tombstone is not fully shadowed, this imply the new tombstone // simply extend after the first one and we'll deal with it later) - assert metadata.comparator.compare(tombstone.start.bound, first.stop.bound) > 0; + assert metadata.comparator.compare(tombstone.start.bound, first.stop.bound) <= 0; openTombstones.add(tombstone); return null; }