Repository: cassandra Updated Branches: refs/heads/trunk 31e3f612b -> a89597da1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java index ee9364a..637e072 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java @@ -36,7 +36,6 @@ import org.junit.Test; import com.datastax.driver.core.*; import com.datastax.driver.core.exceptions.InvalidQueryException; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; @@ -47,6 +46,7 @@ import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.exceptions.FunctionExecutionException; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.transport.Event; @@ -2174,7 +2174,7 @@ public class UFTest extends CQLTester "LANGUAGE JAVA\n" + "AS 'throw new RuntimeException();';"); - KSMetaData ksm = Schema.instance.getKSMetaData(KEYSPACE_PER_TEST); + KeyspaceMetadata ksm = Schema.instance.getKSMetaData(KEYSPACE_PER_TEST); UDFunction f = (UDFunction) ksm.functions.get(parseFunctionName(fName)).iterator().next(); UDFunction broken = UDFunction.createBrokenFunction(f.name(), @@ -2185,7 +2185,7 @@ public class UFTest extends CQLTester "java", f.body(), new InvalidRequestException("foo bar is broken")); - Schema.instance.setKeyspaceDefinition(ksm.withSwapped(ksm.functions.without(f.name(), f.argTypes()).with(broken))); + Schema.instance.setKeyspaceMetadata(ksm.withSwapped(ksm.functions.without(f.name(), f.argTypes()).with(broken))); assertInvalidThrowMessage("foo bar is broken", InvalidRequestException.class, "SELECT key, " + fName + "(dval) FROM %s"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java index ac26368..6971b79 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java @@ -27,7 +27,6 @@ import org.apache.commons.lang3.time.DateUtils; import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.functions.UDAggregate; @@ -35,6 +34,7 @@ import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.FunctionExecutionException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.serializers.Int32Serializer; +import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Event; import org.apache.cassandra.transport.messages.ResultMessage; @@ -1015,7 +1015,7 @@ public class AggregationTest extends CQLTester "SFUNC " + shortFunctionName(fState) + " " + "STYPE int "); - KSMetaData ksm = Schema.instance.getKSMetaData(keyspace()); + KeyspaceMetadata ksm = Schema.instance.getKSMetaData(keyspace()); UDAggregate f = (UDAggregate) ksm.functions.get(parseFunctionName(a)).iterator().next(); UDAggregate broken = UDAggregate.createBroken(f.name(), @@ -1024,7 +1024,7 @@ public class AggregationTest extends CQLTester null, new InvalidRequestException("foo bar is broken")); - Schema.instance.setKeyspaceDefinition(ksm.withSwapped(ksm.functions.without(f.name(), f.argTypes()).with(broken))); + Schema.instance.setKeyspaceMetadata(ksm.withSwapped(ksm.functions.without(f.name(), f.argTypes()).with(broken))); assertInvalidThrowMessage("foo bar is broken", InvalidRequestException.class, "SELECT " + a + "(val) FROM %s"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java index e4f16d1..e3a0331 100644 --- a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java @@ -96,7 +96,7 @@ public class SystemKeyspaceTest // Compare versions again & verify that snapshots were created for all tables in the system ks SystemKeyspace.snapshotOnVersionChange(); - assertEquals(SystemKeyspace.definition().tables.size(), getSystemSnapshotFiles().size()); + assertEquals(SystemKeyspace.metadata().tables.size(), getSystemSnapshotFiles().size()); // clear out the snapshots & set the previous recorded version equal to the latest, we shouldn't // see any new snapshots created this time. http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java index ce2b1ac..fcf2630 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java @@ -25,13 +25,11 @@ import java.util.List; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.RateLimiter; -import junit.framework.Assert; import org.junit.BeforeClass; import org.junit.After; import org.junit.Test; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.db.rows.RowStats; @@ -43,15 +41,11 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.concurrent.Refs; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.concurrent.Refs; -import org.apache.cassandra.Util; import org.apache.cassandra.UpdateBuilder; import static org.hamcrest.CoreMatchers.is; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java index a54156c..9eb6f5a 100644 --- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java @@ -24,7 +24,6 @@ package org.apache.cassandra.db.compaction; import java.io.RandomAccessFile; import java.util.*; -import com.google.common.collect.Iterators; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -34,15 +33,11 @@ import static org.junit.Assert.assertNotNull; 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.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.utils.ByteBufferUtil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java index 400adb5..b2e5ed4 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java @@ -28,7 +28,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.*; @@ -37,7 +36,6 @@ import org.apache.cassandra.db.partitions.ArrayBackedPartition; import org.apache.cassandra.db.partitions.PartitionUpdate; 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.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 7646100..2feb3e9 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -24,14 +24,12 @@ import java.util.concurrent.TimeUnit; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.*; 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.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 8cee842..c5c4607 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java @@ -35,7 +35,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.UpdateBuilder; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; @@ -53,15 +52,10 @@ import org.apache.cassandra.db.partitions.PartitionUpdate; 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.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.locator.SimpleStrategy; -import org.apache.cassandra.db.compaction.SSTableSplitter; 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; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 846dff5..0dd8825 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java @@ -30,7 +30,6 @@ 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.ColumnFamilyStore; import org.apache.cassandra.db.DataRange; import org.apache.cassandra.db.DecoratedKey; @@ -45,7 +44,6 @@ import org.apache.cassandra.dht.ByteOrderedPartitioner; 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; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 14683eb..34338ea 100644 --- a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java @@ -28,7 +28,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.IPartitioner; @@ -36,6 +35,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.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.PendingRangeCalculatorService; import org.apache.cassandra.service.StorageServiceAccessor; @@ -181,7 +181,7 @@ public class SimpleStrategyTest private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) { - KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName); + KeyspaceMetadata ksmd = Schema.instance.getKSMetaData(keyspaceName); return AbstractReplicationStrategy.createReplicationStrategy( keyspaceName, ksmd.params.replication.klass, http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 38e3cf5..dcc4c51 100644 --- a/test/unit/org/apache/cassandra/schema/DefsTest.java +++ b/test/unit/org/apache/cassandra/schema/DefsTest.java @@ -34,7 +34,6 @@ import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.IndexType; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; @@ -163,7 +162,7 @@ public class DefsTest { final String ks = KEYSPACE1; final String cf = "BrandNewCfWithNull"; - KSMetaData original = Schema.instance.getKSMetaData(ks); + KeyspaceMetadata original = Schema.instance.getKSMetaData(ks); CFMetaData newCf = addTestTable(original.name, cf, null); @@ -179,7 +178,7 @@ public class DefsTest { final String ksName = KEYSPACE1; final String tableName = "anewtable"; - KSMetaData original = Schema.instance.getKSMetaData(ksName); + KeyspaceMetadata original = Schema.instance.getKSMetaData(ksName); CFMetaData cfm = addTestTable(original.name, tableName, "A New Table"); @@ -208,7 +207,7 @@ public class DefsTest public void dropCf() throws ConfigurationException { // sanity - final KSMetaData ks = Schema.instance.getKSMetaData(KEYSPACE1); + final KeyspaceMetadata ks = Schema.instance.getKSMetaData(KEYSPACE1); assertNotNull(ks); final CFMetaData cfm = ks.tables.getNullable(TABLE1); assertNotNull(cfm); @@ -258,7 +257,7 @@ public class DefsTest public void addNewKS() throws ConfigurationException { CFMetaData cfm = addTestTable("newkeyspace1", "newstandard1", "A new cf for a new ks"); - KSMetaData newKs = KSMetaData.create(cfm.ksName, KeyspaceParams.simple(5), Tables.of(cfm)); + KeyspaceMetadata newKs = KeyspaceMetadata.create(cfm.ksName, KeyspaceParams.simple(5), Tables.of(cfm)); MigrationManager.announceNewKeyspace(newKs); assertNotNull(Schema.instance.getKSMetaData(cfm.ksName)); @@ -279,7 +278,7 @@ public class DefsTest public void dropKS() throws ConfigurationException { // sanity - final KSMetaData ks = Schema.instance.getKSMetaData(KEYSPACE1); + final KeyspaceMetadata ks = Schema.instance.getKSMetaData(KEYSPACE1); assertNotNull(ks); final CFMetaData cfm = ks.tables.getNullable(TABLE2); assertNotNull(cfm); @@ -329,7 +328,7 @@ public class DefsTest public void dropKSUnflushed() throws ConfigurationException { // sanity - final KSMetaData ks = Schema.instance.getKSMetaData(KEYSPACE3); + final KeyspaceMetadata ks = Schema.instance.getKSMetaData(KEYSPACE3); assertNotNull(ks); final CFMetaData cfm = ks.tables.getNullable(TABLE1); assertNotNull(cfm); @@ -349,7 +348,7 @@ public class DefsTest public void createEmptyKsAddNewCf() throws ConfigurationException { assertNull(Schema.instance.getKSMetaData(EMPTY_KEYSPACE)); - KSMetaData newKs = KSMetaData.create(EMPTY_KEYSPACE, KeyspaceParams.simple(5)); + KeyspaceMetadata newKs = KeyspaceMetadata.create(EMPTY_KEYSPACE, KeyspaceParams.simple(5)); MigrationManager.announceNewKeyspace(newKs); assertNotNull(Schema.instance.getKSMetaData(EMPTY_KEYSPACE)); @@ -383,7 +382,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.create(cf.ksName, KeyspaceParams.simple(5), Tables.of(cf)); + KeyspaceMetadata oldKs = KeyspaceMetadata.create(cf.ksName, KeyspaceParams.simple(5), Tables.of(cf)); MigrationManager.announceNewKeyspace(oldKs); @@ -391,7 +390,7 @@ public class DefsTest assertEquals(Schema.instance.getKSMetaData(cf.ksName), oldKs); // names should match. - KSMetaData newBadKs2 = KSMetaData.create(cf.ksName + "trash", KeyspaceParams.simple(4)); + KeyspaceMetadata newBadKs2 = KeyspaceMetadata.create(cf.ksName + "trash", KeyspaceParams.simple(4)); try { MigrationManager.announceKeyspaceUpdate(newBadKs2); @@ -406,10 +405,10 @@ public class DefsTest replicationMap.put(KeyspaceParams.Replication.CLASS, OldNetworkTopologyStrategy.class.getName()); replicationMap.put("replication_factor", "1"); - KSMetaData newKs = KSMetaData.create(cf.ksName, KeyspaceParams.create(true, replicationMap)); + KeyspaceMetadata newKs = KeyspaceMetadata.create(cf.ksName, KeyspaceParams.create(true, replicationMap)); MigrationManager.announceKeyspaceUpdate(newKs); - KSMetaData newFetchedKs = Schema.instance.getKSMetaData(newKs.name); + KeyspaceMetadata newFetchedKs = Schema.instance.getKSMetaData(newKs.name); 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/a89597da/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 450f226..e5b2599 100644 --- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java +++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java @@ -31,7 +31,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.Schema; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.dht.IPartitioner; @@ -44,6 +43,7 @@ import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.SimpleSnitch; import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.schema.KeyspaceMetadata; import static org.junit.Assert.*; @@ -711,7 +711,7 @@ public class LeaveAndBootstrapTest private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) { - KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName); + KeyspaceMetadata ksmd = Schema.instance.getKSMetaData(keyspaceName); return AbstractReplicationStrategy.createReplicationStrategy( keyspaceName, ksmd.params.replication.klass, http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 b69d544..97fb39e 100644 --- a/test/unit/org/apache/cassandra/service/MoveTest.java +++ b/test/unit/org/apache/cassandra/service/MoveTest.java @@ -32,7 +32,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.Schema; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; @@ -46,6 +45,7 @@ import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.SimpleSnitch; import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.schema.KeyspaceMetadata; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -557,7 +557,7 @@ public class MoveTest private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) { - KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName); + KeyspaceMetadata ksmd = Schema.instance.getKSMetaData(keyspaceName); return AbstractReplicationStrategy.createReplicationStrategy( keyspaceName, ksmd.params.replication.klass, http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 3ec6264..624ec29 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; +import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SystemKeyspace; @@ -122,8 +122,8 @@ public class StorageServiceServerTest configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); + Schema.instance.setKeyspaceMetadata(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangeForEndpointWithinDC(meta.name, InetAddress.getByName("127.0.0.1")); @@ -165,8 +165,8 @@ public class StorageServiceServerTest configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); + Schema.instance.setKeyspaceMetadata(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangesForEndpoint(meta.name, InetAddress.getByName("127.0.0.1")); assert primaryRanges.size() == 1; @@ -202,8 +202,8 @@ public class StorageServiceServerTest configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); + Schema.instance.setKeyspaceMetadata(meta); // endpoints in DC1 should not have primary range Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangesForEndpoint(meta.name, InetAddress.getByName("127.0.0.1")); @@ -241,8 +241,8 @@ public class StorageServiceServerTest configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); + Schema.instance.setKeyspaceMetadata(meta); // endpoints in DC1 should not have primary range Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangeForEndpointWithinDC(meta.name, InetAddress.getByName("127.0.0.1")); @@ -293,8 +293,8 @@ public class StorageServiceServerTest configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); + Schema.instance.setKeyspaceMetadata(meta); // endpoints in DC1 should not have primary range Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangesForEndpoint(meta.name, InetAddress.getByName("127.0.0.1")); @@ -360,8 +360,8 @@ public class StorageServiceServerTest configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.create(false, configOptions)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); + Schema.instance.setKeyspaceMetadata(meta); // endpoints in DC1 should have primary ranges which also cover DC2 Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangeForEndpointWithinDC(meta.name, InetAddress.getByName("127.0.0.1")); @@ -419,8 +419,8 @@ public class StorageServiceServerTest metadata.updateNormalToken(new StringToken("C"), InetAddress.getByName("127.0.0.3")); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.simpleTransient(2)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.simpleTransient(2)); + Schema.instance.setKeyspaceMetadata(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangesForEndpoint(meta.name, InetAddress.getByName("127.0.0.1")); assert primaryRanges.size() == 1; @@ -450,8 +450,8 @@ public class StorageServiceServerTest configOptions.put("replication_factor", "2"); Keyspace.clear("Keyspace1"); - KSMetaData meta = KSMetaData.create("Keyspace1", KeyspaceParams.simpleTransient(2)); - Schema.instance.setKeyspaceDefinition(meta); + KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.simpleTransient(2)); + Schema.instance.setKeyspaceMetadata(meta); Collection<Range<Token>> primaryRanges = StorageService.instance.getPrimaryRangeForEndpointWithinDC(meta.name, InetAddress.getByName("127.0.0.1")); assert primaryRanges.size() == 1; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89597da/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 5b61124..8d66ca7 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java @@ -22,10 +22,10 @@ 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.config.Schema; import org.apache.cassandra.config.TriggerDefinition; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Tables; import org.apache.cassandra.service.MigrationManager; @@ -51,7 +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.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); + KeyspaceMetadata ksm = KeyspaceMetadata.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName); @@ -63,7 +63,7 @@ public class TriggersSchemaTest @Test public void addNewCfWithTriggerToKs() throws Exception { - KSMetaData ksm = KSMetaData.create(ksName, KeyspaceParams.simple(1)); + KeyspaceMetadata ksm = KeyspaceMetadata.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); @@ -82,7 +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.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); + KeyspaceMetadata ksm = KeyspaceMetadata.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).copy(); @@ -102,7 +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.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); + KeyspaceMetadata ksm = KeyspaceMetadata.create(ksName, KeyspaceParams.simple(1), Tables.of(cfm1)); MigrationManager.announceNewKeyspace(ksm); CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).copy();
