Updated Branches: refs/heads/trunk 38fdcd198 -> a393072aa
ensure that the sstables we unmark compacting, are the same ones we marked Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a393072a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a393072a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a393072a Branch: refs/heads/trunk Commit: a393072aac6292412fc465d207c411c4b6b69e0b Parents: 38fdcd1 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 9 14:56:54 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 9 14:56:54 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a393072a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 3f8b7fc..8dbe52a 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -30,10 +30,7 @@ import javax.management.*; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.collect.AbstractIterator; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +import com.google.common.collect.*; import com.google.common.util.concurrent.Futures; import org.apache.cassandra.db.compaction.*; @@ -61,6 +58,7 @@ import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndexManager; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.Range; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.CompressionParameters; @@ -1908,7 +1906,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean public Iterable<SSTableReader> call() throws Exception { assert data.getCompacting().isEmpty() : data.getCompacting(); - Iterable<SSTableReader> sstables = AbstractCompactionStrategy.filterSuspectSSTables(getSSTables()); + Iterable<SSTableReader> sstables = Lists.newArrayList(AbstractCompactionStrategy.filterSuspectSSTables(getSSTables())); if (Iterables.isEmpty(sstables)) return null; boolean success = data.markCompacting(sstables);
