cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] cassandra git commit: Avoid read repairing purgeable tombstones
Date Tue, 03 May 2016 10:48:29 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 6d725afae -> ed64a76f6


Avoid read repairing purgeable tombstones

Patch by Stefan Podkowinski; reviewed by Sylvain Lebresne for CASSANDRA-11427


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3db33c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3db33c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3db33c0

Branch: refs/heads/cassandra-3.0
Commit: d3db33c008542c7044f3ed8c19f3a45679fcf52e
Parents: dff7b44
Author: Stefan Podkowinski <s.podkowinski@gmail.com>
Authored: Thu Apr 7 16:32:56 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue May 3 12:45:55 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3db33c0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fb06cd6..19e1afe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.7
+ * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
  * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
  * JSON datetime formatting needs timezone (CASSANDRA-11137)
  * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3db33c0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 79c9af2..abd41e7 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2293,6 +2293,9 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
                     removeDroppedColumns(data);
                 }
 
+                // remove purgable tombstones from result - see CASSANDRA-11427
+                data.purgeTombstones(gcBefore(filter.timestamp));
+
                 rows.add(new Row(rawRow.key, data));
                 if (!ignoreTombstonedPartitions || !data.hasOnlyTombstones(filter.timestamp))
                     matched++;


Mime
View raw message