Return-Path: 
 <commits-return-61279-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3273AD305
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Tue,  9 Oct 2012 21:46:31 +0000 (UTC)
Received: (qmail 42175 invoked by uid 500); 9 Oct 2012 21:46:30 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 42131 invoked by uid 500); 9 Oct 2012 21:46:30 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 41908 invoked by uid 99); 9 Oct 2012 21:46:30 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2012 21:46:30 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 3032B3CEED; Tue,  9 Oct 2012 21:46:30 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jbellis@apache.org
To: commits@cassandra.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [2/4] git commit: fix infinite recompaction in L0
Message-Id: <20121009214630.3032B3CEED@tyr.zones.apache.org>
Date: Tue,  9 Oct 2012 21:46:30 +0000 (UTC)

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/cassandra-1.1
Commit: f34bd79b9a92f23c1fc5e185e074d7faa880fc0b
Parents: 19c3bd3
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Oct 9 16:45:20 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
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