Updated Branches: refs/heads/cassandra-1.2 361aca59f -> 42ceccb90
Fix timestamp-based tomstone removal logic patch by slebresne; reviewed by jbellis for CASSANDRA-5248 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42ceccb9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42ceccb9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42ceccb9 Branch: refs/heads/cassandra-1.2 Commit: 42ceccb90cdf10ea457c14e17344e8d7e9128bc7 Parents: 361aca5 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Feb 15 19:29:17 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Feb 15 19:29:17 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42ceccb9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8ecf594..a83efe9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,7 @@ * fix compressed streaming sending extra chunk (CASSANDRA-5105) * Add CQL3-based implementations of IAuthenticator and IAuthorizer (CASSANDRA-4898) + * Fix timestamp-based tomstone removal logic (CASSANDRA-5248) 1.2.1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/42ceccb9/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index 6104486..ff3de53 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -114,7 +114,7 @@ public class CompactionController List<SSTableReader> filteredSSTables = overlappingTree.search(key); for (SSTableReader sstable : filteredSSTables) { - if (sstable.getBloomFilter().isPresent(key.key) && sstable.getMinTimestamp() >= maxDeletionTimestamp) + if (sstable.getBloomFilter().isPresent(key.key) && sstable.getMinTimestamp() <= maxDeletionTimestamp) return false; } return true;
