Updated Branches: refs/heads/trunk a5647ad5c -> 61bbae106
r/m unused parameter Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61bbae10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61bbae10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61bbae10 Branch: refs/heads/trunk Commit: 61bbae106931499ab24ec6d87fe5d4826efe9e21 Parents: a5647ad Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 9 15:19:19 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 9 15:19:19 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionsTest.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61bbae10/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 11d7966..fabebe9 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -42,7 +42,6 @@ import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableScanner; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; @@ -222,12 +221,12 @@ public class CompactionsTest extends SchemaLoader public void testDontPurgeAccidentaly() throws IOException, ExecutionException, InterruptedException { // Testing with and without forcing deserialization. Without deserialization, EchoedRow will be used. - testDontPurgeAccidentaly("test1", "Super5", false); - testDontPurgeAccidentaly("test2", "Super5", true); + testDontPurgeAccidentaly("test1", "Super5"); + testDontPurgeAccidentaly("test2", "Super5"); // Use CF with gc_grace=0, see last bug of CASSANDRA-2786 - testDontPurgeAccidentaly("test1", "SuperDirectGC", false); - testDontPurgeAccidentaly("test2", "SuperDirectGC", true); + testDontPurgeAccidentaly("test1", "SuperDirectGC"); + testDontPurgeAccidentaly("test2", "SuperDirectGC"); } @Test @@ -299,7 +298,7 @@ public class CompactionsTest extends SchemaLoader assert !compactionLogs.containsKey(Pair.create(TABLE1, cf)); } - private void testDontPurgeAccidentaly(String k, String cfname, boolean forceDeserialize) throws IOException, ExecutionException, InterruptedException + private void testDontPurgeAccidentaly(String k, String cfname) throws IOException, ExecutionException, InterruptedException { // This test catches the regression of CASSANDRA-2786 Table table = Table.open(TABLE1);
