Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/757dac9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/757dac9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/757dac9c
Branch: refs/heads/trunk
Commit: 757dac9c0ed441024f281d6510c36932210bf962
Parents: 82dabe0 94b6471
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Oct 9 14:01:54 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Oct 9 14:01:54 2015 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/db/KeyCacheTest.java | 55 ++++++++++++++++++++
1 file changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/757dac9c/test/unit/org/apache/cassandra/db/KeyCacheTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/KeyCacheTest.java
index 4188d97,d3328f1..9a98bde
--- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
@@@ -17,24 -17,23 +17,27 @@@
*/
package org.apache.cassandra.db;
+ import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+ import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Uninterruptibles;
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.KeyCacheKey;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.concurrent.ScheduledExecutors;
+ import org.apache.cassandra.db.compaction.OperationType;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.filter.QueryFilter;
@@@ -47,23 -44,14 +50,25 @@@ import org.apache.cassandra.utils.ByteB
import org.apache.cassandra.utils.concurrent.Refs;
import static org.junit.Assert.assertEquals;
-public class KeyCacheTest extends SchemaLoader
+public class KeyCacheTest
{
- private static final String KEYSPACE1 = "KeyCacheSpace";
+ private static final String KEYSPACE1 = "KeyCacheTest1";
private static final String COLUMN_FAMILY1 = "Standard1";
private static final String COLUMN_FAMILY2 = "Standard2";
+ private static final String COLUMN_FAMILY3 = "Standard3";
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ SimpleStrategy.class,
+ KSMetaData.optsWithRF(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, COLUMN_FAMILY1),
+ SchemaLoader.standardCFMD(KEYSPACE1, COLUMN_FAMILY2));
+ }
+
@AfterClass
public static void cleanup()
{
|