http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/config/CFMetaDataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java deleted file mode 100644 index b1249a6..0000000 --- a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * 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 - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cassandra.config; - -import java.util.*; - -import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.Mutation; -import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.db.rows.UnfilteredRowIterators; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.schema.*; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; - -import org.junit.BeforeClass; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public class CFMetaDataTest -{ - private static final String KEYSPACE1 = "CFMetaDataTest1"; - private static final String CF_STANDARD1 = "Standard1"; - - @BeforeClass - public static void defineSchema() throws ConfigurationException - { - SchemaLoader.prepareServer(); - SchemaLoader.createKeyspace(KEYSPACE1, - KeyspaceParams.simple(1), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1)); - } - - @Test - public void testConversionsInverses() throws Exception - { - for (String keyspaceName : Schema.instance.getNonSystemKeyspaces()) - { - for (ColumnFamilyStore cfs : Keyspace.open(keyspaceName).getColumnFamilyStores()) - { - CFMetaData cfm = cfs.metadata; - checkInverses(cfm); - - // Testing with compression to catch #3558 - CFMetaData withCompression = cfm.copy(); - withCompression.compression(CompressionParams.snappy(32768)); - checkInverses(withCompression); - } - } - } - - private void checkInverses(CFMetaData cfm) throws Exception - { - KeyspaceMetadata keyspace = Schema.instance.getKSMetaData(cfm.ksName); - - // Test schema conversion - Mutation rm = SchemaKeyspace.makeCreateTableMutation(keyspace, cfm, FBUtilities.timestampMicros()).build(); - PartitionUpdate cfU = rm.getPartitionUpdate(Schema.instance.getId(SchemaConstants.SCHEMA_KEYSPACE_NAME, SchemaKeyspace.TABLES)); - PartitionUpdate cdU = rm.getPartitionUpdate(Schema.instance.getId(SchemaConstants.SCHEMA_KEYSPACE_NAME, SchemaKeyspace.COLUMNS)); - - UntypedResultSet.Row tableRow = QueryProcessor.resultify(String.format("SELECT * FROM %s.%s", SchemaConstants.SCHEMA_KEYSPACE_NAME, SchemaKeyspace.TABLES), - UnfilteredRowIterators.filter(cfU.unfilteredIterator(), FBUtilities.nowInSeconds())) - .one(); - TableParams params = SchemaKeyspace.createTableParamsFromRow(tableRow); - - UntypedResultSet columnsRows = QueryProcessor.resultify(String.format("SELECT * FROM %s.%s", SchemaConstants.SCHEMA_KEYSPACE_NAME, SchemaKeyspace.COLUMNS), - UnfilteredRowIterators.filter(cdU.unfilteredIterator(), FBUtilities.nowInSeconds())); - Set<ColumnDefinition> columns = new HashSet<>(); - for (UntypedResultSet.Row row : columnsRows) - columns.add(SchemaKeyspace.createColumnFromRow(row, Types.none())); - - assertEquals(cfm.params, params); - assertEquals(new HashSet<>(cfm.allColumns()), columns); - } - - @Test - public void testIsNameValidPositive() - { - assertTrue(CFMetaData.isNameValid("abcdefghijklmnopqrstuvwxyz")); - assertTrue(CFMetaData.isNameValid("ABCDEFGHIJKLMNOPQRSTUVWXYZ")); - assertTrue(CFMetaData.isNameValid("_01234567890")); - } - - @Test - public void testIsNameValidNegative() - { - assertFalse(CFMetaData.isNameValid(null)); - assertFalse(CFMetaData.isNameValid("")); - assertFalse(CFMetaData.isNameValid(" ")); - assertFalse(CFMetaData.isNameValid("@")); - assertFalse(CFMetaData.isNameValid("!")); - } - - private static Set<String> primitiveTypes = new HashSet<String>(Arrays.asList(new String[] { "ascii", "bigint", "blob", "boolean", "date", - "duration", "decimal", "double", "float", - "inet", "int", "smallint", "text", "time", - "timestamp", "timeuuid", "tinyint", "uuid", - "varchar", "varint" })); - - @Test - public void typeCompatibilityTest() throws Throwable - { - Map<String, Set<String>> compatibilityMap = new HashMap<>(); - compatibilityMap.put("bigint", new HashSet<>(Arrays.asList(new String[] {"timestamp"}))); - compatibilityMap.put("blob", new HashSet<>(Arrays.asList(new String[] {"ascii", "bigint", "boolean", "date", "decimal", "double", "duration", - "float", "inet", "int", "smallint", "text", "time", "timestamp", - "timeuuid", "tinyint", "uuid", "varchar", "varint"}))); - compatibilityMap.put("date", new HashSet<>(Arrays.asList(new String[] {"int"}))); - compatibilityMap.put("time", new HashSet<>(Arrays.asList(new String[] {"bigint"}))); - compatibilityMap.put("text", new HashSet<>(Arrays.asList(new String[] {"ascii", "varchar"}))); - compatibilityMap.put("timestamp", new HashSet<>(Arrays.asList(new String[] {"bigint"}))); - compatibilityMap.put("varchar", new HashSet<>(Arrays.asList(new String[] {"ascii", "text"}))); - compatibilityMap.put("varint", new HashSet<>(Arrays.asList(new String[] {"bigint", "int", "timestamp"}))); - compatibilityMap.put("uuid", new HashSet<>(Arrays.asList(new String[] {"timeuuid"}))); - - for (String sourceTypeString: primitiveTypes) - { - AbstractType sourceType = CQLTypeParser.parse("KEYSPACE", sourceTypeString, Types.none()); - for (String destinationTypeString: primitiveTypes) - { - AbstractType destinationType = CQLTypeParser.parse("KEYSPACE", destinationTypeString, Types.none()); - - if (compatibilityMap.get(destinationTypeString) != null && - compatibilityMap.get(destinationTypeString).contains(sourceTypeString) || - sourceTypeString.equals(destinationTypeString)) - { - assertTrue(sourceTypeString + " should be compatible with " + destinationTypeString, - destinationType.isValueCompatibleWith(sourceType)); - } - else - { - assertFalse(sourceTypeString + " should not be compatible with " + destinationTypeString, - destinationType.isValueCompatibleWith(sourceType)); - } - } - } - } - - @Test - public void clusteringColumnTypeCompatibilityTest() throws Throwable - { - Map<String, Set<String>> compatibilityMap = new HashMap<>(); - compatibilityMap.put("blob", new HashSet<>(Arrays.asList(new String[] {"ascii", "text", "varchar"}))); - compatibilityMap.put("text", new HashSet<>(Arrays.asList(new String[] {"ascii", "varchar"}))); - compatibilityMap.put("varchar", new HashSet<>(Arrays.asList(new String[] {"ascii", "text" }))); - - for (String sourceTypeString: primitiveTypes) - { - AbstractType sourceType = CQLTypeParser.parse("KEYSPACE", sourceTypeString, Types.none()); - for (String destinationTypeString: primitiveTypes) - { - AbstractType destinationType = CQLTypeParser.parse("KEYSPACE", destinationTypeString, Types.none()); - - if (compatibilityMap.get(destinationTypeString) != null && - compatibilityMap.get(destinationTypeString).contains(sourceTypeString) || - sourceTypeString.equals(destinationTypeString)) - { - assertTrue(sourceTypeString + " should be compatible with " + destinationTypeString, - destinationType.isCompatibleWith(sourceType)); - } - else - { - assertFalse(sourceTypeString + " should not be compatible with " + destinationTypeString, - destinationType.isCompatibleWith(sourceType)); - } - } - } - } -}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java index bce9182..c1dc268 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.config; -import java.io.IOException; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; @@ -30,20 +29,12 @@ import java.util.Enumeration; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.apache.cassandra.OrderedJUnit4ClassRunner; -import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.gms.Gossiper; -import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.service.MigrationManager; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - import static org.junit.Assert.assertTrue; @RunWith(OrderedJUnit4ClassRunner.class) @@ -57,42 +48,6 @@ public class DatabaseDescriptorTest // this came as a result of CASSANDRA-995 @Test - public void testTransKsMigration() throws ConfigurationException, IOException - { - SchemaLoader.cleanupAndLeaveDirs(); - Schema.instance.loadFromDisk(); - assertEquals(0, Schema.instance.getNonSystemKeyspaces().size()); - - Gossiper.instance.start((int)(System.currentTimeMillis() / 1000)); - Keyspace.setInitialized(); - - try - { - // add a few. - MigrationManager.announceNewKeyspace(KeyspaceMetadata.create("ks0", KeyspaceParams.simple(3))); - MigrationManager.announceNewKeyspace(KeyspaceMetadata.create("ks1", KeyspaceParams.simple(3))); - - assertNotNull(Schema.instance.getKSMetaData("ks0")); - assertNotNull(Schema.instance.getKSMetaData("ks1")); - - Schema.instance.clearKeyspaceMetadata(Schema.instance.getKSMetaData("ks0")); - Schema.instance.clearKeyspaceMetadata(Schema.instance.getKSMetaData("ks1")); - - assertNull(Schema.instance.getKSMetaData("ks0")); - assertNull(Schema.instance.getKSMetaData("ks1")); - - Schema.instance.loadFromDisk(); - - assertNotNull(Schema.instance.getKSMetaData("ks0")); - assertNotNull(Schema.instance.getKSMetaData("ks1")); - } - finally - { - Gossiper.instance.stop(); - } - } - - @Test public void testConfigurationLoader() throws Exception { // By default, we should load from the yaml @@ -254,7 +209,5 @@ public class DatabaseDescriptorTest Collection<String> tokens = DatabaseDescriptor.tokensFromString(" a,b ,c , d, f,g,h"); assertEquals(7, tokens.size()); assertTrue(tokens.containsAll(Arrays.asList(new String[]{"a", "b", "c", "d", "f", "g", "h"}))); - - } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index a3e2021..68d8f66 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -42,10 +42,8 @@ import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.concurrent.ScheduledExecutors; -import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.schema.*; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; -import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.ThreadAwareSecurityManager; import org.apache.cassandra.cql3.statements.ParsedStatement; @@ -58,6 +56,7 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.locator.AbstractEndpointSnitch; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; @@ -725,9 +724,9 @@ public abstract class CQLTester } } - protected CFMetaData currentTableMetadata() + protected TableMetadata currentTableMetadata() { - return Schema.instance.getCFMetaData(KEYSPACE, currentTable()); + return Schema.instance.getTableMetadata(KEYSPACE, currentTable()); } protected com.datastax.driver.core.ResultSet executeNet(ProtocolVersion protocolVersion, String query, Object... values) throws Throwable http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java b/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java index 32e6aec..408d489 100644 --- a/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java +++ b/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java @@ -30,12 +30,13 @@ import org.junit.Test; import org.apache.cassandra.cache.KeyCacheKey; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.index.Index; import org.apache.cassandra.metrics.CacheMetrics; import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.schema.CachingParams; +import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.service.StorageService; @@ -43,7 +44,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNull; -import org.apache.cassandra.utils.Pair; public class KeyCacheCqlTest extends CQLTester @@ -301,11 +301,6 @@ public class KeyCacheCqlTest extends CQLTester assertEquals(500, result.size()); } - //Test Schema.getColumnFamilyStoreIncludingIndexes, several null check paths - //are defensive and unreachable - assertNull(Schema.instance.getColumnFamilyStoreIncludingIndexes(Pair.create("foo", "bar"))); - assertNull(Schema.instance.getColumnFamilyStoreIncludingIndexes(Pair.create(KEYSPACE_PER_TEST, "bar"))); - dropTable("DROP TABLE %s"); Schema.instance.updateVersion(); @@ -386,8 +381,9 @@ public class KeyCacheCqlTest extends CQLTester while(iter.hasNext()) { KeyCacheKey key = iter.next(); - Assert.assertFalse(key.ksAndCFName.left.equals("KEYSPACE_PER_TEST")); - Assert.assertFalse(key.ksAndCFName.right.startsWith(table)); + TableMetadataRef tableMetadataRef = Schema.instance.getTableMetadataRef(key.tableId); + Assert.assertFalse(tableMetadataRef.keyspace.equals("KEYSPACE_PER_TEST")); + Assert.assertFalse(tableMetadataRef.name.startsWith(table)); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java b/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java index 24efc5e..b4fe0f5 100644 --- a/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java +++ b/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.cql3; import static junit.framework.Assert.fail; import java.io.Closeable; -import java.util.UUID; import java.util.concurrent.ExecutionException; import org.junit.Assert; @@ -34,6 +33,7 @@ import org.apache.cassandra.db.commitlog.CommitLogSegment; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.io.FSWriteError; +import org.apache.cassandra.schema.TableId; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.KillerForTests; @@ -125,9 +125,9 @@ public class OutOfSpaceTest extends CQLTester } // Make sure commit log wasn't discarded. - UUID cfid = currentTableMetadata().cfId; + TableId tableId = currentTableMetadata().id; for (CommitLogSegment segment : CommitLog.instance.segmentManager.getActiveSegments()) - if (segment.getDirtyCFIDs().contains(cfid)) + if (segment.getDirtyTableIds().contains(tableId)) return; fail("Expected commit log to remain dirty for the affected table."); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java b/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java index e01b812..cd7e381 100644 --- a/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java +++ b/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java @@ -27,7 +27,7 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.SyntaxError; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.index.StubIndex; import org.apache.cassandra.service.EmbeddedCassandraService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java index 0bcb877..fb577ec 100644 --- a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java +++ b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java @@ -25,7 +25,7 @@ import java.util.List; import org.junit.Test; import junit.framework.Assert; -import org.apache.cassandra.config.SchemaConstants; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.marshal.Int32Type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java index cc8bfe9..ea07f90 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java @@ -31,9 +31,6 @@ import junit.framework.Assert; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.transport.ProtocolVersion; http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java index 86e00dc..8d2f3da 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java @@ -34,9 +34,9 @@ import junit.framework.Assert; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.Schema; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.Schema; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.serializers.SimpleDateSerializer; import org.apache.cassandra.serializers.TimeSerializer; @@ -176,8 +176,8 @@ public class ViewSchemaTest extends CQLTester //Test alter add executeNet(protocolVersion, "ALTER TABLE %s ADD foo text"); - CFMetaData metadata = Schema.instance.getCFMetaData(keyspace(), "mv1_test"); - Assert.assertNotNull(metadata.getColumnDefinition(ByteBufferUtil.bytes("foo"))); + TableMetadata metadata = Schema.instance.getTableMetadata(keyspace(), "mv1_test"); + Assert.assertNotNull(metadata.getColumn(ByteBufferUtil.bytes("foo"))); updateView("INSERT INTO %s(k,asciival,bigintval,foo)VALUES(?,?,?,?)", 0, "foo", 1L, "bar"); assertRows(execute("SELECT foo from %s"), row("bar")); @@ -186,8 +186,8 @@ public class ViewSchemaTest extends CQLTester executeNet(protocolVersion, "ALTER TABLE %s RENAME asciival TO bar"); assertRows(execute("SELECT bar from %s"), row("foo")); - metadata = Schema.instance.getCFMetaData(keyspace(), "mv1_test"); - Assert.assertNotNull(metadata.getColumnDefinition(ByteBufferUtil.bytes("bar"))); + metadata = Schema.instance.getTableMetadata(keyspace(), "mv1_test"); + Assert.assertNotNull(metadata.getColumn(ByteBufferUtil.bytes("bar"))); } @@ -286,12 +286,12 @@ public class ViewSchemaTest extends CQLTester "tupleval frozen<tuple<int, ascii, uuid>>," + "udtval frozen<" + myType + ">)"); - CFMetaData metadata = currentTableMetadata(); + TableMetadata metadata = currentTableMetadata(); execute("USE " + keyspace()); executeNet(protocolVersion, "USE " + keyspace()); - for (ColumnDefinition def : new HashSet<>(metadata.allColumns())) + for (ColumnMetadata def : new HashSet<>(metadata.columns())) { try { http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/ViewTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java b/test/unit/org/apache/cassandra/cql3/ViewTest.java index ac065e6..b5573c2 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java @@ -35,8 +35,8 @@ import com.datastax.driver.core.exceptions.InvalidQueryException; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SystemKeyspace; @@ -636,12 +636,12 @@ public class ViewTest extends CQLTester "bigintval bigint, " + "PRIMARY KEY((k, asciival)))"); - CFMetaData metadata = currentTableMetadata(); + TableMetadata metadata = currentTableMetadata(); execute("USE " + keyspace()); executeNet(protocolVersion, "USE " + keyspace()); - for (ColumnDefinition def : new HashSet<>(metadata.allColumns())) + for (ColumnMetadata def : new HashSet<>(metadata.columns())) { try { http://git-wip-us.apache.org/repos/asf/cassandra/blob/af3fe39d/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java index 5822027..0035fa1 100644 --- a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java @@ -23,10 +23,7 @@ import java.util.*; import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.cql3.*; -import org.apache.cassandra.cql3.Constants.Value; -import org.apache.cassandra.cql3.conditions.ColumnCondition; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.ListType; @@ -34,6 +31,7 @@ import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.serializers.TimeUUIDSerializer; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; @@ -52,13 +50,13 @@ public class ColumnConditionTest public static final ByteBuffer ONE = Int32Type.instance.fromString("1"); public static final ByteBuffer TWO = Int32Type.instance.fromString("2"); - private static Row newRow(ColumnDefinition definition, ByteBuffer value) + private static Row newRow(ColumnMetadata definition, ByteBuffer value) { BufferCell cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, value, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } - private static Row newRow(ColumnDefinition definition, List<ByteBuffer> values) + private static Row newRow(ColumnMetadata definition, List<ByteBuffer> values) { Row.Builder builder = BTreeRow.sortedBuilder(); builder.newRow(Clustering.EMPTY); @@ -82,7 +80,7 @@ public class ColumnConditionTest return builder.build(); } - private static Row newRow(ColumnDefinition definition, SortedSet<ByteBuffer> values) + private static Row newRow(ColumnMetadata definition, SortedSet<ByteBuffer> values) { Row.Builder builder = BTreeRow.sortedBuilder(); builder.newRow(Clustering.EMPTY); @@ -102,7 +100,7 @@ public class ColumnConditionTest return builder.build(); } - private static Row newRow(ColumnDefinition definition, Map<ByteBuffer, ByteBuffer> values) + private static Row newRow(ColumnMetadata definition, Map<ByteBuffer, ByteBuffer> values) { Row.Builder builder = BTreeRow.sortedBuilder(); builder.newRow(Clustering.EMPTY); @@ -124,7 +122,7 @@ public class ColumnConditionTest private static boolean conditionApplies(ByteBuffer rowValue, Operator op, ByteBuffer conditionValue) { - ColumnDefinition definition = ColumnDefinition.regularDef("ks", "cf", "c", Int32Type.instance); + ColumnMetadata definition = ColumnMetadata.regularColumn("ks", "cf", "c", Int32Type.instance); ColumnCondition condition = ColumnCondition.condition(definition, op, Terms.of(new Constants.Value(conditionValue))); ColumnCondition.Bound bound = condition.bind(QueryOptions.DEFAULT); return bound.appliesTo(newRow(definition, rowValue)); @@ -132,7 +130,7 @@ public class ColumnConditionTest private static boolean conditionApplies(List<ByteBuffer> rowValue, Operator op, List<ByteBuffer> conditionValue) { - ColumnDefinition definition = ColumnDefinition.regularDef("ks", "cf", "c", ListType.getInstance(Int32Type.instance, true)); + ColumnMetadata definition = ColumnMetadata.regularColumn("ks", "cf", "c", ListType.getInstance(Int32Type.instance, true)); ColumnCondition condition = ColumnCondition.condition(definition, op, Terms.of(new Lists.Value(conditionValue))); ColumnCondition.Bound bound = condition.bind(QueryOptions.DEFAULT); return bound.appliesTo(newRow(definition, rowValue)); @@ -140,7 +138,7 @@ public class ColumnConditionTest private static boolean conditionApplies(SortedSet<ByteBuffer> rowValue, Operator op, SortedSet<ByteBuffer> conditionValue) { - ColumnDefinition definition = ColumnDefinition.regularDef("ks", "cf", "c", SetType.getInstance(Int32Type.instance, true)); + ColumnMetadata definition = ColumnMetadata.regularColumn("ks", "cf", "c", SetType.getInstance(Int32Type.instance, true)); ColumnCondition condition = ColumnCondition.condition(definition, op, Terms.of(new Sets.Value(conditionValue))); ColumnCondition.Bound bound = condition.bind(QueryOptions.DEFAULT); return bound.appliesTo(newRow(definition, rowValue)); @@ -148,7 +146,7 @@ public class ColumnConditionTest private static boolean conditionApplies(Map<ByteBuffer, ByteBuffer> rowValue, Operator op, Map<ByteBuffer, ByteBuffer> conditionValue) { - ColumnDefinition definition = ColumnDefinition.regularDef("ks", "cf", "c", MapType.getInstance(Int32Type.instance, Int32Type.instance, true)); + ColumnMetadata definition = ColumnMetadata.regularColumn("ks", "cf", "c", MapType.getInstance(Int32Type.instance, Int32Type.instance, true)); ColumnCondition condition = ColumnCondition.condition(definition, op, Terms.of(new Maps.Value(conditionValue))); ColumnCondition.Bound bound = condition.bind(QueryOptions.DEFAULT); return bound.appliesTo(newRow(definition, rowValue));
