natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid read repairing purgeable tombstones 

Patch by Stefan Podkowinski; reviewed by Sylvain Lebresne for CASSANDRA-11427
This commit is contained in:
Stefan Podkowinski 2016-04-07 16:32:56 +02:00 committed by Sylvain Lebresne
parent dff7b447a7
commit d3db33c008
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

3
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -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++;