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:48 UTC
[4/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/KeyspaceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyspaceTest.java b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
index 12e6d9f..a71b0dd 100644
--- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
@@ -27,14 +27,23 @@ import java.io.IOException;
import com.google.common.collect.Iterables;
import org.apache.commons.lang3.StringUtils;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.CompositeType;
+import org.apache.cassandra.db.marshal.IntegerType;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.WrappedRunnable;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.Util.expiringColumn;
@@ -44,11 +53,38 @@ import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class KeyspaceTest extends SchemaLoader
+public class KeyspaceTest
{
private static final DecoratedKey TEST_KEY = Util.dk("key1");
private static final DecoratedKey TEST_SLICE_KEY = Util.dk("key1-slicerange");
+ private static final String KEYSPACE1 = "Keyspace1";
+ private static final String CF_STANDARD1 = "Standard1";
+ private static final String CF_STANDARD2 = "Standard2";
+ private static final String CF_STANDARDLONG = "StandardLong1";
+ private static final String CF_STANDARDCOMPOSITE2 = "StandardComposite2";
+
+ private static final String KEYSPACE2 = "Keyspace2";
+ private static final String CF_STANDARD3 = "Standard3";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ AbstractType<?> compositeMaxMin = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, IntegerType.instance}));
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLONG),
+ CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDCOMPOSITE2, compositeMaxMin));
+ SchemaLoader.createKeyspace(KEYSPACE2,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE2, CF_STANDARD3));
+ }
+
public static void reTest(ColumnFamilyStore cfs, Runnable verify) throws Exception
{
verify.run();
@@ -59,12 +95,12 @@ public class KeyspaceTest extends SchemaLoader
@Test
public void testGetRowNoColumns() throws Throwable
{
- final Keyspace keyspace = Keyspace.open("Keyspace2");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE2);
final ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard3");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace2", "Standard3");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE2, "Standard3");
cf.addColumn(column("col1","val1", 1L));
- Mutation rm = new Mutation("Keyspace2", TEST_KEY.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE2, TEST_KEY.getKey(), cf);
rm.apply();
Runnable verify = new WrappedRunnable()
@@ -89,14 +125,14 @@ public class KeyspaceTest extends SchemaLoader
@Test
public void testGetRowSingleColumn() throws Throwable
{
- final Keyspace keyspace = Keyspace.open("Keyspace1");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1","val1", 1L));
cf.addColumn(column("col2","val2", 1L));
cf.addColumn(column("col3","val3", 1L));
- Mutation rm = new Mutation("Keyspace1", TEST_KEY.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, TEST_KEY.getKey(), cf);
rm.apply();
Runnable verify = new WrappedRunnable()
@@ -118,15 +154,15 @@ public class KeyspaceTest extends SchemaLoader
@Test
public void testGetRowSliceByRange() throws Throwable
{
- DecoratedKey key = TEST_SLICE_KEY;
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ DecoratedKey key = TEST_SLICE_KEY;
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
// First write "a", "b", "c"
cf.addColumn(column("a", "val1", 1L));
cf.addColumn(column("b", "val2", 1L));
cf.addColumn(column("c", "val3", 1L));
- Mutation rm = new Mutation("Keyspace1", key.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey(), cf);
rm.apply();
cf = cfStore.getColumnFamily(key, cellname("b"), cellname("c"), false, 100, System.currentTimeMillis());
@@ -142,10 +178,10 @@ public class KeyspaceTest extends SchemaLoader
@Test
public void testGetSliceNoMatch() throws Throwable
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard2");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard2");
cf.addColumn(column("col1", "val1", 1));
- Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes("row1000"), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("row1000"), cf);
rm.apply();
validateGetSliceNoMatch(keyspace);
@@ -162,17 +198,17 @@ public class KeyspaceTest extends SchemaLoader
public void testGetSliceWithCutoff() throws Throwable
{
// tests slicing against data from one row in a memtable and then flushed to an sstable
- final Keyspace keyspace = Keyspace.open("Keyspace1");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
final DecoratedKey ROW = Util.dk("row4");
final NumberFormat fmt = new DecimalFormat("000");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
// at this rate, we're getting 78-79 cos/block, assuming the blocks are set to be about 4k.
// so if we go to 300, we'll get at least 4 blocks, which is plenty for testing.
for (int i = 0; i < 300; i++)
cf.addColumn(column("col" + fmt.format(i), "omg!thisisthevalue!"+i, 1L));
- Mutation rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
Runnable verify = new WrappedRunnable()
@@ -219,15 +255,15 @@ public class KeyspaceTest extends SchemaLoader
@Test
public void testReversedWithFlushing()
{
- final Keyspace keyspace = Keyspace.open("Keyspace1");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardLong1");
final DecoratedKey ROW = Util.dk("row4");
for (int i = 0; i < 10; i++)
{
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "StandardLong1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "StandardLong1");
cf.addColumn(new BufferCell(cellname((long)i), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0));
- Mutation rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
}
@@ -235,9 +271,9 @@ public class KeyspaceTest extends SchemaLoader
for (int i = 10; i < 20; i++)
{
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "StandardLong1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "StandardLong1");
cf.addColumn(new BufferCell(cellname((long)i), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0));
- Mutation rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
cf = cfs.getColumnFamily(ROW, Composites.EMPTY, Composites.EMPTY, true, 1, System.currentTimeMillis());
@@ -264,21 +300,21 @@ public class KeyspaceTest extends SchemaLoader
public void testGetSliceFromBasic() throws Throwable
{
// tests slicing against data from one row in a memtable and then flushed to an sstable
- final Keyspace keyspace = Keyspace.open("Keyspace1");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
final DecoratedKey ROW = Util.dk("row1");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
cf.addColumn(column("col3", "val3", 1L));
cf.addColumn(column("col4", "val4", 1L));
cf.addColumn(column("col5", "val5", 1L));
cf.addColumn(column("col7", "val7", 1L));
cf.addColumn(column("col9", "val9", 1L));
- Mutation rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
- rm = new Mutation("Keyspace1", ROW.getKey());
+ rm = new Mutation(KEYSPACE1, ROW.getKey());
rm.delete("Standard1", cellname("col4"), 2L);
rm.apply();
@@ -319,15 +355,15 @@ public class KeyspaceTest extends SchemaLoader
public void testGetSliceWithExpiration() throws Throwable
{
// tests slicing against data from one row with expiring column in a memtable and then flushed to an sstable
- final Keyspace keyspace = Keyspace.open("Keyspace1");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
final DecoratedKey ROW = Util.dk("row5");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
cf.addColumn(expiringColumn("col2", "val2", 1L, 60)); // long enough not to be tombstoned
cf.addColumn(column("col3", "val3", 1L));
- Mutation rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
Runnable verify = new WrappedRunnable()
@@ -353,26 +389,26 @@ public class KeyspaceTest extends SchemaLoader
public void testGetSliceFromAdvanced() throws Throwable
{
// tests slicing against data from one row spread across two sstables
- final Keyspace keyspace = Keyspace.open("Keyspace1");
+ final Keyspace keyspace = Keyspace.open(KEYSPACE1);
final ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
final DecoratedKey ROW = Util.dk("row2");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
cf.addColumn(column("col2", "val2", 1L));
cf.addColumn(column("col3", "val3", 1L));
cf.addColumn(column("col4", "val4", 1L));
cf.addColumn(column("col5", "val5", 1L));
cf.addColumn(column("col6", "val6", 1L));
- Mutation rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
cfStore.forceBlockingFlush();
- cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "valx", 2L));
cf.addColumn(column("col2", "valx", 2L));
cf.addColumn(column("col3", "valx", 2L));
- rm = new Mutation("Keyspace1", ROW.getKey(), cf);
+ rm = new Mutation(KEYSPACE1, ROW.getKey(), cf);
rm.apply();
Runnable verify = new WrappedRunnable()
@@ -402,13 +438,13 @@ public class KeyspaceTest extends SchemaLoader
public void testGetSliceFromLarge() throws Throwable
{
// tests slicing against 1000 columns in an sstable
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
DecoratedKey key = Util.dk("row3");
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
for (int i = 1000; i < 2000; i++)
cf.addColumn(column("col" + i, ("v" + i), 1L));
- Mutation rm = new Mutation("Keyspace1", key.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey(), cf);
rm.apply();
cfStore.forceBlockingFlush();
@@ -430,18 +466,18 @@ public class KeyspaceTest extends SchemaLoader
@Test
public void testLimitSSTables() throws CharacterCodingException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
cfStore.disableAutoCompaction();
DecoratedKey key = Util.dk("row_maxmin");
for (int j = 0; j < 10; j++)
{
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
for (int i = 1000 + (j*100); i < 1000 + ((j+1)*100); i++)
{
cf.addColumn(column("col" + i, ("v" + i), i));
}
- Mutation rm = new Mutation("Keyspace1", key.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey(), cf);
rm.apply();
cfStore.forceBlockingFlush();
}
@@ -494,7 +530,7 @@ public class KeyspaceTest extends SchemaLoader
---------------------
then we slice out col1 = a5 and col2 > 85 -> which should let us just check 2 sstables and get 2 columns
*/
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardComposite2");
cfs.disableAutoCompaction();
@@ -505,7 +541,7 @@ public class KeyspaceTest extends SchemaLoader
{
for (int i = 0; i < 10; i++)
{
- Mutation rm = new Mutation("Keyspace1", key.getKey());
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
CellName colName = type.makeCellName(ByteBufferUtil.bytes("a" + i), ByteBufferUtil.bytes(j*10 + i));
rm.add("StandardComposite2", colName, ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/MultitableTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/MultitableTest.java b/test/unit/org/apache/cassandra/db/MultitableTest.java
index cc11163..536ba1c 100644
--- a/test/unit/org/apache/cassandra/db/MultitableTest.java
+++ b/test/unit/org/apache/cassandra/db/MultitableTest.java
@@ -20,33 +20,55 @@ package org.apache.cassandra.db;
*
*/
-import org.apache.cassandra.Util;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.Util;
import static org.apache.cassandra.Util.column;
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
-public class MultitableTest extends SchemaLoader
+public class MultitableTest
{
+ private static final String KEYSPACE1 = "MultitableTest1";
+ private static final String KEYSPACE2 = "MultitableTest2";
+ private static final String CF1 = "Standard1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF1));
+ SchemaLoader.createKeyspace(KEYSPACE2,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE2, CF1));
+ }
+
@Test
public void testSameCFs()
{
- Keyspace keyspace1 = Keyspace.open("Keyspace1");
- Keyspace keyspace2 = Keyspace.open("Keyspace2");
+ Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace2 = Keyspace.open(KEYSPACE2);
Mutation rm;
DecoratedKey dk = Util.dk("keymulti");
ColumnFamily cf;
- cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
- rm = new Mutation("Keyspace1", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
rm.apply();
- cf = ArrayBackedSortedColumns.factory.create("Keyspace2", "Standard1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE2, "Standard1");
cf.addColumn(column("col2", "val2", 1L));
- rm = new Mutation("Keyspace2", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE2, dk.getKey(), cf);
rm.apply();
keyspace1.getColumnFamilyStore("Standard1").forceBlockingFlush();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/NameSortTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java
index 6bd71c7..c4361d8 100644
--- a/test/unit/org/apache/cassandra/db/NameSortTest.java
+++ b/test/unit/org/apache/cassandra/db/NameSortTest.java
@@ -26,12 +26,32 @@ import java.util.Collection;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.db.marshal.LongType;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class NameSortTest extends SchemaLoader
+public class NameSortTest
{
+ private static final String KEYSPACE1 = "NameSortTest";
+ private static final String CF = "Standard1";
+ private static final String CFSUPER = "Super1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF),
+ SchemaLoader.superCFMD(KEYSPACE1, CFSUPER, LongType.instance));
+ }
+
@Test
public void testNameSort1() throws IOException
{
@@ -55,7 +75,7 @@ public class NameSortTest extends SchemaLoader
private void testNameSort(int N) throws IOException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
for (int i = 0; i < N; ++i)
{
@@ -66,7 +86,7 @@ public class NameSortTest extends SchemaLoader
for (int j = 0; j < 8; ++j)
{
ByteBuffer bytes = j % 2 == 0 ? ByteBufferUtil.bytes("a") : ByteBufferUtil.bytes("b");
- rm = new Mutation("Keyspace1", key);
+ rm = new Mutation(KEYSPACE1, key);
rm.add("Standard1", Util.cellname("Cell-" + j), bytes, j);
rm.applyUnsafe();
}
@@ -74,11 +94,11 @@ public class NameSortTest extends SchemaLoader
// super
for (int j = 0; j < 8; ++j)
{
- rm = new Mutation("Keyspace1", key);
+ rm = new Mutation(KEYSPACE1, key);
for (int k = 0; k < 4; ++k)
{
String value = (j + k) % 2 == 0 ? "a" : "b";
- addMutation(rm, "Super1", "SuperColumn-" + j, k, value, k);
+ addMutation(rm, CFSUPER, "SuperColumn-" + j, k, value, k);
}
rm.applyUnsafe();
}
@@ -87,7 +107,7 @@ public class NameSortTest extends SchemaLoader
validateNameSort(keyspace, N);
keyspace.getColumnFamilyStore("Standard1").forceBlockingFlush();
- keyspace.getColumnFamilyStore("Super1").forceBlockingFlush();
+ keyspace.getColumnFamilyStore(CFSUPER).forceBlockingFlush();
validateNameSort(keyspace, N);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 60ccf9f..a7a961d 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -28,12 +28,11 @@ import java.util.TreeSet;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterators;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.IndexType;
+import org.apache.cassandra.config.*;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
@@ -48,8 +47,10 @@ import org.apache.cassandra.db.index.PerColumnSecondaryIndex;
import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.db.index.SecondaryIndexSearcher;
import org.apache.cassandra.db.marshal.Int32Type;
+import org.apache.cassandra.db.marshal.IntegerType;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.concurrent.OpOrder;
import org.apache.cassandra.utils.memory.MemtableAllocator;
@@ -59,11 +60,21 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class RangeTombstoneTest extends SchemaLoader
+public class RangeTombstoneTest
{
- private static final String KSNAME = "Keyspace1";
+ private static final String KSNAME = "RangeTombstoneTest";
private static final String CFNAME = "StandardInteger1";
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KSNAME,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ CFMetaData.denseCFMetaData(KSNAME, CFNAME, IntegerType.instance));
+ }
+
@Test
public void simpleQueryWithRangeTombstoneTest() throws Exception
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index 6d19d3a..d32df49 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -25,26 +25,50 @@ import java.nio.ByteBuffer;
import java.util.SortedSet;
import java.util.TreeSet;
+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.composites.*;
import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.db.filter.SliceQueryFilter;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.util.DataOutputBuffer;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-public class ReadMessageTest extends SchemaLoader
+public class ReadMessageTest
{
+ private static final String KEYSPACE1 = "ReadMessageTest1";
+ private static final String KEYSPACENOCOMMIT = "ReadMessageTest_NoCommit";
+ 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));
+ SchemaLoader.createKeyspace(KEYSPACENOCOMMIT,
+ false,
+ true,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACENOCOMMIT, CF));
+ }
+
@Test
public void testMakeReadMessage() throws IOException
{
- CellNameType type = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1").getComparator();
+ CellNameType type = Keyspace.open(KEYSPACE1).getColumnFamilyStore("Standard1").getComparator();
SortedSet<CellName> colList = new TreeSet<CellName>(type);
colList.add(Util.cellname("col1"));
@@ -54,15 +78,15 @@ public class ReadMessageTest extends SchemaLoader
DecoratedKey dk = Util.dk("row1");
long ts = System.currentTimeMillis();
- rm = new SliceByNamesReadCommand("Keyspace1", dk.getKey(), "Standard1", ts, new NamesQueryFilter(colList));
+ rm = new SliceByNamesReadCommand(KEYSPACE1, dk.getKey(), "Standard1", ts, new NamesQueryFilter(colList));
rm2 = serializeAndDeserializeReadMessage(rm);
assert rm2.toString().equals(rm.toString());
- rm = new SliceFromReadCommand("Keyspace1", dk.getKey(), "Standard1", ts, new SliceQueryFilter(Composites.EMPTY, Composites.EMPTY, true, 2));
+ rm = new SliceFromReadCommand(KEYSPACE1, dk.getKey(), "Standard1", ts, new SliceQueryFilter(Composites.EMPTY, Composites.EMPTY, true, 2));
rm2 = serializeAndDeserializeReadMessage(rm);
assert rm2.toString().equals(rm.toString());
- rm = new SliceFromReadCommand("Keyspace1", dk.getKey(), "Standard1", ts, new SliceQueryFilter(Util.cellname("a"), Util.cellname("z"), true, 5));
+ rm = new SliceFromReadCommand(KEYSPACE1, dk.getKey(), "Standard1", ts, new SliceQueryFilter(Util.cellname("a"), Util.cellname("z"), true, 5));
rm2 = serializeAndDeserializeReadMessage(rm);
assert rm2.toString().equals(rm.toString());
}
@@ -81,17 +105,17 @@ public class ReadMessageTest extends SchemaLoader
@Test
public void testGetColumn()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
CellNameType type = keyspace.getColumnFamilyStore("Standard1").getComparator();
Mutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("abcd"), 0);
rm.apply();
- ReadCommand command = new SliceByNamesReadCommand("Keyspace1", dk.getKey(), "Standard1", System.currentTimeMillis(), new NamesQueryFilter(FBUtilities.singleton(Util.cellname("Column1"), type)));
+ ReadCommand command = new SliceByNamesReadCommand(KEYSPACE1, dk.getKey(), "Standard1", System.currentTimeMillis(), new NamesQueryFilter(FBUtilities.singleton(Util.cellname("Column1"), type)));
Row row = command.getRow(keyspace);
Cell col = row.cf.getColumn(Util.cellname("Column1"));
assertEquals(col.value(), ByteBuffer.wrap("abcd".getBytes()));
@@ -100,11 +124,11 @@ public class ReadMessageTest extends SchemaLoader
@Test
public void testNoCommitLog() throws Exception
{
- Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes("row"));
+ Mutation rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("row"));
rm.add("Standard1", Util.cellname("commit1"), ByteBufferUtil.bytes("abcd"), 0);
rm.apply();
- rm = new Mutation("NoCommitlogSpace", ByteBufferUtil.bytes("row"));
+ rm = new Mutation(KEYSPACENOCOMMIT, ByteBufferUtil.bytes("row"));
rm.add("Standard1", Util.cellname("commit2"), ByteBufferUtil.bytes("abcd"), 0);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
index ede3e9b..03d358f 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
@@ -21,6 +21,7 @@ package org.apache.cassandra.db;
*/
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
@@ -28,15 +29,33 @@ import org.slf4j.LoggerFactory;
import static org.apache.cassandra.Util.column;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.commitlog.CommitLog;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-public class RecoveryManager2Test extends SchemaLoader
+public class RecoveryManager2Test
{
private static Logger logger = LoggerFactory.getLogger(RecoveryManager2Test.class);
+ private static final String KEYSPACE1 = "RecoveryManager2Test";
+ private static final String CF_STANDARD1 = "Standard1";
+ private static final String CF_STANDARD2 = "Standard2";
+
+ @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));
+ }
+
@Test
/* test that commit logs do not replay flushed data */
public void testWithFlush() throws Exception
@@ -55,7 +74,7 @@ public class RecoveryManager2Test extends SchemaLoader
insertRow("Standard1", key);
}
- Keyspace keyspace1 = Keyspace.open("Keyspace1");
+ Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfs = keyspace1.getColumnFamilyStore("Standard1");
logger.debug("forcing flush");
cfs.forceBlockingFlush();
@@ -70,9 +89,9 @@ public class RecoveryManager2Test extends SchemaLoader
private void insertRow(String cfname, String key)
{
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", cfname);
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, cfname);
cf.addColumn(column("col1", "val1", 1L));
- Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes(key), cf);
+ Mutation rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes(key), cf);
rm.apply();
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
index c9bc86a..13d649d 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
@@ -24,37 +24,61 @@ package org.apache.cassandra.db;
import java.io.File;
import java.io.IOException;
+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.commitlog.CommitLog;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.locator.SimpleStrategy;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
-public class RecoveryManager3Test extends SchemaLoader
+public class RecoveryManager3Test
{
+ private static final String KEYSPACE1 = "RecoveryManager3Test1";
+ private static final String CF_STANDARD1 = "Standard1";
+
+ private static final String KEYSPACE2 = "RecoveryManager3Test2";
+ private static final String CF_STANDARD3 = "Standard3";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1));
+ SchemaLoader.createKeyspace(KEYSPACE2,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE2, CF_STANDARD3));
+ }
+
@Test
public void testMissingHeader() throws IOException
{
- Keyspace keyspace1 = Keyspace.open("Keyspace1");
- Keyspace keyspace2 = Keyspace.open("Keyspace2");
+ Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace2 = Keyspace.open(KEYSPACE2);
Mutation rm;
DecoratedKey dk = Util.dk("keymulti");
ColumnFamily cf;
- cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
- rm = new Mutation("Keyspace1", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
rm.apply();
- cf = ArrayBackedSortedColumns.factory.create("Keyspace2", "Standard3");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE2, "Standard3");
cf.addColumn(column("col2", "val2", 1L));
- rm = new Mutation("Keyspace2", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE2, dk.getKey(), cf);
rm.apply();
keyspace1.getColumnFamilyStore("Standard1").clearUnsafe();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index 687df5a..5d4928c 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -24,7 +24,14 @@ import java.util.concurrent.TimeUnit;
import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.CounterColumnType;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,8 +44,30 @@ import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
import static org.apache.cassandra.Util.cellname;
@RunWith(OrderedJUnit4ClassRunner.class)
-public class RecoveryManagerTest extends SchemaLoader
+public class RecoveryManagerTest
{
+ private static final String KEYSPACE1 = "RecoveryManagerTest1";
+ private static final String CF_STANDARD1 = "Standard1";
+ private static final String CF_COUNTER1 = "Counter1";
+
+ private static final String KEYSPACE2 = "RecoveryManagerTest2";
+ private static final String CF_STANDARD3 = "Standard3";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1),
+ CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER1, BytesType.instance).defaultValidator(CounterColumnType.instance));
+ SchemaLoader.createKeyspace(KEYSPACE2,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE2, CF_STANDARD3));
+ }
+
@Test
public void testNothingToRecover() throws IOException {
CommitLog.instance.recover();
@@ -47,21 +76,21 @@ public class RecoveryManagerTest extends SchemaLoader
@Test
public void testOne() throws IOException
{
- Keyspace keyspace1 = Keyspace.open("Keyspace1");
- Keyspace keyspace2 = Keyspace.open("Keyspace2");
+ Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace2 = Keyspace.open(KEYSPACE2);
Mutation rm;
DecoratedKey dk = Util.dk("keymulti");
ColumnFamily cf;
- cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
- rm = new Mutation("Keyspace1", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
rm.apply();
- cf = ArrayBackedSortedColumns.factory.create("Keyspace2", "Standard3");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE2, "Standard3");
cf.addColumn(column("col2", "val2", 1L));
- rm = new Mutation("Keyspace2", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE2, dk.getKey(), cf);
rm.apply();
keyspace1.getColumnFamilyStore("Standard1").clearUnsafe();
@@ -77,7 +106,7 @@ public class RecoveryManagerTest extends SchemaLoader
@Test
public void testRecoverCounter() throws IOException
{
- Keyspace keyspace1 = Keyspace.open("Keyspace1");
+ Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
Mutation rm;
DecoratedKey dk = Util.dk("key");
@@ -85,9 +114,9 @@ public class RecoveryManagerTest extends SchemaLoader
for (int i = 0; i < 10; ++i)
{
- cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Counter1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Counter1");
cf.addColumn(BufferCounterCell.createLocal(cellname("col"), 1L, 1L, Long.MIN_VALUE));
- rm = new Mutation("Keyspace1", dk.getKey(), cf);
+ rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
rm.apply();
}
@@ -111,14 +140,14 @@ public class RecoveryManagerTest extends SchemaLoader
Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12");
long timeMS = date.getTime() - 5000;
- Keyspace keyspace1 = Keyspace.open("Keyspace1");
+ Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
DecoratedKey dk = Util.dk("dkey");
for (int i = 0; i < 10; ++i)
{
long ts = TimeUnit.MILLISECONDS.toMicros(timeMS + (i * 1000));
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("name-" + i, "value", ts));
- Mutation rm = new Mutation("Keyspace1", dk.getKey(), cf);
+ Mutation rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
rm.apply();
}
keyspace1.getColumnFamilyStore("Standard1").clearUnsafe();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
index 1f7d388..23caaf8 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
@@ -26,28 +26,45 @@ import java.io.IOException;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.commitlog.CommitLog;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.utils.ByteBufferUtil;
/**
* Test for the truncate operation.
*/
-public class RecoveryManagerTruncateTest extends SchemaLoader
+public class RecoveryManagerTruncateTest
{
+ private static final String KEYSPACE1 = "RecoveryManagerTruncateTest";
+ 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 testTruncate() throws IOException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1");
Mutation rm;
ColumnFamily cf;
// add a single cell
- cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf.addColumn(column("col1", "val1", 1L));
- rm = new Mutation("Keyspace1", ByteBufferUtil.bytes("keymulti"), cf);
+ rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes("keymulti"), cf);
rm.apply();
// Make sure data was written
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RemoveCellTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveCellTest.java b/test/unit/org/apache/cassandra/db/RemoveCellTest.java
index 77ff02d..ac941b5 100644
--- a/test/unit/org/apache/cassandra/db/RemoveCellTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveCellTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cassandra.db;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -25,27 +26,43 @@ import static org.junit.Assert.assertNull;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
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 RemoveCellTest extends SchemaLoader
+public class RemoveCellTest
{
+ private static final String KEYSPACE1 = "RemoveCellTest";
+ 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 testRemoveColumn()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
Mutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
store.forceBlockingFlush();
// remove
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.delete("Standard1", Util.cellname("Column1"), 1);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
index 09eed71..c8bab47 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cassandra.db;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertNull;
@@ -25,26 +26,42 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+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 RemoveColumnFamilyTest extends SchemaLoader
+public class RemoveColumnFamilyTest
{
+ private static final String KEYSPACE1 = "RemoveColumnFamilyTest";
+ 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 testRemoveColumnFamily()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
Mutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
// remove
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.delete("Standard1", 1);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
index f898f16..830eba5 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
@@ -18,6 +18,7 @@
*/
package org.apache.cassandra.db;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertNull;
@@ -25,28 +26,44 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+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 RemoveColumnFamilyWithFlush1Test extends SchemaLoader
+public class RemoveColumnFamilyWithFlush1Test
{
+ private static final String KEYSPACE1 = "RemoveColumnFamilyWithFlush1Test";
+ 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 testRemoveColumnFamilyWithFlush1()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
Mutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.add("Standard1", Util.cellname("Column2"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
store.forceBlockingFlush();
// remove
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.delete("Standard1", 1);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
index 1e910ad..d2ba51f 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
@@ -18,6 +18,7 @@
*/
package org.apache.cassandra.db;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertNull;
@@ -25,25 +26,41 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+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 RemoveColumnFamilyWithFlush2Test extends SchemaLoader
+public class RemoveColumnFamilyWithFlush2Test
{
+ private static final String KEYSPACE1 = "RemoveColumnFamilyWithFlush2Test";
+ 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 testRemoveColumnFamilyWithFlush2()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
Mutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
// remove
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.delete("Standard1", 1);
rm.apply();
store.forceBlockingFlush();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RemoveSubCellTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveSubCellTest.java b/test/unit/org/apache/cassandra/db/RemoveSubCellTest.java
index cec1bce..db27bef 100644
--- a/test/unit/org/apache/cassandra/db/RemoveSubCellTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveSubCellTest.java
@@ -21,12 +21,17 @@ package org.apache.cassandra.db;
import java.nio.ByteBuffer;
import java.util.concurrent.TimeUnit;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.marshal.LongType;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import static org.apache.cassandra.Util.getBytes;
import org.apache.cassandra.Util;
@@ -36,25 +41,38 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import com.google.common.util.concurrent.Uninterruptibles;
-public class RemoveSubCellTest extends SchemaLoader
+public class RemoveSubCellTest
{
+ private static final String KEYSPACE1 = "RemoveSubCellTest";
+ private static final String CF_SUPER1 = "Super1";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER1, LongType.instance));
+ }
+
@Test
public void testRemoveSubColumn()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Super1");
Mutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
Util.addMutation(rm, "Super1", "SC1", 1, "asdf", 0);
rm.apply();
store.forceBlockingFlush();
CellName cname = CellNames.compositeDense(ByteBufferUtil.bytes("SC1"), getBytes(1L));
// remove
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.delete("Super1", cname, 1);
rm.apply();
@@ -66,13 +84,13 @@ public class RemoveSubCellTest extends SchemaLoader
@Test
public void testRemoveSubColumnAndContainer()
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Super1");
Mutation rm;
DecoratedKey dk = Util.dk("key2");
// add data
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
Util.addMutation(rm, "Super1", "SC1", 1, "asdf", 0);
rm.apply();
store.forceBlockingFlush();
@@ -80,7 +98,7 @@ public class RemoveSubCellTest extends SchemaLoader
// remove the SC
ByteBuffer scName = ByteBufferUtil.bytes("SC1");
CellName cname = CellNames.compositeDense(scName, getBytes(1L));
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.deleteRange("Super1", SuperColumns.startOf(scName), SuperColumns.endOf(scName), 1);
rm.apply();
@@ -90,7 +108,7 @@ public class RemoveSubCellTest extends SchemaLoader
Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
// remove the column itself
- rm = new Mutation("Keyspace1", dk.getKey());
+ rm = new Mutation(KEYSPACE1, dk.getKey());
rm.delete("Super1", cname, 2);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 7b6ff99..4bed2ad 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -23,30 +23,51 @@ import java.nio.ByteBuffer;
import java.util.Collection;
import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.cache.CachingOptions;
import org.apache.cassandra.cache.RowCacheKey;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.marshal.IntegerType;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.locator.TokenMetadata;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assert.assertEquals;
-public class RowCacheTest extends SchemaLoader
+public class RowCacheTest
{
- private String KEYSPACE = "RowCacheSpace";
- private String COLUMN_FAMILY = "CachedCF";
+ private static final String KEYSPACE_CACHED = "RowCacheTest";
+ private static final String CF_CACHED = "CachedCF";
+ private static final String CF_CACHEDINT = "CachedIntCF";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE_CACHED,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL),
+ SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT)
+ .defaultValidator(IntegerType.instance)
+ .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL),
+ new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100))));
+ }
@AfterClass
public static void cleanup()
{
- cleanupSavedCaches();
+ SchemaLoader.cleanupSavedCaches();
}
@Test
@@ -54,8 +75,8 @@ public class RowCacheTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
- Keyspace keyspace = Keyspace.open(KEYSPACE);
- ColumnFamilyStore cachedStore = keyspace.getColumnFamilyStore(COLUMN_FAMILY);
+ Keyspace keyspace = Keyspace.open(KEYSPACE_CACHED);
+ ColumnFamilyStore cachedStore = keyspace.getColumnFamilyStore(CF_CACHED);
// empty the row cache
CacheService.instance.invalidateRowCache();
@@ -64,7 +85,7 @@ public class RowCacheTest extends SchemaLoader
CacheService.instance.setRowCacheCapacityInMB(1);
// inserting 100 rows into both column families
- insertData(KEYSPACE, COLUMN_FAMILY, 0, 100);
+ SchemaLoader.insertData(KEYSPACE_CACHED, CF_CACHED, 0, 100);
// now reading rows one by one and checking if row change grows
for (int i = 0; i < 100; i++)
@@ -87,7 +108,7 @@ public class RowCacheTest extends SchemaLoader
}
// insert 10 more keys
- insertData(KEYSPACE, COLUMN_FAMILY, 100, 10);
+ SchemaLoader.insertData(KEYSPACE_CACHED, CF_CACHED, 100, 10);
for (int i = 100; i < 110; i++)
{
@@ -134,7 +155,7 @@ public class RowCacheTest extends SchemaLoader
CacheService.instance.setRowCacheCapacityInMB(1);
rowCacheLoad(100, Integer.MAX_VALUE, 1000);
- ColumnFamilyStore store = Keyspace.open(KEYSPACE).getColumnFamilyStore(COLUMN_FAMILY);
+ ColumnFamilyStore store = Keyspace.open(KEYSPACE_CACHED).getColumnFamilyStore(CF_CACHED);
assertEquals(CacheService.instance.rowCache.getKeySet().size(), 100);
store.cleanupCache();
assertEquals(CacheService.instance.rowCache.getKeySet().size(), 100);
@@ -161,7 +182,7 @@ public class RowCacheTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
- Keyspace keyspace = Keyspace.open(KEYSPACE);
+ Keyspace keyspace = Keyspace.open(KEYSPACE_CACHED);
String cf = "CachedIntCF";
ColumnFamilyStore cachedStore = keyspace.getColumnFamilyStore(cf);
long startRowCacheHits = cachedStore.metric.rowCacheHit.count();
@@ -175,7 +196,7 @@ public class RowCacheTest extends SchemaLoader
ByteBuffer key = ByteBufferUtil.bytes("rowcachekey");
DecoratedKey dk = cachedStore.partitioner.decorateKey(key);
RowCacheKey rck = new RowCacheKey(cachedStore.metadata.cfId, dk);
- Mutation mutation = new Mutation(KEYSPACE, key);
+ Mutation mutation = new Mutation(KEYSPACE_CACHED, key);
for (int i = 0; i < 200; i++)
mutation.add(cf, Util.cellname(i), ByteBufferUtil.bytes("val" + i), System.currentTimeMillis());
mutation.applyUnsafe();
@@ -234,15 +255,15 @@ public class RowCacheTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
- ColumnFamilyStore store = Keyspace.open(KEYSPACE).getColumnFamilyStore(COLUMN_FAMILY);
+ ColumnFamilyStore store = Keyspace.open(KEYSPACE_CACHED).getColumnFamilyStore(CF_CACHED);
// empty the cache
CacheService.instance.invalidateRowCache();
assert CacheService.instance.rowCache.size() == 0;
// insert data and fill the cache
- insertData(KEYSPACE, COLUMN_FAMILY, offset, totalKeys);
- readData(KEYSPACE, COLUMN_FAMILY, offset, totalKeys);
+ SchemaLoader.insertData(KEYSPACE_CACHED, CF_CACHED, offset, totalKeys);
+ SchemaLoader.readData(KEYSPACE_CACHED, CF_CACHED, offset, totalKeys);
assert CacheService.instance.rowCache.size() == totalKeys;
// force the cache to disk
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RowIterationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java
index 8464a35..10d8903 100644
--- a/test/unit/org/apache/cassandra/db/RowIterationTest.java
+++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java
@@ -25,20 +25,36 @@ import java.util.HashSet;
import org.apache.cassandra.Util;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.*;
+import org.apache.cassandra.db.marshal.LongType;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.FBUtilities;
import static org.junit.Assert.assertEquals;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class RowIterationTest extends SchemaLoader
+public class RowIterationTest
{
- public static final String KEYSPACE1 = "Keyspace2";
+ public static final String KEYSPACE1 = "RowIterationTest";
public static final InetAddress LOCAL = FBUtilities.getBroadcastAddress();
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, "Standard3"),
+ SchemaLoader.superCFMD(KEYSPACE1, "Super3", LongType.instance));
+ }
+
@Test
public void testRowIteration()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/RowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java
index 22e112e..910f9e1 100644
--- a/test/unit/org/apache/cassandra/db/RowTest.java
+++ b/test/unit/org/apache/cassandra/db/RowTest.java
@@ -22,10 +22,14 @@ import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.google.common.util.concurrent.Uninterruptibles;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.CellNames;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.apache.cassandra.Util.column;
@@ -34,15 +38,28 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class RowTest extends SchemaLoader
+public class RowTest
{
+ private static final String KEYSPACE1 = "RowTest";
+ 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 testDiffColumnFamily()
{
- ColumnFamily cf1 = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf1 = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf1.addColumn(column("one", "onev", 0));
- ColumnFamily cf2 = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf2 = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
DeletionInfo delInfo = new DeletionInfo(0, 0);
cf2.delete(delInfo);
@@ -86,10 +103,10 @@ public class RowTest extends SchemaLoader
@Test
public void testResolve()
{
- ColumnFamily cf1 = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf1 = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf1.addColumn(column("one", "A", 0));
- ColumnFamily cf2 = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
+ ColumnFamily cf2 = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
cf2.addColumn(column("one", "B", 1));
cf2.addColumn(column("two", "C", 1));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index e0bbb64..24a6787 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -30,10 +30,17 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.cql3.QueryProcessor;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.CounterColumnType;
+import org.apache.cassandra.db.marshal.UUIDType;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.RequestExecutionException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.commons.lang3.StringUtils;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,12 +65,28 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@RunWith(OrderedJUnit4ClassRunner.class)
-public class ScrubTest extends SchemaLoader
+public class ScrubTest
{
- public String KEYSPACE = "Keyspace1";
- public String CF = "Standard1";
- public String CF3 = "Standard2";
- public String COUNTER_CF = "Counter1";
+ public static final String KEYSPACE = "Keyspace1";
+ public static final String CF = "Standard1";
+ public static final String CF2 = "Standard2";
+ public static final String CF3 = "Standard3";
+ public static final String COUNTER_CF = "Counter1";
+ public static final String CF_UUID = "UUIDKeys";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.loadSchema();
+ SchemaLoader.createKeyspace(KEYSPACE,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE, CF),
+ SchemaLoader.standardCFMD(KEYSPACE, CF2),
+ SchemaLoader.standardCFMD(KEYSPACE, CF3),
+ CFMetaData.denseCFMetaData(KEYSPACE, COUNTER_CF, BytesType.instance).defaultValidator(CounterColumnType.instance),
+ SchemaLoader.standardCFMD(KEYSPACE, CF_UUID).keyValidator(UUIDType.instance));
+ }
@Test
public void testScrubOneRow() throws ExecutionException, InterruptedException
@@ -138,10 +161,10 @@ public class ScrubTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
- ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF3);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF2);
cfs.clearUnsafe();
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE, CF3);
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE, CF2);
cf.delete(new DeletionInfo(0, 1)); // expired tombstone
Mutation rm = new Mutation(KEYSPACE, ByteBufferUtil.bytes(1), cf);
rm.applyUnsafe();
@@ -178,7 +201,7 @@ public class ScrubTest extends SchemaLoader
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
- String columnFamily = "Standard3";
+ String columnFamily = CF3;
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(columnFamily);
cfs.clearUnsafe();
@@ -283,12 +306,12 @@ public class ScrubTest extends SchemaLoader
@Test
public void testScrubColumnValidation() throws InterruptedException, RequestExecutionException, ExecutionException
{
- QueryProcessor.process("CREATE TABLE \"Keyspace1\".test_compact_static_columns (a bigint, b timeuuid, c boolean static, d text, PRIMARY KEY (a, b))", ConsistencyLevel.ONE);
+ QueryProcessor.process(String.format("CREATE TABLE \"%s\".test_compact_static_columns (a bigint, b timeuuid, c boolean static, d text, PRIMARY KEY (a, b))", KEYSPACE), ConsistencyLevel.ONE);
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("test_compact_static_columns");
- QueryProcessor.executeInternal("INSERT INTO \"Keyspace1\".test_compact_static_columns (a, b, c, d) VALUES (123, c3db07e8-b602-11e3-bc6b-e0b9a54a6d93, true, 'foobar')");
+ QueryProcessor.executeInternal(String.format("INSERT INTO \"%s\".test_compact_static_columns (a, b, c, d) VALUES (123, c3db07e8-b602-11e3-bc6b-e0b9a54a6d93, true, 'foobar')", KEYSPACE));
cfs.forceBlockingFlush();
CompactionManager.instance.performScrub(cfs, false);
}
@@ -299,12 +322,12 @@ public class ScrubTest extends SchemaLoader
@Test
public void testColumnNameEqualToDefaultKeyAlias() throws ExecutionException, InterruptedException
{
- Keyspace keyspace = Keyspace.open("Keyspace1");
- ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("UUIDKeys");
+ Keyspace keyspace = Keyspace.open(KEYSPACE);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_UUID);
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "UUIDKeys");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE, CF_UUID);
cf.addColumn(column(CFMetaData.DEFAULT_KEY_ALIAS, "not a uuid", 1L));
- Mutation mutation = new Mutation("Keyspace1", ByteBufferUtil.bytes(UUIDGen.getTimeUUID()), cf);
+ Mutation mutation = new Mutation(KEYSPACE, ByteBufferUtil.bytes(UUIDGen.getTimeUUID()), cf);
mutation.applyUnsafe();
cfs.forceBlockingFlush();
CompactionManager.instance.performScrub(cfs, false);
@@ -319,19 +342,19 @@ public class ScrubTest extends SchemaLoader
@Test
public void testValidationCompactStorage() throws Exception
{
- QueryProcessor.process("CREATE TABLE \"Keyspace1\".test_compact_dynamic_columns (a int, b text, c text, PRIMARY KEY (a, b)) WITH COMPACT STORAGE", ConsistencyLevel.ONE);
+ QueryProcessor.process(String.format("CREATE TABLE \"%s\".test_compact_dynamic_columns (a int, b text, c text, PRIMARY KEY (a, b)) WITH COMPACT STORAGE", KEYSPACE), ConsistencyLevel.ONE);
- Keyspace keyspace = Keyspace.open("Keyspace1");
+ Keyspace keyspace = Keyspace.open(KEYSPACE);
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("test_compact_dynamic_columns");
- QueryProcessor.executeInternal("INSERT INTO \"Keyspace1\".test_compact_dynamic_columns (a, b, c) VALUES (0, 'a', 'foo')");
- QueryProcessor.executeInternal("INSERT INTO \"Keyspace1\".test_compact_dynamic_columns (a, b, c) VALUES (0, 'b', 'bar')");
- QueryProcessor.executeInternal("INSERT INTO \"Keyspace1\".test_compact_dynamic_columns (a, b, c) VALUES (0, 'c', 'boo')");
+ QueryProcessor.executeInternal(String.format("INSERT INTO \"%s\".test_compact_dynamic_columns (a, b, c) VALUES (0, 'a', 'foo')", KEYSPACE));
+ QueryProcessor.executeInternal(String.format("INSERT INTO \"%s\".test_compact_dynamic_columns (a, b, c) VALUES (0, 'b', 'bar')", KEYSPACE));
+ QueryProcessor.executeInternal(String.format("INSERT INTO \"%s\".test_compact_dynamic_columns (a, b, c) VALUES (0, 'c', 'boo')", KEYSPACE));
cfs.forceBlockingFlush();
CompactionManager.instance.performScrub(cfs, true);
// Scrub is silent, but it will remove broken records. So reading everything back to make sure nothing to "scrubbed away"
- UntypedResultSet rs = QueryProcessor.executeInternal("SELECT * FROM \"Keyspace1\".test_compact_dynamic_columns");
+ UntypedResultSet rs = QueryProcessor.executeInternal(String.format("SELECT * FROM \"%s\".test_compact_dynamic_columns", KEYSPACE));
assertEquals(3, rs.size());
Iterator<UntypedResultSet.Row> iter = rs.iterator();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2a3827a/test/unit/org/apache/cassandra/db/SerializationsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SerializationsTest.java b/test/unit/org/apache/cassandra/db/SerializationsTest.java
index 0dd6b8f..a50bbae 100644
--- a/test/unit/org/apache/cassandra/db/SerializationsTest.java
+++ b/test/unit/org/apache/cassandra/db/SerializationsTest.java
@@ -19,16 +19,21 @@
package org.apache.cassandra.db;
import org.apache.cassandra.AbstractSerializationsTester;
+import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.*;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.LongType;
import org.apache.cassandra.dht.AbstractBounds;
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.io.util.DataOutputStreamAndChannel;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.net.CallbackInfo;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.net.MessageOut;
@@ -36,6 +41,7 @@ import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.io.DataInputStream;
@@ -47,6 +53,7 @@ public class SerializationsTest extends AbstractSerializationsTester
{
Statics statics = new Statics();
+ private static final String KEYSPACE1 = "Keyspace1";
private ByteBuffer startCol = ByteBufferUtil.bytes("Start");
private ByteBuffer stopCol = ByteBufferUtil.bytes("Stop");
private Composite emptyCol = Composites.EMPTY;
@@ -56,6 +63,17 @@ public class SerializationsTest extends AbstractSerializationsTester
public SliceQueryFilter nonEmptyRangePred = new SliceQueryFilter(CellNames.simpleDense(startCol), CellNames.simpleDense(stopCol), true, 100);
public SliceQueryFilter nonEmptyRangeSCPred = new SliceQueryFilter(CellNames.compositeDense(statics.SC, startCol), CellNames.compositeDense(statics.SC, stopCol), true, 100);
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, "Standard1"),
+ SchemaLoader.superCFMD(KEYSPACE1, "Super1", LongType.instance));
+ }
+
private void testRangeSliceCommandWrite() throws IOException
{
IPartitioner part = StorageService.getPartitioner();
@@ -339,7 +357,7 @@ public class SerializationsTest extends AbstractSerializationsTester
private static class Statics
{
- private final String KS = "Keyspace1";
+ private final String KS = KEYSPACE1;
private final ByteBuffer Key = ByteBufferUtil.bytes("Key01");
private final SortedSet<CellName> NamedCols = new TreeSet<CellName>(new SimpleDenseCellNameType(BytesType.instance))
{{