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 trunk

This commit is contained in:
Marcus Eriksson 2015-01-22 15:51:25 +01:00
parent 9fcb409f50 6bedeff4fd
commit 10b8a765be
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -55,6 +55,8 @@
2.1.3 2.1.3
* Make sure we don't add tmplink files to the compaction
strategy (CASSANDRA-8580)
* (cqlsh) Handle maps with blob keys (CASSANDRA-8372) * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
* (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563) * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
* Add tooling to detect hot partitions (CASSANDRA-7974) * Add tooling to detect hot partitions (CASSANDRA-7974)

11
src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
View File

@ -323,10 +323,13 @@ public final class WrappingCompactionStrategy extends AbstractCompactionStrategy
super.startup(); super.startup();
for (SSTableReader sstable : cfs.getSSTables()) for (SSTableReader sstable : cfs.getSSTables())
{ {
if (sstable.isRepaired()) if (sstable.openReason != SSTableReader.OpenReason.EARLY)
repaired.addSSTable(sstable); {
else if (sstable.isRepaired())
unrepaired.addSSTable(sstable); repaired.addSSTable(sstable);
else
unrepaired.addSSTable(sstable);
}
} }
repaired.startup(); repaired.startup();
unrepaired.startup(); unrepaired.startup();