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

Merge branch 'cassandra-2.1' into cassandra-2.2

This commit is contained in:
Aleksey Yeschenko 2015-05-20 20:02:56 +03:00
parent 52dc63b6c7 2248780eae
commit 76b5f30e73
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -3,6 +3,8 @@
* Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
* Add ability to stop compaction by ID (CASSANDRA-7207)
Merged from 2.1:
2.1.6
* Optimize range tombstone memory footprint (CASSANDRA-8603)
* Use configured gcgs in anticompaction (CASSANDRA-9397)

4
src/java/org/apache/cassandra/db/RangeTombstone.java
View File

@ -272,6 +272,10 @@ public class RangeTombstone extends Interval<Composite, DeletionTime> implements
{
Composite max = type.serializer().deserialize(in);
DeletionTime dt = DeletionTime.serializer.deserialize(in);
// If the max equals the min.end(), we can avoid keeping an extra ByteBuffer in memory by using
// min.end() instead of max
Composite minEnd = min.end();
max = minEnd.equals(max) ? minEnd : max;
return new RangeTombstone(min, max, dt);
}