fix infinite recompaction in L0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f34bd79b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f34bd79b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f34bd79b Branch: refs/heads/trunk Commit: f34bd79b9a92f23c1fc5e185e074d7faa880fc0b Parents: 19c3bd3 Author: Jonathan Ellis <[email protected]> Authored: Tue Oct 9 16:45:20 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Oct 9 16:45:20 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/LeveledManifest.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f34bd79b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index fcbd5cb..5f22109 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -479,7 +479,7 @@ public class LeveledManifest candidates.addAll(overlapping(candidates, generations[1])); } - return candidates; + return candidates.size() > 1 ? candidates : Collections.<SSTableReader>emptyList(); } // for non-L0 compactions, pick up where we left off last time
