You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/05/03 12:48:29 UTC
[1/2] cassandra git commit: Avoid read repairing purgeable tombstones
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....@gmail.com>
Authored: Thu Apr 7 16:32:56 2016 +0200
Committer: Sylvain Lebresne <sy...@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++;
[2/2] cassandra git commit: Merge commit
'd3db33c008542c7044f3ed8c19f3a45679fcf52e' into cassandra-3.0
Posted by sl...@apache.org.
Merge commit 'd3db33c008542c7044f3ed8c19f3a45679fcf52e' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed64a76f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed64a76f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed64a76f
Branch: refs/heads/cassandra-3.0
Commit: ed64a76f6ba904329b20f904165ed303fe8e0e3a
Parents: 6d725af d3db33c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 3 12:48:13 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 3 12:48:13 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------