You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/06/26 20:05:14 UTC
[1/4] cassandra git commit: Fix error msg when creating index on
compact value columns
Repository: cassandra
Updated Branches:
refs/heads/trunk 288ffca73 -> 35e912ff6
Fix error msg when creating index on compact value columns
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-9527
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54e58d8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54e58d8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54e58d8c
Branch: refs/heads/trunk
Commit: 54e58d8c52b5aed15e6de47ca51fb21c164acf41
Parents: c939422
Author: blerer <be...@datastax.com>
Authored: Fri Jun 26 12:43:23 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jun 26 12:43:23 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cql3/statements/CreateIndexStatement.java | 6 +-
.../apache/cassandra/cql3/CreateIndexTest.java | 145 +++++++++++++++++++
3 files changed, 152 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54e58d8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6e3a147..80b4a8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.0.17
+ * Fix error message when attempting to create an index on a column
+ in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
* 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
* Display min timestamp in sstablemetadata viewer (CASSANDRA-6767)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54e58d8c/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
index 5710290..f2d698a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
@@ -85,9 +85,13 @@ public class CreateIndexStatement extends SchemaAlteringStatement
properties.validate();
// TODO: we could lift that limitation
- if ((cfm.getCfDef().isCompact || !cfm.getCfDef().isComposite) && cd.type != ColumnDefinition.Type.REGULAR)
+ if ((cfm.getCfDef().isCompact || !cfm.getCfDef().isComposite)
+ && (cd.type == ColumnDefinition.Type.PARTITION_KEY || cd.type == ColumnDefinition.Type.CLUSTERING_KEY))
throw new InvalidRequestException("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables");
+ if (cd.type == ColumnDefinition.Type.COMPACT_VALUE)
+ throw new InvalidRequestException("Secondary indexes are not supported on COMPACT STORAGE tables that have clustering columns");
+
// It would be possible to support 2ndary index on static columns (but not without modifications of at least ExtendedFilter and
// CompositesIndex) and maybe we should, but that means a query like:
// SELECT * FROM foo WHERE static_column = 'bar'
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54e58d8c/test/unit/org/apache/cassandra/cql3/CreateIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CreateIndexTest.java b/test/unit/org/apache/cassandra/cql3/CreateIndexTest.java
new file mode 100644
index 0000000..a8bcf11
--- /dev/null
+++ b/test/unit/org/apache/cassandra/cql3/CreateIndexTest.java
@@ -0,0 +1,145 @@
+/*
+ * 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.cql3;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+import static org.apache.cassandra.cql3.QueryProcessor.processInternal;
+
+import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.db.ConsistencyLevel;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.gms.Gossiper;
+import org.apache.cassandra.service.ClientState;
+
+import static org.apache.cassandra.cql3.QueryProcessor.process;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class CreateIndexTest
+{
+ private static final String KEYSPACE = "create_index_test";
+ static ClientState clientState;
+
+ @BeforeClass
+ public static void setUpClass() throws Throwable
+ {
+ SchemaLoader.loadSchema();
+ executeSchemaChange("CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}");
+ clientState = ClientState.forInternalCalls();
+ }
+
+ @AfterClass
+ public static void stopGossiper()
+ {
+ Gossiper.instance.stop();
+ }
+
+ private static void executeSchemaChange(String query) throws Throwable
+ {
+ try
+ {
+ process(String.format(query, KEYSPACE), ConsistencyLevel.ONE);
+ } catch (RuntimeException exc)
+ {
+ throw exc.getCause();
+ }
+ }
+
+ @Test
+ public void testCreateIndexOnCompactTableWithClusteringColumns() throws Throwable
+ {
+ executeSchemaChange("CREATE TABLE %s.compact_table_with_clustering_columns "
+ + "(a int, b int , c int, PRIMARY KEY (a, b))"
+ + " WITH COMPACT STORAGE;");
+
+ assertInvalid("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables",
+ "CREATE INDEX ON %s.compact_table_with_clustering_columns (a);");
+
+ assertInvalid("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables",
+ "CREATE INDEX ON %s.compact_table_with_clustering_columns (b);");
+
+ assertInvalid("Secondary indexes are not supported on COMPACT STORAGE tables that have clustering columns",
+ "CREATE INDEX ON %s.compact_table_with_clustering_columns (c);");
+ }
+
+ @Test
+ public void testCreateIndexOnCompactTableWithoutClusteringColumns() throws Throwable
+ {
+ executeSchemaChange("CREATE TABLE %s.compact_table (a int PRIMARY KEY, b int)"
+ + " WITH COMPACT STORAGE;");
+
+ assertInvalid("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables",
+ "CREATE INDEX ON %s.compact_table (a);");
+
+ executeSchemaChange("CREATE INDEX ON %s.compact_table (b);");
+
+ execute("INSERT INTO %s.compact_table (a, b) VALUES (1, 1);");
+ execute("INSERT INTO %s.compact_table (a, b) VALUES (2, 4);");
+ execute("INSERT INTO %s.compact_table (a, b) VALUES (3, 6);");
+
+ UntypedResultSet results = execute("SELECT * FROM %s.compact_table WHERE b = 4;");
+ assertEquals(1, results.size());
+ checkRow(0, results, 2, 4);
+ }
+
+ private static UntypedResultSet execute(String query) throws Throwable
+ {
+ try
+ {
+ return processInternal(String.format(query, KEYSPACE));
+ } catch (RuntimeException exc)
+ {
+ if (exc.getCause() != null)
+ throw exc.getCause();
+ throw exc;
+ }
+ }
+
+ private static void checkRow(int rowIndex, UntypedResultSet results, Integer... expectedValues)
+ {
+ List<UntypedResultSet.Row> rows = newArrayList(results.iterator());
+ UntypedResultSet.Row row = rows.get(rowIndex);
+ Iterator<ColumnSpecification> columns = row.getColumns().iterator();
+ for (Integer expected : expectedValues)
+ {
+ String columnName = columns.next().name.toString();
+ int actual = row.getInt(columnName);
+ assertEquals(String.format("Expected value %d for column %s in row %d, but got %s", actual, columnName, rowIndex, expected),
+ (long) expected, actual);
+ }
+ }
+
+ private static void assertInvalid(String msg, String stmt) throws Throwable {
+ try
+ {
+ executeSchemaChange(stmt);
+ fail();
+ }
+ catch (InvalidRequestException e)
+ {
+ assertEquals(msg, e.getMessage());
+ }
+ }}
[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9a84831
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9a84831
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9a84831
Branch: refs/heads/trunk
Commit: a9a848318d6ce5b024eaf7d3e821c79d40935f59
Parents: afc5093 39c082f
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Jun 26 12:59:07 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jun 26 12:59:07 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cql3/statements/CreateIndexStatement.java | 5 ++-
.../cql3/validation/operations/CreateTest.java | 32 ++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9a84831/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a4e348e,498218e..8469232
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,20 +1,33 @@@
-2.1.8
+2.2
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Update cqlsh for UDFs (CASSANDRA-7556)
+ * Change Windows kernel default timer resolution (CASSANDRA-9634)
+ * Deprected sstable2json and json2sstable (CASSANDRA-9618)
+ * Allow native functions in user-defined aggregates (CASSANDRA-9542)
+ * Don't repair system_distributed by default (CASSANDRA-9621)
+ * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622)
+ * Rename class for DATE type in Java driver (CASSANDRA-9563)
+ * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
+ * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
+ * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573)
+ * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229)
+ * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566)
+ * Fix deprecated repair JMX API (CASSANDRA-9570)
+ * Add logback metrics (CASSANDRA-9378)
+ * Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583)
+Merged from 2.1:
* Fix IndexOutOfBoundsException when inserting tuple with too many
elements using the string literal notation (CASSANDRA-9559)
- * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
- * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
* Enable describe on indices (CASSANDRA-7814)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
* ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
-Merged from 2.0
- * Fix error message when attempting to create an index on a column
- in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
- * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
-
-
-2.1.7
* Fix bug in cardinality check when compacting (CASSANDRA-9580)
* Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
+ * Make rebuild only run one at a time (CASSANDRA-9119)
Merged from 2.0
++ * Fix error message when attempting to create an index on a column
++ in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
+ * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
* Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
* ArrivalWindow should use primitives (CASSANDRA-9496)
* Periodically submit background compaction tasks (CASSANDRA-9592)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9a84831/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9a84831/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39c082ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39c082ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39c082ff
Branch: refs/heads/trunk
Commit: 39c082ff92742aefdeb5df74d7726603f0741e25
Parents: c233270 54e58d8
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Jun 26 12:48:11 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jun 26 12:48:11 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cql3/statements/CreateIndexStatement.java | 5 ++-
.../cql3/validation/operations/CreateTest.java | 32 ++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c082ff/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 874c8ee,80b4a8d..498218e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,11 +1,20 @@@
-2.0.17
- * Fix error message when attempting to create an index on a column
- in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
- * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
- * Display min timestamp in sstablemetadata viewer (CASSANDRA-6767)
-
-
-2.0.16:
+2.1.8
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
+Merged from 2.0
++ * Fix error message when attempting to create an index on a column
++ in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
+ * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
+
+
+2.1.7
+ * Fix bug in cardinality check when compacting (CASSANDRA-9580)
+ * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
+Merged from 2.0
* Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
* ArrivalWindow should use primitives (CASSANDRA-9496)
* Periodically submit background compaction tasks (CASSANDRA-9592)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c082ff/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
index 778ec78,f2d698a..72174fb
--- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
@@@ -119,9 -85,13 +119,12 @@@ public class CreateIndexStatement exten
properties.validate();
// TODO: we could lift that limitation
- if ((cfm.comparator.isDense() || !cfm.comparator.isCompound()) && cd.kind != ColumnDefinition.Kind.REGULAR)
- if ((cfm.getCfDef().isCompact || !cfm.getCfDef().isComposite)
- && (cd.type == ColumnDefinition.Type.PARTITION_KEY || cd.type == ColumnDefinition.Type.CLUSTERING_KEY))
++ if ((cfm.comparator.isDense() || !cfm.comparator.isCompound()) && cd.isPrimaryKeyColumn())
throw new InvalidRequestException("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables");
- if (cd.type == ColumnDefinition.Type.COMPACT_VALUE)
++ if (cd.kind == ColumnDefinition.Kind.COMPACT_VALUE)
+ throw new InvalidRequestException("Secondary indexes are not supported on COMPACT STORAGE tables that have clustering columns");
+
// It would be possible to support 2ndary index on static columns (but not without modifications of at least ExtendedFilter and
// CompositesIndex) and maybe we should, but that means a query like:
// SELECT * FROM foo WHERE static_column = 'bar'
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c082ff/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
index 3240c06,0000000..fdb2ebb
mode 100644,000000..100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
@@@ -1,462 -1,0 +1,494 @@@
+/*
+ * 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.cql3.validation.operations;
+
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.TriggerDefinition;
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.db.ColumnFamily;
+import org.apache.cassandra.db.Mutation;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.exceptions.SyntaxException;
+import org.apache.cassandra.triggers.ITrigger;
+
+import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CreateTest extends CQLTester
+{
+ @Test
+ public void testCQL3PartitionKeyOnlyTable()
+ {
+ createTable("CREATE TABLE %s (id text PRIMARY KEY);");
+ assertFalse(currentTableMetadata().isThriftCompatible());
+ }
+
+ /**
+ * Creation and basic operations on a static table,
+ * migrated from cql_tests.py:TestCQL.static_cf_test()
+ */
+ @Test
+ public void testStaticTable() throws Throwable
+ {
+ createTable("CREATE TABLE %s (userid uuid PRIMARY KEY, firstname text, lastname text, age int)");
+
+ UUID id1 = UUID.fromString("550e8400-e29b-41d4-a716-446655440000");
+ UUID id2 = UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479");
+
+ execute("INSERT INTO %s (userid, firstname, lastname, age) VALUES (?, ?, ?, ?)", id1, "Frodo", "Baggins", 32);
+ execute("UPDATE %s SET firstname = ?, lastname = ?, age = ? WHERE userid = ?", "Samwise", "Gamgee", 33, id2);
+
+ assertRows(execute("SELECT firstname, lastname FROM %s WHERE userid = ?", id1),
+ row("Frodo", "Baggins"));
+
+ assertRows(execute("SELECT * FROM %s WHERE userid = ?", id1),
+ row(id1, 32, "Frodo", "Baggins"));
+
+ assertRows(execute("SELECT * FROM %s"),
+ row(id2, 33, "Samwise", "Gamgee"),
+ row(id1, 32, "Frodo", "Baggins")
+ );
+
+ String batch = "BEGIN BATCH "
+ + "INSERT INTO %1$s (userid, age) VALUES (?, ?) "
+ + "UPDATE %1$s SET age = ? WHERE userid = ? "
+ + "DELETE firstname, lastname FROM %1$s WHERE userid = ? "
+ + "DELETE firstname, lastname FROM %1$s WHERE userid = ? "
+ + "APPLY BATCH";
+
+ execute(batch, id1, 36, 37, id2, id1, id2);
+
+ assertRows(execute("SELECT * FROM %s"),
+ row(id2, 37, null, null),
+ row(id1, 36, null, null));
+ }
+
+ /**
+ * Creation and basic operations on a static table with compact storage,
+ * migrated from cql_tests.py:TestCQL.noncomposite_static_cf_test()
+ */
+ @Test
+ public void testDenseStaticTable() throws Throwable
+ {
+ createTable("CREATE TABLE %s (userid uuid PRIMARY KEY, firstname text, lastname text, age int) WITH COMPACT STORAGE");
+
+ UUID id1 = UUID.fromString("550e8400-e29b-41d4-a716-446655440000");
+ UUID id2 = UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479");
+
+ execute("INSERT INTO %s (userid, firstname, lastname, age) VALUES (?, ?, ?, ?)", id1, "Frodo", "Baggins", 32);
+ execute("UPDATE %s SET firstname = ?, lastname = ?, age = ? WHERE userid = ?", "Samwise", "Gamgee", 33, id2);
+
+ assertRows(execute("SELECT firstname, lastname FROM %s WHERE userid = ?", id1),
+ row("Frodo", "Baggins"));
+
+ assertRows(execute("SELECT * FROM %s WHERE userid = ?", id1),
+ row(id1, 32, "Frodo", "Baggins"));
+
+ assertRows(execute("SELECT * FROM %s"),
+ row(id2, 33, "Samwise", "Gamgee"),
+ row(id1, 32, "Frodo", "Baggins")
+ );
+
+ String batch = "BEGIN BATCH "
+ + "INSERT INTO %1$s (userid, age) VALUES (?, ?) "
+ + "UPDATE %1$s SET age = ? WHERE userid = ? "
+ + "DELETE firstname, lastname FROM %1$s WHERE userid = ? "
+ + "DELETE firstname, lastname FROM %1$s WHERE userid = ? "
+ + "APPLY BATCH";
+
+ execute(batch, id1, 36, 37, id2, id1, id2);
+
+ assertRows(execute("SELECT * FROM %s"),
+ row(id2, 37, null, null),
+ row(id1, 36, null, null));
+ }
+
+ /**
+ * Creation and basic operations on a non-composite table with compact storage,
+ * migrated from cql_tests.py:TestCQL.dynamic_cf_test()
+ */
+ @Test
+ public void testDenseNonCompositeTable() throws Throwable
+ {
+ createTable("CREATE TABLE %s (userid uuid, url text, time bigint, PRIMARY KEY (userid, url)) WITH COMPACT STORAGE");
+
+ UUID id1 = UUID.fromString("550e8400-e29b-41d4-a716-446655440000");
+ UUID id2 = UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479");
+ UUID id3 = UUID.fromString("810e8500-e29b-41d4-a716-446655440000");
+
+ execute("INSERT INTO %s (userid, url, time) VALUES (?, ?, ?)", id1, "http://foo.bar", 42L);
+ execute("INSERT INTO %s (userid, url, time) VALUES (?, ?, ?)", id1, "http://foo-2.bar", 24L);
+ execute("INSERT INTO %s (userid, url, time) VALUES (?, ?, ?)", id1, "http://bar.bar", 128L);
+ execute("UPDATE %s SET time = 24 WHERE userid = ? and url = 'http://bar.foo'", id2);
+ execute("UPDATE %s SET time = 12 WHERE userid IN (?, ?) and url = 'http://foo-3'", id2, id1);
+
+ assertRows(execute("SELECT url, time FROM %s WHERE userid = ?", id1),
+ row("http://bar.bar", 128L),
+ row("http://foo-2.bar", 24L),
+ row("http://foo-3", 12L),
+ row("http://foo.bar", 42L));
+
+ assertRows(execute("SELECT * FROM %s WHERE userid = ?", id2),
+ row(id2, "http://bar.foo", 24L),
+ row(id2, "http://foo-3", 12L));
+
+ assertRows(execute("SELECT time FROM %s"),
+ row(24L), // id2
+ row(12L),
+ row(128L), // id1
+ row(24L),
+ row(12L),
+ row(42L)
+ );
+
+ // Check we don't allow empty values for url since this is the full underlying cell name (#6152)
+ assertInvalid("INSERT INTO %s (userid, url, time) VALUES (?, '', 42)", id3);
+ }
+
+ /**
+ * Creation and basic operations on a composite table with compact storage,
+ * migrated from cql_tests.py:TestCQL.dense_cf_test()
+ */
+ @Test
+ public void testDenseCompositeTable() throws Throwable
+ {
+ createTable("CREATE TABLE %s (userid uuid, ip text, port int, time bigint, PRIMARY KEY (userid, ip, port)) WITH COMPACT STORAGE");
+
+ UUID id1 = UUID.fromString("550e8400-e29b-41d4-a716-446655440000");
+ UUID id2 = UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479");
+
+ execute("INSERT INTO %s (userid, ip, port, time) VALUES (?, '192.168.0.1', 80, 42)", id1);
+ execute("INSERT INTO %s (userid, ip, port, time) VALUES (?, '192.168.0.2', 80, 24)", id1);
+ execute("INSERT INTO %s (userid, ip, port, time) VALUES (?, '192.168.0.2', 90, 42)", id1);
+ execute("UPDATE %s SET time = 24 WHERE userid = ? AND ip = '192.168.0.2' AND port = 80", id2);
+
+ // we don't have to include all of the clustering columns (see CASSANDRA-7990)
+ execute("INSERT INTO %s (userid, ip, time) VALUES (?, '192.168.0.3', 42)", id2);
+ execute("UPDATE %s SET time = 42 WHERE userid = ? AND ip = '192.168.0.4'", id2);
+
+ assertRows(execute("SELECT ip, port, time FROM %s WHERE userid = ?", id1),
+ row("192.168.0.1", 80, 42L),
+ row("192.168.0.2", 80, 24L),
+ row("192.168.0.2", 90, 42L));
+
+ assertRows(execute("SELECT ip, port, time FROM %s WHERE userid = ? and ip >= '192.168.0.2'", id1),
+ row("192.168.0.2", 80, 24L),
+ row("192.168.0.2", 90, 42L));
+
+ assertRows(execute("SELECT ip, port, time FROM %s WHERE userid = ? and ip = '192.168.0.2'", id1),
+ row("192.168.0.2", 80, 24L),
+ row("192.168.0.2", 90, 42L));
+
+ assertEmpty(execute("SELECT ip, port, time FROM %s WHERE userid = ? and ip > '192.168.0.2'", id1));
+
+ assertRows(execute("SELECT ip, port, time FROM %s WHERE userid = ? AND ip = '192.168.0.3'", id2),
+ row("192.168.0.3", null, 42L));
+
+ assertRows(execute("SELECT ip, port, time FROM %s WHERE userid = ? AND ip = '192.168.0.4'", id2),
+ row("192.168.0.4", null, 42L));
+
+ execute("DELETE time FROM %s WHERE userid = ? AND ip = '192.168.0.2' AND port = 80", id1);
+
+ assertRowCount(execute("SELECT * FROM %s WHERE userid = ?", id1), 2);
+
+ execute("DELETE FROM %s WHERE userid = ?", id1);
+ assertEmpty(execute("SELECT * FROM %s WHERE userid = ?", id1));
+
+ execute("DELETE FROM %s WHERE userid = ? AND ip = '192.168.0.3'", id2);
+ assertEmpty(execute("SELECT * FROM %s WHERE userid = ? AND ip = '192.168.0.3'", id2));
+ }
+
+ /**
+ * Creation and basic operations on a composite table,
+ * migrated from cql_tests.py:TestCQL.sparse_cf_test()
+ */
+ @Test
+ public void testSparseCompositeTable() throws Throwable
+ {
+ createTable("CREATE TABLE %s (userid uuid, posted_month int, posted_day int, body text, posted_by text, PRIMARY KEY (userid, posted_month, posted_day))");
+
+ UUID id1 = UUID.fromString("550e8400-e29b-41d4-a716-446655440000");
+ UUID id2 = UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479");
+
+ execute("INSERT INTO %s (userid, posted_month, posted_day, body, posted_by) VALUES (?, 1, 12, 'Something else', 'Frodo Baggins')", id1);
+ execute("INSERT INTO %s (userid, posted_month, posted_day, body, posted_by) VALUES (?, 1, 24, 'Something something', 'Frodo Baggins')", id1);
+ execute("UPDATE %s SET body = 'Yo Froddo', posted_by = 'Samwise Gamgee' WHERE userid = ? AND posted_month = 1 AND posted_day = 3", id2);
+ execute("UPDATE %s SET body = 'Yet one more message' WHERE userid = ? AND posted_month = 1 and posted_day = 30", id1);
+
+ assertRows(execute("SELECT body, posted_by FROM %s WHERE userid = ? AND posted_month = 1 AND posted_day = 24", id1),
+ row("Something something", "Frodo Baggins"));
+
+ assertRows(execute("SELECT posted_day, body, posted_by FROM %s WHERE userid = ? AND posted_month = 1 AND posted_day > 12", id1),
+ row(24, "Something something", "Frodo Baggins"),
+ row(30, "Yet one more message", null));
+
+ assertRows(execute("SELECT posted_day, body, posted_by FROM %s WHERE userid = ? AND posted_month = 1", id1),
+ row(12, "Something else", "Frodo Baggins"),
+ row(24, "Something something", "Frodo Baggins"),
+ row(30, "Yet one more message", null));
+ }
+
+ /**
+ * Check invalid create table statements,
+ * migrated from cql_tests.py:TestCQL.create_invalid_test()
+ */
+ @Test
+ public void testInvalidCreateTableStatements() throws Throwable
+ {
+ assertInvalidThrow(SyntaxException.class, "CREATE TABLE test ()");
+
+ assertInvalid("CREATE TABLE test (c1 text, c2 text, c3 text)");
+ assertInvalid("CREATE TABLE test (key1 text PRIMARY KEY, key2 text PRIMARY KEY)");
+
+ assertInvalid("CREATE TABLE test (key text PRIMARY KEY, key int)");
+ assertInvalid("CREATE TABLE test (key text PRIMARY KEY, c int, c text)");
+
+ assertInvalid("CREATE TABLE test (key text, key2 text, c int, d text, PRIMARY KEY (key, key2)) WITH COMPACT STORAGE");
+ }
+
+ /**
+ * Check obsolete properties from CQL2 are rejected
+ * migrated from cql_tests.py:TestCQL.invalid_old_property_test()
+ */
+ @Test
+ public void testObsoleteTableProperties() throws Throwable
+ {
+ assertInvalidThrow(SyntaxException.class, "CREATE TABLE test (foo text PRIMARY KEY, c int) WITH default_validation=timestamp");
+
+ createTable("CREATE TABLE %s (foo text PRIMARY KEY, c int)");
+ assertInvalidThrow(SyntaxException.class, "ALTER TABLE %s WITH default_validation=int");
+ }
+
+ /**
+ * Test create and drop keyspace
+ * migrated from cql_tests.py:TestCQL.keyspace_test()
+ */
+ @Test
+ public void testKeyspace() throws Throwable
+ {
+ assertInvalidThrow(SyntaxException.class, "CREATE KEYSPACE %s testXYZ ");
+
+ execute("CREATE KEYSPACE testXYZ WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }");
+
+ assertInvalid(
+ "CREATE KEYSPACE My_much_much_too_long_identifier_that_should_not_work WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }");
+
+ execute("DROP KEYSPACE testXYZ");
+ assertInvalidThrow(ConfigurationException.class, "DROP KEYSPACE non_existing");
+
+ execute("CREATE KEYSPACE testXYZ WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }");
+
+ // clean-up
+ execute("DROP KEYSPACE testXYZ");
+ }
+
+ /**
+ * Test create and drop table
+ * migrated from cql_tests.py:TestCQL.table_test()
+ */
+ @Test
+ public void testTable() throws Throwable
+ {
+ String table1 = createTable(" CREATE TABLE %s (k int PRIMARY KEY, c int)");
+ createTable(" CREATE TABLE %s (k int, name int, value int, PRIMARY KEY(k, name)) WITH COMPACT STORAGE ");
+ createTable(" CREATE TABLE %s (k int, c int, PRIMARY KEY (k),)");
+
+ String table4 = createTableName();
+
+ // repeated column
+ assertInvalidMessage("Multiple definition of identifier k", String.format("CREATE TABLE %s (k int PRIMARY KEY, c int, k text)", table4));
+
+ // compact storage limitations
+ assertInvalidThrow(SyntaxException.class,
+ String.format("CREATE TABLE %s (k int, name, int, c1 int, c2 int, PRIMARY KEY(k, name)) WITH COMPACT STORAGE", table4));
+
+ execute(String.format("DROP TABLE %s.%s", keyspace(), table1));
+
+ createTable(String.format("CREATE TABLE %s.%s ( k int PRIMARY KEY, c1 int, c2 int, ) ", keyspace(), table1));
+ }
+
+ /**
+ * Test truncate statement,
+ * migrated from cql_tests.py:TestCQL.table_test().
+ */
+ @Test
+ public void testTruncate() throws Throwable
+ {
+ createTable(" CREATE TABLE %s (k int, name int, value int, PRIMARY KEY(k, name)) WITH COMPACT STORAGE ");
+ execute("TRUNCATE %s");
+ }
+
+ /**
+ * Migrated from cql_tests.py:TestCQL.multiordering_validation_test()
+ */
+ @Test
+ public void testMultiOrderingValidation() throws Throwable
+ {
+ String tableName = KEYSPACE + "." + createTableName();
+ assertInvalid(String.format("CREATE TABLE test (k int, c1 int, c2 int, PRIMARY KEY (k, c1, c2)) WITH CLUSTERING ORDER BY (c2 DESC)", tableName));
+
+ tableName = KEYSPACE + "." + createTableName();
+ assertInvalid(String.format("CREATE TABLE test (k int, c1 int, c2 int, PRIMARY KEY (k, c1, c2)) WITH CLUSTERING ORDER BY (c2 ASC, c1 DESC)", tableName));
+
+ tableName = KEYSPACE + "." + createTableName();
+ assertInvalid(String.format("CREATE TABLE test (k int, c1 int, c2 int, PRIMARY KEY (k, c1, c2)) WITH CLUSTERING ORDER BY (c1 DESC, c2 DESC, c3 DESC)", tableName));
+
+ createTable("CREATE TABLE %s (k int, c1 int, c2 int, PRIMARY KEY (k, c1, c2)) WITH CLUSTERING ORDER BY (c1 DESC, c2 DESC)");
+ createTable("CREATE TABLE %s (k int, c1 int, c2 int, PRIMARY KEY (k, c1, c2)) WITH CLUSTERING ORDER BY (c1 ASC, c2 DESC)");
+ }
+
+ @Test
+ public void testCreateTrigger() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a))");
+ execute("CREATE TRIGGER trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_1", TestTrigger.class);
+ execute("CREATE TRIGGER trigger_2 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_2", TestTrigger.class);
+ assertInvalid("CREATE TRIGGER trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ execute("CREATE TRIGGER \"Trigger 3\" ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("Trigger 3", TestTrigger.class);
+ }
+
+ @Test
+ public void testCreateTriggerIfNotExists() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a, b))");
+
+ execute("CREATE TRIGGER IF NOT EXISTS trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_1", TestTrigger.class);
+
+ execute("CREATE TRIGGER IF NOT EXISTS trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_1", TestTrigger.class);
+ }
+
+ @Test
+ public void testDropTrigger() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a))");
+
+ execute("CREATE TRIGGER trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_1", TestTrigger.class);
+
+ execute("DROP TRIGGER trigger_1 ON %s");
+ assertTriggerDoesNotExists("trigger_1", TestTrigger.class);
+
+ execute("CREATE TRIGGER trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_1", TestTrigger.class);
+
+ assertInvalid("DROP TRIGGER trigger_2 ON %s");
+
+ execute("CREATE TRIGGER \"Trigger 3\" ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("Trigger 3", TestTrigger.class);
+
+ execute("DROP TRIGGER \"Trigger 3\" ON %s");
+ assertTriggerDoesNotExists("Trigger 3", TestTrigger.class);
+ }
+
+ @Test
+ public void testDropTriggerIfExists() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a))");
+
+ execute("DROP TRIGGER IF EXISTS trigger_1 ON %s");
+ assertTriggerDoesNotExists("trigger_1", TestTrigger.class);
+
+ execute("CREATE TRIGGER trigger_1 ON %s USING '" + TestTrigger.class.getName() + "'");
+ assertTriggerExists("trigger_1", TestTrigger.class);
+
+ execute("DROP TRIGGER IF EXISTS trigger_1 ON %s");
+ assertTriggerDoesNotExists("trigger_1", TestTrigger.class);
+ }
+
+ @Test
++ public void testCreateIndexOnCompactTableWithClusteringColumns() throws Throwable
++ {
++ createTable("CREATE TABLE %s (a int, b int , c int, PRIMARY KEY (a, b)) WITH COMPACT STORAGE;");
++
++ assertInvalidMessage("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables",
++ "CREATE INDEX ON %s (a);");
++
++ assertInvalidMessage("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables",
++ "CREATE INDEX ON %s (b);");
++
++ assertInvalidMessage("Secondary indexes are not supported on COMPACT STORAGE tables that have clustering columns",
++ "CREATE INDEX ON %s (c);");
++ }
++
++ @Test
++ public void testCreateIndexOnCompactTableWithoutClusteringColumns() throws Throwable
++ {
++ createTable("CREATE TABLE %s (a int PRIMARY KEY, b int) WITH COMPACT STORAGE;");
++
++ assertInvalidMessage("Secondary indexes are not supported on PRIMARY KEY columns in COMPACT STORAGE tables",
++ "CREATE INDEX ON %s (a);");
++
++ createIndex("CREATE INDEX ON %s (b);");
++
++ execute("INSERT INTO %s (a, b) values (1, 1)");
++ execute("INSERT INTO %s (a, b) values (2, 4)");
++ execute("INSERT INTO %s (a, b) values (3, 6)");
++
++ assertRows(execute("SELECT * FROM %s WHERE b = ?", 4), row(2, 4));
++ }
++
++ @Test
+ // tests CASSANDRA-9565
+ public void testDoubleWith() throws Throwable
+ {
+ String[] stmts = new String[] { "CREATE KEYSPACE WITH WITH DURABLE_WRITES = true",
+ "CREATE KEYSPACE ks WITH WITH DURABLE_WRITES = true" };
+
+ for (String stmt : stmts) {
+ assertInvalidSyntaxMessage("no viable alternative at input 'WITH'", stmt);
+ }
+ }
+
+ private void assertTriggerExists(String name, Class<?> clazz)
+ {
+ CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), currentTable()).copy();
+ assertTrue("the trigger does not exist", cfm.containsTriggerDefinition(TriggerDefinition.create(name,
+ clazz.getName())));
+ }
+
+ private void assertTriggerDoesNotExists(String name, Class<?> clazz)
+ {
+ CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), currentTable()).copy();
+ Assert.assertFalse("the trigger exists", cfm.containsTriggerDefinition(TriggerDefinition.create(name,
+ clazz.getName())));
+ }
+
+ public static class TestTrigger implements ITrigger
+ {
+ public TestTrigger() { }
+ public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update)
+ {
+ return Collections.emptyList();
+ }
+ }
+}
[4/4] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35e912ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35e912ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35e912ff
Branch: refs/heads/trunk
Commit: 35e912ff68f238daf624f7f2f833a397eea9db90
Parents: 288ffca a9a8483
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Jun 26 13:02:45 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jun 26 13:02:45 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cql3/statements/CreateIndexStatement.java | 5 ++-
.../cql3/validation/operations/CreateTest.java | 32 ++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e912ff/CHANGES.txt
----------------------------------------------------------------------