Repository: cassandra Updated Branches: refs/heads/13426 [created] b30c6da2d
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java index da5c3bd..bfd8a15 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java @@ -1414,10 +1414,8 @@ public class InsertUpdateIfConditionTest extends CQLTester { String tableName = createTable("CREATE TABLE %s (id text PRIMARY KEY, value1 blob, value2 blob)with comment = 'foo'"); - execute("use " + KEYSPACE); - // try dropping when doesn't exist - schemaChange("DROP INDEX IF EXISTS myindex"); + schemaChange(format("DROP INDEX IF EXISTS %s.myindex", KEYSPACE)); // create and confirm createIndex("CREATE INDEX IF NOT EXISTS myindex ON %s (value1)"); @@ -1428,7 +1426,7 @@ public class InsertUpdateIfConditionTest extends CQLTester execute("CREATE INDEX IF NOT EXISTS myindex ON %s (value1)"); // drop and confirm - execute("DROP INDEX IF EXISTS myindex"); + execute(format("DROP INDEX IF EXISTS %s.myindex", KEYSPACE)); Object[][] rows = getRows(execute("select index_name from system.\"IndexInfo\" where table_name = ?", tableName)); assertEquals(0, rows.length); http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/cql3/validation/operations/SelectSingleColumnRelationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectSingleColumnRelationTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectSingleColumnRelationTest.java index 7e5afda..baedd63 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectSingleColumnRelationTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectSingleColumnRelationTest.java @@ -223,7 +223,7 @@ public class SelectSingleColumnRelationTest extends CQLTester @Test public void testClusteringColumnRelationsWithClusteringOrder() throws Throwable { - createTable("CREATE TABLE %s (a text, b int, c int, d int, primary key(a, b, c)) WITH CLUSTERING ORDER BY (b DESC);"); + createTable("CREATE TABLE %s (a text, b int, c int, d int, primary key(a, b, c)) WITH CLUSTERING ORDER BY (b DESC, c ASC);"); execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 1, 5, 1); execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 2, 6, 2); execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 3, 7, 3); http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java index c0a8a9c..327a0a7 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java @@ -2608,7 +2608,7 @@ public class SelectTest extends CQLTester }); // test clutering order - createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, PRIMARY KEY ((a, b), c, d)) WITH CLUSTERING ORDER BY (c DESC)"); + createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, PRIMARY KEY ((a, b), c, d)) WITH CLUSTERING ORDER BY (c DESC, d ASC)"); execute("INSERT INTO %s (a,b,c,d,e) VALUES (11, 11, 13, 14, 15)"); execute("INSERT INTO %s (a,b,c,d,e) VALUES (11, 11, 14, 17, 18)"); @@ -4098,7 +4098,7 @@ public class SelectTest extends CQLTester // compound, first column DESC order createTable("CREATE TABLE %s (a text, b int, c int, PRIMARY KEY (a, b, c)) WITH" + compactOption + - " CLUSTERING ORDER BY (b DESC)" + " CLUSTERING ORDER BY (b DESC, c ASC)" ); execute("INSERT INTO %s (a, b, c) VALUES ('a', 2, 4)"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java b/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java index e563070..d1c4527 100644 --- a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java +++ b/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.cache.IMeasurableMemory; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java b/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java index 0baad3b..01dc369 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.cql3.QueryProcessor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/db/compaction/CompactionManagerGetSSTablesForValidationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionManagerGetSSTablesForValidationTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionManagerGetSSTablesForValidationTest.java index b9e3c17..28bc2ff 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionManagerGetSSTablesForValidationTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionManagerGetSSTablesForValidationTest.java @@ -32,7 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.schema.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/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 eccf671..89de11d 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java @@ -27,9 +27,9 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.cql3.statements.CreateTableStatement; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.*; import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.db.rows.Row; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java b/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java index b06187d..21dbd7e 100644 --- a/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java +++ b/test/unit/org/apache/cassandra/hints/HintWriteTTLTest.java @@ -32,7 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.partitions.PartitionUpdate; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/index/CustomIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/CustomIndexTest.java b/test/unit/org/apache/cassandra/index/CustomIndexTest.java index ed999fa..959b992 100644 --- a/test/unit/org/apache/cassandra/index/CustomIndexTest.java +++ b/test/unit/org/apache/cassandra/index/CustomIndexTest.java @@ -162,11 +162,11 @@ public class CustomIndexTest extends CQLTester { createTable("CREATE TABLE %s(k int, c int, v1 int, v2 int, PRIMARY KEY (k,c))"); - assertInvalidMessage("Duplicate column v1 in index target list", + assertInvalidMessage("Duplicate column 'v1' in index target list", String.format("CREATE CUSTOM INDEX ON %%s(v1, v1) USING '%s'", StubIndex.class.getName())); - assertInvalidMessage("Duplicate column v1 in index target list", + assertInvalidMessage("Duplicate column 'v1' in index target list", String.format("CREATE CUSTOM INDEX ON %%s(v1, v1, c, c) USING '%s'", StubIndex.class.getName())); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java index 8b9402b..a62e486 100644 --- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java +++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java @@ -524,10 +524,10 @@ public class CassandraIndexTest extends CQLTester } // this is slightly annoying, but we cannot read rows from the methods in Util as - // ReadCommand#executeInternal uses metadata retrieved via the tableId, which the index + // ReadCommand#executeLocally uses metadata retrieved via the tableId, which the index // CFS inherits from the base CFS. This has the 'wrong' partitioner (the index table // uses LocalPartition, the base table a real one, so we cannot read from the index - // table with executeInternal + // table with executeLocally private void assertIndexRowTtl(ColumnFamilyStore indexCfs, int indexedValue, int ttl) throws Throwable { DecoratedKey indexKey = indexCfs.decorateKey(ByteBufferUtil.bytes(indexedValue)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/repair/StreamingRepairTaskTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/StreamingRepairTaskTest.java b/test/unit/org/apache/cassandra/repair/StreamingRepairTaskTest.java index f433f2e..6ee3110 100644 --- a/test/unit/org/apache/cassandra/repair/StreamingRepairTaskTest.java +++ b/test/unit/org/apache/cassandra/repair/StreamingRepairTaskTest.java @@ -26,7 +26,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.repair.messages.SyncRequest; import org.apache.cassandra.schema.KeyspaceParams; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java index b7adb27..037d8f2 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/CoordinatorSessionsTest.java @@ -29,7 +29,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.repair.AbstractRepairTest; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java b/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java index a5197ec..6e7a7ee 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/LocalSessionTest.java @@ -40,7 +40,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.repair.AbstractRepairTest; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/repair/consistent/PendingAntiCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/consistent/PendingAntiCompactionTest.java b/test/unit/org/apache/cassandra/repair/consistent/PendingAntiCompactionTest.java index 2126835..5d00621 100644 --- a/test/unit/org/apache/cassandra/repair/consistent/PendingAntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/repair/consistent/PendingAntiCompactionTest.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/schema/IndexMetadataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/IndexMetadataTest.java b/test/unit/org/apache/cassandra/schema/IndexMetadataTest.java index 785ed73..c9e0d52 100644 --- a/test/unit/org/apache/cassandra/schema/IndexMetadataTest.java +++ b/test/unit/org/apache/cassandra/schema/IndexMetadataTest.java @@ -23,6 +23,8 @@ package org.apache.cassandra.schema; import org.junit.Assert; import org.junit.Test; +import org.apache.cassandra.cql3.ColumnIdentifier; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -49,8 +51,7 @@ public class IndexMetadataTest { @Test public void testGetDefaultIndexName() { - Assert.assertEquals("aB4__idx", IndexMetadata.getDefaultIndexName("a B-4@!_+", null)); - Assert.assertEquals("34_Ddd_F6_idx", IndexMetadata.getDefaultIndexName("34_()Ddd", "#F%6*")); - + Assert.assertEquals("aB4__idx", IndexMetadata.generateDefaultIndexName("a B-4@!_+")); + Assert.assertEquals("34_Ddd_F6_idx", IndexMetadata.generateDefaultIndexName("34_()Ddd", new ColumnIdentifier("#F%6*", true))); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java index d4c4bb4..df7c1ef 100644 --- a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Mutation; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/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 56bf59c..407efc6 100644 --- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.cassandra.*; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnIdentifier; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java b/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java index 6abc2a2..e4bef39 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamSessionTest.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java index c27593b..a146a13 100644 --- a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java +++ b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java @@ -35,7 +35,6 @@ import org.apache.cassandra.cql3.QueryHandler; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.statements.BatchStatement; -import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; @@ -368,7 +367,7 @@ public class MessagePayloadTest extends CQLTester public static class TestQueryHandler implements QueryHandler { - public ParsedStatement.Prepared getPrepared(MD5Digest id) + public QueryProcessor.Prepared getPrepared(MD5Digest id) { return QueryProcessor.instance.getPrepared(id); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/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 88f74a2..31111bd 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java @@ -21,7 +21,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.exceptions.ConfigurationException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java b/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java index ae72f21..7dabe84 100644 --- a/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java +++ b/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java @@ -29,6 +29,9 @@ import org.apache.commons.lang3.ArrayUtils; import com.datastax.driver.core.ProtocolVersion; import com.datastax.driver.core.TypeCodec; import org.antlr.runtime.RecognitionException; +import org.apache.cassandra.cql3.CQLStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTypeStatement; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; @@ -39,9 +42,6 @@ import org.apache.cassandra.cql3.CqlParser; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.UpdateParameters; import org.apache.cassandra.cql3.functions.UDHelper; -import org.apache.cassandra.cql3.statements.CreateTableStatement; -import org.apache.cassandra.cql3.statements.CreateTypeStatement; -import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.cql3.statements.UpdateStatement; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.UserType; @@ -58,7 +58,6 @@ import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.schema.Types; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.Pair; /** * Utility to write SSTables. @@ -359,8 +358,8 @@ public class StressCQLSSTableWriter implements Closeable private Boolean makeRangeAware = false; - private CreateTableStatement.RawStatement schemaStatement; - private final List<CreateTypeStatement> typeStatements; + private CreateTableStatement.Raw schemaStatement; + private final List<CreateTypeStatement.Raw> typeStatements; private UpdateStatement.ParsedInsert insertStatement; private IPartitioner partitioner; @@ -430,7 +429,7 @@ public class StressCQLSSTableWriter implements Closeable public Builder withType(String typeDefinition) throws SyntaxException { - typeStatements.add(parseStatement(typeDefinition, CreateTypeStatement.class, "CREATE TYPE")); + typeStatements.add(parseStatement(typeDefinition, CreateTypeStatement.Raw.class, "CREATE TYPE")); return this; } @@ -450,7 +449,7 @@ public class StressCQLSSTableWriter implements Closeable */ public Builder forTable(String schema) { - this.schemaStatement = parseStatement(schema, CreateTableStatement.RawStatement.class, "CREATE TABLE"); + this.schemaStatement = parseStatement(schema, CreateTableStatement.Raw.class, "CREATE TABLE"); return this; } @@ -567,25 +566,25 @@ public class StressCQLSSTableWriter implements Closeable if (partitioner == null) partitioner = cfs.getPartitioner(); - Pair<UpdateStatement, List<ColumnSpecification>> preparedInsert = prepareInsert(); + UpdateStatement preparedInsert = prepareInsert(); AbstractSSTableSimpleWriter writer = sorted - ? new SSTableSimpleWriter(cfs.getDirectories().getDirectoryForNewSSTables(), cfs.metadata, preparedInsert.left.updatedColumns()) - : new SSTableSimpleUnsortedWriter(cfs.getDirectories().getDirectoryForNewSSTables(), cfs.metadata, preparedInsert.left.updatedColumns(), bufferSizeInMB); + ? new SSTableSimpleWriter(cfs.getDirectories().getDirectoryForNewSSTables(), cfs.metadata, preparedInsert.updatedColumns()) + : new SSTableSimpleUnsortedWriter(cfs.getDirectories().getDirectoryForNewSSTables(), cfs.metadata, preparedInsert.updatedColumns(), bufferSizeInMB); if (formatType != null) writer.setSSTableFormatType(formatType); writer.setRangeAwareWriting(makeRangeAware); - return new StressCQLSSTableWriter(cfs, writer, preparedInsert.left, preparedInsert.right); + return new StressCQLSSTableWriter(cfs, writer, preparedInsert, preparedInsert.getBindVariables()); } } - private static void createTypes(String keyspace, List<CreateTypeStatement> typeStatements) + private static void createTypes(String keyspace, List<CreateTypeStatement.Raw> typeStatements) { KeyspaceMetadata ksm = Schema.instance.getKeyspaceMetadata(keyspace); Types.RawBuilder builder = Types.rawBuilder(keyspace); - for (CreateTypeStatement st : typeStatements) + for (CreateTypeStatement.Raw st : typeStatements) st.addToRawBuilder(builder); ksm = ksm.withSwapped(builder.build()); @@ -594,14 +593,14 @@ public class StressCQLSSTableWriter implements Closeable public static ColumnFamilyStore createOfflineTable(String schema, List<File> directoryList) { - return createOfflineTable(parseStatement(schema, CreateTableStatement.RawStatement.class, "CREATE TABLE"), Collections.EMPTY_LIST, directoryList); + return createOfflineTable(parseStatement(schema, CreateTableStatement.Raw.class, "CREATE TABLE"), Collections.EMPTY_LIST, directoryList); } /** * Creates the table according to schema statement * with specified data directories */ - public static ColumnFamilyStore createOfflineTable(CreateTableStatement.RawStatement schemaStatement, List<CreateTypeStatement> typeStatements, List<File> directoryList) + public static ColumnFamilyStore createOfflineTable(CreateTableStatement.Raw schemaStatement, List<CreateTypeStatement.Raw> typeStatements, List<File> directoryList) { String keyspace = schemaStatement.keyspace(); @@ -612,16 +611,17 @@ public class StressCQLSSTableWriter implements Closeable KeyspaceMetadata ksm = Schema.instance.getKeyspaceMetadata(keyspace); - TableMetadata tableMetadata = ksm.tables.getNullable(schemaStatement.columnFamily()); + TableMetadata tableMetadata = ksm.tables.getNullable(schemaStatement.table()); if (tableMetadata != null) return Schema.instance.getColumnFamilyStoreInstance(tableMetadata.id); - CreateTableStatement statement = (CreateTableStatement) schemaStatement.prepare(ksm.types).statement; - statement.validate(ClientState.forInternalCalls()); + ClientState state = ClientState.forInternalCalls(); + CreateTableStatement statement = schemaStatement.prepare(state); + statement.validate(state); //Build metadata with a portable tableId - tableMetadata = statement.builder() - .id(deterministicId(statement.keyspace(), statement.columnFamily())) + tableMetadata = statement.builder(ksm.types) + .id(deterministicId(schemaStatement.keyspace(), schemaStatement.table())) .build(); Keyspace.setInitialized(); @@ -646,28 +646,29 @@ public class StressCQLSSTableWriter implements Closeable * * @return prepared Insert statement and it's bound names */ - private Pair<UpdateStatement, List<ColumnSpecification>> prepareInsert() + private UpdateStatement prepareInsert() { - ParsedStatement.Prepared cqlStatement = insertStatement.prepare(); - UpdateStatement insert = (UpdateStatement) cqlStatement.statement; - insert.validate(ClientState.forInternalCalls()); + ClientState state = ClientState.forInternalCalls(); + CQLStatement cqlStatement = insertStatement.prepare(state); + UpdateStatement insert = (UpdateStatement) cqlStatement; + insert.validate(state); if (insert.hasConditions()) throw new IllegalArgumentException("Conditional statements are not supported"); if (insert.isCounter()) throw new IllegalArgumentException("Counter update statements are not supported"); - if (cqlStatement.boundNames.isEmpty()) + if (insert.getBindVariables().isEmpty()) throw new IllegalArgumentException("Provided insert statement has no bind variables"); - return Pair.create(insert, cqlStatement.boundNames); + return insert; } } - public static <T extends ParsedStatement> T parseStatement(String query, Class<T> klass, String type) + public static <T extends CQLStatement.Raw> T parseStatement(String query, Class<T> klass, String type) { try { - ParsedStatement stmt = CQLFragmentParser.parseAnyUnhandled(CqlParser::query, query); + CQLStatement.Raw stmt = CQLFragmentParser.parseAnyUnhandled(CqlParser::query, query); if (!stmt.getClass().equals(klass)) throw new IllegalArgumentException("Invalid query, must be a " + type + " statement but was: " + stmt.getClass()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java b/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java index 1860fef..b319228 100644 --- a/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java +++ b/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java @@ -31,7 +31,7 @@ import com.google.common.util.concurrent.Uninterruptibles; import io.airlift.command.*; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SystemKeyspace; @@ -112,7 +112,7 @@ public abstract class CompactionStress implements Runnable { generateTokens(stressProfile.seedStr, StorageService.instance.getTokenMetadata(), numTokens); - CreateTableStatement.RawStatement createStatement = stressProfile.getCreateStatement(); + CreateTableStatement.Raw createStatement = stressProfile.getCreateStatement(); List<File> dataDirectories = getDataDirectories(); ColumnFamilyStore cfs = StressCQLSSTableWriter.Builder.createOfflineTable(createStatement, Collections.EMPTY_LIST, dataDirectories); http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaddbd49/tools/stress/src/org/apache/cassandra/stress/StressProfile.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java index 2420d68..4449305 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java @@ -40,8 +40,7 @@ import com.datastax.driver.core.exceptions.AlreadyExistsException; import org.antlr.runtime.RecognitionException; import org.apache.cassandra.cql3.CQLFragmentParser; import org.apache.cassandra.cql3.CqlParser; -import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.cql3.statements.CreateTableStatement; +import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.schema.ColumnMetadata; @@ -162,7 +161,7 @@ public class StressProfile implements Serializable { try { - String name = CQLFragmentParser.parseAnyUnhandled(CqlParser::createKeyspaceStatement, keyspaceCql).keyspace(); + String name = CQLFragmentParser.parseAnyUnhandled(CqlParser::createKeyspaceStatement, keyspaceCql).keyspaceName; assert name.equalsIgnoreCase(keyspaceName) : "Name in keyspace_definition doesn't match keyspace property: '" + name + "' != '" + keyspaceName + "'"; } catch (RecognitionException | SyntaxException e) @@ -179,7 +178,7 @@ public class StressProfile implements Serializable { try { - String name = CQLFragmentParser.parseAnyUnhandled(CqlParser::createTableStatement, tableCql).columnFamily(); + String name = CQLFragmentParser.parseAnyUnhandled(CqlParser::createTableStatement, tableCql).table(); assert name.equalsIgnoreCase(tableName) : "Name in table_definition doesn't match table property: '" + name + "' != '" + tableName + "'"; } catch (RecognitionException | RuntimeException e) @@ -425,11 +424,10 @@ public class StressProfile implements Serializable return new PartitionGenerator(partitionColumns, clusteringColumns, regularColumns, PartitionGenerator.Order.ARBITRARY); } - public CreateTableStatement.RawStatement getCreateStatement() + public CreateTableStatement.Raw getCreateStatement() { - CreateTableStatement.RawStatement createStatement = QueryProcessor.parseStatement(tableCql, CreateTableStatement.RawStatement.class, "CREATE TABLE"); - createStatement.prepareKeyspace(keyspaceName); - + CreateTableStatement.Raw createStatement = CQLFragmentParser.parseAny(CqlParser::createTableStatement, tableCql, "CREATE TABLE"); + createStatement.keyspace(keyspaceName); return createStatement; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
