You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/06/20 19:56:47 UTC
[3/6] Reduce unit test times due to schema loading
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/TimeSortTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java
index 80c0ff1..77890fb 100644
--- a/test/unit/org/apache/cassandra/db/TimeSortTest.java
+++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java
@@ -21,6 +21,7 @@ package org.apache.cassandra.db;
import java.io.IOException;
import java.util.*;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -29,28 +30,44 @@ import static org.apache.cassandra.Util.cellname;
import static org.apache.cassandra.Util.getBytes;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class TimeSortTest extends SchemaLoader
+public class TimeSortTest
{
+ private static final String KEYSPACE1 = "TimeSortTest";
+ private static final String CF_STANDARD1 = "StandardLong1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1));
+ }
+
@Test
public void testMixedSources()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
- ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("StandardLong1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore(CF_STANDARD1);
Mutation rm;
DecoratedKey key = Util.dk("key0");
- rm = new Mutation("Keyspace1", key.getKey());
- rm.add("StandardLong1", cellname(100), ByteBufferUtil.bytes("a"), 100);
+ rm = new Mutation(KEYSPACE1, key.getKey());
+ rm.add(CF_STANDARD1, cellname(100), ByteBufferUtil.bytes("a"), 100);
rm.apply();
cfStore.forceBlockingFlush();
- rm = new Mutation("Keyspace1", key.getKey());
- rm.add("StandardLong1", cellname(0), ByteBufferUtil.bytes("b"), 0);
+ rm = new Mutation(KEYSPACE1, key.getKey());
+ rm.add(CF_STANDARD1, cellname(0), ByteBufferUtil.bytes("b"), 0);
rm.apply();
ColumnFamily cf = cfStore.getColumnFamily(key, cellname(10), Composites.EMPTY, false, 1000, System.currentTimeMillis());
@@ -61,15 +78,15 @@ public class TimeSortTest extends SchemaLoader
@Test
public void testTimeSort() throws IOException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
- ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("StandardLong1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore(CF_STANDARD1);
for (int i = 900; i < 1000; ++i)
{
- Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes(Integer.toString(i)));
+ Mutation rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes(Integer.toString(i)));
for (int j = 0; j < 8; ++j)
{
- rm.add("StandardLong1", cellname(j * 2), ByteBufferUtil.bytes("a"), j * 2);
+ rm.add(CF_STANDARD1, cellname(j * 2), ByteBufferUtil.bytes("a"), j * 2);
}
rm.apply();
}
@@ -81,16 +98,16 @@ public class TimeSortTest extends SchemaLoader
// interleave some new data to test memtable + sstable
DecoratedKey key = Util.dk("900");
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int j = 0; j < 4; ++j)
{
- rm.add("StandardLong1", cellname(j * 2 + 1), ByteBufferUtil.bytes("b"), j * 2 + 1);
+ rm.add(CF_STANDARD1, cellname(j * 2 + 1), ByteBufferUtil.bytes("b"), j * 2 + 1);
}
rm.apply();
// and some overwrites
- rm = new Mutation("Keyspace1", key.getKey());
- rm.add("StandardLong1", cellname(0), ByteBufferUtil.bytes("c"), 100);
- rm.add("StandardLong1", cellname(10), ByteBufferUtil.bytes("c"), 100);
+ rm = new Mutation(KEYSPACE1, key.getKey());
+ rm.add(CF_STANDARD1, cellname(0), ByteBufferUtil.bytes("c"), 100);
+ rm.add(CF_STANDARD1, cellname(10), ByteBufferUtil.bytes("c"), 100);
rm.apply();
// verify
@@ -107,7 +124,7 @@ public class TimeSortTest extends SchemaLoader
TreeSet<CellName> columnNames = new TreeSet<CellName>(cfStore.getComparator());
columnNames.add(cellname(10));
columnNames.add(cellname(0));
- cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(Util.dk("900"), "StandardLong1", columnNames, System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(Util.dk("900"), CF_STANDARD1, columnNames, System.currentTimeMillis()));
assert "c".equals(ByteBufferUtil.string(cf.getColumn(cellname(0)).value()));
assert "c".equals(ByteBufferUtil.string(cf.getColumn(cellname(10)).value()));
}
@@ -119,7 +136,7 @@ public class TimeSortTest extends SchemaLoader
DecoratedKey key = Util.dk(Integer.toString(i));
for (int j = 0; j < 8; j += 3)
{
- ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardLong1");
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARD1);
ColumnFamily cf = cfs.getColumnFamily(key, cellname(j * 2), Composites.EMPTY, false, 1000, System.currentTimeMillis());
Collection<Cell> cells = cf.getSortedColumns();
assert cells.size() == 8 - j;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index b8637a8..ac628ee 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -22,6 +22,11 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
+
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -41,11 +46,21 @@ import static junit.framework.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class AntiCompactionTest extends SchemaLoader
+public class AntiCompactionTest
{
- private static final String KEYSPACE1 = "Keyspace1";
+ private static final String KEYSPACE1 = "AntiCompactionTest";
private static final String CF = "Standard1";
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF));
+ }
+
@Test
public void antiCompactOne() throws InterruptedException, ExecutionException, IOException
{
@@ -58,7 +73,7 @@ public class AntiCompactionTest extends SchemaLoader
DecoratedKey key = Util.dk(Integer.toString(i));
Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int j = 0; j < 10; j++)
- rm.add("Standard1", Util.cellname(Integer.toString(j)),
+ rm.add(CF, Util.cellname(Integer.toString(j)),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
0);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index e6626ea..8beea7f 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -31,20 +31,34 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.apache.cassandra.Util.cellname;
-public class BlacklistingCompactionsTest extends SchemaLoader
+public class BlacklistingCompactionsTest
{
- public static final String KEYSPACE = "Keyspace1";
+ private static final String KEYSPACE1 = "BlacklistingCompactionsTest";
+ private static final String CF_STANDARD1 = "Standard1";
@BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1));
+ closeStdErr();
+ }
+
public static void closeStdErr()
{
// These tests generate an error message per CorruptSSTableException since it goes through
@@ -70,7 +84,7 @@ public class BlacklistingCompactionsTest extends SchemaLoader
public void testBlacklisting(String compactionStrategy) throws Exception
{
// this test does enough rows to force multiple block indexes to be used
- Keyspace keyspace = Keyspace.open(KEYSPACE);
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1");
final int ROWS_PER_SSTABLE = 10;
@@ -89,7 +103,7 @@ public class BlacklistingCompactionsTest extends SchemaLoader
for (int i = 0; i < ROWS_PER_SSTABLE; i++)
{
DecoratedKey key = Util.dk(String.valueOf(i % 2));
- Mutation rm = new Mutation(KEYSPACE, key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
long timestamp = j * ROWS_PER_SSTABLE + i;
rm.add("Standard1", cellname(i / 2), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp);
maxTimestampExpected = Math.max(timestamp, maxTimestampExpected);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
index 80608f5..e8656c4 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
@@ -22,8 +22,14 @@ import java.util.Collection;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import org.apache.cassandra.cache.CachingOptions;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -45,10 +51,43 @@ import static org.apache.cassandra.Util.cellname;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class CompactionsPurgeTest extends SchemaLoader
+public class CompactionsPurgeTest
{
- public static final String KEYSPACE1 = "Keyspace1";
- public static final String KEYSPACE2 = "Keyspace2";
+ private static final String KEYSPACE1 = "CompactionsPurgeTest1";
+ private static final String CF_STANDARD1 = "Standard1";
+ private static final String CF_STANDARD2 = "Standard2";
+ private static final String KEYSPACE2 = "CompactionsPurgeTest2";
+ private static final String KEYSPACE_CACHED = "CompactionsPurgeTestCached";
+ private static final String CF_CACHED = "CachedCF";
+ private static final String KEYSPACE_CQL = "cql_keyspace";
+ private static final String CF_CQL = "table1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2));
+ SchemaLoader.createKeyspace(KEYSPACE2,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE2, CF_STANDARD1));
+ SchemaLoader.createKeyspace(KEYSPACE_CACHED,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL));
+ SchemaLoader.createKeyspace(KEYSPACE_CQL,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ CFMetaData.compile("CREATE TABLE " + CF_CQL + " ("
+ + "k int PRIMARY KEY,"
+ + "v1 text,"
+ + "v2 int"
+ + ")", KEYSPACE_CQL));
+ }
@Test
public void testMajorCompactionPurge() throws ExecutionException, InterruptedException
@@ -235,8 +274,8 @@ public class CompactionsPurgeTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
- String keyspaceName = "RowCacheSpace";
- String cfName = "CachedCF";
+ String keyspaceName = KEYSPACE_CACHED;
+ String cfName = CF_CACHED;
Keyspace keyspace = Keyspace.open(keyspaceName);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName);
@@ -283,7 +322,7 @@ public class CompactionsPurgeTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
- String keyspaceName = "Keyspace1";
+ String keyspaceName = KEYSPACE1;
String cfName = "Standard1";
Keyspace keyspace = Keyspace.open(keyspaceName);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/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 58473b4..808a87e 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@ -21,37 +21,37 @@ package org.apache.cassandra.db.compaction;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.LongType;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.exceptions.ConfigurationException;
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.sstable.SSTableWriter;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,15 +63,39 @@ import com.google.common.collect.Sets;
import static org.junit.Assert.*;
@RunWith(OrderedJUnit4ClassRunner.class)
-public class CompactionsTest extends SchemaLoader
+public class CompactionsTest
{
- private static final String STANDARD1 = "Standard1";
- public static final String KEYSPACE1 = "Keyspace1";
+ private static final String KEYSPACE1 = "Keyspace1";
+ private static final String CF_STANDARD1 = "CF_STANDARD1";
+ private static final String CF_STANDARD2 = "Standard2";
+ private static final String CF_STANDARD3 = "Standard3";
+ private static final String CF_STANDARD4 = "Standard4";
+ private static final String CF_SUPER1 = "Super1";
+ private static final String CF_SUPER5 = "Super5";
+ private static final String CF_SUPERGC = "SuperDirectGC";
+
+ @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_STANDARD1).compactionStrategyOptions(compactionOptions),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD3),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD4),
+ SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER1, LongType.instance),
+ SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER5, BytesType.instance),
+ SchemaLoader.superCFMD(KEYSPACE1, CF_SUPERGC, BytesType.instance).gcGraceSeconds(0));
+ }
public ColumnFamilyStore testSingleSSTableCompaction(String strategyClassName) throws Exception
{
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(STANDARD1);
+ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARD1);
store.clearUnsafe();
store.metadata.gcGraceSeconds(1);
store.setCompactionStrategyClass(strategyClassName);
@@ -79,7 +103,7 @@ public class CompactionsTest extends SchemaLoader
// disable compaction while flushing
store.disableAutoCompaction();
- long timestamp = populate(KEYSPACE1, STANDARD1, 0, 9, 3); //ttl=3s
+ long timestamp = populate(KEYSPACE1, CF_STANDARD1, 0, 9, 3); //ttl=3s
store.forceBlockingFlush();
assertEquals(1, store.getSSTables().size());
@@ -180,7 +204,7 @@ public class CompactionsTest extends SchemaLoader
public void testUncheckedTombstoneSizeTieredCompaction() throws Exception
{
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(STANDARD1);
+ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARD1);
store.clearUnsafe();
store.metadata.gcGraceSeconds(1);
store.metadata.compactionStrategyOptions.put("tombstone_compaction_interval", "1");
@@ -192,11 +216,11 @@ public class CompactionsTest extends SchemaLoader
store.disableAutoCompaction();
//Populate sstable1 with with keys [0..9]
- populate(KEYSPACE1, STANDARD1, 0, 9, 3); //ttl=3s
+ populate(KEYSPACE1, CF_STANDARD1, 0, 9, 3); //ttl=3s
store.forceBlockingFlush();
//Populate sstable2 with with keys [10..19] (keys do not overlap with SSTable1)
- long timestamp2 = populate(KEYSPACE1, STANDARD1, 10, 19, 3); //ttl=3s
+ long timestamp2 = populate(KEYSPACE1, CF_STANDARD1, 10, 19, 3); //ttl=3s
store.forceBlockingFlush();
assertEquals(2, store.getSSTables().size());
@@ -456,7 +480,7 @@ public class CompactionsTest extends SchemaLoader
String cf = "Standard4";
ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(cf);
- insertData(KEYSPACE1, cf, 0, 1);
+ SchemaLoader.insertData(KEYSPACE1, cf, 0, 1);
cfs.forceBlockingFlush();
Collection<SSTableReader> sstables = cfs.getSSTables();
@@ -545,7 +569,7 @@ public class CompactionsTest extends SchemaLoader
long timestamp = System.currentTimeMillis();
DecoratedKey decoratedKey = Util.dk(String.format("%03d", key));
Mutation rm = new Mutation(KEYSPACE1, decoratedKey.getKey());
- rm.add("Standard1", Util.cellname("col"), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp, 1000);
+ rm.add("CF_STANDARD1", Util.cellname("col"), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp, 1000);
rm.apply();
}
@@ -554,7 +578,7 @@ public class CompactionsTest extends SchemaLoader
public void testNeedsCleanup()
{
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
+ ColumnFamilyStore store = keyspace.getColumnFamilyStore("CF_STANDARD1");
store.clearUnsafe();
// disable compaction while flushing
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index defb087..71bf6e5 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -18,23 +18,24 @@
package org.apache.cassandra.db.compaction;
import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.repair.RepairJobDesc;
import org.apache.cassandra.repair.Validator;
import org.apache.cassandra.service.ActiveRepairService;
@@ -45,16 +46,32 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@RunWith(OrderedJUnit4ClassRunner.class)
-public class LeveledCompactionStrategyTest extends SchemaLoader
+public class LeveledCompactionStrategyTest
{
- private String ksname = "Keyspace1";
- private String cfname = "StandardLeveled";
- private Keyspace keyspace = Keyspace.open(ksname);
- private ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
+ private static final String KEYSPACE1 = "LeveledCompactionStrategyTest";
+ private static final String CF_STANDARDDLEVELED = "StandardLeveled";
+ private Keyspace keyspace;
+ private ColumnFamilyStore cfs;
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ Map<String, String> leveledOptions = new HashMap<>();
+ leveledOptions.put("sstable_size_in_mb", "1");
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDDLEVELED)
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions));
+ }
@Before
public void enableCompaction()
{
+ keyspace = Keyspace.open(KEYSPACE1);
+ cfs = keyspace.getColumnFamilyStore(CF_STANDARDDLEVELED);
cfs.enableAutoCompaction();
}
@@ -83,10 +100,10 @@ public class LeveledCompactionStrategyTest extends SchemaLoader
for (int r = 0; r < rows; r++)
{
DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(ksname, key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < columns; c++)
{
- rm.add(cfname, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDDLEVELED, Util.cellname("column" + c), value, 0);
}
rm.apply();
cfs.forceBlockingFlush();
@@ -99,10 +116,10 @@ public class LeveledCompactionStrategyTest extends SchemaLoader
assert strategy.getLevelSize(2) > 0;
Range<Token> range = new Range<>(Util.token(""), Util.token(""));
- int gcBefore = keyspace.getColumnFamilyStore(cfname).gcBefore(System.currentTimeMillis());
+ int gcBefore = keyspace.getColumnFamilyStore(CF_STANDARDDLEVELED).gcBefore(System.currentTimeMillis());
UUID parentRepSession = UUID.randomUUID();
ActiveRepairService.instance.registerParentRepairSession(parentRepSession, Arrays.asList(cfs), Arrays.asList(range));
- RepairJobDesc desc = new RepairJobDesc(parentRepSession, UUID.randomUUID(), ksname, cfname, range);
+ RepairJobDesc desc = new RepairJobDesc(parentRepSession, UUID.randomUUID(), KEYSPACE1, CF_STANDARDDLEVELED, range);
Validator validator = new Validator(desc, FBUtilities.getBroadcastAddress(), gcBefore);
CompactionManager.instance.submitValidation(cfs, validator).get();
}
@@ -128,10 +145,10 @@ public class LeveledCompactionStrategyTest extends SchemaLoader
for (int r = 0; r < rows; r++)
{
DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(ksname, key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < columns; c++)
{
- rm.add(cfname, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDDLEVELED, Util.cellname("column" + c), value, 0);
}
rm.apply();
cfs.forceBlockingFlush();
@@ -167,10 +184,10 @@ public class LeveledCompactionStrategyTest extends SchemaLoader
for (int r = 0; r < rows; r++)
{
DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(ksname, key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < columns; c++)
{
- rm.add(cfname, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDDLEVELED, Util.cellname("column" + c), value, 0);
}
rm.apply();
cfs.forceBlockingFlush();
@@ -213,10 +230,10 @@ public class LeveledCompactionStrategyTest extends SchemaLoader
for (int r = 0; r < rows; r++)
{
DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(ksname, key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < columns; c++)
{
- rm.add(cfname, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDDLEVELED, Util.cellname("column" + c), value, 0);
}
rm.apply();
cfs.forceBlockingFlush();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
index bc3fe35..375dfe8 100644
--- a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
@@ -18,12 +18,15 @@
*/
package org.apache.cassandra.db.compaction;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.Set;
import java.util.HashSet;
import org.apache.cassandra.Util;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -31,22 +34,42 @@ import static org.junit.Assert.assertEquals;
import org.apache.cassandra.db.*;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class OneCompactionTest extends SchemaLoader
+public class OneCompactionTest
{
+ public static final String KEYSPACE1 = "OneCompactionTest";
+ private static final String CF_STANDARD1 = "Standard1";
+ private static final String CF_STANDARD2 = "Standard2";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ Map<String, String> leveledOptions = new HashMap<>();
+ leveledOptions.put("sstable_size_in_mb", "1");
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1).compactionStrategyOptions(leveledOptions),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2));
+ }
+
private void testCompaction(String columnFamilyName, int insertsPerTable) throws ExecutionException, InterruptedException
{
CompactionManager.instance.disableAutoCompaction();
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore(columnFamilyName);
Set<DecoratedKey> inserted = new HashSet<DecoratedKey>();
for (int j = 0; j < insertsPerTable; j++) {
DecoratedKey key = Util.dk(String.valueOf(j));
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
rm.add(columnFamilyName, Util.cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
rm.apply();
inserted.add(key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
index 6132dad..ef886e7 100644
--- a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
@@ -20,13 +20,16 @@ package org.apache.cassandra.db.compaction;
import java.nio.ByteBuffer;
import java.util.*;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.metrics.RestorableMeter;
import org.apache.cassandra.utils.Pair;
@@ -38,8 +41,23 @@ import static org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy.va
import static org.junit.Assert.*;
-public class SizeTieredCompactionStrategyTest extends SchemaLoader
+public class SizeTieredCompactionStrategyTest
{
+ public static final String KEYSPACE1 = "SizeTieredCompactionStrategyTest";
+ private static final String CF_STANDARD1 = "Standard1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ Map<String, String> leveledOptions = new HashMap<>();
+ leveledOptions.put("sstable_size_in_mb", "1");
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1)
+ .compactionStrategyOptions(leveledOptions));
+ }
@Test
public void testOptionsValidation() throws ConfigurationException
@@ -146,7 +164,7 @@ public class SizeTieredCompactionStrategyTest extends SchemaLoader
@Test
public void testPrepBucket() throws Exception
{
- String ksname = "Keyspace1";
+ String ksname = KEYSPACE1;
String cfname = "Standard1";
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
@@ -190,7 +208,7 @@ public class SizeTieredCompactionStrategyTest extends SchemaLoader
@Test
public void testFilterColdSSTables() throws Exception
{
- String ksname = "Keyspace1";
+ String ksname = KEYSPACE1;
String cfname = "Standard1";
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index b98af68..3a2bc4a 100644
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@ -20,31 +20,48 @@ package org.apache.cassandra.db.compaction;
*
*/
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(OrderedJUnit4ClassRunner.class)
-public class TTLExpiryTest extends SchemaLoader
+public class TTLExpiryTest
{
+ public static final String KEYSPACE1 = "TTLExpiryTest";
+ private static final String CF_STANDARD1 = "Standard1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1));
+ }
+
@Test
public void testSimpleExpire() throws InterruptedException
{
- ColumnFamilyStore cfs = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1");
+ ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore("Standard1");
cfs.disableAutoCompaction();
cfs.metadata.gcGraceSeconds(0);
long timestamp = System.currentTimeMillis();
- Mutation rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ Mutation rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
@@ -57,21 +74,21 @@ public class TTLExpiryTest extends SchemaLoader
rm.apply();
cfs.forceBlockingFlush();
- rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col2"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
1);
rm.apply();
cfs.forceBlockingFlush();
- rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col3"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
1);
rm.apply();
cfs.forceBlockingFlush();
- rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col311"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
@@ -88,11 +105,11 @@ public class TTLExpiryTest extends SchemaLoader
@Test
public void testNoExpire() throws InterruptedException
{
- ColumnFamilyStore cfs = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1");
+ ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore("Standard1");
cfs.disableAutoCompaction();
cfs.metadata.gcGraceSeconds(0);
long timestamp = System.currentTimeMillis();
- Mutation rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ Mutation rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
@@ -105,14 +122,14 @@ public class TTLExpiryTest extends SchemaLoader
rm.apply();
cfs.forceBlockingFlush();
- rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col2"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
1);
rm.apply();
cfs.forceBlockingFlush();
- rm = new Mutation("Keyspace1", Util.dk("ttl").getKey());
+ rm = new Mutation(KEYSPACE1, Util.dk("ttl").getKey());
rm.add("Standard1", Util.cellname("col3"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
@@ -120,7 +137,7 @@ public class TTLExpiryTest extends SchemaLoader
rm.apply();
cfs.forceBlockingFlush();
DecoratedKey noTTLKey = Util.dk("nottl");
- rm = new Mutation("Keyspace1", noTTLKey.getKey());
+ rm = new Mutation(KEYSPACE1, noTTLKey.getKey());
rm.add("Standard1", Util.cellname("col311"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index 158dd2c..e312182 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -23,11 +23,13 @@ import java.util.Arrays;
import java.util.Set;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.Cell;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.ColumnFamilyStore;
@@ -36,12 +38,13 @@ import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.composites.CellName;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.concurrent.OpOrder;
import static org.junit.Assert.*;
-public class PerRowSecondaryIndexTest extends SchemaLoader
+public class PerRowSecondaryIndexTest
{
// test that when index(key) is called on a PRSI index,
@@ -50,6 +53,19 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
// indexed & stashes it in a static variable for inspection
// in the test.
+ private static final String KEYSPACE1 = "PerRowSecondaryIndexTest";
+ private static final String CF_INDEXED = "Indexed1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.perRowIndexedCFMD(KEYSPACE1, CF_INDEXED));
+ }
+
@Before
public void clearTestStub()
{
@@ -61,7 +77,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
{
// create a row then test that the configured index instance was able to read the row
Mutation rm;
- rm = new Mutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k1"));
+ rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("k1"));
rm.add("Indexed1", Util.cellname("indexed"), ByteBufferUtil.bytes("foo"), 1);
rm.apply();
@@ -70,7 +86,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
assertEquals(ByteBufferUtil.bytes("foo"), indexedRow.getColumn(Util.cellname("indexed")).value());
// update the row and verify what was indexed
- rm = new Mutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k1"));
+ rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("k1"));
rm.add("Indexed1", Util.cellname("indexed"), ByteBufferUtil.bytes("bar"), 2);
rm.apply();
@@ -85,7 +101,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
{
// issue a column delete and test that the configured index instance was notified to update
Mutation rm;
- rm = new Mutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k2"));
+ rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("k2"));
rm.delete("Indexed1", Util.cellname("indexed"), 1);
rm.apply();
@@ -103,7 +119,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
{
// issue a row level delete and test that the configured index instance was notified to update
Mutation rm;
- rm = new Mutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k3"));
+ rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("k3"));
rm.delete("Indexed1", 1);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
index f606780..35be43d 100644
--- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
@@ -19,28 +19,30 @@
package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
-import org.apache.cassandra.serializers.MarshalException;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.composites.CellNames;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.locator.SimpleStrategy;
+import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.*;
-public class CompositeTypeTest extends SchemaLoader
+public class CompositeTypeTest
{
- private static final String cfName = "StandardComposite";
+ private static final String KEYSPACE1 = "CompositeTypeTest";
+ private static final String CF_STANDARDCOMPOSITE = "StandardComposite";
private static final CompositeType comparator;
static
{
@@ -59,6 +61,17 @@ public class CompositeTypeTest extends SchemaLoader
uuids[i] = UUIDGen.getTimeUUID();
}
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ AbstractType<?> composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance}));
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDCOMPOSITE, composite));
+ }
+
@Test
public void testEndOfComponent()
{
@@ -164,8 +177,8 @@ public class CompositeTypeTest extends SchemaLoader
@Test
public void testFullRound() throws Exception
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
- ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName);
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARDCOMPOSITE);
ByteBuffer cname1 = createCompositeKey("test1", null, -1, false);
ByteBuffer cname2 = createCompositeKey("test1", uuids[0], 24, false);
@@ -174,7 +187,7 @@ public class CompositeTypeTest extends SchemaLoader
ByteBuffer cname5 = createCompositeKey("test2", uuids[1], 42, false);
ByteBuffer key = ByteBufferUtil.bytes("k");
- Mutation rm = new Mutation("Keyspace1", key);
+ Mutation rm = new Mutation(KEYSPACE1, key);
addColumn(rm, cname5);
addColumn(rm, cname1);
addColumn(rm, cname4);
@@ -182,7 +195,7 @@ public class CompositeTypeTest extends SchemaLoader
addColumn(rm, cname3);
rm.apply();
- ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("k"), cfName, System.currentTimeMillis()));
+ ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("k"), CF_STANDARDCOMPOSITE, System.currentTimeMillis()));
Iterator<Cell> iter = cf.getSortedColumns().iterator();
@@ -258,7 +271,7 @@ public class CompositeTypeTest extends SchemaLoader
private void addColumn(Mutation rm, ByteBuffer cname)
{
- rm.add(cfName, CellNames.simpleDense(cname), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(CF_STANDARDCOMPOSITE, CellNames.simpleDense(cname), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
private ByteBuffer createCompositeKey(String s, UUID uuid, int i, boolean lastIsOne)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index 26d2e62..fa10dbb 100644
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@ -24,25 +24,31 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.cassandra.serializers.MarshalException;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.fail;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
+import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.*;
-public class DynamicCompositeTypeTest extends SchemaLoader
+public class DynamicCompositeTypeTest
{
- private static final String cfName = "StandardDynamicComposite";
+ private static final String KEYSPACE1 = "DynamicCompositeType";
+ private static final String CF_STANDARDDYNCOMPOSITE = "StandardDynamicComposite";
+ private static Map<Byte, AbstractType<?>> aliases = new HashMap<>();
private static final DynamicCompositeType comparator;
static
{
- Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
aliases.put((byte)'b', BytesType.instance);
aliases.put((byte)'t', TimeUUIDType.instance);
comparator = DynamicCompositeType.getInstance(aliases);
@@ -56,6 +62,17 @@ public class DynamicCompositeTypeTest extends SchemaLoader
uuids[i] = UUIDGen.getTimeUUID();
}
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases);
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDDYNCOMPOSITE, dynamicComposite));
+ }
+
@Test
public void testEndOfComponent()
{
@@ -163,8 +180,8 @@ public class DynamicCompositeTypeTest extends SchemaLoader
@Test
public void testFullRound() throws Exception
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
- ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName);
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARDDYNCOMPOSITE);
ByteBuffer cname1 = createDynamicCompositeKey("test1", null, -1, false);
ByteBuffer cname2 = createDynamicCompositeKey("test1", uuids[0], 24, false);
@@ -173,7 +190,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
ByteBuffer cname5 = createDynamicCompositeKey("test2", uuids[1], 42, false);
ByteBuffer key = ByteBufferUtil.bytes("k");
- Mutation rm = new Mutation("Keyspace1", key);
+ Mutation rm = new Mutation(KEYSPACE1, key);
addColumn(rm, cname5);
addColumn(rm, cname1);
addColumn(rm, cname4);
@@ -181,7 +198,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
addColumn(rm, cname3);
rm.apply();
- ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("k"), cfName, System.currentTimeMillis()));
+ ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("k"), CF_STANDARDDYNCOMPOSITE, System.currentTimeMillis()));
Iterator<Cell> iter = cf.getSortedColumns().iterator();
@@ -232,7 +249,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
private void addColumn(Mutation rm, ByteBuffer cname)
{
- rm.add(cfName, CellNames.simpleDense(cname), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(CF_STANDARDDYNCOMPOSITE, CellNames.simpleDense(cname), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
private ByteBuffer createDynamicCompositeKey(String s, UUID uuid, int i, boolean lastIsOne)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
index ffad335..b95572f 100644
--- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
+++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.Map;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,6 +33,7 @@ import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.gms.IFailureDetectionEventListener;
import org.apache.cassandra.gms.IFailureDetector;
import org.apache.cassandra.locator.TokenMetadata;
@@ -40,8 +42,16 @@ import org.apache.cassandra.service.StorageService;
import static org.junit.Assert.*;
@RunWith(OrderedJUnit4ClassRunner.class)
-public class BootStrapperTest extends SchemaLoader
+public class BootStrapperTest
{
+ @BeforeClass
+ public static void setup() throws ConfigurationException
+ {
+ SchemaLoader.startGossiper();
+ SchemaLoader.prepareServer();
+ SchemaLoader.schemaDefinition("BootStrapperTest");
+ }
+
@Test
public void testSourceTargetComputation() throws UnknownHostException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java b/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java
index 4943a3a..afcf2a5 100644
--- a/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java
+++ b/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java
@@ -23,12 +23,11 @@ package org.apache.cassandra.io;
import org.junit.Test;
-import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.io.sstable.BloomFilterTracker;
import static org.junit.Assert.assertEquals;
-public class BloomFilterTrackerTest extends SchemaLoader
+public class BloomFilterTrackerTest
{
@Test
public void testAddingFalsePositives()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
index 5281449..83c9daa 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
@@ -33,8 +34,12 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.cache.CachingOptions;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.metrics.RestorableMeter;
import static org.apache.cassandra.io.sstable.Downsampling.BASE_SAMPLING_LEVEL;
@@ -46,7 +51,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class IndexSummaryManagerTest extends SchemaLoader
+public class IndexSummaryManagerTest
{
private static final Logger logger = LoggerFactory.getLogger(IndexSummaryManagerTest.class);
@@ -54,11 +59,28 @@ public class IndexSummaryManagerTest extends SchemaLoader
int originalMaxIndexInterval;
long originalCapacity;
+ private static final String KEYSPACE1 = "IndexSummaryManagerTest";
+ // index interval of 8, no key caching
+ private static final String CF_STANDARDLOWiINTERVAL = "StandardLowIndexInterval";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLOWiINTERVAL)
+ .minIndexInterval(8)
+ .maxIndexInterval(256)
+ .caching(CachingOptions.NONE));
+ }
+
@Before
public void beforeTest()
{
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval"; // index interval of 8, no key caching
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
originalMinIndexInterval = cfs.metadata.getMinIndexInterval();
@@ -69,8 +91,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
@After
public void afterTest()
{
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval"; // index interval of 8, no key caching
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
cfs.metadata.minIndexInterval(originalMinIndexInterval);
@@ -162,8 +184,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
@Test
public void testChangeMinIndexInterval() throws IOException
{
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval"; // index interval of 8, no key caching
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
int numSSTables = 1;
@@ -234,8 +256,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
@Test
public void testChangeMaxIndexInterval() throws IOException
{
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval"; // index interval of 8, no key caching
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
int numSSTables = 1;
@@ -274,8 +296,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
@Test(timeout = 10000)
public void testRedistributeSummaries() throws IOException
{
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval"; // index interval of 8, no key caching
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
int numSSTables = 4;
@@ -395,8 +417,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
@Test
public void testRebuildAtSamplingLevel() throws IOException
{
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval";
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL;
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
cfs.truncateBlocking();
@@ -452,8 +474,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
manager.setMemoryPoolCapacityInMB(10);
assertEquals(10, manager.getMemoryPoolCapacityInMB());
- String ksname = "Keyspace1";
- String cfname = "StandardLowIndexInterval"; // index interval of 8, no key caching
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching
Keyspace keyspace = Keyspace.open(ksname);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
cfs.truncateBlocking();
@@ -478,7 +500,7 @@ public class IndexSummaryManagerTest extends SchemaLoader
assertTrue(manager.getAverageIndexInterval() >= cfs.metadata.getMinIndexInterval());
Map<String, Integer> intervals = manager.getIndexIntervals();
for (Map.Entry<String, Integer> entry : intervals.entrySet())
- if (entry.getKey().contains("StandardLowIndexInterval"))
+ if (entry.getKey().contains(CF_STANDARDLOWiINTERVAL))
assertEquals(cfs.metadata.getMinIndexInterval(), entry.getValue(), 0.001);
manager.setMemoryPoolCapacityInMB(0);
@@ -487,7 +509,7 @@ public class IndexSummaryManagerTest extends SchemaLoader
intervals = manager.getIndexIntervals();
for (Map.Entry<String, Integer> entry : intervals.entrySet())
{
- if (entry.getKey().contains("StandardLowIndexInterval"))
+ if (entry.getKey().contains(CF_STANDARDLOWiINTERVAL))
assertTrue(entry.getValue() >= cfs.metadata.getMinIndexInterval());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index 2dc07ec..0a7f2c4 100644
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@ -31,6 +31,7 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
@@ -41,6 +42,8 @@ import org.apache.cassandra.db.composites.CellNameType;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.streaming.StreamPlan;
import org.apache.cassandra.streaming.StreamSession;
@@ -50,16 +53,26 @@ import org.apache.cassandra.utils.FBUtilities;
/**
* Tests backwards compatibility for SSTables
*/
-public class LegacySSTableTest extends SchemaLoader
+public class LegacySSTableTest
{
public static final String LEGACY_SSTABLE_PROP = "legacy-sstable-root";
- public static final String KSNAME = "Keyspace1";
+ public static final String KSNAME = "LegacySSTableTest";
public static final String CFNAME = "Standard1";
public static Set<String> TEST_DATA;
public static File LEGACY_SSTABLE_ROOT;
@BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KSNAME,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KSNAME, CFNAME));
+ beforeClass();
+ }
+
public static void beforeClass()
{
Keyspace.setInitialized();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
index 39beb94..815fc68 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
@@ -27,12 +27,14 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.Row;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
@@ -40,12 +42,24 @@ import org.apache.cassandra.utils.OutputHandler;
import static org.junit.Assert.assertEquals;
-public class SSTableLoaderTest extends SchemaLoader
+public class SSTableLoaderTest
{
+ public static final String KEYSPACE1 = "SSTableLoaderTest";
+ public static final String CF_STANDARD = "Standard1";
+
@BeforeClass
+ public static void defineSchema() throws Exception
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD));
+ setup();
+ }
+
public static void setup() throws Exception
{
- Keyspace.setInitialized();
StorageService.instance.initServer();
}
@@ -53,9 +67,9 @@ public class SSTableLoaderTest extends SchemaLoader
public void testLoadingSSTable() throws Exception
{
File tempdir = Files.createTempDir();
- File dataDir = new File(tempdir.getAbsolutePath() + File.separator + "Keyspace1" + File.separator + "Standard1");
+ File dataDir = new File(tempdir.getAbsolutePath() + File.separator + KEYSPACE1 + File.separator + CF_STANDARD);
assert dataDir.mkdirs();
- CFMetaData cfmeta = Schema.instance.getCFMetaData("Keyspace1", "Standard1");
+ CFMetaData cfmeta = Schema.instance.getCFMetaData(KEYSPACE1, CF_STANDARD);
SSTableSimpleUnsortedWriter writer = new SSTableSimpleUnsortedWriter(dataDir,
cfmeta,
StorageService.getPartitioner(),
@@ -69,7 +83,7 @@ public class SSTableLoaderTest extends SchemaLoader
{
public void init(String keyspace)
{
- for (Range<Token> range : StorageService.instance.getLocalRanges("Keyspace1"))
+ for (Range<Token> range : StorageService.instance.getLocalRanges(KEYSPACE1))
addRangeForEndpoint(range, FBUtilities.getBroadcastAddress());
setPartitioner(StorageService.getPartitioner());
}
@@ -82,7 +96,7 @@ public class SSTableLoaderTest extends SchemaLoader
loader.stream().get();
- List<Row> rows = Util.getRangeSlice(Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1"));
+ List<Row> rows = Util.getRangeSlice(Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD));
assertEquals(1, rows.size());
assertEquals(key, rows.get(0).key);
assertEquals(ByteBufferUtil.bytes(100), rows.get(0).cf.getColumn(Util.cellname("col1")).value());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
index 72307c5..19d984a 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
@@ -23,15 +23,22 @@ package org.apache.cassandra.io.sstable;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
+
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.context.CounterContext;
+import org.apache.cassandra.db.marshal.*;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CounterId;
@@ -41,18 +48,40 @@ import static org.junit.Assert.assertTrue;
import static org.apache.cassandra.Util.cellname;
-public class SSTableMetadataTest extends SchemaLoader
+public class SSTableMetadataTest
{
+ public static final String KEYSPACE1 = "SSTableMetadataTest";
+ public static final String CF_STANDARD = "Standard1";
+ public static final String CF_STANDARD2 = "Standard2";
+ public static final String CF_STANDARD3 = "Standard3";
+ public static final String CF_STANDARDCOMPOSITE2 = "StandardComposite2";
+ public static final String CF_COUNTER1 = "Counter1";
+
+ @BeforeClass
+ public static void defineSchema() throws Exception
+ {
+ AbstractType<?> compositeMaxMin = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, IntegerType.instance}));
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD3),
+ CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDCOMPOSITE2, compositeMaxMin),
+ CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER1, BytesType.instance).defaultValidator(CounterColumnType.instance));
+ }
+
@Test
public void testTrackMaxDeletionTime()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
long timestamp = System.currentTimeMillis();
for(int i = 0; i < 10; i++)
{
DecoratedKey key = Util.dk(Integer.toString(i));
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int j = 0; j < 10; j++)
rm.add("Standard1", cellname(Integer.toString(j)),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
@@ -60,7 +89,7 @@ public class SSTableMetadataTest extends SchemaLoader
10 + j);
rm.apply();
}
- Mutation rm = new Mutation("Keyspace1", Util.dk("longttl").getKey());
+ Mutation rm = new Mutation(KEYSPACE1, Util.dk("longttl").getKey());
rm.add("Standard1", cellname("col"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
@@ -76,7 +105,7 @@ public class SSTableMetadataTest extends SchemaLoader
assertEquals(ttltimestamp + 10000, firstDelTime, 10);
}
- rm = new Mutation("Keyspace1", Util.dk("longttl2").getKey());
+ rm = new Mutation(KEYSPACE1, Util.dk("longttl2").getKey());
rm.add("Standard1", cellname("col"),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
timestamp,
@@ -119,11 +148,11 @@ public class SSTableMetadataTest extends SchemaLoader
@Test
public void testWithDeletes() throws ExecutionException, InterruptedException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard2");
long timestamp = System.currentTimeMillis();
DecoratedKey key = Util.dk("deletetest");
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int i = 0; i<5; i++)
rm.add("Standard2", cellname("deletecolumn" + i),
ByteBufferUtil.EMPTY_BYTE_BUFFER,
@@ -143,7 +172,7 @@ public class SSTableMetadataTest extends SchemaLoader
firstMaxDelTime = sstable.getSSTableMetadata().maxLocalDeletionTime;
assertEquals(ttltimestamp + 1000, firstMaxDelTime, 10);
}
- rm = new Mutation("Keyspace1", key.getKey());
+ rm = new Mutation(KEYSPACE1, key.getKey());
rm.delete("Standard2", cellname("todelete"), timestamp + 1);
rm.apply();
store.forceBlockingFlush();
@@ -169,13 +198,13 @@ public class SSTableMetadataTest extends SchemaLoader
@Test
public void trackMaxMinColNames() throws CharacterCodingException, ExecutionException, InterruptedException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard3");
store.getCompactionStrategy();
for (int j = 0; j < 8; j++)
{
DecoratedKey key = Util.dk("row"+j);
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int i = 100; i<150; i++)
{
rm.add("Standard3", cellname(j + "col" + i), ByteBufferUtil.EMPTY_BYTE_BUFFER, System.currentTimeMillis());
@@ -190,7 +219,7 @@ public class SSTableMetadataTest extends SchemaLoader
assertEquals(ByteBufferUtil.string(sstable.getSSTableMetadata().maxColumnNames.get(0)), "7col149");
}
DecoratedKey key = Util.dk("row2");
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int i = 101; i<299; i++)
{
rm.add("Standard3", cellname(9 + "col" + i), ByteBufferUtil.EMPTY_BYTE_BUFFER, System.currentTimeMillis());
@@ -221,7 +250,7 @@ public class SSTableMetadataTest extends SchemaLoader
---------------------
meaning max columns are b9 and 9, min is a0 and 0
*/
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardComposite2");
@@ -230,7 +259,7 @@ public class SSTableMetadataTest extends SchemaLoader
ByteBuffer key = ByteBufferUtil.bytes("k");
for (int i = 0; i < 10; i++)
{
- Mutation rm = new Mutation("Keyspace1", key);
+ Mutation rm = new Mutation(KEYSPACE1, key);
CellName colName = type.makeCellName(ByteBufferUtil.bytes("a"+(9-i)), ByteBufferUtil.bytes(i));
rm.add("StandardComposite2", colName, ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
rm.apply();
@@ -240,7 +269,7 @@ public class SSTableMetadataTest extends SchemaLoader
key = ByteBufferUtil.bytes("k2");
for (int i = 0; i < 10; i++)
{
- Mutation rm = new Mutation("Keyspace1", key);
+ Mutation rm = new Mutation(KEYSPACE1, key);
CellName colName = type.makeCellName(ByteBufferUtil.bytes("b"+(9-i)), ByteBufferUtil.bytes(i));
rm.add("StandardComposite2", colName, ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
rm.apply();
@@ -260,7 +289,7 @@ public class SSTableMetadataTest extends SchemaLoader
@Test
public void testLegacyCounterShardTracking()
{
- ColumnFamilyStore cfs = Keyspace.open("Keyspace1").getColumnFamilyStore("Counter1");
+ ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore("Counter1");
// A cell with all shards
CounterContext.ContextState state = CounterContext.ContextState.allocate(1, 1, 1);