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

LCS will merge up to 32 L0 sstables as intended 

patch by jbellis; reviewed by yukim for CASSANDRA-4778
This commit is contained in:
Jonathan Ellis 2012-10-08 22:43:41 -05:00
parent 5b5b20a878
commit 6d13ce69b6
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
1.1.6
* LCS will merge up to 32 L0 sstables as intended (CASSANDRA-4778)
* NTS will default unconfigured DC replicas to zero (CASSANDRA-4675)
* use default consistency level in counter validation if none is
explicitly provide (CASSANDRA-4700)

20
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
View File

@ -59,7 +59,7 @@ public class LeveledManifest
* uses a pessimistic estimate of how many keys overlap (none), so we risk wasting memory
* or even OOMing when compacting highly overlapping sstables
*/
static int MAX_COMPACTING_L0 = 32;
private static final int MAX_COMPACTING_L0 = 32;
private final ColumnFamilyStore cfs;
private final List<SSTableReader>[] generations;
@ -469,22 +469,16 @@ public class LeveledManifest
List<SSTableReader> ageSortedCandidates = new ArrayList<SSTableReader>(candidates);
Collections.sort(ageSortedCandidates, SSTable.maxTimestampComparator);
candidates = new HashSet<SSTableReader>(ageSortedCandidates.subList(0, MAX_COMPACTING_L0));
if (SSTable.getTotalBytes(candidates) > maxSSTableSizeInBytes)
{
// add sstables from L1 that overlap candidates
candidates.addAll(overlapping(candidates, generations[1]));
}
return candidates;
}
if (SSTable.getTotalBytes(candidates) > maxSSTableSizeInBytes)
{
// add sstables from L1 that overlap candidates
candidates.addAll(overlapping(candidates, generations[1]));
break;
}
}
if (SSTable.getTotalBytes(candidates) > maxSSTableSizeInBytes)
{
// add sstables from L1 that overlap candidates
candidates.addAll(overlapping(candidates, generations[1]));
}
return candidates;
}