Repository: cassandra Updated Branches: refs/heads/trunk 71abd2208 -> ca1b06500
ninja fix 7705 trunk merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca1b0650 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca1b0650 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca1b0650 Branch: refs/heads/trunk Commit: ca1b06500c54aed0c67659b5d9e697ae1ae050a4 Parents: 71abd22 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Jan 28 17:54:11 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Jan 28 17:54:11 2015 +0000 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/format/SSTableReader.java | 1 + .../org/apache/cassandra/service/ActiveRepairService.java | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca1b0650/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 2073e50..de65ca7 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@ -469,6 +469,7 @@ public abstract class SSTableReader extends SSTable implements RefCounted reader.ifile = ifile; reader.dfile = dfile; reader.indexSummary = isummary; + reader.tidy.setup(reader); return reader; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca1b0650/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index 7c7b0b6..fa9be8a 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -25,6 +25,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -431,13 +432,9 @@ public class ActiveRepairService public synchronized Refs<SSTableReader> getAndReferenceSSTablesInRange(UUID cfId, Range<Token> range) { Refs<SSTableReader> sstables = getAndReferenceSSTables(cfId); - for (SSTableReader sstable : new ArrayList<>(sstables)) - { - if (new Bounds<>(sstable.first.getToken(), sstable.last.getToken()).intersects(Arrays.asList(range))) - sstables.add(sstable); - else + for (SSTableReader sstable : ImmutableList.copyOf(sstables)) + if (!new Bounds<>(sstable.first.getToken(), sstable.last.getToken()).intersects(Arrays.asList(range))) sstables.release(sstable); - } return sstables; }
