Repository: cassandra Updated Branches: refs/heads/trunk 6e1033bc9 -> 31e3f612b
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 eae11b6..7be787e 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java @@ -1,6 +1,4 @@ -package org.apache.cassandra.db.compaction; /* - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,11 +15,10 @@ package org.apache.cassandra.db.compaction; * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ +package org.apache.cassandra.db.compaction; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -33,14 +30,12 @@ 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.filter.ColumnFilter; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.ISSTableScanner; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import java.io.IOException; import java.util.Collections; @@ -60,18 +55,17 @@ public class TTLExpiryTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD1) - .addPartitionKey("pKey", AsciiType.instance) - .addRegularColumn("col1", AsciiType.instance) - .addRegularColumn("col", AsciiType.instance) - .addRegularColumn("col311", AsciiType.instance) - .addRegularColumn("col2", AsciiType.instance) - .addRegularColumn("col3", AsciiType.instance) - .addRegularColumn("col7", AsciiType.instance) - .addRegularColumn("shadow", AsciiType.instance) - .build().gcGraceSeconds(0)); + KeyspaceParams.simple(1), + CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD1) + .addPartitionKey("pKey", AsciiType.instance) + .addRegularColumn("col1", AsciiType.instance) + .addRegularColumn("col", AsciiType.instance) + .addRegularColumn("col311", AsciiType.instance) + .addRegularColumn("col2", AsciiType.instance) + .addRegularColumn("col3", AsciiType.instance) + .addRegularColumn("col7", AsciiType.instance) + .addRegularColumn("shadow", AsciiType.instance) + .build().gcGraceSeconds(0)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 158460b..77de665 100644 --- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db.index; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Set; @@ -30,7 +29,6 @@ import junit.framework.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.QueryProcessor; @@ -43,7 +41,7 @@ import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.OpOrder; @@ -67,9 +65,8 @@ public class PerRowSecondaryIndexTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - SchemaLoader.perRowIndexedCFMD(KEYSPACE1, CF_INDEXED)); + KeyspaceParams.simple(1), + SchemaLoader.perRowIndexedCFMD(KEYSPACE1, CF_INDEXED)); } @Before http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 68b888c..3454bf1 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -30,16 +30,14 @@ import static org.junit.Assert.assertEquals; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.partitions.ArrayBackedPartition; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.*; public class CompositeTypeTest @@ -70,8 +68,7 @@ public class CompositeTypeTest AbstractType<?> composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance})); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.denseCFMD(KEYSPACE1, CF_STANDARDCOMPOSITE, composite)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 071c5de..1fc3f2c 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -32,15 +32,13 @@ import static org.junit.Assert.fail; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.partitions.ArrayBackedPartition; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.*; public class DynamicCompositeTypeTest @@ -73,8 +71,7 @@ public class DynamicCompositeTypeTest AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.denseCFMD(KEYSPACE1, CF_STANDARDDYNCOMPOSITE, dynamicComposite)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java b/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java index 03a530d..3cda1d3 100644 --- a/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java +++ b/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java @@ -33,7 +33,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ColumnFamilyStore; @@ -44,15 +43,12 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; 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 static org.apache.cassandra.Util.dk; - - /** * Test cases where multiple keys collides, ie have the same token. * Order preserving partitioner have no possible collision and creating @@ -73,8 +69,7 @@ public class KeyCollisionTest DatabaseDescriptor.setPartitioner(LengthPartitioner.instance); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java index 5683356..97de022 100644 --- a/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java @@ -26,14 +26,13 @@ import org.junit.BeforeClass; import junit.framework.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.UpdateBuilder; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.db.rows.RowStats; import org.apache.cassandra.io.sstable.format.SSTableWriter; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.concurrent.AbstractTransactionalTest; public class BigTableWriterTest extends AbstractTransactionalTest @@ -48,8 +47,7 @@ public class BigTableWriterTest extends AbstractTransactionalTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD, 0, Int32Type.instance, AsciiType.instance, Int32Type.instance)); cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 4037cb7..56d4b1f 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java @@ -15,23 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.io.sstable; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import org.junit.After; import org.junit.Before; @@ -41,25 +36,20 @@ import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import junit.framework.Assert; import org.apache.cassandra.OrderedJUnit4ClassRunner; 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.ColumnFamilyStore; -import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.rows.*; -import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.OperationType; -import org.apache.cassandra.db.partitions.ArrayBackedPartition; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.metrics.RestorableMeter; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import static com.google.common.collect.ImmutableMap.of; @@ -72,7 +62,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; @RunWith(OrderedJUnit4ClassRunner.class) @@ -94,8 +83,7 @@ public class IndexSummaryManagerTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLOWiINTERVAL) .minIndexInterval(8) .maxIndexInterval(256) http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 67c5b51..60cac2b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.io.sstable; import java.io.File; @@ -30,7 +29,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DeletionTime; @@ -45,7 +43,7 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.Version; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.streaming.StreamPlan; import org.apache.cassandra.streaming.StreamSession; @@ -78,8 +76,7 @@ public class LegacySSTableTest .build(); SchemaLoader.createKeyspace(KSNAME, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), metadata); beforeClass(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 4e6c75e..f8644bb 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java @@ -27,16 +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.SimpleClustering; import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -54,8 +52,7 @@ public class SSTableLoaderTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD)); setup(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/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 31b03db..c587bb3 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java @@ -17,10 +17,8 @@ */ 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; @@ -30,28 +28,18 @@ 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.ClusteringComparator; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; -import org.apache.cassandra.db.context.CounterContext; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.AsciiType; -import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.db.marshal.CompositeType; -import org.apache.cassandra.db.marshal.CounterColumnType; import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.CounterId; import static org.apache.cassandra.Util.getBytes; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class SSTableMetadataTest @@ -68,8 +56,7 @@ public class SSTableMetadataTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD3), http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index 3b8b90c..2712b1c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -15,10 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.io.sstable; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -42,7 +40,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ColumnFamilyStore; @@ -55,8 +52,6 @@ import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.db.index.SecondaryIndexSearcher; import org.apache.cassandra.db.rows.Row; -import org.apache.cassandra.db.partitions.ArrayBackedPartition; -import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.dht.LocalPartitioner.LocalToken; import org.apache.cassandra.dht.Range; @@ -65,15 +60,13 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.MmappedSegmentedFile; import org.apache.cassandra.io.util.SegmentedFile; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.CacheService; 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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; @@ -96,8 +89,7 @@ public class SSTableReaderTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2), SchemaLoader.compositeIndexCFMD(KEYSPACE1, CF_INDEXED, true), http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java index 9e4c939..8cee842 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java @@ -63,6 +63,7 @@ import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.metrics.StorageMetrics; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; @@ -80,8 +81,7 @@ public class SSTableRewriterTest extends SchemaLoader { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE, CF)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java index 45bca51..846dff5 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java @@ -46,6 +46,7 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.dht.AbstractBounds.isEmpty; @@ -63,8 +64,7 @@ public class SSTableScannerTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE, TABLE)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java index aac0798..6eb08c4 100644 --- a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.locator; import java.net.InetAddress; @@ -23,6 +22,7 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,7 +31,6 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; @@ -64,7 +63,7 @@ public class OldNetworkTopologyStrategyTest { RackInferringSnitch endpointSnitch = new RackInferringSnitch(); - AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tmd, endpointSnitch, KSMetaData.optsWithRF(1)); + AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tmd, endpointSnitch, optsWithRF(1)); addEndpoint("0", "5", "254.0.0.1"); addEndpoint("10", "15", "254.0.0.2"); addEndpoint("20", "25", "254.0.0.3"); @@ -89,7 +88,7 @@ public class OldNetworkTopologyStrategyTest { RackInferringSnitch endpointSnitch = new RackInferringSnitch(); - AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tmd, endpointSnitch, KSMetaData.optsWithRF(1)); + AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tmd, endpointSnitch, optsWithRF(1)); addEndpoint("0", "5", "254.0.0.1"); addEndpoint("10", "15", "254.0.0.2"); addEndpoint("20", "25", "254.1.0.3"); @@ -115,7 +114,7 @@ public class OldNetworkTopologyStrategyTest { RackInferringSnitch endpointSnitch = new RackInferringSnitch(); - AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tmd, endpointSnitch, KSMetaData.optsWithRF(1)); + AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tmd, endpointSnitch, optsWithRF(1)); addEndpoint("0", "5", "254.0.0.1"); addEndpoint("10", "15", "254.0.0.2"); addEndpoint("20", "25", "254.0.1.3"); @@ -358,7 +357,7 @@ public class OldNetworkTopologyStrategyTest TokenMetadata tokenMetadataCurrent = initTokenMetadata(tokens); TokenMetadata tokenMetadataAfterMove = initTokenMetadata(tokensAfterMove); - AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tokenMetadataCurrent, endpointSnitch, KSMetaData.optsWithRF(2)); + AbstractReplicationStrategy strategy = new OldNetworkTopologyStrategy("Keyspace1", tokenMetadataCurrent, endpointSnitch, optsWithRF(2)); Collection<Range<Token>> currentRanges = strategy.getAddressRanges().get(movingNode); Collection<Range<Token>> updatedRanges = strategy.getPendingAddressRanges(tokenMetadataAfterMove, tokensAfterMove[movingNodeIdx], movingNode); @@ -368,5 +367,8 @@ public class OldNetworkTopologyStrategyTest return ranges; } - + private static Map<String, String> optsWithRF(int rf) + { + return Collections.singletonMap("replication_factor", Integer.toString(rf)); + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/locator/ReplicationStrategyEndpointCacheTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/ReplicationStrategyEndpointCacheTest.java b/test/unit/org/apache/cassandra/locator/ReplicationStrategyEndpointCacheTest.java index de2b02a..c811811 100644 --- a/test/unit/org/apache/cassandra/locator/ReplicationStrategyEndpointCacheTest.java +++ b/test/unit/org/apache/cassandra/locator/ReplicationStrategyEndpointCacheTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.locator; import java.net.InetAddress; @@ -29,11 +28,11 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.KeyspaceParams; public class ReplicationStrategyEndpointCacheTest { @@ -47,8 +46,7 @@ public class ReplicationStrategyEndpointCacheTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE, - SimpleStrategy.class, - KSMetaData.optsWithRF(5)); + KeyspaceParams.simple(5)); } public void setup(Class stratClass, Map<String, String> strategyOptions) throws Exception http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java index a806cda..14683eb 100644 --- a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.locator; import java.net.InetAddress; @@ -37,6 +36,7 @@ import org.apache.cassandra.dht.OrderPreservingPartitioner; import org.apache.cassandra.dht.OrderPreservingPartitioner.StringToken; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.PendingRangeCalculatorService; import org.apache.cassandra.service.StorageServiceAccessor; import org.apache.cassandra.utils.ByteBufferUtil; @@ -53,9 +53,7 @@ public class SimpleStrategyTest public static void defineSchema() throws Exception { SchemaLoader.prepareServer(); - SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1)); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1)); } @Test @@ -186,9 +184,9 @@ public class SimpleStrategyTest KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName); return AbstractReplicationStrategy.createReplicationStrategy( keyspaceName, - ksmd.strategyClass, + ksmd.params.replication.klass, tmd, new SimpleSnitch(), - ksmd.strategyOptions); + ksmd.params.replication.options); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java b/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java index b4d3051..77a6ac4 100644 --- a/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java +++ b/test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java @@ -28,14 +28,13 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.MerkleTree; @@ -52,8 +51,7 @@ public class LocalSyncTaskTest extends SchemaLoader { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/repair/ValidatorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/ValidatorTest.java b/test/unit/org/apache/cassandra/repair/ValidatorTest.java index f9caf43..e18dc1d 100644 --- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java @@ -26,7 +26,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; @@ -34,16 +33,15 @@ import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.net.IMessageSink; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.repair.messages.RepairMessage; import org.apache.cassandra.repair.messages.ValidationComplete; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MerkleTree; import org.apache.cassandra.utils.concurrent.SimpleCondition; @@ -64,8 +62,7 @@ public class ValidatorTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(keyspace, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(keyspace, columnFamily)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/schema/DefsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/DefsTest.java b/test/unit/org/apache/cassandra/schema/DefsTest.java index ce5c25e..38e3cf5 100644 --- a/test/unit/org/apache/cassandra/schema/DefsTest.java +++ b/test/unit/org/apache/cassandra/schema/DefsTest.java @@ -20,6 +20,8 @@ package org.apache.cassandra.schema; import java.io.File; import java.nio.ByteBuffer; +import java.util.HashMap; +import java.util.Map; import java.util.function.Supplier; import org.junit.BeforeClass; @@ -37,17 +39,14 @@ import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.db.marshal.TimeUUIDType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTableDeletingTask; import org.apache.cassandra.locator.OldNetworkTopologyStrategy; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.service.MigrationManager; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -78,18 +77,15 @@ public class DefsTest SchemaLoader.prepareServer(); SchemaLoader.startGossiper(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, TABLE1), SchemaLoader.standardCFMD(KEYSPACE1, TABLE2)); - SchemaLoader.createKeyspace(KEYSPACE3, true, false, - SimpleStrategy.class, - KSMetaData.optsWithRF(5), + SchemaLoader.createKeyspace(KEYSPACE3, + KeyspaceParams.simple(5), SchemaLoader.standardCFMD(KEYSPACE1, TABLE1), SchemaLoader.compositeIndexCFMD(KEYSPACE3, TABLE1i, true)); SchemaLoader.createKeyspace(KEYSPACE6, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.compositeIndexCFMD(KEYSPACE6, TABLE1i, true)); } @@ -262,7 +258,7 @@ public class DefsTest public void addNewKS() throws ConfigurationException { CFMetaData cfm = addTestTable("newkeyspace1", "newstandard1", "A new cf for a new ks"); - KSMetaData newKs = KSMetaData.testMetadata(cfm.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(5), cfm); + KSMetaData newKs = KSMetaData.create(cfm.ksName, KeyspaceParams.simple(5), Tables.of(cfm)); MigrationManager.announceNewKeyspace(newKs); assertNotNull(Schema.instance.getKSMetaData(cfm.ksName)); @@ -353,7 +349,7 @@ public class DefsTest public void createEmptyKsAddNewCf() throws ConfigurationException { assertNull(Schema.instance.getKSMetaData(EMPTY_KEYSPACE)); - KSMetaData newKs = KSMetaData.testMetadata(EMPTY_KEYSPACE, SimpleStrategy.class, KSMetaData.optsWithRF(5)); + KSMetaData newKs = KSMetaData.create(EMPTY_KEYSPACE, KeyspaceParams.simple(5)); MigrationManager.announceNewKeyspace(newKs); assertNotNull(Schema.instance.getKSMetaData(EMPTY_KEYSPACE)); @@ -387,7 +383,7 @@ public class DefsTest { // create a keyspace to serve as existing. CFMetaData cf = addTestTable("UpdatedKeyspace", "AddedStandard1", "A new cf for a new ks"); - KSMetaData oldKs = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(5), cf); + KSMetaData oldKs = KSMetaData.create(cf.ksName, KeyspaceParams.simple(5), Tables.of(cf)); MigrationManager.announceNewKeyspace(oldKs); @@ -395,7 +391,7 @@ public class DefsTest assertEquals(Schema.instance.getKSMetaData(cf.ksName), oldKs); // names should match. - KSMetaData newBadKs2 = KSMetaData.testMetadata(cf.ksName + "trash", SimpleStrategy.class, KSMetaData.optsWithRF(4)); + KSMetaData newBadKs2 = KSMetaData.create(cf.ksName + "trash", KeyspaceParams.simple(4)); try { MigrationManager.announceKeyspaceUpdate(newBadKs2); @@ -406,12 +402,16 @@ public class DefsTest // expected. } - KSMetaData newKs = KSMetaData.testMetadata(cf.ksName, OldNetworkTopologyStrategy.class, KSMetaData.optsWithRF(1)); + Map<String, String> replicationMap = new HashMap<>(); + replicationMap.put(KeyspaceParams.Replication.CLASS, OldNetworkTopologyStrategy.class.getName()); + replicationMap.put("replication_factor", "1"); + + KSMetaData newKs = KSMetaData.create(cf.ksName, KeyspaceParams.create(true, replicationMap)); MigrationManager.announceKeyspaceUpdate(newKs); KSMetaData newFetchedKs = Schema.instance.getKSMetaData(newKs.name); - assertEquals(newFetchedKs.strategyClass, newKs.strategyClass); - assertFalse(newFetchedKs.strategyClass.equals(oldKs.strategyClass)); + assertEquals(newFetchedKs.params.replication.klass, newKs.params.replication.klass); + assertFalse(newFetchedKs.params.replication.klass.equals(oldKs.params.replication.klass)); } /* http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java b/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java index 25d4134..75b99d4 100644 --- a/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java +++ b/test/unit/org/apache/cassandra/service/ActiveRepairServiceTest.java @@ -28,15 +28,14 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.AbstractReplicationStrategy; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.assertEquals; @@ -58,10 +57,9 @@ public class ActiveRepairServiceTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE5, - SimpleStrategy.class, - KSMetaData.optsWithRF(2), - SchemaLoader.standardCFMD(KEYSPACE5, CF_COUNTER), - SchemaLoader.standardCFMD(KEYSPACE5, CF_STANDRAD1)); + KeyspaceParams.simple(2), + SchemaLoader.standardCFMD(KEYSPACE5, CF_COUNTER), + SchemaLoader.standardCFMD(KEYSPACE5, CF_STANDRAD1)); } @Before http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/DataResolverTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/DataResolverTest.java b/test/unit/org/apache/cassandra/service/DataResolverTest.java index b4902a7..d752539 100644 --- a/test/unit/org/apache/cassandra/service/DataResolverTest.java +++ b/test/unit/org/apache/cassandra/service/DataResolverTest.java @@ -1,6 +1,4 @@ -package org.apache.cassandra.service; /* - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,9 +15,8 @@ package org.apache.cassandra.service; * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ - +package org.apache.cassandra.service; import java.net.InetAddress; import java.net.UnknownHostException; @@ -31,15 +28,14 @@ import org.junit.*; 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.rows.*; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.net.*; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.Util.assertClustering; @@ -80,8 +76,7 @@ public class DataResolverTest .build(); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), cfMetadata); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java b/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java index b9367e4..b89f01d 100644 --- a/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java +++ b/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java @@ -28,9 +28,8 @@ import org.junit.Test; 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.marshal.AsciiType; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.thrift.*; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.thrift.TException; @@ -63,13 +62,12 @@ public class EmbeddedCassandraServiceTest SchemaLoader.prepareServer(); setup(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD, true, false, false) - .addPartitionKey("pk", AsciiType.instance) - .addClusteringColumn("ck", AsciiType.instance) - .addRegularColumn("val", AsciiType.instance) - .build()); + KeyspaceParams.simple(1), + CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD, true, false, false) + .addPartitionKey("pk", AsciiType.instance) + .addClusteringColumn("ck", AsciiType.instance) + .addRegularColumn("val", AsciiType.instance) + .build()); } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java index c2a9769..450f226 100644 --- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java +++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java @@ -714,10 +714,10 @@ public class LeaveAndBootstrapTest KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName); return AbstractReplicationStrategy.createReplicationStrategy( keyspaceName, - ksmd.strategyClass, + ksmd.params.replication.klass, tmd, new SimpleSnitch(), - ksmd.strategyOptions); + ksmd.params.replication.options); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/MoveTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/MoveTest.java b/test/unit/org/apache/cassandra/service/MoveTest.java index cf20273..b69d544 100644 --- a/test/unit/org/apache/cassandra/service/MoveTest.java +++ b/test/unit/org/apache/cassandra/service/MoveTest.java @@ -560,10 +560,10 @@ public class MoveTest KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName); return AbstractReplicationStrategy.createReplicationStrategy( keyspaceName, - ksmd.strategyClass, + ksmd.params.replication.klass, tmd, new SimpleSnitch(), - ksmd.strategyOptions); + ksmd.params.replication.options); } private Token positionToken(int position) http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/QueryPagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java index 7aa1f87..228b2a9 100644 --- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java @@ -28,7 +28,6 @@ import org.junit.runner.RunWith; import org.apache.cassandra.*; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.rows.RowIterator; @@ -36,7 +35,7 @@ import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.partitions.FilteredPartition; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.pager.QueryPager; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -58,12 +57,10 @@ public class QueryPagerTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD)); SchemaLoader.createKeyspace(KEYSPACE_CQL, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), + KeyspaceParams.simple(1), CFMetaData.compile("CREATE TABLE " + CF_CQL + " (" + "k text," + "c text," http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java index 24d57e7..3ec6264 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -46,6 +46,7 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.PropertyFileSnitch; import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.LegacySchemaTables; import static org.junit.Assert.assertEquals; @@ -118,9 +119,10 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC1", "1"); configOptions.put("DC2", "1"); + configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "NetworkTopologyStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); Schema.instance.setKeyspaceDefinition(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangeForEndpointWithinDC(meta.name, @@ -160,9 +162,10 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC1", "1"); configOptions.put("DC2", "1"); + configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "NetworkTopologyStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); Schema.instance.setKeyspaceDefinition(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangesForEndpoint(meta.name, InetAddress.getByName("127.0.0.1")); @@ -196,9 +199,10 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC2", "2"); + configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "NetworkTopologyStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); Schema.instance.setKeyspaceDefinition(meta); // endpoints in DC1 should not have primary range @@ -234,9 +238,10 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC2", "2"); + configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "NetworkTopologyStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); Schema.instance.setKeyspaceDefinition(meta); // endpoints in DC1 should not have primary range @@ -285,9 +290,10 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC2", "2"); + configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "NetworkTopologyStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); Schema.instance.setKeyspaceDefinition(meta); // endpoints in DC1 should not have primary range @@ -351,9 +357,10 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC1", "1"); configOptions.put("DC2", "2"); + configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "NetworkTopologyStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); Schema.instance.setKeyspaceDefinition(meta); // endpoints in DC1 should have primary ranges which also cover DC2 @@ -411,11 +418,8 @@ public class StorageServiceServerTest metadata.updateNormalToken(new StringToken("B"), InetAddress.getByName("127.0.0.2")); metadata.updateNormalToken(new StringToken("C"), InetAddress.getByName("127.0.0.3")); - Map<String, String> configOptions = new HashMap<>(); - configOptions.put("replication_factor", "2"); - Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "SimpleStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.simpleTransient(2)); Schema.instance.setKeyspaceDefinition(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangesForEndpoint(meta.name, InetAddress.getByName("127.0.0.1")); @@ -446,7 +450,7 @@ public class StorageServiceServerTest configOptions.put("replication_factor", "2"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.newKeyspace("Keyspace1", "SimpleStrategy", configOptions, false); + KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.simpleTransient(2)); Schema.instance.setKeyspaceDefinition(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangeForEndpointWithinDC(meta.name, InetAddress.getByName("127.0.0.1")); http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java index 06c9fc0..6227a1f 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@ -29,14 +29,13 @@ import org.junit.Test; import junit.framework.Assert; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.assertEquals; @@ -52,9 +51,8 @@ public class StreamTransferTaskTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD)); + KeyspaceParams.simple(1), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 3fe8d7a..0a3c02a 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -37,7 +37,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.*; @@ -48,7 +47,7 @@ import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -79,27 +78,24 @@ public class StreamingTransferTest SchemaLoader.prepareServer(); StorageService.instance.initServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - CFMetaData.Builder.create(KEYSPACE1, CF_COUNTER, false, true, true) - .addPartitionKey("key", BytesType.instance) - .build(), - CFMetaData.Builder.create(KEYSPACE1, CF_STANDARDINT) - .addPartitionKey("key", AsciiType.instance) - .addClusteringColumn("cols", Int32Type.instance) - .addRegularColumn("val", BytesType.instance) - .build(), - SchemaLoader.compositeIndexCFMD(KEYSPACE1, CF_INDEX, true)); + KeyspaceParams.simple(1), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), + CFMetaData.Builder.create(KEYSPACE1, CF_COUNTER, false, true, true) + .addPartitionKey("key", BytesType.instance) + .build(), + CFMetaData.Builder.create(KEYSPACE1, CF_STANDARDINT) + .addPartitionKey("key", AsciiType.instance) + .addClusteringColumn("cols", Int32Type.instance) + .addRegularColumn("val", BytesType.instance) + .build(), + SchemaLoader.compositeIndexCFMD(KEYSPACE1, CF_INDEX, true)); SchemaLoader.createKeyspace(KEYSPACE2, - SimpleStrategy.class, - KSMetaData.optsWithRF(1)); + KeyspaceParams.simple(1)); SchemaLoader.createKeyspace(KEYSPACE_CACHEKEY, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - SchemaLoader.standardCFMD(KEYSPACE_CACHEKEY, CF_STANDARD), - SchemaLoader.standardCFMD(KEYSPACE_CACHEKEY, CF_STANDARD2), - SchemaLoader.standardCFMD(KEYSPACE_CACHEKEY, CF_STANDARD3)); + KeyspaceParams.simple(1), + SchemaLoader.standardCFMD(KEYSPACE_CACHEKEY, CF_STANDARD), + SchemaLoader.standardCFMD(KEYSPACE_CACHEKEY, CF_STANDARD2), + SchemaLoader.standardCFMD(KEYSPACE_CACHEKEY, CF_STANDARD3)); } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java b/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java index 7097b9a..5b61124 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.triggers; -import java.util.Collections; - import org.junit.BeforeClass; import org.junit.Test; @@ -28,7 +26,8 @@ import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.config.TriggerDefinition; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.Tables; import org.apache.cassandra.service.MigrationManager; import static org.junit.Assert.*; @@ -52,11 +51,7 @@ public class TriggersSchemaTest TriggerDefinition td = TriggerDefinition.create(triggerName, triggerClass); CFMetaData cfm1 = CFMetaData.compile(String.format("CREATE TABLE %s (k int PRIMARY KEY, v int)", cfName), ksName); cfm1.addTriggerDefinition(td); - KSMetaData ksm = KSMetaData.newKeyspace(ksName, - SimpleStrategy.class, - Collections.singletonMap("replication_factor", "1"), - true, - Collections.singletonList(cfm1)); + KSMetaData ksm = KSMetaData.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName); @@ -68,11 +63,7 @@ public class TriggersSchemaTest @Test public void addNewCfWithTriggerToKs() throws Exception { - KSMetaData ksm = KSMetaData.newKeyspace(ksName, - SimpleStrategy.class, - Collections.singletonMap("replication_factor", "1"), - true, - Collections.EMPTY_LIST); + KSMetaData ksm = KSMetaData.create(ksName, KeyspaceParams.simple(1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm1 = CFMetaData.compile(String.format("CREATE TABLE %s (k int PRIMARY KEY, v int)", cfName), ksName); @@ -91,11 +82,7 @@ public class TriggersSchemaTest public void addTriggerToCf() throws Exception { CFMetaData cfm1 = CFMetaData.compile(String.format("CREATE TABLE %s (k int PRIMARY KEY, v int)", cfName), ksName); - KSMetaData ksm = KSMetaData.newKeyspace(ksName, - SimpleStrategy.class, - Collections.singletonMap("replication_factor", "1"), - true, - Collections.singletonList(cfm1)); + KSMetaData ksm = KSMetaData.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).copy(); @@ -115,11 +102,7 @@ public class TriggersSchemaTest TriggerDefinition td = TriggerDefinition.create(triggerName, triggerClass); CFMetaData cfm1 = CFMetaData.compile(String.format("CREATE TABLE %s (k int PRIMARY KEY, v int)", cfName), ksName); cfm1.addTriggerDefinition(td); - KSMetaData ksm = KSMetaData.newKeyspace(ksName, - SimpleStrategy.class, - Collections.singletonMap("replication_factor", "1"), - true, - Collections.singletonList(cfm1)); + KSMetaData ksm = KSMetaData.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).copy(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e3f612/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java b/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java index db04ddb..a2cff63 100644 --- a/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java +++ b/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java @@ -26,14 +26,13 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.vint.EncodedDataInputStream; import org.apache.cassandra.utils.vint.EncodedDataOutputStream; @@ -50,10 +49,9 @@ public class EncodedStreamsTest { SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - SchemaLoader.counterCFMD(KEYSPACE1, CF_COUNTER)); + KeyspaceParams.simple(1), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), + SchemaLoader.counterCFMD(KEYSPACE1, CF_COUNTER)); } @Test
