Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f0509ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f0509ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f0509ee
Branch: refs/heads/trunk
Commit: 9f0509ee358e0fa1e4eafd53015ea534ec212ccf
Parents: 8324818 362da9b
Author: Marcus Eriksson <marc...@apache.org>
Authored: Thu Sep 10 14:39:01 2015 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Thu Sep 10 14:39:01 2015 +0200
----------------------------------------------------------------------
.../db/compaction/CompactionManager.java | 28 +++++++++++++-------
.../db/compaction/AntiCompactionTest.java | 4 +--
2 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0509ee/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0509ee/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index a3167f9,7c3fbc2..cd82b19
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@@ -299,21 -289,21 +299,21 @@@ public class AntiCompactionTes
{
generateSStable(store,Integer.toString(table));
}
- Collection<SSTableReader> sstables = store.getUnrepairedSSTables();
- assertEquals(store.getSSTables().size(), sstables.size());
-
+ Collection<SSTableReader> sstables = getUnrepairedSSTables(store);
+ assertEquals(store.getLiveSSTables().size(), sstables.size());
+
- Range<Token> range = new Range<Token>(new
BytesToken("-10".getBytes()), new BytesToken("-1".getBytes()));
+ Range<Token> range = new Range<Token>(new
BytesToken("-1".getBytes()), new BytesToken("-10".getBytes()));
List<Range<Token>> ranges = Arrays.asList(range);
try (LifecycleTransaction txn =
store.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
Refs<SSTableReader> refs = Refs.ref(sstables))
{
- CompactionManager.instance.performAnticompaction(store, ranges,
refs, txn, 0);
+ CompactionManager.instance.performAnticompaction(store, ranges,
refs, txn, 1);
}
- assertThat(store.getSSTables().size(), is(10));
- assertThat(Iterables.get(store.getSSTables(), 0).isRepaired(),
is(false));
+ assertThat(store.getLiveSSTables().size(), is(10));
+ assertThat(Iterables.get(store.getLiveSSTables(), 0).isRepaired(),
is(false));
}
private ColumnFamilyStore prepareColumnFamilyStore()
