You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/06/24 18:15:18 UTC
[25/32] cassandra git commit: 2.2 commit for CASSANDRA-9160
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java b/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
deleted file mode 100644
index cde4f92..0000000
--- a/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
+++ /dev/null
@@ -1,233 +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.cql3;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-public class SelectWithTokenFunctionTest extends CQLTester
-{
- @Test
- public void testTokenFunctionWithSingleColumnPartitionKey() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int PRIMARY KEY, b text)");
- execute("INSERT INTO %s (a, b) VALUES (0, 'a')");
-
- assertRows(execute("SELECT * FROM %s WHERE token(a) >= token(?)", 0), row(0, "a"));
- assertRows(execute("SELECT * FROM %s WHERE token(a) >= token(?) and token(a) < token(?)", 0, 1), row(0, "a"));
- assertInvalid("SELECT * FROM %s WHERE token(a) > token(?)", "a");
- assertInvalidMessage("The token() function must contains only partition key components",
- "SELECT * FROM %s WHERE token(a, b) >= token(?, ?)", "b", 0);
- assertInvalidMessage("More than one restriction was found for the start bound on a",
- "SELECT * FROM %s WHERE token(a) >= token(?) and token(a) >= token(?)", 0, 1);
- assertInvalidMessage("Columns \"a\" cannot be restricted by both an equality and an inequality relation",
- "SELECT * FROM %s WHERE token(a) >= token(?) and token(a) = token(?)", 0, 1);
- assertInvalidSyntax("SELECT * FROM %s WHERE token(a) = token(?) and token(a) IN (token(?))", 0, 1);
-
- assertInvalidMessage("More than one restriction was found for the start bound on a",
- "SELECT * FROM %s WHERE token(a) > token(?) AND token(a) > token(?)", 1, 2);
- assertInvalidMessage("More than one restriction was found for the end bound on a",
- "SELECT * FROM %s WHERE token(a) <= token(?) AND token(a) < token(?)", 1, 2);
- assertInvalidMessage("Columns \"a\" cannot be restricted by both an equality and an inequality relation",
- "SELECT * FROM %s WHERE token(a) > token(?) AND token(a) = token(?)", 1, 2);
- assertInvalidMessage("a cannot be restricted by more than one relation if it includes an Equal",
- "SELECT * FROM %s WHERE token(a) = token(?) AND token(a) > token(?)", 1, 2);
- }
-
- @Test
- public void testTokenFunctionWithPartitionKeyAndClusteringKeyArguments() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int, b text, PRIMARY KEY (a, b))");
- assertInvalidMessage("The token() function must contains only partition key components",
- "SELECT * FROM %s WHERE token(a, b) > token(0, 'c')");
- }
-
- @Test
- public void testTokenFunctionWithMultiColumnPartitionKey() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int, b text, PRIMARY KEY ((a, b)))");
- execute("INSERT INTO %s (a, b) VALUES (0, 'a')");
- execute("INSERT INTO %s (a, b) VALUES (0, 'b')");
- execute("INSERT INTO %s (a, b) VALUES (0, 'c')");
-
- assertRows(execute("SELECT * FROM %s WHERE token(a, b) > token(?, ?)", 0, "a"),
- row(0, "b"),
- row(0, "c"));
- assertRows(execute("SELECT * FROM %s WHERE token(a, b) > token(?, ?) and token(a, b) < token(?, ?)",
- 0, "a",
- 0, "d"),
- row(0, "b"),
- row(0, "c"));
- assertInvalidMessage("The token() function must be applied to all partition key components or none of them",
- "SELECT * FROM %s WHERE token(a) > token(?) and token(b) > token(?)", 0, "a");
- assertInvalidMessage("The token() function must be applied to all partition key components or none of them",
- "SELECT * FROM %s WHERE token(a) > token(?, ?) and token(a) < token(?, ?) and token(b) > token(?, ?) ",
- 0, "a", 0, "d", 0, "a");
- assertInvalidMessage("The token function arguments must be in the partition key order: a, b",
- "SELECT * FROM %s WHERE token(b, a) > token(0, 'c')");
- assertInvalidMessage("The token() function must be applied to all partition key components or none of them",
- "SELECT * FROM %s WHERE token(a, b) > token(?, ?) and token(b) < token(?, ?)", 0, "a", 0, "a");
- assertInvalidMessage("The token() function must be applied to all partition key components or none of them",
- "SELECT * FROM %s WHERE token(a) > token(?, ?) and token(b) > token(?, ?)", 0, "a", 0, "a");
- }
-
- @Test
- public void testSingleColumnPartitionKeyWithTokenNonTokenRestrictionsMix() throws Throwable
- {
- createTable("CREATE TABLE %s (a int primary key, b int)");
-
- execute("INSERT INTO %s (a, b) VALUES (0, 0);");
- execute("INSERT INTO %s (a, b) VALUES (1, 1);");
- execute("INSERT INTO %s (a, b) VALUES (2, 2);");
- execute("INSERT INTO %s (a, b) VALUES (3, 3);");
- execute("INSERT INTO %s (a, b) VALUES (4, 4);");
- assertRows(execute("SELECT * FROM %s WHERE a IN (?, ?);", 1, 3),
- row(1, 1),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a)> token(?) and token(a) <= token(?);", 1, 3),
- row(2, 2),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a)= token(2);"),
- row(2, 2));
- assertRows(execute("SELECT * FROM %s WHERE token(a) > token(?) AND token(a) <= token(?) AND a IN (?, ?);",
- 1, 3, 1, 3),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) < token(?) AND token(a) >= token(?) AND a IN (?, ?);",
- 1, 3, 1, 3),
- row(3, 3));
- assertInvalidMessage("Only EQ and IN relation are supported on the partition key (unless you use the token() function)",
- "SELECT * FROM %s WHERE token(a) > token(?) AND token(a) <= token(?) AND a > ?;", 1, 3, 1);
-
- assertRows(execute("SELECT * FROM %s WHERE token(a) > token(?) AND token(a) <= token(?) AND a IN ?;",
- 1, 3, Arrays.asList(1, 3)),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) > token(?) AND a = ?;", 1, 3),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND token(a) > token(?);", 3, 1),
- row(3, 3));
- assertEmpty(execute("SELECT * FROM %s WHERE token(a) > token(?) AND a = ?;", 3, 1));
- assertEmpty(execute("SELECT * FROM %s WHERE a = ? AND token(a) > token(?);", 1, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) > token(?) AND a IN (?, ?);", 2, 1, 3),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) > token(?) AND token(a) < token(?) AND a IN (?, ?) ;", 2, 5, 1, 3),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE a IN (?, ?) AND token(a) > token(?) AND token(a) < token(?);", 1, 3, 2, 5),
- row(3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) > token(?) AND a IN (?, ?) AND token(a) < token(?);", 2, 1, 3, 5),
- row(3, 3));
- assertEmpty(execute("SELECT * FROM %s WHERE a IN (?, ?) AND token(a) > token(?);", 1, 3, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) <= token(?) AND a = ?;", 2, 2),
- row(2, 2));
- assertEmpty(execute("SELECT * FROM %s WHERE token(a) <= token(?) AND a = ?;", 2, 3));
- assertEmpty(execute("SELECT * FROM %s WHERE token(a) = token(?) AND a = ?;", 2, 3));
- assertRows(execute("SELECT * FROM %s WHERE token(a) >= token(?) AND token(a) <= token(?) AND a = ?;", 2, 2, 2),
- row(2, 2));
- assertEmpty(execute("SELECT * FROM %s WHERE token(a) >= token(?) AND token(a) < token(?) AND a = ?;", 2, 2, 2));
- assertEmpty(execute("SELECT * FROM %s WHERE token(a) > token(?) AND token(a) <= token(?) AND a = ?;", 2, 2, 2));
- assertEmpty(execute("SELECT * FROM %s WHERE token(a) > token(?) AND token(a) < token(?) AND a = ?;", 2, 2, 2));
- }
-
- @Test
- public void testMultiColumnPartitionKeyWithTokenNonTokenRestrictionsMix() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b int, c int, primary key((a, b)))");
-
- execute("INSERT INTO %s (a, b, c) VALUES (0, 0, 0);");
- execute("INSERT INTO %s (a, b, c) VALUES (0, 1, 1);");
- execute("INSERT INTO %s (a, b, c) VALUES (0, 2, 2);");
- execute("INSERT INTO %s (a, b, c) VALUES (1, 0, 3);");
- execute("INSERT INTO %s (a, b, c) VALUES (1, 1, 4);");
-
- assertRows(execute("SELECT * FROM %s WHERE token(a, b) > token(?, ?);", 0, 0),
- row(0, 1, 1),
- row(0, 2, 2),
- row(1, 0, 3),
- row(1, 1, 4));
-
- assertRows(execute("SELECT * FROM %s WHERE token(a, b) > token(?, ?) AND a = ? AND b IN (?, ?);",
- 0, 0, 1, 0, 1),
- row(1, 0, 3),
- row(1, 1, 4));
-
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND token(a, b) > token(?, ?) AND b IN (?, ?);",
- 1, 0, 0, 0, 1),
- row(1, 0, 3),
- row(1, 1, 4));
-
- assertRows(execute("SELECT * FROM %s WHERE b IN (?, ?) AND token(a, b) > token(?, ?) AND a = ?;",
- 0, 1, 0, 0, 1),
- row(1, 0, 3),
- row(1, 1, 4));
-
- assertEmpty(execute("SELECT * FROM %s WHERE b IN (?, ?) AND token(a, b) > token(?, ?) AND token(a, b) < token(?, ?) AND a = ?;",
- 0, 1, 0, 0, 0, 0, 1));
-
- assertEmpty(execute("SELECT * FROM %s WHERE b IN (?, ?) AND token(a, b) > token(?, ?) AND token(a, b) <= token(?, ?) AND a = ?;",
- 0, 1, 0, 0, 0, 0, 1));
-
- assertEmpty(execute("SELECT * FROM %s WHERE b IN (?, ?) AND token(a, b) >= token(?, ?) AND token(a, b) < token(?, ?) AND a = ?;",
- 0, 1, 0, 0, 0, 0, 1));
-
- assertEmpty(execute("SELECT * FROM %s WHERE b IN (?, ?) AND token(a, b) = token(?, ?) AND a = ?;",
- 0, 1, 0, 0, 1));
-
- assertInvalidMessage("Partition key parts: b must be restricted as other parts are",
- "SELECT * FROM %s WHERE token(a, b) > token(?, ?) AND a = ?;", 0, 0, 1);
- }
-
- @Test
- public void testMultiColumnPartitionKeyWithIndexAndTokenNonTokenRestrictionsMix() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b int, c int, primary key((a, b)))");
- createIndex("CREATE INDEX ON %s(b)");
- createIndex("CREATE INDEX ON %s(c)");
-
- execute("INSERT INTO %s (a, b, c) VALUES (0, 0, 0);");
- execute("INSERT INTO %s (a, b, c) VALUES (0, 1, 1);");
- execute("INSERT INTO %s (a, b, c) VALUES (0, 2, 2);");
- execute("INSERT INTO %s (a, b, c) VALUES (1, 0, 3);");
- execute("INSERT INTO %s (a, b, c) VALUES (1, 1, 4);");
-
- assertRows(execute("SELECT * FROM %s WHERE b = ?;", 1),
- row(0, 1, 1),
- row(1, 1, 4));
-
- assertRows(execute("SELECT * FROM %s WHERE token(a, b) > token(?, ?) AND b = ?;", 0, 0, 1),
- row(0, 1, 1),
- row(1, 1, 4));
-
- assertRows(execute("SELECT * FROM %s WHERE b = ? AND token(a, b) > token(?, ?);", 1, 0, 0),
- row(0, 1, 1),
- row(1, 1, 4));
-
- assertRows(execute("SELECT * FROM %s WHERE b = ? AND token(a, b) > token(?, ?) and c = ? ALLOW FILTERING;", 1, 0, 0, 4),
- row(1, 1, 4));
- }
-
- @Test
- public void testTokenFunctionWithCompoundPartitionAndClusteringCols() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int, b int, c int, d int, PRIMARY KEY ((a, b), c, d))");
- // just test that the queries don't error
- execute("SELECT * FROM %s WHERE token(a, b) > token(0, 0) AND c > 10 ALLOW FILTERING;");
- execute("SELECT * FROM %s WHERE c > 10 AND token(a, b) > token(0, 0) ALLOW FILTERING;");
- execute("SELECT * FROM %s WHERE token(a, b) > token(0, 0) AND (c, d) > (0, 0) ALLOW FILTERING;");
- execute("SELECT * FROM %s WHERE (c, d) > (0, 0) AND token(a, b) > token(0, 0) ALLOW FILTERING;");
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/SelectionOrderingTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/SelectionOrderingTest.java b/test/unit/org/apache/cassandra/cql3/SelectionOrderingTest.java
deleted file mode 100644
index 301aaf4..0000000
--- a/test/unit/org/apache/cassandra/cql3/SelectionOrderingTest.java
+++ /dev/null
@@ -1,233 +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.cql3;
-
-import org.junit.Test;
-
-public class SelectionOrderingTest extends CQLTester
-{
-
- @Test
- public void testNormalSelectionOrderSingleClustering() throws Throwable
- {
- for (String descOption : new String[]{"", " WITH CLUSTERING ORDER BY (b DESC)"})
- {
- createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a, b))" + descOption);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 0, 0);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 1, 1);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 2, 2);
-
- assertRows(execute("SELECT * FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0, 0, 0),
- row(0, 1, 1),
- row(0, 2, 2)
- );
-
- assertRows(execute("SELECT * FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(0, 2, 2),
- row(0, 1, 1),
- row(0, 0, 0)
- );
-
- // order by the only column in the selection
- assertRows(execute("SELECT b FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2));
-
- assertRows(execute("SELECT b FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0));
-
- // order by a column not in the selection
- assertRows(execute("SELECT c FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2));
-
- assertRows(execute("SELECT c FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0));
- }
- }
-
- @Test
- public void testFunctionSelectionOrderSingleClustering() throws Throwable
- {
- for (String descOption : new String[]{"", " WITH CLUSTERING ORDER BY (b DESC)"})
- {
- createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a, b))" + descOption);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 0, 0);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 1, 1);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 2, 2);
-
- // order by the only column in the selection
- assertRows(execute("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2));
-
- assertRows(execute("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0));
-
- // order by a column not in the selection
- assertRows(execute("SELECT blobAsInt(intAsBlob(c)) FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2));
-
- assertRows(execute("SELECT blobAsInt(intAsBlob(c)) FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0));
-
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY c ASC", 0);
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY c DESC", 0);
- }
- }
-
- @Test
- public void testFieldSelectionOrderSingleClustering() throws Throwable
- {
- String type = createType("CREATE TYPE %s (a int)");
-
- for (String descOption : new String[]{"", " WITH CLUSTERING ORDER BY (b DESC)"})
- {
- createTable("CREATE TABLE %s (a int, b int, c frozen<" + type + " >, PRIMARY KEY (a, b))" + descOption);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, {a: ?})", 0, 0, 0);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, {a: ?})", 0, 1, 1);
- execute("INSERT INTO %s (a, b, c) VALUES (?, ?, {a: ?})", 0, 2, 2);
-
- // order by a column not in the selection
- assertRows(execute("SELECT c.a FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2));
-
- assertRows(execute("SELECT c.a FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0));
-
- assertRows(execute("SELECT blobAsInt(intAsBlob(c.a)) FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0));
- dropTable("DROP TABLE %s");
- }
- }
-
- @Test
- public void testNormalSelectionOrderMultipleClustering() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b int, c int, d int, PRIMARY KEY (a, b, c))");
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 0, 0);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 1);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 2, 2);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 0, 3);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 1, 4);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 2, 5);
-
- assertRows(execute("SELECT * FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0, 0, 0, 0),
- row(0, 0, 1, 1),
- row(0, 0, 2, 2),
- row(0, 1, 0, 3),
- row(0, 1, 1, 4),
- row(0, 1, 2, 5)
- );
-
- assertRows(execute("SELECT * FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(0, 1, 2, 5),
- row(0, 1, 1, 4),
- row(0, 1, 0, 3),
- row(0, 0, 2, 2),
- row(0, 0, 1, 1),
- row(0, 0, 0, 0)
- );
-
- assertRows(execute("SELECT * FROM %s WHERE a=? ORDER BY b DESC, c DESC", 0),
- row(0, 1, 2, 5),
- row(0, 1, 1, 4),
- row(0, 1, 0, 3),
- row(0, 0, 2, 2),
- row(0, 0, 1, 1),
- row(0, 0, 0, 0)
- );
-
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY c ASC", 0);
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY c DESC", 0);
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY b ASC, c DESC", 0);
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY b DESC, c ASC", 0);
- assertInvalid("SELECT * FROM %s WHERE a=? ORDER BY d ASC", 0);
-
- // select and order by b
- assertRows(execute("SELECT b FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(0), row(0), row(1), row(1), row(1));
- assertRows(execute("SELECT b FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(1), row(1), row(1), row(0), row(0), row(0));
-
- // select c, order by b
- assertRows(execute("SELECT c FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2), row(0), row(1), row(2));
- assertRows(execute("SELECT c FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0), row(2), row(1), row(0));
-
- // select c, order by b, c
- assertRows(execute("SELECT c FROM %s WHERE a=? ORDER BY b ASC, c ASC", 0),
- row(0), row(1), row(2), row(0), row(1), row(2));
- assertRows(execute("SELECT c FROM %s WHERE a=? ORDER BY b DESC, c DESC", 0),
- row(2), row(1), row(0), row(2), row(1), row(0));
-
- // select d, order by b, c
- assertRows(execute("SELECT d FROM %s WHERE a=? ORDER BY b ASC, c ASC", 0),
- row(0), row(1), row(2), row(3), row(4), row(5));
- assertRows(execute("SELECT d FROM %s WHERE a=? ORDER BY b DESC, c DESC", 0),
- row(5), row(4), row(3), row(2), row(1), row(0));
- }
-
- @Test
- public void testFunctionSelectionOrderMultipleClustering() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b int, c int, d int, PRIMARY KEY (a, b, c))");
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 0, 0);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 1);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 2, 2);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 0, 3);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 1, 4);
- execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 2, 5);
-
- assertInvalid("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY c ASC", 0);
- assertInvalid("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY c DESC", 0);
- assertInvalid("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b ASC, c DESC", 0);
- assertInvalid("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b DESC, c ASC", 0);
- assertInvalid("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY d ASC", 0);
-
- // select and order by b
- assertRows(execute("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(0), row(0), row(1), row(1), row(1));
- assertRows(execute("SELECT blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(1), row(1), row(1), row(0), row(0), row(0));
-
- assertRows(execute("SELECT b, blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0, 0), row(0, 0), row(0, 0), row(1, 1), row(1, 1), row(1, 1));
- assertRows(execute("SELECT b, blobAsInt(intAsBlob(b)) FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(1, 1), row(1, 1), row(1, 1), row(0, 0), row(0, 0), row(0, 0));
-
- // select c, order by b
- assertRows(execute("SELECT blobAsInt(intAsBlob(c)) FROM %s WHERE a=? ORDER BY b ASC", 0),
- row(0), row(1), row(2), row(0), row(1), row(2));
- assertRows(execute("SELECT blobAsInt(intAsBlob(c)) FROM %s WHERE a=? ORDER BY b DESC", 0),
- row(2), row(1), row(0), row(2), row(1), row(0));
-
- // select c, order by b, c
- assertRows(execute("SELECT blobAsInt(intAsBlob(c)) FROM %s WHERE a=? ORDER BY b ASC, c ASC", 0),
- row(0), row(1), row(2), row(0), row(1), row(2));
- assertRows(execute("SELECT blobAsInt(intAsBlob(c)) FROM %s WHERE a=? ORDER BY b DESC, c DESC", 0),
- row(2), row(1), row(0), row(2), row(1), row(0));
-
- // select d, order by b, c
- assertRows(execute("SELECT blobAsInt(intAsBlob(d)) FROM %s WHERE a=? ORDER BY b ASC, c ASC", 0),
- row(0), row(1), row(2), row(3), row(4), row(5));
- assertRows(execute("SELECT blobAsInt(intAsBlob(d)) FROM %s WHERE a=? ORDER BY b DESC, c DESC", 0),
- row(5), row(4), row(3), row(2), row(1), row(0));
-
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/SingleColumnRelationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/SingleColumnRelationTest.java b/test/unit/org/apache/cassandra/cql3/SingleColumnRelationTest.java
deleted file mode 100644
index 2b8fbd4..0000000
--- a/test/unit/org/apache/cassandra/cql3/SingleColumnRelationTest.java
+++ /dev/null
@@ -1,553 +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.cql3;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SingleColumnRelationTest extends CQLTester
-{
- @Test
- public void testInvalidCollectionEqualityRelation() throws Throwable
- {
- createTable("CREATE TABLE %s (a int PRIMARY KEY, b set<int>, c list<int>, d map<int, int>)");
- createIndex("CREATE INDEX ON %s (b)");
- createIndex("CREATE INDEX ON %s (c)");
- createIndex("CREATE INDEX ON %s (d)");
-
- assertInvalidMessage("Collection column 'b' (set<int>) cannot be restricted by a '=' relation",
- "SELECT * FROM %s WHERE a = 0 AND b=?", set(0));
- assertInvalidMessage("Collection column 'c' (list<int>) cannot be restricted by a '=' relation",
- "SELECT * FROM %s WHERE a = 0 AND c=?", list(0));
- assertInvalidMessage("Collection column 'd' (map<int, int>) cannot be restricted by a '=' relation",
- "SELECT * FROM %s WHERE a = 0 AND d=?", map(0, 0));
- }
-
- @Test
- public void testInvalidCollectionNonEQRelation() throws Throwable
- {
- createTable("CREATE TABLE %s (a int PRIMARY KEY, b set<int>, c int)");
- createIndex("CREATE INDEX ON %s (c)");
- execute("INSERT INTO %s (a, b, c) VALUES (0, {0}, 0)");
-
- // non-EQ operators
- assertInvalidMessage("Collection column 'b' (set<int>) cannot be restricted by a '>' relation",
- "SELECT * FROM %s WHERE c = 0 AND b > ?", set(0));
- assertInvalidMessage("Collection column 'b' (set<int>) cannot be restricted by a '>=' relation",
- "SELECT * FROM %s WHERE c = 0 AND b >= ?", set(0));
- assertInvalidMessage("Collection column 'b' (set<int>) cannot be restricted by a '<' relation",
- "SELECT * FROM %s WHERE c = 0 AND b < ?", set(0));
- assertInvalidMessage("Collection column 'b' (set<int>) cannot be restricted by a '<=' relation",
- "SELECT * FROM %s WHERE c = 0 AND b <= ?", set(0));
- assertInvalidMessage("Collection column 'b' (set<int>) cannot be restricted by a 'IN' relation",
- "SELECT * FROM %s WHERE c = 0 AND b IN (?)", set(0));
- }
-
- @Test
- public void testClusteringColumnRelations() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b int, c int, d int, primary key(a, b, c))");
- 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);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "second", 4, 8, 4);
-
- testSelectQueriesWithClusteringColumnRelations();
- }
-
- @Test
- public void testClusteringColumnRelationsWithCompactStorage() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b int, c int, d int, primary key(a, b, c)) WITH COMPACT STORAGE;");
- 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);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "second", 4, 8, 4);
-
- testSelectQueriesWithClusteringColumnRelations();
- }
-
- private void testSelectQueriesWithClusteringColumnRelations() throws Throwable
- {
- assertRows(execute("select * from %s where a in (?, ?)", "first", "second"),
- row("first", 1, 5, 1),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3),
- row("second", 4, 8, 4));
-
- assertRows(execute("select * from %s where a = ? and b = ? and c in (?, ?)", "first", 2, 6, 7),
- row("first", 2, 6, 2));
-
- assertRows(execute("select * from %s where a = ? and b in (?, ?) and c in (?, ?)", "first", 2, 3, 6, 7),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
-
- assertRows(execute("select * from %s where a = ? and b in (?, ?) and c in (?, ?)", "first", 3, 2, 7, 6),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
-
- assertRows(execute("select * from %s where a = ? and c in (?, ?) and b in (?, ?)", "first", 7, 6, 3, 2),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
-
- assertRows(execute("select c, d from %s where a = ? and c in (?, ?) and b in (?, ?)", "first", 7, 6, 3, 2),
- row(6, 2),
- row(7, 3));
-
- assertRows(execute("select c, d from %s where a = ? and c in (?, ?) and b in (?, ?, ?)", "first", 7, 6, 3, 2, 3),
- row(6, 2),
- row(7, 3));
-
- assertRows(execute("select * from %s where a = ? and b in (?, ?) and c = ?", "first", 3, 2, 7),
- row("first", 3, 7, 3));
-
- assertRows(execute("select * from %s where a = ? and b in ? and c in ?",
- "first", Arrays.asList(3, 2), Arrays.asList(7, 6)),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
-
- assertInvalidMessage("Invalid null value for column b",
- "select * from %s where a = ? and b in ? and c in ?", "first", null, Arrays.asList(7, 6));
-
- assertRows(execute("select * from %s where a = ? and c >= ? and b in (?, ?)", "first", 6, 3, 2),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
-
- assertRows(execute("select * from %s where a = ? and c > ? and b in (?, ?)", "first", 6, 3, 2),
- row("first", 3, 7, 3));
-
- assertRows(execute("select * from %s where a = ? and c <= ? and b in (?, ?)", "first", 6, 3, 2),
- row("first", 2, 6, 2));
-
- assertRows(execute("select * from %s where a = ? and c < ? and b in (?, ?)", "first", 7, 3, 2),
- row("first", 2, 6, 2));
-//---
- assertRows(execute("select * from %s where a = ? and c >= ? and c <= ? and b in (?, ?)", "first", 6, 7, 3, 2),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
-
- assertRows(execute("select * from %s where a = ? and c > ? and c <= ? and b in (?, ?)", "first", 6, 7, 3, 2),
- row("first", 3, 7, 3));
-
- assertEmpty(execute("select * from %s where a = ? and c > ? and c < ? and b in (?, ?)", "first", 6, 7, 3, 2));
-
- assertInvalidMessage("Column \"c\" cannot be restricted by both an equality and an inequality relation",
- "select * from %s where a = ? and c > ? and c = ? and b in (?, ?)", "first", 6, 7, 3, 2);
-
- assertInvalidMessage("c cannot be restricted by more than one relation if it includes an Equal",
- "select * from %s where a = ? and c = ? and c > ? and b in (?, ?)", "first", 6, 7, 3, 2);
-
- assertRows(execute("select * from %s where a = ? and c in (?, ?) and b in (?, ?) order by b DESC",
- "first", 7, 6, 3, 2),
- row("first", 3, 7, 3),
- row("first", 2, 6, 2));
-
- assertInvalidMessage("More than one restriction was found for the start bound on b",
- "select * from %s where a = ? and b > ? and b > ?", "first", 6, 3, 2);
-
- assertInvalidMessage("More than one restriction was found for the end bound on b",
- "select * from %s where a = ? and b < ? and b <= ?", "first", 6, 3, 2);
- }
-
- @Test
- public void testPartitionKeyColumnRelations() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b int, c int, d int, primary key((a, b), c))");
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 1, 1, 1);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 2, 2, 2);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 3, 3, 3);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "first", 4, 4, 4);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "second", 1, 1, 1);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "second", 4, 4, 4);
-
- assertRows(execute("select * from %s where a = ? and b = ?", "first", 2),
- row("first", 2, 2, 2));
-
- assertRows(execute("select * from %s where a in (?, ?) and b in (?, ?)", "first", "second", 2, 3),
- row("first", 2, 2, 2),
- row("first", 3, 3, 3));
-
- assertRows(execute("select * from %s where a in (?, ?) and b = ?", "first", "second", 4),
- row("first", 4, 4, 4),
- row("second", 4, 4, 4));
-
- assertRows(execute("select * from %s where a = ? and b in (?, ?)", "first", 3, 4),
- row("first", 3, 3, 3),
- row("first", 4, 4, 4));
-
- assertRows(execute("select * from %s where a in (?, ?) and b in (?, ?)", "first", "second", 1, 4),
- row("first", 1, 1, 1),
- row("first", 4, 4, 4),
- row("second", 1, 1, 1),
- row("second", 4, 4, 4));
-
- assertInvalidMessage("Partition key parts: b must be restricted as other parts are",
- "select * from %s where a in (?, ?)", "first", "second");
- assertInvalidMessage("Partition key parts: b must be restricted as other parts are",
- "select * from %s where a = ?", "first");
- assertInvalidMessage("b cannot be restricted by more than one relation if it includes a IN",
- "select * from %s where a = ? AND b IN (?, ?) AND b = ?", "first", 2, 2, 3);
- assertInvalidMessage("b cannot be restricted by more than one relation if it includes an Equal",
- "select * from %s where a = ? AND b = ? AND b IN (?, ?)", "first", 2, 2, 3);
- assertInvalidMessage("a cannot be restricted by more than one relation if it includes a IN",
- "select * from %s where a IN (?, ?) AND a = ? AND b = ?", "first", "second", "first", 3);
- assertInvalidMessage("a cannot be restricted by more than one relation if it includes an Equal",
- "select * from %s where a = ? AND a IN (?, ?) AND b IN (?, ?)", "first", "second", "first", 2, 3);
- }
-
- @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);");
- 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);
- execute("insert into %s (a, b, c, d) values (?, ?, ?, ?)", "second", 4, 8, 4);
-
- assertRows(execute("select * from %s where a = ? and c in (?, ?) and b in (?, ?) order by b DESC",
- "first", 7, 6, 3, 2),
- row("first", 3, 7, 3),
- row("first", 2, 6, 2));
-
- assertRows(execute("select * from %s where a = ? and c in (?, ?) and b in (?, ?) order by b ASC",
- "first", 7, 6, 3, 2),
- row("first", 2, 6, 2),
- row("first", 3, 7, 3));
- }
-
- @Test
- public void testAllowFilteringWithClusteringColumn() throws Throwable
- {
- createTable("CREATE TABLE %s (k int, c int, v int, PRIMARY KEY (k, c))");
-
- execute("INSERT INTO %s (k, c, v) VALUES(?, ?, ?)", 1, 2, 1);
- execute("INSERT INTO %s (k, c, v) VALUES(?, ?, ?)", 1, 3, 2);
- execute("INSERT INTO %s (k, c, v) VALUES(?, ?, ?)", 2, 2, 3);
-
- // Don't require filtering, always allowed
- assertRows(execute("SELECT * FROM %s WHERE k = ?", 1),
- row(1, 2, 1),
- row(1, 3, 2));
-
- assertRows(execute("SELECT * FROM %s WHERE k = ? AND c > ?", 1, 2), row(1, 3, 2));
-
- assertRows(execute("SELECT * FROM %s WHERE k = ? AND c = ?", 1, 2), row(1, 2, 1));
-
- assertRows(execute("SELECT * FROM %s WHERE k = ? ALLOW FILTERING", 1),
- row(1, 2, 1),
- row(1, 3, 2));
-
- assertRows(execute("SELECT * FROM %s WHERE k = ? AND c > ? ALLOW FILTERING", 1, 2), row(1, 3, 2));
-
- assertRows(execute("SELECT * FROM %s WHERE k = ? AND c = ? ALLOW FILTERING", 1, 2), row(1, 2, 1));
-
- // Require filtering, allowed only with ALLOW FILTERING
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE c = ?", 2);
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE c > ? AND c <= ?", 2, 4);
-
- assertRows(execute("SELECT * FROM %s WHERE c = ? ALLOW FILTERING", 2),
- row(1, 2, 1),
- row(2, 2, 3));
-
- assertRows(execute("SELECT * FROM %s WHERE c > ? AND c <= ? ALLOW FILTERING", 2, 4), row(1, 3, 2));
- }
-
- @Test
- public void testAllowFilteringWithIndexedColumn() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int)");
- createIndex("CREATE INDEX ON %s(a)");
-
- execute("INSERT INTO %s(k, a, b) VALUES(?, ?, ?)", 1, 10, 100);
- execute("INSERT INTO %s(k, a, b) VALUES(?, ?, ?)", 2, 20, 200);
- execute("INSERT INTO %s(k, a, b) VALUES(?, ?, ?)", 3, 30, 300);
- execute("INSERT INTO %s(k, a, b) VALUES(?, ?, ?)", 4, 40, 400);
-
- // Don't require filtering, always allowed
- assertRows(execute("SELECT * FROM %s WHERE k = ?", 1), row(1, 10, 100));
- assertRows(execute("SELECT * FROM %s WHERE a = ?", 20), row(2, 20, 200));
- assertRows(execute("SELECT * FROM %s WHERE k = ? ALLOW FILTERING", 1), row(1, 10, 100));
- assertRows(execute("SELECT * FROM %s WHERE a = ? ALLOW FILTERING", 20), row(2, 20, 200));
-
- assertInvalid("SELECT * FROM %s WHERE a = ? AND b = ?");
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND b = ? ALLOW FILTERING", 20, 200), row(2, 20, 200));
- }
-
- @Test
- public void testIndexQueriesOnComplexPrimaryKey() throws Throwable
- {
- createTable("CREATE TABLE %s (pk0 int, pk1 int, ck0 int, ck1 int, ck2 int, value int, PRIMARY KEY ((pk0, pk1), ck0, ck1, ck2))");
-
- createIndex("CREATE INDEX ON %s (ck1)");
- createIndex("CREATE INDEX ON %s (ck2)");
- createIndex("CREATE INDEX ON %s (pk0)");
- createIndex("CREATE INDEX ON %s (ck0)");
-
- execute("INSERT INTO %s (pk0, pk1, ck0, ck1, ck2, value) VALUES (?, ?, ?, ?, ?, ?)", 0, 1, 2, 3, 4, 5);
- execute("INSERT INTO %s (pk0, pk1, ck0, ck1, ck2, value) VALUES (?, ?, ?, ?, ?, ?)", 1, 2, 3, 4, 5, 0);
- execute("INSERT INTO %s (pk0, pk1, ck0, ck1, ck2, value) VALUES (?, ?, ?, ?, ?, ?)", 2, 3, 4, 5, 0, 1);
- execute("INSERT INTO %s (pk0, pk1, ck0, ck1, ck2, value) VALUES (?, ?, ?, ?, ?, ?)", 3, 4, 5, 0, 1, 2);
- execute("INSERT INTO %s (pk0, pk1, ck0, ck1, ck2, value) VALUES (?, ?, ?, ?, ?, ?)", 4, 5, 0, 1, 2, 3);
- execute("INSERT INTO %s (pk0, pk1, ck0, ck1, ck2, value) VALUES (?, ?, ?, ?, ?, ?)", 5, 0, 1, 2, 3, 4);
-
- assertRows(execute("SELECT value FROM %s WHERE pk0 = 2"), row(1));
- assertRows(execute("SELECT value FROM %s WHERE ck0 = 0"), row(3));
- assertRows(execute("SELECT value FROM %s WHERE pk0 = 3 AND pk1 = 4 AND ck1 = 0"), row(2));
- assertRows(execute("SELECT value FROM %s WHERE pk0 = 5 AND pk1 = 0 AND ck0 = 1 AND ck2 = 3 ALLOW FILTERING"), row(4));
- }
-
- @Test
- public void testIndexOnClusteringColumns() throws Throwable
- {
- createTable("CREATE TABLE %s (id1 int, id2 int, author text, time bigint, v1 text, v2 text, PRIMARY KEY ((id1, id2), author, time))");
- createIndex("CREATE INDEX ON %s(time)");
- createIndex("CREATE INDEX ON %s(id2)");
-
- execute("INSERT INTO %s(id1, id2, author, time, v1, v2) VALUES(0, 0, 'bob', 0, 'A', 'A')");
- execute("INSERT INTO %s(id1, id2, author, time, v1, v2) VALUES(0, 0, 'bob', 1, 'B', 'B')");
- execute("INSERT INTO %s(id1, id2, author, time, v1, v2) VALUES(0, 1, 'bob', 2, 'C', 'C')");
- execute("INSERT INTO %s(id1, id2, author, time, v1, v2) VALUES(0, 0, 'tom', 0, 'D', 'D')");
- execute("INSERT INTO %s(id1, id2, author, time, v1, v2) VALUES(0, 1, 'tom', 1, 'E', 'E')");
-
- assertRows(execute("SELECT v1 FROM %s WHERE time = 1"), row("B"), row("E"));
-
- assertRows(execute("SELECT v1 FROM %s WHERE id2 = 1"), row("C"), row("E"));
-
- assertRows(execute("SELECT v1 FROM %s WHERE id1 = 0 AND id2 = 0 AND author = 'bob' AND time = 0"), row("A"));
-
- // Test for CASSANDRA-8206
- execute("UPDATE %s SET v2 = null WHERE id1 = 0 AND id2 = 0 AND author = 'bob' AND time = 1");
-
- assertRows(execute("SELECT v1 FROM %s WHERE id2 = 0"), row("A"), row("B"), row("D"));
-
- assertRows(execute("SELECT v1 FROM %s WHERE time = 1"), row("B"), row("E"));
-
- assertInvalidMessage("IN restrictions are not supported on indexed columns",
- "SELECT v1 FROM %s WHERE id2 = 0 and time IN (1, 2) ALLOW FILTERING");
- }
-
- @Test
- public void testCompositeIndexWithPrimaryKey() throws Throwable
- {
- createTable("CREATE TABLE %s (blog_id int, time1 int, time2 int, author text, content text, PRIMARY KEY (blog_id, time1, time2))");
-
- createIndex("CREATE INDEX ON %s(author)");
-
- String req = "INSERT INTO %s (blog_id, time1, time2, author, content) VALUES (?, ?, ?, ?, ?)";
- execute(req, 1, 0, 0, "foo", "bar1");
- execute(req, 1, 0, 1, "foo", "bar2");
- execute(req, 2, 1, 0, "foo", "baz");
- execute(req, 3, 0, 1, "gux", "qux");
-
- assertRows(execute("SELECT blog_id, content FROM %s WHERE author='foo'"),
- row(1, "bar1"),
- row(1, "bar2"),
- row(2, "baz"));
- assertRows(execute("SELECT blog_id, content FROM %s WHERE time1 > 0 AND author='foo' ALLOW FILTERING"), row(2, "baz"));
- assertRows(execute("SELECT blog_id, content FROM %s WHERE time1 = 1 AND author='foo' ALLOW FILTERING"), row(2, "baz"));
- assertRows(execute("SELECT blog_id, content FROM %s WHERE time1 = 1 AND time2 = 0 AND author='foo' ALLOW FILTERING"),
- row(2, "baz"));
- assertEmpty(execute("SELECT content FROM %s WHERE time1 = 1 AND time2 = 1 AND author='foo' ALLOW FILTERING"));
- assertEmpty(execute("SELECT content FROM %s WHERE time1 = 1 AND time2 > 0 AND author='foo' ALLOW FILTERING"));
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT content FROM %s WHERE time2 >= 0 AND author='foo'");
- }
-
- @Test
- public void testRangeQueryOnIndex() throws Throwable
- {
- createTable("CREATE TABLE %s (id int primary key, row int, setid int);");
- createIndex("CREATE INDEX ON %s (setid)");
-
- String q = "INSERT INTO %s (id, row, setid) VALUES (?, ?, ?);";
- execute(q, 0, 0, 0);
- execute(q, 1, 1, 0);
- execute(q, 2, 2, 0);
- execute(q, 3, 3, 0);
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE setid = 0 AND row < 1;");
- assertRows(execute("SELECT * FROM %s WHERE setid = 0 AND row < 1 ALLOW FILTERING;"), row(0, 0, 0));
- }
-
- @Test
- public void testEmptyIN() throws Throwable
- {
- for (String compactOption : new String[] { "", " WITH COMPACT STORAGE" })
- {
- createTable("CREATE TABLE %s (k1 int, k2 int, v int, PRIMARY KEY (k1, k2))" + compactOption);
-
- for (int i = 0; i <= 2; i++)
- for (int j = 0; j <= 2; j++)
- execute("INSERT INTO %s (k1, k2, v) VALUES (?, ?, ?)", i, j, i + j);
-
- assertEmpty(execute("SELECT v FROM %s WHERE k1 IN ()"));
- assertEmpty(execute("SELECT v FROM %s WHERE k1 = 0 AND k2 IN ()"));
- }
- }
-
- @Test
- public void testINWithDuplicateValue() throws Throwable
- {
- for (String compactOption : new String[] { "", " WITH COMPACT STORAGE" })
- {
- createTable("CREATE TABLE %s (k1 int, k2 int, v int, PRIMARY KEY (k1, k2))" + compactOption);
- execute("INSERT INTO %s (k1, k2, v) VALUES (?, ?, ?)", 1, 1, 1);
-
- assertRows(execute("SELECT * FROM %s WHERE k1 IN (?, ?)", 1, 1),
- row(1, 1, 1));
-
- assertRows(execute("SELECT * FROM %s WHERE k1 IN (?, ?) AND k2 IN (?, ?)", 1, 1, 1, 1),
- row(1, 1, 1));
-
- assertRows(execute("SELECT * FROM %s WHERE k1 = ? AND k2 IN (?, ?)", 1, 1, 1),
- row(1, 1, 1));
- }
- }
-
- @Test
- public void testLargeClusteringINValues() throws Throwable
- {
- createTable("CREATE TABLE %s (k int, c int, v int, PRIMARY KEY (k, c))");
- execute("INSERT INTO %s (k, c, v) VALUES (0, 0, 0)");
- List<Integer> inValues = new ArrayList<>(10000);
- for (int i = 0; i < 10000; i++)
- inValues.add(i);
- assertRows(execute("SELECT * FROM %s WHERE k=? AND c IN ?", 0, inValues),
- row(0, 0, 0));
- }
-
- @Test
- public void testMultiplePartitionKeyWithIndex() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY ((a, b), c, d, e))");
- createIndex("CREATE INDEX ON %s (c)");
- createIndex("CREATE INDEX ON %s (f)");
-
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 0, 0, 0, 0);
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 0, 1, 0, 1);
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 0, 1, 1, 2);
-
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 1, 0, 0, 3);
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 1, 1, 0, 4);
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 1, 1, 1, 5);
-
- execute("INSERT INTO %s (a, b, c, d, e, f) VALUES (?, ?, ?, ?, ?, ?)", 0, 0, 2, 0, 0, 5);
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c = ?", 0, 1);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c = ? ALLOW FILTERING", 0, 1),
- row(0, 0, 1, 0, 0, 3),
- row(0, 0, 1, 1, 0, 4),
- row(0, 0, 1, 1, 1, 5));
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c = ? AND d = ?", 0, 1, 1);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c = ? AND d = ? ALLOW FILTERING", 0, 1, 1),
- row(0, 0, 1, 1, 0, 4),
- row(0, 0, 1, 1, 1, 5));
-
- assertInvalidMessage("Partition key parts: b must be restricted as other parts are",
- "SELECT * FROM %s WHERE a = ? AND c IN (?) AND d IN (?) ALLOW FILTERING", 0, 1, 1);
-
- assertInvalidMessage("Partition key parts: b must be restricted as other parts are",
- "SELECT * FROM %s WHERE a = ? AND (c, d) >= (?, ?) ALLOW FILTERING", 0, 1, 1);
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c IN (?) AND f = ?", 0, 1, 5);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c IN (?) AND f = ? ALLOW FILTERING", 0, 1, 5),
- row(0, 0, 1, 1, 1, 5));
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c IN (?, ?) AND f = ?", 0, 1, 2, 5);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c IN (?, ?) AND f = ? ALLOW FILTERING", 0, 1, 2, 5),
- row(0, 0, 1, 1, 1, 5),
- row(0, 0, 2, 0, 0, 5));
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c IN (?) AND d IN (?) AND f = ?", 0, 1, 0, 3);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c IN (?) AND d IN (?) AND f = ? ALLOW FILTERING", 0, 1, 0, 3),
- row(0, 0, 1, 0, 0, 3));
-
- assertInvalidMessage("Partition key parts: b must be restricted as other parts are",
- "SELECT * FROM %s WHERE a = ? AND c >= ? ALLOW FILTERING", 0, 1);
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c >= ? AND f = ?", 0, 1, 5);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c >= ? AND f = ? ALLOW FILTERING", 0, 1, 5),
- row(0, 0, 1, 1, 1, 5),
- row(0, 0, 2, 0, 0, 5));
-
- assertInvalidMessage("Cannot execute this query as it might involve data filtering",
- "SELECT * FROM %s WHERE a = ? AND c = ? AND d >= ? AND f = ?", 0, 1, 1, 5);
- assertRows(execute("SELECT * FROM %s WHERE a = ? AND c = ? AND d >= ? AND f = ? ALLOW FILTERING", 0, 1, 1, 5),
- row(0, 0, 1, 1, 1, 5));
- }
-
- @Test
- public void testFunctionCallWithUnset() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, s text, i int)");
-
- assertInvalidMessage("Invalid unset value for argument in call to function token",
- "SELECT * FROM %s WHERE token(k) >= token(?)", unset());
- assertInvalidMessage("Invalid unset value for argument in call to function blobasint",
- "SELECT * FROM %s WHERE k = blobAsInt(?)", unset());
- }
-
- @Test
- public void testLimitWithUnset() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, i int)");
- execute("INSERT INTO %s (k, i) VALUES (1, 1)");
- execute("INSERT INTO %s (k, i) VALUES (2, 1)");
- assertRows(execute("SELECT k FROM %s LIMIT ?", unset()), // treat as 'unlimited'
- row(1),
- row(2)
- );
- }
-
- @Test
- public void testWithUnsetValues() throws Throwable
- {
- createTable("CREATE TABLE %s (k int, i int, j int, s text, PRIMARY KEY(k,i,j))");
- createIndex("CREATE INDEX s_index ON %s (s)");
- // partition key
- assertInvalidMessage("Invalid unset value for column k", "SELECT * from %s WHERE k = ?", unset());
- assertInvalidMessage("Invalid unset value for column k", "SELECT * from %s WHERE k IN ?", unset());
- assertInvalidMessage("Invalid unset value for column k", "SELECT * from %s WHERE k IN(?)", unset());
- assertInvalidMessage("Invalid unset value for column k", "SELECT * from %s WHERE k IN(?,?)", 1, unset());
- // clustering column
- assertInvalidMessage("Invalid unset value for column i", "SELECT * from %s WHERE k = 1 AND i = ?", unset());
- assertInvalidMessage("Invalid unset value for column i", "SELECT * from %s WHERE k = 1 AND i IN ?", unset());
- assertInvalidMessage("Invalid unset value for column i", "SELECT * from %s WHERE k = 1 AND i IN(?)", unset());
- assertInvalidMessage("Invalid unset value for column i", "SELECT * from %s WHERE k = 1 AND i IN(?,?)", 1, unset());
- assertInvalidMessage("Invalid unset value for column i", "SELECT * from %s WHERE i = ? ALLOW FILTERING", unset());
- // indexed column
- assertInvalidMessage("Unsupported unset value for indexed column s", "SELECT * from %s WHERE s = ?", unset());
- // range
- assertInvalidMessage("Invalid unset value for column i", "SELECT * from %s WHERE k = 1 AND i > ?", unset());
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java b/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
deleted file mode 100644
index a3f7197..0000000
--- a/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
+++ /dev/null
@@ -1,170 +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.cql3;
-
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.base.Throwables;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.filter.TombstoneOverwhelmingException;
-
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-
-/**
- * Test that TombstoneOverwhelmingException gets thrown when it should be and doesn't when it shouldn't be.
- */
-public class SliceQueryFilterWithTombstonesTest extends CQLTester
-{
- static final int ORIGINAL_THRESHOLD = DatabaseDescriptor.getTombstoneFailureThreshold();
- static final int THRESHOLD = 100;
-
- @BeforeClass
- public static void setUp() throws Throwable
- {
- DatabaseDescriptor.setTombstoneFailureThreshold(THRESHOLD);
- }
-
- @AfterClass
- public static void tearDown()
- {
- DatabaseDescriptor.setTombstoneFailureThreshold(ORIGINAL_THRESHOLD);
- }
-
- @Test
- public void testBelowThresholdSelect() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b text, c text, PRIMARY KEY (a, b));");
-
- // insert exactly the amount of tombstones that shouldn't trigger an exception
- for (int i = 0; i < THRESHOLD; i++)
- execute("INSERT INTO %s (a, b, c) VALUES ('key', 'column" + i + "', null);");
-
- try
- {
- execute("SELECT * FROM %s WHERE a = 'key';");
- }
- catch (Throwable e)
- {
- fail("SELECT with tombstones below the threshold should not have failed, but has: " + e);
- }
- }
-
- @Test
- public void testBeyondThresholdSelect() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b text, c text, PRIMARY KEY (a, b));");
-
- // insert exactly the amount of tombstones that *SHOULD* trigger an exception
- for (int i = 0; i < THRESHOLD + 1; i++)
- execute("INSERT INTO %s (a, b, c) VALUES ('key', 'column" + i + "', null);");
-
- try
- {
- execute("SELECT * FROM %s WHERE a = 'key';");
- fail("SELECT with tombstones beyond the threshold should have failed, but hasn't");
- }
- catch (Throwable e)
- {
- String error = "Expected exception instanceof TombstoneOverwhelmingException instead got "
- + System.lineSeparator()
- + Throwables.getStackTraceAsString(e);
- assertTrue(error, e instanceof TombstoneOverwhelmingException);
- }
- }
-
- @Test
- public void testAllShadowedSelect() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b text, c text, PRIMARY KEY (a, b));");
-
- // insert exactly the amount of tombstones that *SHOULD* normally trigger an exception
- for (int i = 0; i < THRESHOLD + 1; i++)
- execute("INSERT INTO %s (a, b, c) VALUES ('key', 'column" + i + "', null);");
-
- // delete all with a partition level tombstone
- execute("DELETE FROM %s WHERE a = 'key'");
-
- try
- {
- execute("SELECT * FROM %s WHERE a = 'key';");
- }
- catch (Throwable e)
- {
- fail("SELECT with tombstones shadowed by a partition tombstone should not have failed, but has: " + e);
- }
- }
-
- @Test
- public void testLiveShadowedCellsSelect() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b text, c text, PRIMARY KEY (a, b));");
-
- for (int i = 0; i < THRESHOLD + 1; i++)
- execute("INSERT INTO %s (a, b, c) VALUES ('key', 'column" + i + "', 'column');");
-
- // delete all with a partition level tombstone
- execute("DELETE FROM %s WHERE a = 'key'");
-
- try
- {
- execute("SELECT * FROM %s WHERE a = 'key';");
- }
- catch (Throwable e)
- {
- fail("SELECT with regular cells shadowed by a partition tombstone should not have failed, but has: " + e);
- }
- }
-
- @Test
- public void testExpiredTombstones() throws Throwable
- {
- createTable("CREATE TABLE %s (a text, b text, c text, PRIMARY KEY (a, b)) WITH gc_grace_seconds = 1;");
-
- for (int i = 0; i < THRESHOLD + 1; i++)
- execute("INSERT INTO %s (a, b, c) VALUES ('key', 'column" + i + "', null);");
-
- // not yet past gc grace - must throw a TOE
- try
- {
- execute("SELECT * FROM %s WHERE a = 'key';");
- fail("SELECT with tombstones beyond the threshold should have failed, but hasn't");
- }
- catch (Throwable e)
- {
- assertTrue(e instanceof TombstoneOverwhelmingException);
- }
-
- // sleep past gc grace
- TimeUnit.SECONDS.sleep(2);
-
- // past gc grace - must not throw a TOE now
- try
- {
- execute("SELECT * FROM %s WHERE a = 'key';");
- }
- catch (Throwable e)
- {
- fail("SELECT with expired tombstones beyond the threshold should not have failed, but has: " + e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
deleted file mode 100644
index e27f968..0000000
--- a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
+++ /dev/null
@@ -1,280 +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.cql3;
-
-import org.junit.Test;
-
-/**
- * Test column ranges and ordering with static column in table
- */
-public class StaticColumnsQueryTest extends CQLTester
-{
- @Test
- public void testSingleClustering() throws Throwable
- {
- createTable("CREATE TABLE %s (p text, c text, v text, s text static, PRIMARY KEY (p, c))");
-
- execute("INSERT INTO %s(p, c, v, s) values (?, ?, ?, ?)", "p1", "k1", "v1", "sv1");
- execute("INSERT INTO %s(p, c, v) values (?, ?, ?)", "p1", "k2", "v2");
- execute("INSERT INTO %s(p, s) values (?, ?)", "p2", "sv2");
-
- assertRows(execute("SELECT * FROM %s WHERE p=?", "p1"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=?", "p2"),
- row("p2", null, "sv2", null)
- );
-
- // Ascending order
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c ASC", "p1"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c ASC", "p2"),
- row("p2", null, "sv2", null)
- );
-
- // Descending order
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c DESC", "p1"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c DESC", "p2"),
- row("p2", null, "sv2", null)
- );
-
- // No order with one relation
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=?", "p1", "k1"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=?", "p1", "k2"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c>=?", "p1", "k3"));
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c =?", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c<=?", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c<=?", "p1", "k0"));
-
- // Ascending with one relation
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c ASC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c ASC", "p1", "k2"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c ASC", "p1", "k3"));
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c =? ORDER BY c ASC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c ASC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c ASC", "p1", "k0"));
-
- // Descending with one relation
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c DESC", "p1", "k1"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c DESC", "p1", "k2"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c DESC", "p1", "k3"));
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c =? ORDER BY c DESC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c DESC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c DESC", "p1", "k0"));
-
- // IN
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c IN (?, ?)", "p1", "k1", "k2"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c IN (?, ?) ORDER BY c ASC", "p1", "k1", "k2"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c IN (?, ?) ORDER BY c DESC", "p1", "k1", "k2"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
- }
-
- @Test
- public void testSingleClusteringReversed() throws Throwable
- {
- createTable("CREATE TABLE %s (p text, c text, v text, s text static, PRIMARY KEY (p, c)) WITH CLUSTERING ORDER BY (c DESC)");
-
- execute("INSERT INTO %s(p, c, v, s) values (?, ?, ?, ?)", "p1", "k1", "v1", "sv1");
- execute("INSERT INTO %s(p, c, v) values (?, ?, ?)", "p1", "k2", "v2");
- execute("INSERT INTO %s(p, s) values (?, ?)", "p2", "sv2");
-
- assertRows(execute("SELECT * FROM %s WHERE p=?", "p1"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=?", "p2"),
- row("p2", null, "sv2", null)
- );
-
- // Ascending order
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c ASC", "p1"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c ASC", "p2"),
- row("p2", null, "sv2", null)
- );
-
- // Descending order
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c DESC", "p1"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? ORDER BY c DESC", "p2"),
- row("p2", null, "sv2", null)
- );
-
- // No order with one relation
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=?", "p1", "k1"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=?", "p1", "k2"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c>=?", "p1", "k3"));
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c=?", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c<=?", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c<=?", "p1", "k0"));
-
- // Ascending with one relation
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c ASC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c ASC", "p1", "k2"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c ASC", "p1", "k3"));
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c=? ORDER BY c ASC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c ASC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c ASC", "p1", "k0"));
-
- // Descending with one relation
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c DESC", "p1", "k1"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c DESC", "p1", "k2"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c>=? ORDER BY c DESC", "p1", "k3"));
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c=? ORDER BY c DESC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c DESC", "p1", "k1"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertEmpty(execute("SELECT * FROM %s WHERE p=? AND c<=? ORDER BY c DESC", "p1", "k0"));
-
- // IN
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c IN (?, ?)", "p1", "k1", "k2"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c IN (?, ?) ORDER BY c ASC", "p1", "k1", "k2"),
- row("p1", "k1", "sv1", "v1"),
- row("p1", "k2", "sv1", "v2")
- );
-
- assertRows(execute("SELECT * FROM %s WHERE p=? AND c IN (?, ?) ORDER BY c DESC", "p1", "k1", "k2"),
- row("p1", "k2", "sv1", "v2"),
- row("p1", "k1", "sv1", "v1")
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java b/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java
index 3125b28..7b72ef8 100644
--- a/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class ThriftCompatibilityTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/TimestampTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/TimestampTest.java b/test/unit/org/apache/cassandra/cql3/TimestampTest.java
deleted file mode 100644
index 6673904..0000000
--- a/test/unit/org/apache/cassandra/cql3/TimestampTest.java
+++ /dev/null
@@ -1,36 +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.cql3;
-
-import org.junit.Test;
-
-public class TimestampTest extends CQLTester
-{
- @Test
- public void testNegativeTimestamps() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, v int)");
-
- execute("INSERT INTO %s (k, v) VALUES (?, ?) USING TIMESTAMP ?", 1, 1, -42L);
- assertRows(execute("SELECT writetime(v) FROM %s WHERE k = ?", 1),
- row(-42L)
- );
-
- assertInvalid("INSERT INTO %s (k, v) VALUES (?, ?) USING TIMESTAMP ?", 2, 2, Long.MIN_VALUE);
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java b/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
deleted file mode 100644
index 48f0caf..0000000
--- a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
+++ /dev/null
@@ -1,114 +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.cql3;
-
-import org.junit.Test;
-
-public class TupleTypeTest extends CQLTester
-{
- @Test
- public void testTuplePutAndGet() throws Throwable
- {
- String[] valueTypes = {"frozen<tuple<int, text, double>>", "tuple<int, text, double>"};
- for (String valueType : valueTypes)
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, t " + valueType + ")");
-
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 0, tuple(3, "foo", 3.4));
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 1, tuple(8, "bar", 0.2));
- assertAllRows(
- row(0, tuple(3, "foo", 3.4)),
- row(1, tuple(8, "bar", 0.2))
- );
-
- // nulls
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 2, tuple(5, null, 3.4));
- assertRows(execute("SELECT * FROM %s WHERE k=?", 2),
- row(2, tuple(5, null, 3.4))
- );
-
- // incomplete tuple
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 3, tuple(5, "bar"));
- assertRows(execute("SELECT * FROM %s WHERE k=?", 3),
- row(3, tuple(5, "bar"))
- );
- }
- }
-
- @Test
- public void testNestedTuple() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, t frozen<tuple<int, tuple<text, double>>>)");
-
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 0, tuple(3, tuple("foo", 3.4)));
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 1, tuple(8, tuple("bar", 0.2)));
- assertAllRows(
- row(0, tuple(3, tuple("foo", 3.4))),
- row(1, tuple(8, tuple("bar", 0.2)))
- );
- }
-
- @Test
- public void testTupleInPartitionKey() throws Throwable
- {
- createTable("CREATE TABLE %s (t frozen<tuple<int, text>> PRIMARY KEY)");
-
- execute("INSERT INTO %s (t) VALUES (?)", tuple(3, "foo"));
- assertAllRows(row(tuple(3, "foo")));
- }
-
- @Test
- public void testTupleInClusteringKey() throws Throwable
- {
- createTable("CREATE TABLE %s (k int, t frozen<tuple<int, text>>, PRIMARY KEY (k, t))");
-
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 0, tuple(5, "bar"));
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 0, tuple(3, "foo"));
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 0, tuple(6, "bar"));
- execute("INSERT INTO %s (k, t) VALUES (?, ?)", 0, tuple(5, "foo"));
-
- assertAllRows(
- row(0, tuple(3, "foo")),
- row(0, tuple(5, "bar")),
- row(0, tuple(5, "foo")),
- row(0, tuple(6, "bar"))
- );
- }
-
- @Test
- public void testInvalidQueries() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, t frozen<tuple<int, text, double>>)");
-
- assertInvalidSyntax("INSERT INTO %s (k, t) VALUES (0, ())");
- assertInvalid("INSERT INTO %s (k, t) VALUES (0, (2, 'foo', 3.1, 'bar'))");
- }
-
- @Test
- public void testTupleWithUnsetValues() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, t tuple<int, text, double>)");
- // invalid positional field substitution
- assertInvalidMessage("Invalid unset value for tuple field number 1",
- "INSERT INTO %s (k, t) VALUES(0, (3, ?, 2.1))", unset());
-
- createIndex("CREATE INDEX tuple_index ON %s (t)");
- // select using unset
- assertInvalidMessage("Invalid unset value for tuple field number 0", "SELECT * FROM %s WHERE k = ? and t = (?,?,?)", unset(), unset(), unset(), unset());
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/TypeCastTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/TypeCastTest.java b/test/unit/org/apache/cassandra/cql3/TypeCastTest.java
deleted file mode 100644
index 7b9c9a2..0000000
--- a/test/unit/org/apache/cassandra/cql3/TypeCastTest.java
+++ /dev/null
@@ -1,54 +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.cql3;
-
-import org.junit.Test;
-
-/**
- * Type-casting is mostly using for functions and their use with functions is
- * tested in UFTest. This is a few additional "sanity" tests.
- */
-public class TypeCastTest extends CQLTester
-{
- @Test
- public void testTypeCasts() throws Throwable
- {
- createTable("CREATE TABLE %s (k int PRIMARY KEY, t text, a ascii, d double, i int)");
-
- // The followings is fine
- execute("UPDATE %s SET t = 'foo' WHERE k = ?", 0);
- execute("UPDATE %s SET t = (ascii)'foo' WHERE k = ?", 0);
- execute("UPDATE %s SET t = (text)(ascii)'foo' WHERE k = ?", 0);
- execute("UPDATE %s SET a = 'foo' WHERE k = ?", 0);
- execute("UPDATE %s SET a = (ascii)'foo' WHERE k = ?", 0);
-
- // But trying to put some explicitely type-casted text into an ascii
- // column should be rejected (even though the text is actually ascci)
- assertInvalid("UPDATE %s SET a = (text)'foo' WHERE k = ?", 0);
-
- // This is also fine because integer constants works for both integer and float types
- execute("UPDATE %s SET i = 3 WHERE k = ?", 0);
- execute("UPDATE %s SET i = (int)3 WHERE k = ?", 0);
- execute("UPDATE %s SET d = 3 WHERE k = ?", 0);
- execute("UPDATE %s SET d = (double)3 WHERE k = ?", 0);
-
- // But values for ints and doubles are not truly compatible (their binary representation differs)
- assertInvalid("UPDATE %s SET d = (int)3 WHERE k = ?", 0);
- assertInvalid("UPDATE %s SET i = (double)3 WHERE k = ?", 0);
- }
-}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01115f72/test/unit/org/apache/cassandra/cql3/TypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/TypeTest.java b/test/unit/org/apache/cassandra/cql3/TypeTest.java
deleted file mode 100644
index 0605554..0000000
--- a/test/unit/org/apache/cassandra/cql3/TypeTest.java
+++ /dev/null
@@ -1,89 +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.cql3;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class TypeTest extends CQLTester
-{
- @Test
- public void testNowToUUIDCompatibility() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b uuid, PRIMARY KEY (a, b))");
- execute("INSERT INTO %s (a, b) VALUES (0, now())");
- UntypedResultSet results = execute("SELECT * FROM %s WHERE a=0 AND b < now()");
- assertEquals(1, results.size());
- }
-
- @Test
- public void testDateCompatibility() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b timestamp, c bigint, d varint, PRIMARY KEY (a, b, c, d))");
-
- execute("INSERT INTO %s (a, b, c, d) VALUES (0, toUnixTimestamp(now()), toTimestamp(now()), toTimestamp(now()))");
- UntypedResultSet results = execute("SELECT * FROM %s WHERE a=0 AND b < toUnixTimestamp(now())");
- assertEquals(1, results.size());
-
- execute("INSERT INTO %s (a, b, c, d) VALUES (1, unixTimestampOf(now()), dateOf(now()), dateOf(now()))");
- results = execute("SELECT * FROM %s WHERE a=1 AND b < toUnixTimestamp(now())");
- assertEquals(1, results.size());
- }
-
- @Test
- public void testReversedTypeCompatibility() throws Throwable
- {
- createTable("CREATE TABLE %s (a int, b timeuuid, PRIMARY KEY (a, b)) WITH CLUSTERING ORDER BY (b DESC)");
- execute("INSERT INTO %s (a, b) VALUES (0, now())");
- UntypedResultSet results = execute("SELECT * FROM %s WHERE a=0 AND b < now()");
- assertEquals(1, results.size());
- }
-
- @Test
- // tests CASSANDRA-7797
- public void testAlterReversedColumn() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int, b 'org.apache.cassandra.db.marshal.DateType', PRIMARY KEY (a, b)) WITH CLUSTERING ORDER BY (b DESC)");
- alterTable("ALTER TABLE %s ALTER b TYPE 'org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimestampType)'");
- }
-
- @Test
- public void testIncompatibleReversedTypes() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int, b 'org.apache.cassandra.db.marshal.DateType', PRIMARY KEY (a, b)) WITH CLUSTERING ORDER BY (b DESC)");
- try
- {
- alterTable("ALTER TABLE %s ALTER b TYPE 'org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType)'");
- fail("Expected error for ALTER statement");
- }
- catch (RuntimeException e) { }
- }
-
- @Test
- public void testReversedAndNonReversed() throws Throwable
- {
- createTable("CREATE TABLE IF NOT EXISTS %s (a int, b 'org.apache.cassandra.db.marshal.DateType', PRIMARY KEY (a, b))");
- try
- {
- alterTable("ALTER TABLE %s ALTER b TYPE 'org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.DateType)'");
- fail("Expected error for ALTER statement");
- }
- catch (RuntimeException e) { }
- }
-}