You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2017/09/05 06:08:37 UTC
[10/16] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
index 87b19ad,fe618b6..6803230
--- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
@@@ -21,9 -21,8 +21,10 @@@ package org.apache.cassandra.cql3
import java.util.*;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
++import org.junit.Ignore;
import org.junit.Test;
import com.datastax.driver.core.exceptions.InvalidQueryException;
@@@ -95,6 -67,6 +96,324 @@@ public class ViewFilteringTest extends
views.remove(name);
}
++ private static void waitForView(String keyspace, String view) throws InterruptedException
++ {
++ while (!SystemKeyspace.isViewBuilt(keyspace, view))
++ Thread.sleep(10);
++ }
++
++ // TODO will revise the non-pk filter condition in MV, see CASSANDRA-13826
++ @Ignore
++ @Test
++ public void testViewFilteringWithFlush() throws Throwable
++ {
++ testViewFiltering(true);
++ }
++
++ // TODO will revise the non-pk filter condition in MV, see CASSANDRA-13826
++ @Ignore
++ @Test
++ public void testViewFilteringWithoutFlush() throws Throwable
++ {
++ testViewFiltering(false);
++ }
++
++ public void testViewFiltering(boolean flush) throws Throwable
++ {
++ // CASSANDRA-13547: able to shadow entire view row if base column used in filter condition is modified
++ createTable("CREATE TABLE %s (a int, b int, c int, d int, PRIMARY KEY (a))");
++
++ execute("USE " + keyspace());
++ executeNet(protocolVersion, "USE " + keyspace());
++
++ createView("mv_test1",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL and c = 1 PRIMARY KEY (a, b)");
++ createView("mv_test2",
++ "CREATE MATERIALIZED VIEW %s AS SELECT c, d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL and c = 1 and d = 1 PRIMARY KEY (a, b)");
++ createView("mv_test3",
++ "CREATE MATERIALIZED VIEW %s AS SELECT a, b, c, d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a, b)");
++ createView("mv_test4",
++ "CREATE MATERIALIZED VIEW %s AS SELECT c FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL and c = 1 PRIMARY KEY (a, b)");
++ createView("mv_test5",
++ "CREATE MATERIALIZED VIEW %s AS SELECT c FROM %%s WHERE a IS NOT NULL and d = 1 PRIMARY KEY (a, d)");
++ createView("mv_test6",
++ "CREATE MATERIALIZED VIEW %s AS SELECT c FROM %%s WHERE a = 1 and d IS NOT NULL PRIMARY KEY (a, d)");
++
++ waitForView(keyspace(), "mv_test1");
++ waitForView(keyspace(), "mv_test2");
++ waitForView(keyspace(), "mv_test3");
++ waitForView(keyspace(), "mv_test4");
++ waitForView(keyspace(), "mv_test5");
++ waitForView(keyspace(), "mv_test6");
++
++ Keyspace ks = Keyspace.open(keyspace());
++ ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test2").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test3").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test4").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test5").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test6").disableAutoCompaction();
++
++
++ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ // views should be updated.
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 1));
++
++ updateView("UPDATE %s using timestamp 1 set c = ? WHERE a=?", 0, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowCount(execute("SELECT * FROM mv_test1"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 0, 1));
++ assertRowCount(execute("SELECT * FROM mv_test4"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 0));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 0));
++
++ updateView("UPDATE %s using timestamp 2 set c = ? WHERE a=?", 1, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ // row should be back in views.
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 1));
++
++ updateView("UPDATE %s using timestamp 3 set d = ? WHERE a=?", 0, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 0));
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 1, 0));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1, 1));
++ assertRowCount(execute("SELECT * FROM mv_test5"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 0, 1));
++
++ updateView("UPDATE %s using timestamp 4 set c = ? WHERE a=?", 0, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowCount(execute("SELECT * FROM mv_test1"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 0, 0));
++ assertRowCount(execute("SELECT * FROM mv_test4"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test5"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 0, 0));
++
++ updateView("UPDATE %s using timestamp 5 set d = ? WHERE a=?", 1, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ // should not update as c=0
++ assertRowCount(execute("SELECT * FROM mv_test1"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 0, 1));
++ assertRowCount(execute("SELECT * FROM mv_test4"), 0);
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 0));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 0));
++
++ updateView("UPDATE %s using timestamp 6 set c = ? WHERE a=?", 1, 1);
++
++ // row should be back in views.
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 1));
++
++ updateView("UPDATE %s using timestamp 7 set b = ? WHERE a=?", 2, 1);
++ if (flush)
++ {
++ FBUtilities.waitOnFutures(ks.flush());
++ for (String view : views)
++ ks.getColumnFamilyStore(view).forceMajorCompaction();
++ }
++ // row should be back in views.
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 2, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"), row(1, 2, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 2, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 2, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 1));
++
++ updateView("DELETE b, c FROM %s using timestamp 6 WHERE a=?", 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT * FROM %s"), row(1, 2, null, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 2, null, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, null));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, null));
++
++ updateView("DELETE FROM %s using timestamp 8 where a=?", 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowCount(execute("SELECT * FROM mv_test1"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test3"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test4"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test5"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test6"), 0);
++
++ updateView("UPDATE %s using timestamp 9 set b = ?,c = ? where a=?", 1, 1, 1); // upsert
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
++ assertRows(execute("SELECT * FROM mv_test2"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 1, null));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1, 1));
++ assertRows(execute("SELECT * FROM mv_test5"));
++ assertRows(execute("SELECT * FROM mv_test6"));
++
++ updateView("DELETE FROM %s using timestamp 10 where a=?", 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowCount(execute("SELECT * FROM mv_test1"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test3"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test4"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test5"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test6"), 0);
++
++ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 11", 1, 1, 1, 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ // row should be back in views.
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test5"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test6"), row(1, 1, 1));
++
++ updateView("DELETE FROM %s using timestamp 12 where a=?", 1);
++ if (flush)
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowCount(execute("SELECT * FROM mv_test1"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test2"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test3"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test4"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test5"), 0);
++ assertRowCount(execute("SELECT * FROM mv_test6"), 0);
++
++ dropView("mv_test1");
++ dropView("mv_test2");
++ dropView("mv_test3");
++ dropView("mv_test4");
++ dropView("mv_test5");
++ dropView("mv_test6");
++ dropTable("DROP TABLE %s");
++ }
++
++ // TODO will revise the non-pk filter condition in MV, see CASSANDRA-13826
++ @Ignore
++ @Test
++ public void testMVFilteringWithComplexColumn() throws Throwable
++ {
++ createTable("CREATE TABLE %s (a int, b int, c int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (a, b))");
++
++ execute("USE " + keyspace());
++ executeNet(protocolVersion, "USE " + keyspace());
++
++ createView("mv_test1",
++ "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c IS NOT NULL "
++ + "and l contains (1) AND s contains (1) AND m contains key (1) PRIMARY KEY (a, b, c)");
++ createView("mv_test2",
++ "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL and b IS NOT NULL AND l contains (1) PRIMARY KEY (a, b)");
++ createView("mv_test3",
++ "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND s contains (1) PRIMARY KEY (a, b)");
++ createView("mv_test4",
++ "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND m contains key (1) PRIMARY KEY (a, b)");
++
++ waitForView(keyspace(), "mv_test1");
++ waitForView(keyspace(), "mv_test2");
++ waitForView(keyspace(), "mv_test3");
++ waitForView(keyspace(), "mv_test4");
++
++ // not able to drop base column filtered in view
++ assertInvalidMessage("Cannot drop column l, depended on by materialized views", "ALTER TABLE %s DROP l");
++ assertInvalidMessage("Cannot drop column s, depended on by materialized views", "ALTER TABLE %S DROP s");
++ assertInvalidMessage("Cannot drop column m, depended on by materialized views", "ALTER TABLE %s DROP m");
++
++ Keyspace ks = Keyspace.open(keyspace());
++ ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test2").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test3").disableAutoCompaction();
++ ks.getColumnFamilyStore("mv_test4").disableAutoCompaction();
++
++ execute("INSERT INTO %s (a, b, c, l, s, m) VALUES (?, ?, ?, ?, ?, ?) ",
++ 1,
++ 1,
++ 1,
++ list(1, 1, 2),
++ set(1, 2),
++ map(1, 1, 2, 2));
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"), row(1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1));
++
++
++ execute("UPDATE %s SET l=l-[1] WHERE a = 1 AND b = 1" );
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1));
++
++ execute("UPDATE %s SET s=s-{2}, m=m-{2} WHERE a = 1 AND b = 1");
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT a,b,c FROM %s"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"), row(1, 1));
++
++ execute("UPDATE %s SET m=m-{1} WHERE a = 1 AND b = 1");
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT a,b,c FROM %s"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"));
++
++ // filter conditions result not changed
++ execute("UPDATE %s SET l=l+[2], s=s-{0}, m=m+{3:3} WHERE a = 1 AND b = 1");
++ FBUtilities.waitOnFutures(ks.flush());
++
++ assertRowsIgnoringOrder(execute("SELECT a,b,c FROM %s"), row(1, 1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test2"));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test3"), row(1, 1));
++ assertRowsIgnoringOrder(execute("SELECT * FROM mv_test4"));
++ }
++
@Test
public void testMVCreationSelectRestrictions() throws Throwable
{
@@@ -124,19 -96,19 +443,19 @@@
catch (InvalidQueryException exc) {}
}
- List<String> goodStatements = Arrays.asList(
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c IS NOT NULL AND d is NOT NULL PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c = 1 AND d IS NOT NULL PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c > 1 AND d IS NOT NULL PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c = 1 AND d IN (1, 2, 3) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) = (1, 1) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) > (1, 1) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) IN ((1, 1), (2, 2)) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = (int) 1 AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(intAsBlob(1)) AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)"
- );
+ List<String> goodStatements = Arrays.asList(
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c IS NOT NULL AND d is NOT NULL PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c = 1 AND d IS NOT NULL PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c > 1 AND d IS NOT NULL PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c = 1 AND d IN (1, 2, 3) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) = (1, 1) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) > (1, 1) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) IN ((1, 1), (2, 2)) PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = (int) 1 AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(intAsBlob(1)) AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)"
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c IS NOT NULL AND d is NOT NULL PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c = 1 AND d IS NOT NULL PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c > 1 AND d IS NOT NULL PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND c = 1 AND d IN (1, 2, 3) PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) = (1, 1) PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) > (1, 1) PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b = 1 AND (c, d) IN ((1, 1), (2, 2)) PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = (int) 1 AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)",
++ "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(intAsBlob(1)) AND b = 1 AND c = 1 AND d = 1 PRIMARY KEY ((a, b), c, d)"
+ );
for (int i = 0; i < goodStatements.size(); i++)
{
@@@ -269,210 -248,6 +588,201 @@@
}
@Test
+ public void testPartitionKeyFilteringUnrestrictedPart() throws Throwable
+ {
+ List<String> mvPrimaryKeys = Arrays.asList("((a, b), c)", "((b, a), c)", "(a, b, c)", "(c, b, a)", "((c, a), b)");
+ for (int i = 0; i < mvPrimaryKeys.size(); i++)
+ {
+ createTable("CREATE TABLE %s (a int, b int, c int, d int, PRIMARY KEY ((a, b), c))");
+
+ execute("USE " + keyspace());
+ executeNet(protocolVersion, "USE " + keyspace());
+
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 0, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 0, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 0, 0, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 0, 1, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 0, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 1, 0);
+
+ logger.info("Testing MV primary key: {}", mvPrimaryKeys.get(i));
+
+ // only accept rows where a = 1
+ String viewName= "mv_test" + i;
+ createView(viewName, "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = 1 AND b IS NOT NULL AND c IS NOT NULL PRIMARY KEY " + mvPrimaryKeys.get(i));
+
+ waitForView(keyspace(), viewName);
+
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 0, 0),
+ row(1, 1, 1, 0)
+ );
+
+ // insert new rows that do not match the filter
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 0, 0),
+ row(1, 1, 1, 0)
+ );
+
+ // insert new row that does match the filter
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 2, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 0, 0),
+ row(1, 1, 1, 0),
+ row(1, 1, 2, 0)
+ );
+
+ // update rows that don't match the filter
+ execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 0, 0);
+ execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 1, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 0, 0),
+ row(1, 1, 1, 0),
+ row(1, 1, 2, 0)
+ );
+
+ // update a row that does match the filter
+ execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 1, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 0, 1),
+ row(1, 1, 1, 0),
+ row(1, 1, 2, 0)
+ );
+
+ // delete rows that don't match the filter
+ execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 0, 0);
+ execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 1, 0);
+ execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 0, 1),
+ row(1, 1, 1, 0),
+ row(1, 1, 2, 0)
+ );
+
+ // delete a row that does match the filter
+ execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 0, 0, 0),
+ row(1, 0, 1, 0),
+ row(1, 1, 1, 0),
+ row(1, 1, 2, 0)
+ );
+
+ // delete a partition that matches the filter
+ execute("DELETE FROM %s WHERE a = ? AND b = ?", 1, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 1, 1, 0),
+ row(1, 1, 2, 0));
+ execute("DELETE FROM %s WHERE a = ? AND b = ?", 1, 1);
+ assertEmpty(execute("SELECT * FROM mv_test" + i));
+ }
+ }
+
+ @Test
+ public void testPartitionKeyFilteringWithSlice() throws Throwable
+ {
+ List<String> mvPrimaryKeys = Arrays.asList("((a, b), c)", "((b, a), c)", "(a, b, c)", "(c, b, a)", "((c, a), b)");
+ for (int i = 0; i < mvPrimaryKeys.size(); i++)
+ {
+ createTable("CREATE TABLE %s (a int, b int, c int, d int, PRIMARY KEY ((a, b), c))");
+
+ execute("USE " + keyspace());
+ executeNet(protocolVersion, "USE " + keyspace());
+
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 1);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 10, 1, 2);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 0, 2, 1);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 10, 2, 2);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 3, 1);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 10, 3, 2);
+
+ logger.info("Testing MV primary key: {}", mvPrimaryKeys.get(i));
+
+ // only accept rows where a = 1
+ String viewName= "mv_test" + i;
+ createView(viewName, "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a > 0 AND b > 5 AND c IS NOT NULL PRIMARY KEY " + mvPrimaryKeys.get(i));
+
+ waitForView(keyspace(), viewName);
+
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2)
+ );
+
+ // insert new rows that do not match the filter
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2)
+ );
+
+ // insert new row that does match the filter
+ execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 3, 10, 4, 2);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2),
+ row(3, 10, 4, 2)
+ );
+
+ // update rows that don't match the filter
+ execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 0, 0);
+ execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 1, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2),
+ row(3, 10, 4, 2)
+ );
+
+ // update a row that does match the filter
+ execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 100, 3, 10, 4);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2),
+ row(3, 10, 4, 100)
+ );
+
+ // delete rows that don't match the filter
+ execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 0, 0);
+ execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 1, 0);
+ execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2),
+ row(3, 10, 4, 100)
+ );
+
+ // delete a row that does match the filter
+ execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 0);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(1, 10, 2, 2),
+ row(2, 10, 3, 2),
+ row(3, 10, 4, 100)
+ );
+
+ // delete a partition that matches the filter
+ execute("DELETE FROM %s WHERE a = ? AND b = ?", 1, 10);
+ assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
+ row(2, 10, 3, 2),
+ row(3, 10, 4, 100));
+ }
+ }
+
-
-
-
- private static void waitForView(String keyspace, String view) throws InterruptedException
- {
- while (!SystemKeyspace.isViewBuilt(keyspace, view))
- Thread.sleep(10);
- }
-
+ @Test
public void testPartitionKeyRestrictions() throws Throwable
{
List<String> mvPrimaryKeys = Arrays.asList("((a, b), c)", "((b, a), c)", "(a, b, c)", "(c, b, a)", "((c, a), b)");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/test/unit/org/apache/cassandra/cql3/ViewTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewTest.java
index 0853562,61f4b4a..a4d227a
--- a/test/unit/org/apache/cassandra/cql3/ViewTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java
@@@ -44,14 -45,11 +45,12 @@@ import org.apache.cassandra.db.ColumnFa
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.FBUtilities;
- import static org.junit.Assert.assertTrue;
-
public class ViewTest extends CQLTester
{
- int protocolVersion = 4;
+ ProtocolVersion protocolVersion = ProtocolVersion.V4;
private final List<String> views = new ArrayList<>();
@BeforeClass
@@@ -1326,4 -1263,37 +1327,4 @@@
assertRows(execute("SELECT count(*) FROM mv_test"), row(1024L));
}
- }
-
- @Test
- public void testFrozenCollectionsWithComplicatedInnerType() throws Throwable
- {
- createTable("CREATE TABLE %s (k int, intval int, listval frozen<list<tuple<text,text>>>, PRIMARY KEY (k))");
-
- execute("USE " + keyspace());
- executeNet(protocolVersion, "USE " + keyspace());
-
- createView("mv",
- "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND listval IS NOT NULL PRIMARY KEY (k, listval)");
-
- updateView("INSERT INTO %s (k, intval, listval) VALUES (?, ?, fromJson(?))",
- 0,
- 0,
- "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]");
-
- // verify input
- assertRows(execute("SELECT k, toJson(listval) FROM %s WHERE k = ?", 0),
- row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
- assertRows(execute("SELECT k, toJson(listval) from mv"),
- row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
-
- // update listval with the same value and it will be compared in view generator
- updateView("INSERT INTO %s (k, listval) VALUES (?, fromJson(?))",
- 0,
- "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]");
- // verify result
- assertRows(execute("SELECT k, toJson(listval) FROM %s WHERE k = ?", 0),
- row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
- assertRows(execute("SELECT k, toJson(listval) from mv"),
- row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
- }
+ }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org