Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/787a20fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/787a20fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/787a20fd Branch: refs/heads/trunk Commit: 787a20fdd616944e679f82d2d38cfe671fa4c188 Parents: b2dfe1b 2d1e46e Author: Yuki Morishita <yu...@apache.org> Authored: Tue Mar 3 17:14:37 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Mar 3 17:14:37 2015 -0600 ---------------------------------------------------------------------- .../cassandra/db/compaction/LongCompactionsTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/787a20fd/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java ---------------------------------------------------------------------- diff --cc test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java index f16d094,e87e336..394f27b --- a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java @@@ -24,40 -24,31 +24,49 @@@ import java.util.concurrent.ExecutionEx import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.junit.BeforeClass; + import org.junit.Before; import org.junit.Test; + import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.Util; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; +import org.apache.cassandra.Util; +import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.db.*; -import org.apache.cassandra.io.sstable.SSTableReader; ++import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.SSTableUtils; +import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; - import static org.junit.Assert.assertEquals; -public class LongCompactionsTest extends SchemaLoader +public class LongCompactionsTest { public static final String KEYSPACE1 = "Keyspace1"; + public static final String CF_STANDARD = "Standard1"; + + @BeforeClass + public static void defineSchema() throws ConfigurationException + { + Map<String, String> compactionOptions = new HashMap<>(); + compactionOptions.put("tombstone_compaction_interval", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, + SimpleStrategy.class, + KSMetaData.optsWithRF(1), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD) + .compactionStrategyOptions(compactionOptions)); + } + @Before + public void cleanupFiles() + { + Keyspace keyspace = Keyspace.open(KEYSPACE1); + ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1"); + cfs.truncateBlocking(); + } + /** * Test compaction with a very wide row. */
