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:28 UTC

[01/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 b0eba5f9c -> 1b36740eb
  refs/heads/cassandra-3.11 14d67d81c -> e624c6638
  refs/heads/trunk 460360093 -> e6fb83028


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
index 245ceb7..fe618b6 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
@@ -77,13 +77,13 @@ public class ViewFilteringTest extends CQLTester
 
         // IS NOT NULL is required on all PK statements that are not otherwise restricted
         List<String> badStatements = Arrays.asList(
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE b IS NOT NULL 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 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 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 is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = ? AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(?) AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s PRIMARY KEY (a, b, c, d)"
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE b IS NOT NULL 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 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 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 is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = ? AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(?) AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s PRIMARY KEY (a, b, c, d)"
         );
 
         for (String badStatement : badStatements)
@@ -96,19 +96,19 @@ public class ViewFilteringTest extends CQLTester
             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)"
+            );
 
         for (int i = 0; i < goodStatements.size(); i++)
         {
@@ -153,21 +153,21 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (\"theKey\", \"theClustering\", \"the\"\"Value\") VALUES (?, ?, ?)", 1, 1, 0);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
-                "PRIMARY KEY (\"theKey\", \"theClustering\")");
+                              "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
+                              "PRIMARY KEY (\"theKey\", \"theClustering\")");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
         createView("mv_test2", "CREATE MATERIALIZED VIEW %s AS SELECT \"theKey\", \"theClustering\", \"the\"\"Value\" FROM %%s " +
-                "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
-                "PRIMARY KEY (\"theKey\", \"theClustering\")");
+                               "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
+                               "PRIMARY KEY (\"theKey\", \"theClustering\")");
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test2"))
             Thread.sleep(10);
 
         for (String mvname : Arrays.asList("mv_test", "mv_test2"))
         {
             assertRowsIgnoringOrder(execute("SELECT \"theKey\", \"theClustering\", \"the\"\"Value\" FROM " + mvname),
-                    row(1, 1, 0)
+                                    row(1, 1, 0)
             );
         }
 
@@ -176,7 +176,7 @@ public class ViewFilteringTest extends CQLTester
         for (String mvname : Arrays.asList("mv_test", "mv_test2"))
         {
             assertRowsIgnoringOrder(execute("SELECT \"theKey\", \"Col\", \"the\"\"Value\" FROM " + mvname),
-                    row(1, 1, 0)
+                                    row(1, 1, 0)
             );
         }
     }
@@ -195,22 +195,22 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 1, 1, 3);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE a = blobAsInt(intAsBlob(1)) AND b IS NOT NULL " +
-                "PRIMARY KEY (a, b)");
+                              "WHERE a = blobAsInt(intAsBlob(1)) AND b IS NOT NULL " +
+                              "PRIMARY KEY (a, b)");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
 
         assertRows(execute("SELECT a, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
 
         executeNet(protocolVersion, "ALTER TABLE %s RENAME a TO foo");
 
         assertRows(execute("SELECT foo, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
     }
 
@@ -228,22 +228,22 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 1, 1, 3);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE a = (int) 1 AND b IS NOT NULL " +
-                "PRIMARY KEY (a, b)");
+                              "WHERE a = (int) 1 AND b IS NOT NULL " +
+                              "PRIMARY KEY (a, b)");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
 
         assertRows(execute("SELECT a, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
 
         executeNet(protocolVersion, "ALTER TABLE %s RENAME a TO foo");
 
         assertRows(execute("SELECT foo, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
     }
 
@@ -274,51 +274,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             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, 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)
+                                    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)
+                                    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)
+                                    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)
+                                    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
@@ -326,20 +326,20 @@ public class ViewFilteringTest extends CQLTester
             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)
+                                    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)
+                                    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
@@ -377,8 +377,8 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
@@ -386,16 +386,16 @@ public class ViewFilteringTest extends CQLTester
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 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, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // update rows that don't match the filter
@@ -403,17 +403,17 @@ public class ViewFilteringTest extends CQLTester
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 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, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 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, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // delete rows that don't match the filter
@@ -422,16 +422,16 @@ public class ViewFilteringTest extends CQLTester
             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, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 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, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // delete a partition that matches the filter
@@ -463,8 +463,8 @@ public class ViewFilteringTest extends CQLTester
             Thread.sleep(10);
 
         assertRows(execute("SELECT * FROM mv_test"),
-            row(1, 1, 0),
-            row(1, 1, 1)
+                   row(1, 1, 0),
+                   row(1, 1, 1)
         );
 
         // insert new rows that do not match the filter
@@ -472,16 +472,16 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 0, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1)
+                   row(1, 1, 0),
+                   row(1, 1, 1)
         );
 
         // insert new row that does match the filter
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 2, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // update rows that don't match the filter
@@ -489,17 +489,17 @@ public class ViewFilteringTest extends CQLTester
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 0, 0);
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // update a row that does match the filter
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete rows that don't match the filter
@@ -508,16 +508,16 @@ public class ViewFilteringTest extends CQLTester
         execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 1, 0);
         execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete a row that does match the filter
         execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete a partition that matches the filter
@@ -554,51 +554,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, 0, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 2, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -606,27 +606,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 2, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                row(0, 1, 0, 0),
-                row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -662,51 +662,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, -1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -714,27 +714,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -772,56 +772,56 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // insert new rows that do not match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, -1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -829,29 +829,29 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
             execute("DELETE FROM %s WHERE a = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -889,10 +889,10 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
@@ -900,20 +900,20 @@ public class ViewFilteringTest extends CQLTester
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, -1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -921,21 +921,21 @@ public class ViewFilteringTest extends CQLTester
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -944,27 +944,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -1002,51 +1002,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 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, -1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new row that does match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update a row that does match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 2, 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -1055,27 +1055,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, -1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a row that does match the filter
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
             execute("DELETE FROM %s WHERE a = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0)
             );
 
             // insert a partition with one matching and one non-matching row using a batch (CASSANDRA-10614)
@@ -1087,9 +1087,9 @@ public class ViewFilteringTest extends CQLTester
                     4, 4, 0, 0,
                     4, 4, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(4, 4, 1, 1)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(4, 4, 1, 1)
             );
 
             dropView("mv_test" + i);
@@ -1127,41 +1127,41 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new row that does match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 0, 1, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update a row that does match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 2, 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -1169,16 +1169,16 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 1);
             execute("DELETE FROM %s WHERE a = ?", 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a row that does match the filter
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
@@ -1218,61 +1218,61 @@ public class ViewFilteringTest extends CQLTester
                              "udtval";
 
         createTable(
-                "CREATE TABLE %s (" +
-                        "asciival ascii, " +
-                        "bigintval bigint, " +
-                        "blobval blob, " +
-                        "booleanval boolean, " +
-                        "dateval date, " +
-                        "decimalval decimal, " +
-                        "doubleval double, " +
-                        "floatval float, " +
-                        "inetval inet, " +
-                        "intval int, " +
-                        "textval text, " +
-                        "timeval time, " +
-                        "timestampval timestamp, " +
-                        "timeuuidval timeuuid, " +
-                        "uuidval uuid," +
-                        "varcharval varchar, " +
-                        "varintval varint, " +
-                        "frozenlistval frozen<list<int>>, " +
-                        "frozensetval frozen<set<uuid>>, " +
-                        "frozenmapval frozen<map<ascii, int>>," +
-                        "tupleval frozen<tuple<int, ascii, uuid>>," +
-                        "udtval frozen<" + myType + ">, " +
-                        "PRIMARY KEY (" + columnNames + "))");
+                    "CREATE TABLE %s (" +
+                            "asciival ascii, " +
+                            "bigintval bigint, " +
+                            "blobval blob, " +
+                            "booleanval boolean, " +
+                            "dateval date, " +
+                            "decimalval decimal, " +
+                            "doubleval double, " +
+                            "floatval float, " +
+                            "inetval inet, " +
+                            "intval int, " +
+                            "textval text, " +
+                            "timeval time, " +
+                            "timestampval timestamp, " +
+                            "timeuuidval timeuuid, " +
+                            "uuidval uuid," +
+                            "varcharval varchar, " +
+                            "varintval varint, " +
+                            "frozenlistval frozen<list<int>>, " +
+                            "frozensetval frozen<set<uuid>>, " +
+                            "frozenmapval frozen<map<ascii, int>>," +
+                            "tupleval frozen<tuple<int, ascii, uuid>>," +
+                            "udtval frozen<" + myType + ">, " +
+                            "PRIMARY KEY (" + columnNames + "))");
 
         execute("USE " + keyspace());
         executeNet(protocolVersion, "USE " + keyspace());
 
 
         createView(
-                "mv_test",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
-                        "asciival = 'abc' AND " +
-                        "bigintval = 123 AND " +
-                        "blobval = 0xfeed AND " +
-                        "booleanval = true AND " +
-                        "dateval = '1987-03-23' AND " +
-                        "decimalval = 123.123 AND " +
-                        "doubleval = 123.123 AND " +
-                        "floatval = 123.123 AND " +
-                        "inetval = '127.0.0.1' AND " +
-                        "intval = 123 AND " +
-                        "textval = 'abc' AND " +
-                        "timeval = '07:35:07.000111222' AND " +
-                        "timestampval = 123123123 AND " +
-                        "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                        "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                        "varcharval = 'abc' AND " +
-                        "varintval = 123123123 AND " +
-                        "frozenlistval = [1, 2, 3] AND " +
-                        "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
-                        "frozenmapval = {'a': 1, 'b': 2} AND " +
-                        "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
-                        "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
-                        "PRIMARY KEY (" + columnNames + ")");
+                   "mv_test",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
+                           "asciival = 'abc' AND " +
+                           "bigintval = 123 AND " +
+                           "blobval = 0xfeed AND " +
+                           "booleanval = true AND " +
+                           "dateval = '1987-03-23' AND " +
+                           "decimalval = 123.123 AND " +
+                           "doubleval = 123.123 AND " +
+                           "floatval = 123.123 AND " +
+                           "inetval = '127.0.0.1' AND " +
+                           "intval = 123 AND " +
+                           "textval = 'abc' AND " +
+                           "timeval = '07:35:07.000111222' AND " +
+                           "timestampval = 123123123 AND " +
+                           "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
+                           "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
+                           "varcharval = 'abc' AND " +
+                           "varintval = 123123123 AND " +
+                           "frozenlistval = [1, 2, 3] AND " +
+                           "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
+                           "frozenmapval = {'a': 1, 'b': 2} AND " +
+                           "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
+                           "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
+                           "PRIMARY KEY (" + columnNames + ")");
 
         execute("INSERT INTO %s (" + columnNames + ") VALUES (" +
                 "'abc'," +

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java b/test/unit/org/apache/cassandra/cql3/ViewTest.java
index f8f8c9f..61f4b4a 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java
@@ -18,12 +18,13 @@
 
 package org.apache.cassandra.cql3;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import com.google.common.util.concurrent.Uninterruptibles;
 
 import junit.framework.Assert;
@@ -46,8 +47,6 @@ import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.utils.FBUtilities;
 
-import static org.junit.Assert.assertTrue;
-
 public class ViewTest extends CQLTester
 {
     int protocolVersion = 4;
@@ -83,7 +82,7 @@ public class ViewTest extends CQLTester
     {
         executeNet(protocolVersion, query, params);
         while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
-                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+                && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
         {
             Thread.sleep(1);
         }
@@ -342,9 +341,9 @@ public class ViewTest extends CQLTester
     public void testCreateMvWithTTL() throws Throwable
     {
         createTable("CREATE TABLE %s (" +
-                "k int PRIMARY KEY, " +
-                "c int, " +
-                "val int) WITH default_time_to_live = 60");
+                    "k int PRIMARY KEY, " +
+                    "c int, " +
+                    "val int) WITH default_time_to_live = 60");
 
         execute("USE " + keyspace());
         executeNet(protocolVersion, "USE " + keyspace());
@@ -421,8 +420,10 @@ public class ViewTest extends CQLTester
         if (flush)
             FBUtilities.waitOnFutures(ks.flush());
 
-            //change c's value and TS=3, tombstones c=1 and adds c=0 record
+        // change c's value and TS=3, tombstones c=1 and adds c=0 record
         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET c = ? WHERE a = ? and b = ? ", 0, 0, 0);
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
         assertRows(execute("SELECT d from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0));
 
         if(flush)
@@ -443,7 +444,7 @@ public class ViewTest extends CQLTester
         assertRows(execute("SELECT d,e from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0, null));
 
 
-            //Add e value @ TS=1
+        //Add e value @ TS=1
         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 1 SET e = ? WHERE a = ? and b = ? ", 1, 0, 0);
         assertRows(execute("SELECT d,e from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0, 1));
 
@@ -838,12 +839,12 @@ public class ViewTest extends CQLTester
         String table = KEYSPACE + "." + currentTable();
         updateView("BEGIN BATCH " +
                 "INSERT INTO " + table + " (a, b, c, d) VALUES (?, ?, ?, ?); " + // should be accepted
-                "UPDATE " + table + " SET d = ? WHERE a = ? AND b = ?; " +  // should be ignored
+                "UPDATE " + table + " SET d = ? WHERE a = ? AND b = ?; " +  // should be accepted
                 "APPLY BATCH",
                 0, 0, 0, 0,
                 1, 0, 1);
         assertRows(execute("SELECT a, b, c from mv WHERE b = ?", 0), row(0, 0, 0));
-        assertEmpty(execute("SELECT a, b, c from mv WHERE b = ?", 1));
+        assertRows(execute("SELECT a, b, c from mv WHERE b = ?", 1), row(0, 1, null));
 
         ColumnFamilyStore cfs = Keyspace.open(keyspace()).getColumnFamilyStore("mv");
         cfs.forceBlockingFlush();
@@ -1005,9 +1006,9 @@ public class ViewTest extends CQLTester
                       row(1, 3));
 
         updateView(String.format("BEGIN UNLOGGED BATCH " +
-                   "DELETE FROM %s WHERE a = 1 AND b > 1 AND b < 3;" +
-                   "DELETE FROM %s WHERE a = 1;" +
-                   "APPLY BATCH", currentTable(), currentTable()));
+                                 "DELETE FROM %s WHERE a = 1 AND b > 1 AND b < 3;" +
+                                 "DELETE FROM %s WHERE a = 1;" +
+                                 "APPLY BATCH", currentTable(), currentTable()));
 
         mvRows = executeNet(protocolVersion, "SELECT a, b FROM mv1");
         assertRowsNet(protocolVersion, mvRows);
@@ -1295,4 +1296,4 @@ public class ViewTest extends CQLTester
         assertRows(execute("SELECT k, toJson(listval) from mv"),
                    row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
     }
-}
+}
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[07/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
index 245ceb7..fe618b6 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
@@ -77,13 +77,13 @@ public class ViewFilteringTest extends CQLTester
 
         // IS NOT NULL is required on all PK statements that are not otherwise restricted
         List<String> badStatements = Arrays.asList(
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE b IS NOT NULL 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 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 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 is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = ? AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(?) AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s PRIMARY KEY (a, b, c, d)"
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE b IS NOT NULL 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 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 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 is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = ? AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(?) AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s PRIMARY KEY (a, b, c, d)"
         );
 
         for (String badStatement : badStatements)
@@ -96,19 +96,19 @@ public class ViewFilteringTest extends CQLTester
             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)"
+            );
 
         for (int i = 0; i < goodStatements.size(); i++)
         {
@@ -153,21 +153,21 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (\"theKey\", \"theClustering\", \"the\"\"Value\") VALUES (?, ?, ?)", 1, 1, 0);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
-                "PRIMARY KEY (\"theKey\", \"theClustering\")");
+                              "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
+                              "PRIMARY KEY (\"theKey\", \"theClustering\")");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
         createView("mv_test2", "CREATE MATERIALIZED VIEW %s AS SELECT \"theKey\", \"theClustering\", \"the\"\"Value\" FROM %%s " +
-                "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
-                "PRIMARY KEY (\"theKey\", \"theClustering\")");
+                               "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
+                               "PRIMARY KEY (\"theKey\", \"theClustering\")");
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test2"))
             Thread.sleep(10);
 
         for (String mvname : Arrays.asList("mv_test", "mv_test2"))
         {
             assertRowsIgnoringOrder(execute("SELECT \"theKey\", \"theClustering\", \"the\"\"Value\" FROM " + mvname),
-                    row(1, 1, 0)
+                                    row(1, 1, 0)
             );
         }
 
@@ -176,7 +176,7 @@ public class ViewFilteringTest extends CQLTester
         for (String mvname : Arrays.asList("mv_test", "mv_test2"))
         {
             assertRowsIgnoringOrder(execute("SELECT \"theKey\", \"Col\", \"the\"\"Value\" FROM " + mvname),
-                    row(1, 1, 0)
+                                    row(1, 1, 0)
             );
         }
     }
@@ -195,22 +195,22 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 1, 1, 3);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE a = blobAsInt(intAsBlob(1)) AND b IS NOT NULL " +
-                "PRIMARY KEY (a, b)");
+                              "WHERE a = blobAsInt(intAsBlob(1)) AND b IS NOT NULL " +
+                              "PRIMARY KEY (a, b)");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
 
         assertRows(execute("SELECT a, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
 
         executeNet(protocolVersion, "ALTER TABLE %s RENAME a TO foo");
 
         assertRows(execute("SELECT foo, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
     }
 
@@ -228,22 +228,22 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 1, 1, 3);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE a = (int) 1 AND b IS NOT NULL " +
-                "PRIMARY KEY (a, b)");
+                              "WHERE a = (int) 1 AND b IS NOT NULL " +
+                              "PRIMARY KEY (a, b)");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
 
         assertRows(execute("SELECT a, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
 
         executeNet(protocolVersion, "ALTER TABLE %s RENAME a TO foo");
 
         assertRows(execute("SELECT foo, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
     }
 
@@ -274,51 +274,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             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, 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)
+                                    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)
+                                    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)
+                                    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)
+                                    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
@@ -326,20 +326,20 @@ public class ViewFilteringTest extends CQLTester
             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)
+                                    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)
+                                    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
@@ -377,8 +377,8 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
@@ -386,16 +386,16 @@ public class ViewFilteringTest extends CQLTester
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 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, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // update rows that don't match the filter
@@ -403,17 +403,17 @@ public class ViewFilteringTest extends CQLTester
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 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, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 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, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // delete rows that don't match the filter
@@ -422,16 +422,16 @@ public class ViewFilteringTest extends CQLTester
             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, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 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, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // delete a partition that matches the filter
@@ -463,8 +463,8 @@ public class ViewFilteringTest extends CQLTester
             Thread.sleep(10);
 
         assertRows(execute("SELECT * FROM mv_test"),
-            row(1, 1, 0),
-            row(1, 1, 1)
+                   row(1, 1, 0),
+                   row(1, 1, 1)
         );
 
         // insert new rows that do not match the filter
@@ -472,16 +472,16 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 0, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1)
+                   row(1, 1, 0),
+                   row(1, 1, 1)
         );
 
         // insert new row that does match the filter
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 2, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // update rows that don't match the filter
@@ -489,17 +489,17 @@ public class ViewFilteringTest extends CQLTester
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 0, 0);
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // update a row that does match the filter
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete rows that don't match the filter
@@ -508,16 +508,16 @@ public class ViewFilteringTest extends CQLTester
         execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 1, 0);
         execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete a row that does match the filter
         execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete a partition that matches the filter
@@ -554,51 +554,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, 0, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 2, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -606,27 +606,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 2, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                row(0, 1, 0, 0),
-                row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -662,51 +662,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, -1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -714,27 +714,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -772,56 +772,56 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // insert new rows that do not match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, -1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -829,29 +829,29 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
             execute("DELETE FROM %s WHERE a = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -889,10 +889,10 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
@@ -900,20 +900,20 @@ public class ViewFilteringTest extends CQLTester
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, -1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -921,21 +921,21 @@ public class ViewFilteringTest extends CQLTester
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -944,27 +944,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -1002,51 +1002,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 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, -1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new row that does match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update a row that does match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 2, 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -1055,27 +1055,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, -1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a row that does match the filter
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
             execute("DELETE FROM %s WHERE a = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0)
             );
 
             // insert a partition with one matching and one non-matching row using a batch (CASSANDRA-10614)
@@ -1087,9 +1087,9 @@ public class ViewFilteringTest extends CQLTester
                     4, 4, 0, 0,
                     4, 4, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(4, 4, 1, 1)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(4, 4, 1, 1)
             );
 
             dropView("mv_test" + i);
@@ -1127,41 +1127,41 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new row that does match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 0, 1, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update a row that does match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 2, 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -1169,16 +1169,16 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 1);
             execute("DELETE FROM %s WHERE a = ?", 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a row that does match the filter
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
@@ -1218,61 +1218,61 @@ public class ViewFilteringTest extends CQLTester
                              "udtval";
 
         createTable(
-                "CREATE TABLE %s (" +
-                        "asciival ascii, " +
-                        "bigintval bigint, " +
-                        "blobval blob, " +
-                        "booleanval boolean, " +
-                        "dateval date, " +
-                        "decimalval decimal, " +
-                        "doubleval double, " +
-                        "floatval float, " +
-                        "inetval inet, " +
-                        "intval int, " +
-                        "textval text, " +
-                        "timeval time, " +
-                        "timestampval timestamp, " +
-                        "timeuuidval timeuuid, " +
-                        "uuidval uuid," +
-                        "varcharval varchar, " +
-                        "varintval varint, " +
-                        "frozenlistval frozen<list<int>>, " +
-                        "frozensetval frozen<set<uuid>>, " +
-                        "frozenmapval frozen<map<ascii, int>>," +
-                        "tupleval frozen<tuple<int, ascii, uuid>>," +
-                        "udtval frozen<" + myType + ">, " +
-                        "PRIMARY KEY (" + columnNames + "))");
+                    "CREATE TABLE %s (" +
+                            "asciival ascii, " +
+                            "bigintval bigint, " +
+                            "blobval blob, " +
+                            "booleanval boolean, " +
+                            "dateval date, " +
+                            "decimalval decimal, " +
+                            "doubleval double, " +
+                            "floatval float, " +
+                            "inetval inet, " +
+                            "intval int, " +
+                            "textval text, " +
+                            "timeval time, " +
+                            "timestampval timestamp, " +
+                            "timeuuidval timeuuid, " +
+                            "uuidval uuid," +
+                            "varcharval varchar, " +
+                            "varintval varint, " +
+                            "frozenlistval frozen<list<int>>, " +
+                            "frozensetval frozen<set<uuid>>, " +
+                            "frozenmapval frozen<map<ascii, int>>," +
+                            "tupleval frozen<tuple<int, ascii, uuid>>," +
+                            "udtval frozen<" + myType + ">, " +
+                            "PRIMARY KEY (" + columnNames + "))");
 
         execute("USE " + keyspace());
         executeNet(protocolVersion, "USE " + keyspace());
 
 
         createView(
-                "mv_test",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
-                        "asciival = 'abc' AND " +
-                        "bigintval = 123 AND " +
-                        "blobval = 0xfeed AND " +
-                        "booleanval = true AND " +
-                        "dateval = '1987-03-23' AND " +
-                        "decimalval = 123.123 AND " +
-                        "doubleval = 123.123 AND " +
-                        "floatval = 123.123 AND " +
-                        "inetval = '127.0.0.1' AND " +
-                        "intval = 123 AND " +
-                        "textval = 'abc' AND " +
-                        "timeval = '07:35:07.000111222' AND " +
-                        "timestampval = 123123123 AND " +
-                        "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                        "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                        "varcharval = 'abc' AND " +
-                        "varintval = 123123123 AND " +
-                        "frozenlistval = [1, 2, 3] AND " +
-                        "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
-                        "frozenmapval = {'a': 1, 'b': 2} AND " +
-                        "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
-                        "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
-                        "PRIMARY KEY (" + columnNames + ")");
+                   "mv_test",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
+                           "asciival = 'abc' AND " +
+                           "bigintval = 123 AND " +
+                           "blobval = 0xfeed AND " +
+                           "booleanval = true AND " +
+                           "dateval = '1987-03-23' AND " +
+                           "decimalval = 123.123 AND " +
+                           "doubleval = 123.123 AND " +
+                           "floatval = 123.123 AND " +
+                           "inetval = '127.0.0.1' AND " +
+                           "intval = 123 AND " +
+                           "textval = 'abc' AND " +
+                           "timeval = '07:35:07.000111222' AND " +
+                           "timestampval = 123123123 AND " +
+                           "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
+                           "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
+                           "varcharval = 'abc' AND " +
+                           "varintval = 123123123 AND " +
+                           "frozenlistval = [1, 2, 3] AND " +
+                           "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
+                           "frozenmapval = {'a': 1, 'b': 2} AND " +
+                           "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
+                           "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
+                           "PRIMARY KEY (" + columnNames + ")");
 
         execute("INSERT INTO %s (" + columnNames + ") VALUES (" +
                 "'abc'," +

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java b/test/unit/org/apache/cassandra/cql3/ViewTest.java
index f8f8c9f..61f4b4a 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java
@@ -18,12 +18,13 @@
 
 package org.apache.cassandra.cql3;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import com.google.common.util.concurrent.Uninterruptibles;
 
 import junit.framework.Assert;
@@ -46,8 +47,6 @@ import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.utils.FBUtilities;
 
-import static org.junit.Assert.assertTrue;
-
 public class ViewTest extends CQLTester
 {
     int protocolVersion = 4;
@@ -83,7 +82,7 @@ public class ViewTest extends CQLTester
     {
         executeNet(protocolVersion, query, params);
         while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
-                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+                && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
         {
             Thread.sleep(1);
         }
@@ -342,9 +341,9 @@ public class ViewTest extends CQLTester
     public void testCreateMvWithTTL() throws Throwable
     {
         createTable("CREATE TABLE %s (" +
-                "k int PRIMARY KEY, " +
-                "c int, " +
-                "val int) WITH default_time_to_live = 60");
+                    "k int PRIMARY KEY, " +
+                    "c int, " +
+                    "val int) WITH default_time_to_live = 60");
 
         execute("USE " + keyspace());
         executeNet(protocolVersion, "USE " + keyspace());
@@ -421,8 +420,10 @@ public class ViewTest extends CQLTester
         if (flush)
             FBUtilities.waitOnFutures(ks.flush());
 
-            //change c's value and TS=3, tombstones c=1 and adds c=0 record
+        // change c's value and TS=3, tombstones c=1 and adds c=0 record
         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET c = ? WHERE a = ? and b = ? ", 0, 0, 0);
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
         assertRows(execute("SELECT d from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0));
 
         if(flush)
@@ -443,7 +444,7 @@ public class ViewTest extends CQLTester
         assertRows(execute("SELECT d,e from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0, null));
 
 
-            //Add e value @ TS=1
+        //Add e value @ TS=1
         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 1 SET e = ? WHERE a = ? and b = ? ", 1, 0, 0);
         assertRows(execute("SELECT d,e from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0, 1));
 
@@ -838,12 +839,12 @@ public class ViewTest extends CQLTester
         String table = KEYSPACE + "." + currentTable();
         updateView("BEGIN BATCH " +
                 "INSERT INTO " + table + " (a, b, c, d) VALUES (?, ?, ?, ?); " + // should be accepted
-                "UPDATE " + table + " SET d = ? WHERE a = ? AND b = ?; " +  // should be ignored
+                "UPDATE " + table + " SET d = ? WHERE a = ? AND b = ?; " +  // should be accepted
                 "APPLY BATCH",
                 0, 0, 0, 0,
                 1, 0, 1);
         assertRows(execute("SELECT a, b, c from mv WHERE b = ?", 0), row(0, 0, 0));
-        assertEmpty(execute("SELECT a, b, c from mv WHERE b = ?", 1));
+        assertRows(execute("SELECT a, b, c from mv WHERE b = ?", 1), row(0, 1, null));
 
         ColumnFamilyStore cfs = Keyspace.open(keyspace()).getColumnFamilyStore("mv");
         cfs.forceBlockingFlush();
@@ -1005,9 +1006,9 @@ public class ViewTest extends CQLTester
                       row(1, 3));
 
         updateView(String.format("BEGIN UNLOGGED BATCH " +
-                   "DELETE FROM %s WHERE a = 1 AND b > 1 AND b < 3;" +
-                   "DELETE FROM %s WHERE a = 1;" +
-                   "APPLY BATCH", currentTable(), currentTable()));
+                                 "DELETE FROM %s WHERE a = 1 AND b > 1 AND b < 3;" +
+                                 "DELETE FROM %s WHERE a = 1;" +
+                                 "APPLY BATCH", currentTable(), currentTable()));
 
         mvRows = executeNet(protocolVersion, "SELECT a, b FROM mv1");
         assertRowsNet(protocolVersion, mvRows);
@@ -1295,4 +1296,4 @@ public class ViewTest extends CQLTester
         assertRows(execute("SELECT k, toJson(listval) from mv"),
                    row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
     }
-}
+}
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[05/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
new file mode 100644
index 0000000..9e32620
--- /dev/null
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@ -0,0 +1,1343 @@
+package org.apache.cassandra.cql3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.cassandra.concurrent.SEPExecutor;
+import org.apache.cassandra.concurrent.Stage;
+import org.apache.cassandra.concurrent.StageManager;
+import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.utils.FBUtilities;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.google.common.base.Objects;
+
+public class ViewComplexTest extends CQLTester
+{
+    int protocolVersion = 4;
+    private final List<String> views = new ArrayList<>();
+
+    @BeforeClass
+    public static void startup()
+    {
+        requireNetwork();
+    }
+    @Before
+    public void begin()
+    {
+        views.clear();
+    }
+
+    @After
+    public void end() throws Throwable
+    {
+        for (String viewName : views)
+            executeNet(protocolVersion, "DROP MATERIALIZED VIEW " + viewName);
+    }
+
+    private void createView(String name, String query) throws Throwable
+    {
+        executeNet(protocolVersion, String.format(query, name));
+        // If exception is thrown, the view will not be added to the list; since it shouldn't have been created, this is
+        // the desired behavior
+        views.add(name);
+    }
+
+    private void updateView(String query, Object... params) throws Throwable
+    {
+        updateViewWithFlush(query, false, params);
+    }
+
+    private void updateViewWithFlush(String query, boolean flush, Object... params) throws Throwable
+    {
+        executeNet(protocolVersion, query, params);
+        while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
+                && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+        {
+            Thread.sleep(1);
+        }
+        if (flush)
+            Keyspace.open(keyspace()).flush();
+    }
+
+    // for now, unselected column cannot be fully supported, SEE CASSANDRA-13826
+    @Ignore
+    @Test
+    public void testPartialDeleteUnselectedColumn() throws Throwable
+    {
+        boolean flush = true;
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT k,c FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+        updateView("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+        updateView("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+
+        execute("truncate %s;");
+
+        // removal generated by unselected column should not shadow PK update with smaller timestamp
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 20 SET a=null WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"));
+        assertRows(execute("SELECT * from mv"));
+
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+    }
+
+    @Test
+    public void testPartialDeleteSelectedColumnWithFlush() throws Throwable
+    {
+        testPartialDeleteSelectedColumn(true);
+    }
+
+    @Test
+    public void testPartialDeleteSelectedColumnWithoutFlush() throws Throwable
+    {
+        testPartialDeleteSelectedColumn(false);
+    }
+
+    private void testPartialDeleteSelectedColumn(boolean flush) throws Throwable
+    {
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, e int, f int, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+
+        updateViewWithFlush("DELETE a FROM %s USING TIMESTAMP 1 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        // view livenessInfo should not be affected by selected column ts or tb
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 0", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 12 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 13 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 14 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TTL 3 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        TimeUnit.SECONDS.sleep(4);
+
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 15 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        execute("truncate %s;");
+
+        // removal generated by unselected column should not shadow selected column with smaller timestamp
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=null WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"));
+        assertRows(execute("SELECT * from mv"));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 16 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+    }
+
+    @Test
+    public void testUpdateColumnInViewPKWithTTLWithFlush() throws Throwable
+    {
+        // CASSANDRA-13657
+        testUpdateColumnInViewPKWithTTL(true);
+    }
+
+    @Test
+    public void testUpdateColumnInViewPKWithTTLWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13657
+        testUpdateColumnInViewPKWithTTL(false);
+    }
+
+    private void testUpdateColumnInViewPKWithTTL(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13657 if base column used in view pk is ttled, then view row is considered dead
+        createTable("create table %s (k int primary key, a int, b int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (a, k)");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s SET a = 1 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null));
+
+        updateView("DELETE a FROM %s WHERE k = 1");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("INSERT INTO %s (k) VALUES (1);");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, null, null));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("UPDATE %s USING TTL 5 SET a = 10 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 10, null));
+        assertRows(execute("SELECT * from mv"), row(10, 1, null));
+
+        updateView("UPDATE %s SET b = 100 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 10, 100));
+        assertRows(execute("SELECT * from mv"), row(10, 1, 100));
+
+        Thread.sleep(5000);
+
+        // 'a' is TTL of 5 and removed.
+        assertRows(execute("SELECT * from %s"), row(1, null, 100));
+        assertEmpty(execute("SELECT * from mv"));
+        assertEmpty(execute("SELECT * from mv WHERE k = ? AND a = ?", 1, 10));
+
+        updateView("DELETE b FROM %s WHERE k=1");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, null, null));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("DELETE FROM %s WHERE k=1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testUpdateColumnNotInViewWithFlush() throws Throwable
+    {
+        testUpdateColumnNotInView(true);
+    }
+
+    @Test
+    public void testUpdateColumnNotInViewWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUpdateColumnNotInView(false);
+    }
+
+    private void testUpdateColumnNotInView(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13127: if base column not selected in view are alive, then pk of view row should be alive
+        createTable("create table %s (p int, c int, v1 int, v2 int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 0 SET v1 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v1 FROM %s USING TIMESTAMP 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        // shadowed by tombstone
+        updateView("UPDATE %s USING TIMESTAMP 1 SET v1 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v1 FROM %s USING TIMESTAMP 3 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v2 FROM %s USING TIMESTAMP 4 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s USING TTL 3 SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        assertInvalidMessage("Cannot drop column v2 on base table with materialized views", "ALTER TABLE %s DROP v2");
+        // // drop unselected base column, unselected metadata should be removed, thus view row is dead
+        // updateView("ALTER TABLE %s DROP v2");
+        // assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+        // assertRowsIgnoringOrder(execute("SELECT * from %s"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testPartialUpdateWithUnselectedCollectionsWithFlush() throws Throwable
+    {
+        testPartialUpdateWithUnselectedCollections(true);
+    }
+
+    @Test
+    public void testPartialUpdateWithUnselectedCollectionsWithoutFlush() throws Throwable
+    {
+        testPartialUpdateWithUnselectedCollections(false);
+    }
+
+    public void testPartialUpdateWithUnselectedCollections(boolean flush) throws Throwable
+    {
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s SET l=l+[1,2,3] WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateView("UPDATE %s SET l=l-[1,2] WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateView("UPDATE %s SET b=3 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 3));
+
+        updateView("UPDATE %s SET b=null, l=l-[3], s=s-{3} WHERE k = 1 AND c = 1");
+        if (flush)
+        {
+            FBUtilities.waitOnFutures(ks.flush());
+            ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        }
+        assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+        assertRowsIgnoringOrder(execute("SELECT * from mv"));
+
+        updateView("UPDATE %s SET m=m+{3:3}, l=l-[1], s=s-{2} WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null));
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m");
+        // executeNet(protocolVersion, "ALTER TABLE %s DROP m");
+        // ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE k = 1 AND c = 1"));
+        // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testUnselectedColumnsTTLWithFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUnselectedColumnsTTL(true);
+    }
+
+    @Test
+    public void testUnselectedColumnsTTLWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUnselectedColumnsTTL(false);
+    }
+
+    private void testUnselectedColumnsTTL(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13127 not ttled unselected column in base should keep view row alive
+        createTable("create table %s (p int, c int, v int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) USING TTL 3;", flush);
+
+        updateViewWithFlush("UPDATE %s USING TTL 1000 SET v = 0 WHERE p = 0 and c = 0;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        Thread.sleep(3000);
+
+        UntypedResultSet.Row row = execute("SELECT v, ttl(v) from %s WHERE c = ? AND p = ?", 0, 0).one();
+        assertTrue("row should have value of 0", row.getInt("v") == 0);
+        assertTrue("row should have ttl less than 1000", row.getInt("ttl(v)") < 1000);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateViewWithFlush("DELETE FROM %s WHERE p = 0 and c = 0;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) ", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        // already have a live row, no need to apply the unselected cell ttl
+        updateViewWithFlush("UPDATE %s USING TTL 3 SET v = 0 WHERE p = 0 and c = 0;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (1, 1) USING TTL 3", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+
+        Thread.sleep(4000);
+
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1));
+
+        // unselected should keep view row alive
+        updateViewWithFlush("UPDATE %s SET v = 0 WHERE p = 1 and c = 1;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+
+    }
+
+    @Test
+    public void testRangeDeletionWithFlush() throws Throwable
+    {
+        testRangeDeletion(true);
+    }
+
+    @Test
+    public void testRangeDeletionWithoutFlush() throws Throwable
+    {
+        testRangeDeletion(false);
+    }
+
+    public void testRangeDeletion(boolean flush) throws Throwable
+    {
+        // for partition range deletion, need to know that existing row is shadowed instead of not existed.
+        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 PRIMARY KEY (a, b)");
+
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
+
+        execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
+
+        // remove view row
+        updateView("UPDATE %s using timestamp 1 set b = null WHERE a=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+        // remove base row, no view updated generated.
+        updateView("DELETE FROM %s using timestamp 2 where a=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+
+        // restor view row with b,c column. d is still tombstone
+        updateView("UPDATE %s using timestamp 3 set b = 1,c = 1 where a=1"); // upsert
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
+    }
+
+    @Test
+    public void testBaseTTLWithSameTimestampTest() throws Throwable
+    {
+        // CASSANDRA-13127 when liveness timestamp tie, greater localDeletionTime should win if both are expiring.
+        createTable("create table %s (p int, c int, v int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) using timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        Thread.sleep(4000);
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+
+        // reversed order
+        execute("truncate %s;");
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        Thread.sleep(4000);
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+
+    }
+
+    @Test
+    public void testCommutativeRowDeletionFlush() throws Throwable
+    {
+        // CASSANDRA-13409
+        testCommutativeRowDeletion(true);
+    }
+
+    @Test
+    public void testCommutativeRowDeletionWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13409
+        testCommutativeRowDeletion(false);
+    }
+
+    private void testCommutativeRowDeletion(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13409 new update should not resurrect previous deleted data in view
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable-1, Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+        // sstable-2
+        updateView("Delete from %s using timestamp 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"));
+        // sstable-3
+        updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+        // sstable-4
+        updateView("UPdate %s using timestamp 4 set v1 = 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+        // sstable-5
+        updateView("UPdate %s using timestamp 5 set v1 = 1 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+
+        if (flush)
+        {
+            // compact sstable 2 and 4, 5;
+            ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+            List<String> sstables = cfs.getLiveSSTables()
+                                       .stream()
+                                       .sorted((s1, s2) -> s1.descriptor.generation - s2.descriptor.generation)
+                                       .map(s -> s.getFilename())
+                                       .collect(Collectors.toList());
+            String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(3), sstables.get(4)));
+            CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+            assertEquals(3, cfs.getLiveSSTables().size());
+        }
+        // regular tombstone should be retained after compaction
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+    }
+
+    @Test
+    public void testUnselectedColumnWithExpiredLivenessInfo() throws Throwable
+    {
+        boolean flush = true;
+        createTable("create table %s (k int, c int, a int, b int, PRIMARY KEY(k, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select k,c,b from %%s where c is not null and k is not null primary key (c, k);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable-1, Set initial values TS=1
+        updateViewWithFlush("UPDATE %s SET a = 1 WHERE k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        // sstable-2
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TTL 5", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        Thread.sleep(5001);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        // sstable-3
+        updateViewWithFlush("Update %s set a = null where k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"));
+
+        // sstable-4
+        updateViewWithFlush("Update %s USING TIMESTAMP 1 set b = 1 where k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1));
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampSmallerThanPkWithFlush() throws Throwable
+    {
+        testUpdateWithColumnTimestampSmallerThanPk(true);
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampSmallerThanPkWithoutFlush() throws Throwable
+    {
+        testUpdateWithColumnTimestampSmallerThanPk(false);
+    }
+
+    public void testUpdateWithColumnTimestampSmallerThanPk(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // reset value
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 6;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+        // increase pk's timestamp to 20
+        updateView("Insert into %s (p) values (3) using timestamp 20;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+        // change v1's to 2 and remove existing view row with ts7
+        updateView("UPdate %s using timestamp 7 set v1 = 2 where p = 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, 3, 6L));
+        // change v1's to 1 and remove existing view row with ts8
+        updateView("UPdate %s using timestamp 8 set v1 = 1 where p = 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampBiggerThanPkWithFlush() throws Throwable
+    {
+        // CASSANDRA-11500
+        testUpdateWithColumnTimestampBiggerThanPk(true);
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampBiggerThanPkWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-11500
+        testUpdateWithColumnTimestampBiggerThanPk(false);
+    }
+
+    public void testUpdateWithColumnTimestampBiggerThanPk(boolean flush) throws Throwable
+    {
+        // CASSANDRA-11500 able to shadow old view row with column ts greater tahn pk's ts and re-insert the view row
+        createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int);");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (k, a);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+        updateView("DELETE FROM %s USING TIMESTAMP 0 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // sstable-1, Set initial values TS=1
+        updateView("INSERT INTO %s(k, a, b) VALUES (1, 1, 1) USING TIMESTAMP 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 1));
+        updateView("UPDATE %s USING TIMESTAMP 10 SET b = 2 WHERE k = 1;");
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        updateView("UPDATE %s USING TIMESTAMP 2 SET a = 2 WHERE k = 1;");
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+        updateView("UPDATE %s USING TIMESTAMP 11 SET a = 1 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+
+        // set non-key base column as tombstone, view row is removed with shadowable
+        updateView("UPDATE %s USING TIMESTAMP 12 SET a = null WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, null, 2));
+
+        // column b should be alive
+        updateView("UPDATE %s USING TIMESTAMP 13 SET a = 1 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+
+        assertInvalidMessage("Cannot drop column a on base table with materialized views", "ALTER TABLE %s DROP a");
+    }
+
+    @Test
+    public void testNonBaseColumnInViewPkWithFlush() throws Throwable
+    {
+        testNonBaseColumnInViewPk(true);
+    }
+
+    @Test
+    public void testNonBaseColumnInViewPkWithoutFlush() throws Throwable
+    {
+        testNonBaseColumnInViewPk(true);
+    }
+
+    public void testNonBaseColumnInViewPk(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key (p1,p2))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1)"
+                           + " with gc_grace_seconds=5;");
+        ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+        cfs.disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 1 set v1 =1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, 1, null));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 set v1 = null, v2 = 1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 set v2 = null where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+
+        updateView("INSERT INTO %s (p1,p2) VALUES(1,1) USING TIMESTAMP 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, null));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, null));
+
+        updateView("DELETE FROM %s USING TIMESTAMP 4 WHERE p1 =1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+
+        updateView("UPDATE %s USING TIMESTAMP 5 set v2 = 1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+    }
+
+    @Test
+    public void testStrictLivenessTombstone() throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p)"
+                           + " with gc_grace_seconds=5;");
+        ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+        cfs.disableAutoCompaction();
+
+        updateView("Insert into %s (p, v1, v2) values (1, 1, 1) ;");
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        updateView("Update %s set v1 = null WHERE p = 1");
+        FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+
+        cfs.forceMajorCompaction(); // before gc grace second, strict-liveness tombstoned dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+
+        Thread.sleep(6000);
+        assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+
+        cfs.forceMajorCompaction(); // after gc grace second, no data left
+        assertEquals(0, cfs.getLiveSSTables().size());
+
+        updateView("Update %s using ttl 5 set v1 = 1 WHERE p = 1");
+        FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        cfs.forceMajorCompaction(); // before ttl+gc_grace_second, strict-liveness ttled dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        Thread.sleep(5500); // after expired, before gc_grace_second
+        cfs.forceMajorCompaction();// before ttl+gc_grace_second, strict-liveness ttled dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+
+        Thread.sleep(5500); // after expired + gc_grace_second
+        assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+
+        cfs.forceMajorCompaction(); // after gc grace second, no data left
+        assertEquals(0, cfs.getLiveSSTables().size());
+    }
+
+    @Test
+    public void testCellTombstoneAndShadowableTombstonesWithFlush() throws Throwable
+    {
+        testCellTombstoneAndShadowableTombstones(true);
+    }
+
+    @Test
+    public void testCellTombstoneAndShadowableTombstonesWithoutFlush() throws Throwable
+    {
+        testCellTombstoneAndShadowableTombstones(false);
+    }
+
+    private void testCellTombstoneAndShadowableTombstones(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable 1, Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+        // sstable 2
+        updateView("UPdate %s using timestamp 2 set v2 = null where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3),
+                                row(null, null));
+        // sstable 3
+        updateView("UPdate %s using timestamp 3 set v1 = 2 where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+        // sstable 4
+        updateView("UPdate %s using timestamp 4 set v1 = 1 where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+
+        if (flush)
+        {
+            // compact sstable 2 and 3;
+            ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+            List<String> sstables = cfs.getLiveSSTables()
+                                       .stream()
+                                       .sorted(Comparator.comparingInt(s -> s.descriptor.generation))
+                                       .map(s -> s.getFilename())
+                                       .collect(Collectors.toList());
+            System.out.println("SSTables " + sstables);
+            String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(2)));
+            CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+        }
+        // cell-tombstone in sstable 4 is not compacted away, because the shadowable tombstone is shadowed by new row.
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+    }
+
+    @Test
+    public void complexTimestampDeletionTestWithFlush() throws Throwable
+    {
+        complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(true);
+        complexTimestampWithbasePKColumnsInViewPKDeletionTest(true);
+    }
+
+    @Test
+    public void complexTimestampDeletionTestWithoutFlush() throws Throwable
+    {
+        complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(false);
+        complexTimestampWithbasePKColumnsInViewPKDeletionTest(false);
+    }
+
+    private void complexTimestampWithbasePKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key(p1, p2))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv2",
+                   "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1);");
+        ks.getColumnFamilyStore("mv2").disableAutoCompaction();
+
+        // Set initial values TS=1
+        updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 4, 1L));
+        // remove row/mv TS=2
+        updateView("Delete from %s using timestamp 2 where p1 = 1 and p2 = 2;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // view are empty
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"));
+        // insert PK with TS=3
+        updateView("Insert into %s (p1, p2) values (1, 2) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+
+        ks.getColumnFamilyStore("mv2").forceMajorCompaction();
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+
+        // reset values
+        updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 10;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 4, 10L));
+
+        updateView("UPDATE %s using timestamp 20 SET v2 = 5 WHERE p1 = 1 and p2 = 2");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 5, 20L));
+
+        updateView("DELETE FROM %s using timestamp 10 WHERE p1 = 1 and p2 = 2");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(null, 5, 20L));
+    }
+
+    public void complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(5, 1L));
+        // remove row/mv TS=2
+        updateView("Delete from %s using timestamp 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // view are empty
+        assertRowsIgnoringOrder(execute("SELECT * from mv"));
+        // insert PK with TS=3
+        updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+
+        // insert values TS=2, it should be considered dead due to previous tombstone
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 2;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+
+        // insert values TS=2, it should be considered dead due to previous tombstone
+        executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET v2 = ? WHERE p = ?", 4, 3);
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+
+        ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+    }
+
+    @Test
+    public void testMVWithDifferentColumnsWithFlush() throws Throwable
+    {
+        testMVWithDifferentColumns(true);
+    }
+
+    @Test
+    public void testMVWithDifferentColumnsWithoutFlush() throws Throwable
+    {
+        testMVWithDifferentColumns(false);
+    }
+
+    private void testMVWithDifferentColumns(boolean flush) throws Throwable
+    {
+        createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY(a, b))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        List<String> viewNames = new ArrayList<>();
+        List<String> mvStatements = Arrays.asList(
+                                                  // all selected
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // unselected e,f
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // no selected
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // all selected, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                  // unselected e,f, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                  // no selected, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)");
+
+        Keyspace ks = Keyspace.open(keyspace());
+
+        for (int i = 0; i < mvStatements.size(); i++)
+        {
+            String name = "mv" + i;
+            viewNames.add(name);
+            createView(name, mvStatements.get(i));
+            ks.getColumnFamilyStore(name).disableAutoCompaction();
+        }
+
+        // insert
+        updateViewWithFlush("INSERT INTO %s (a,b,c,d,e,f) VALUES(1,1,1,1,1,1) using timestamp 1", flush);
+        assertBaseViews(row(1, 1, 1, 1, 1, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 2 SET c=0, d=0 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 0, 0, 1, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 2 SET e=0, f=0 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 0, 0, 0, 0), viewNames);
+
+        updateViewWithFlush("DELETE FROM %s using timestamp 2 WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        // partial update unselected, selected
+        updateViewWithFlush("UPDATE %s using timestamp 3 SET f=1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 4 SET e = 1, f=null WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, 1, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 4 SET e = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 5 SET c = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 5 SET c = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET d = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, 1, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 7 SET d = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 8 SET f = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET c = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, 1), viewNames);
+
+        // view row still alive due to c=1@6
+        updateViewWithFlush("UPDATE %s using timestamp 8 SET f = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET c = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+    }
+
+    private void assertBaseViews(Object[] row, List<String> viewNames) throws Throwable
+    {
+        UntypedResultSet result = execute("SELECT * FROM %s");
+        if (row == null)
+            assertRowsIgnoringOrder(result);
+        else
+            assertRowsIgnoringOrder(result, row);
+        for (int i = 0; i < viewNames.size(); i++)
+            assertBaseView(result, execute(String.format("SELECT * FROM %s", viewNames.get(i))), viewNames.get(i));
+    }
+
+    private void assertBaseView(UntypedResultSet base, UntypedResultSet view, String mv)
+    {
+        List<ColumnSpecification> baseMeta = base.metadata();
+        List<ColumnSpecification> viewMeta = view.metadata();
+
+        Iterator<UntypedResultSet.Row> iter = base.iterator();
+        Iterator<UntypedResultSet.Row> viewIter = view.iterator();
+
+        List<UntypedResultSet.Row> baseData = com.google.common.collect.Lists.newArrayList(iter);
+        List<UntypedResultSet.Row> viewData = com.google.common.collect.Lists.newArrayList(viewIter);
+
+        if (baseData.size() != viewData.size())
+            fail(String.format("Mismatch number of rows in view %s: <%s>, in base <%s>",
+                               mv,
+                               makeRowStrings(view),
+                               makeRowStrings(base)));
+        if (baseData.size() == 0)
+            return;
+        if (viewData.size() != 1)
+            fail(String.format("Expect only one row in view %s, but got <%s>",
+                               mv,
+                               makeRowStrings(view)));
+
+        UntypedResultSet.Row row = baseData.get(0);
+        UntypedResultSet.Row viewRow = viewData.get(0);
+
+        Map<String, ByteBuffer> baseValues = new HashMap<>();
+        for (int j = 0; j < baseMeta.size(); j++)
+        {
+            ColumnSpecification column = baseMeta.get(j);
+            ByteBuffer actualValue = row.getBytes(column.name.toString());
+            baseValues.put(column.name.toString(), actualValue);
+        }
+        for (int j = 0; j < viewMeta.size(); j++)
+        {
+            ColumnSpecification column = viewMeta.get(j);
+            String name = column.name.toString();
+            ByteBuffer viewValue = viewRow.getBytes(name);
+            if (!baseValues.containsKey(name))
+            {
+                fail(String.format("Extra column: %s with value %s in view", name, column.type.compose(viewValue)));
+            }
+            else if (!Objects.equal(baseValues.get(name), viewValue))
+            {
+                fail(String.format("Non equal column: %s, expected <%s> but got <%s>",
+                                   name,
+                                   column.type.compose(baseValues.get(name)),
+                                   column.type.compose(viewValue)));
+            }
+        }
+    }
+
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[06/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

This patch introduces the following changes to fix MV timestamp issues:
 - Add strict liveness for view with non-key base column in pk
 - Deprecated shadowable tombstone and use expired livenessInfo instead
 - Include partition deletion for existing base row
 - Disallow dropping base column with MV

Patch by Zhao Yang and Paulo Motta; reviewed by Paulo Motta for CASSANDRA-11500


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b36740e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b36740e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b36740e

Branch: refs/heads/cassandra-3.11
Commit: 1b36740ebe66b8ed4c3d6cb64eb2419a9279dfbf
Parents: b0eba5f
Author: Zhao Yang <zh...@gmail.com>
Authored: Wed Jul 12 17:49:38 2017 +0800
Committer: Paulo Motta <pa...@apache.org>
Committed: Tue Sep 5 01:03:24 2017 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   18 +
 doc/cql3/CQL.textile                            |    6 +
 .../org/apache/cassandra/config/CFMetaData.java |   13 +
 .../apache/cassandra/cql3/UpdateParameters.java |    2 +-
 .../cql3/statements/AlterTableStatement.java    |   18 +-
 .../org/apache/cassandra/db/LivenessInfo.java   |   17 +-
 .../org/apache/cassandra/db/ReadCommand.java    |    7 +-
 .../db/compaction/CompactionIterator.java       |    7 +-
 .../apache/cassandra/db/filter/RowFilter.java   |    4 +-
 .../cassandra/db/partitions/PurgeFunction.java  |   14 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |    6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   15 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |    5 +
 .../apache/cassandra/db/transform/Filter.java   |    8 +-
 .../db/transform/FilteredPartitions.java        |    4 +-
 .../cassandra/db/transform/FilteredRows.java    |    2 +-
 .../apache/cassandra/db/view/TableViews.java    |   18 +-
 src/java/org/apache/cassandra/db/view/View.java |   43 +-
 .../apache/cassandra/db/view/ViewManager.java   |    5 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  163 ++-
 .../apache/cassandra/service/DataResolver.java  |    4 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |    2 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  | 1343 ++++++++++++++++++
 .../cassandra/cql3/ViewFilteringTest.java       |  706 ++++-----
 .../org/apache/cassandra/cql3/ViewTest.java     |   31 +-
 25 files changed, 1973 insertions(+), 488 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index bb5fdfe..7064c5d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -21,6 +21,24 @@ Upgrading
    - Nothing specific to this release, but please see previous upgrading sections,
      especially if you are upgrading from 2.2.
 
+Materialized Views
+-------------------
+    - Cassandra will no longer allow dropping columns on tables with Materialized Views.
+    - A change was made in the way the Materialized View timestamp is computed, which
+      may cause an old deletion to a base column which is view primary key (PK) column
+      to not be reflected in the view when repairing the base table post-upgrade. This
+      condition is only possible when a column deletion to an MV primary key (PK) column
+      not present in the base table PK (via UPDATE base SET view_pk_col = null or DELETE
+      view_pk_col FROM base) is missed before the upgrade and received by repair after the upgrade.
+      If such column deletions are done on a view PK column which is not a base PK, it's advisable
+      to run repair on the base table of all nodes prior to the upgrade. Alternatively it's possible
+      to fix potential inconsistencies by running repair on the views after upgrade or drop and
+      re-create the views. See CASSANDRA-11500 for more details.
+    - Removal of columns not selected in the Materialized View (via UPDATE base SET unselected_column
+      = null or DELETE unselected_column FROM base) may not be properly reflected in the view in some
+      situations so we advise against doing deletions on base columns not selected in views
+      until this is fixed on CASSANDRA-13826.
+
 3.0.14
 ======
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 1efa6d4..54888b8 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -524,6 +524,12 @@ h4(#createMVWhere). @WHERE@ Clause
 
 The @<where-clause>@ is similar to the "where clause of a @SELECT@ statement":#selectWhere, with a few differences.  First, the where clause must contain an expression that disallows @NULL@ values in columns in the view's primary key.  If no other restriction is desired, this can be accomplished with an @IS NOT NULL@ expression.  Second, only columns which are in the base table's primary key may be restricted with expressions other than @IS NOT NULL@.  (Note that this second restriction may be lifted in the future.)
 
+h4. MV Limitations
+
+__Note:__
+Removal of columns not selected in the Materialized View (via `UPDATE base SET unselected_column = null` or `DELETE unselected_column FROM base`) may shadow missed updates to other columns received by hints or repair.
+For this reason, we advise against doing deletions on base columns not selected in views until this is fixed on CASSANDRA-13826.
+
 h3(#alterMVStmt). ALTER MATERIALIZED VIEW
 
 __Syntax:__

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 44f3a96..1eb991a 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1078,6 +1078,19 @@ public final class CFMetaData
         return isView;
     }
 
+    /**
+     * A table with strict liveness filters/ignores rows without PK liveness info,
+     * effectively tying the row liveness to its primary key liveness.
+     *
+     * Currently this is only used by views with normal base column as PK column
+     * so updates to other columns do not make the row live when the base column
+     * is not live. See CASSANDRA-11500.
+     */
+    public boolean enforceStrictLiveness()
+    {
+        return isView && Keyspace.open(ksName).viewManager.getByName(cfName).enforceStrictLiveness();
+    }
+
     public Serializers serializers()
     {
         return serializers;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 8ff5344..d070f61 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -233,6 +233,6 @@ public class UpdateParameters
             return pendingMutations;
 
         return Rows.merge(prefetchedRow, pendingMutations, nowInSec)
-                   .purge(DeletionPurger.PURGE_ALL, nowInSec);
+                   .purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 5db4b9f..befdd25 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -233,22 +233,10 @@ public class AlterTableStatement extends SchemaAlteringStatement
                                                                                         .collect(Collectors.joining(","))));
                 }
 
-                // If a column is dropped which is included in a view, we don't allow the drop to take place.
-                boolean rejectAlter = false;
-                StringBuilder builder = new StringBuilder();
-                for (ViewDefinition view : views)
-                {
-                    if (!view.includes(columnName)) continue;
-                    if (rejectAlter)
-                        builder.append(',');
-                    rejectAlter = true;
-                    builder.append(view.viewName);
-                }
-                if (rejectAlter)
-                    throw new InvalidRequestException(String.format("Cannot drop column %s, depended on by materialized views (%s.{%s})",
+                if (!Iterables.isEmpty(views))
+                    throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
                                                                     columnName.toString(),
-                                                                    keyspace(),
-                                                                    builder.toString()));
+                                                                    keyspace()));
                 break;
             case OPTS:
                 if (attrs == null)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/LivenessInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/LivenessInfo.java b/src/java/org/apache/cassandra/db/LivenessInfo.java
index 411fb9a..ab61a23 100644
--- a/src/java/org/apache/cassandra/db/LivenessInfo.java
+++ b/src/java/org/apache/cassandra/db/LivenessInfo.java
@@ -176,13 +176,26 @@ public class LivenessInfo
      * Whether this liveness information supersedes another one (that is
      * whether is has a greater timestamp than the other or not).
      *
-     * @param other the {@code LivenessInfo} to compare this info to.
+     * </br>
+     *
+     * If timestamps are the same, livenessInfo with greater TTL supersedes another.
+     *
+     * It also means, if timestamps are the same, ttl superseders no-ttl.
+     *
+     * This is the same rule as {@link Conflicts#resolveRegular}
+     *
+     * @param other
+     *            the {@code LivenessInfo} to compare this info to.
      *
      * @return whether this {@code LivenessInfo} supersedes {@code other}.
      */
     public boolean supersedes(LivenessInfo other)
     {
-        return timestamp > other.timestamp;
+        if (timestamp != other.timestamp)
+            return timestamp > other.timestamp;
+        if (isExpiring() == other.isExpiring())
+            return localExpirationTime() > other.localExpirationTime();
+        return isExpiring();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 6a21bb3..b73cdde 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -541,7 +541,12 @@ public abstract class ReadCommand implements ReadQuery
         {
             public WithoutPurgeableTombstones()
             {
-                super(isForThrift, nowInSec(), cfs.gcBefore(nowInSec()), oldestUnrepairedTombstone(), cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
+                super(isForThrift,
+                      nowInSec(),
+                      cfs.gcBefore(nowInSec()),
+                      oldestUnrepairedTombstone(),
+                      cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
+                      cfs.metadata.enforceStrictLiveness());
             }
 
             protected Predicate<Long> getPurgeEvaluator()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
index 9f0984f..bea365c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
@@ -266,7 +266,12 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
 
         private Purger(boolean isForThrift, CompactionController controller, int nowInSec)
         {
-            super(isForThrift, nowInSec, controller.gcBefore, controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE, controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
+            super(isForThrift,
+                  nowInSec,
+                  controller.gcBefore,
+                  controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE,
+                  controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
+                  controller.cfs.metadata.enforceStrictLiveness());
             this.controller = controller;
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/filter/RowFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java b/src/java/org/apache/cassandra/db/filter/RowFilter.java
index 8d11038..9f3b868 100644
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@ -148,7 +148,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression>
     public boolean isSatisfiedBy(CFMetaData metadata, DecoratedKey partitionKey, Row row, int nowInSec)
     {
         // We purge all tombstones as the expressions isSatisfiedBy methods expects it
-        Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
         if (purged == null)
             return expressions.isEmpty();
 
@@ -290,7 +290,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression>
 
                 public Row applyToRow(Row row)
                 {
-                    Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+                    Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
                     if (purged == null)
                         return null;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
index 6679bdf..5cc9145 100644
--- a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
+++ b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
@@ -28,9 +28,16 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
     private final boolean isForThrift;
     private final DeletionPurger purger;
     private final int nowInSec;
+
+    private final boolean enforceStrictLiveness;
     private boolean isReverseOrder;
 
-    public PurgeFunction(boolean isForThrift, int nowInSec, int gcBefore, int oldestUnrepairedTombstone, boolean onlyPurgeRepairedTombstones)
+    public PurgeFunction(boolean isForThrift,
+                         int nowInSec,
+                         int gcBefore,
+                         int oldestUnrepairedTombstone,
+                         boolean onlyPurgeRepairedTombstones,
+                         boolean enforceStrictLiveness)
     {
         this.isForThrift = isForThrift;
         this.nowInSec = nowInSec;
@@ -38,6 +45,7 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
                       !(onlyPurgeRepairedTombstones && localDeletionTime >= oldestUnrepairedTombstone)
                       && localDeletionTime < gcBefore
                       && getPurgeEvaluator().test(timestamp);
+        this.enforceStrictLiveness = enforceStrictLiveness;
     }
 
     protected abstract Predicate<Long> getPurgeEvaluator();
@@ -84,14 +92,14 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
     protected Row applyToStatic(Row row)
     {
         updateProgress();
-        return row.purge(purger, nowInSec);
+        return row.purge(purger, nowInSec, enforceStrictLiveness);
     }
 
     @Override
     protected Row applyToRow(Row row)
     {
         updateProgress();
-        return row.purge(purger, nowInSec);
+        return row.purge(purger, nowInSec, enforceStrictLiveness);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 41dad0a..b07960c 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -334,7 +334,7 @@ public class BTreeRow extends AbstractRow
              : new BTreeRow(clustering, primaryKeyLivenessInfo, Deletion.regular(newDeletion), btree, Integer.MIN_VALUE);
     }
 
-    public Row purge(DeletionPurger purger, int nowInSec)
+    public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness)
     {
         if (!hasDeletion(nowInSec))
             return this;
@@ -342,6 +342,10 @@ public class BTreeRow extends AbstractRow
         LivenessInfo newInfo = purger.shouldPurge(primaryKeyLivenessInfo, nowInSec) ? LivenessInfo.EMPTY : primaryKeyLivenessInfo;
         Deletion newDeletion = purger.shouldPurge(deletion.time()) ? Deletion.LIVE : deletion;
 
+        // when enforceStrictLiveness is set, a row is considered dead when it's PK liveness info is not present
+        if (enforceStrictLiveness && newDeletion.isLive() && newInfo.isEmpty())
+            return null;
+
         return transformAndFilter(newInfo, newDeletion, (cd) -> cd.purge(purger, nowInSec));
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 9ab1f09..3bcc220 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -200,10 +200,20 @@ public interface Row extends Unfiltered, Collection<ColumnData>
      *
      * @param purger the {@code DeletionPurger} to use to decide what can be purged.
      * @param nowInSec the current time to decide what is deleted and what isn't (in the case of expired cells).
+     * @param enforceStrictLiveness whether the row should be purged if there is no PK liveness info,
+     *                              normally retrieved from {@link CFMetaData#enforceStrictLiveness()}
+     *
+     *        When enforceStrictLiveness is set, rows with empty PK liveness info
+     *        and no row deletion are purged.
+     *
+     *        Currently this is only used by views with normal base column as PK column
+     *        so updates to other base columns do not make the row live when the PK column
+     *        is not live. See CASSANDRA-11500.
+     *
      * @return this row but without any deletion info purged by {@code purger}. If the purged row is empty, returns
      * {@code null}.
      */
-    public Row purge(DeletionPurger purger, int nowInSec);
+    public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness);
 
     /**
      * Returns a copy of this row where all counter cells have they "local" shard marked for clearing.
@@ -215,7 +225,7 @@ public interface Row extends Unfiltered, Collection<ColumnData>
      * timestamp by {@code newTimestamp - 1}.
      *
      * @param newTimestamp the timestamp to use for all live data in the returned row.
-     * @param a copy of this row with timestamp updated using {@code newTimestamp}. This can return {@code null} in the
+     * @return a copy of this row with timestamp updated using {@code newTimestamp}. This can return {@code null} in the
      * rare where the row only as a shadowable row deletion and the new timestamp supersedes it.
      *
      * @see Commit for why we need this.
@@ -277,6 +287,7 @@ public interface Row extends Unfiltered, Collection<ColumnData>
             return time.isLive() ? LIVE : new Deletion(time, false);
         }
 
+        @Deprecated
         public static Deletion shadowable(DeletionTime time)
         {
             return new Deletion(time, true);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
index bdc8388..c4684e1 100644
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
@@ -88,6 +88,11 @@ public class UnfilteredSerializer
      * Extended flags
      */
     private final static int IS_STATIC               = 0x01; // Whether the encoded row is a static. If there is no extended flag, the row is assumed not static.
+    /**
+     * A shadowable tombstone cannot replace a previous row deletion otherwise it could resurrect a
+     * previously deleted cell not updated by a subsequent update, SEE CASSANDRA-11500
+     */
+    @Deprecated
     private final static int HAS_SHADOWABLE_DELETION = 0x02; // Whether the row deletion is shadowable. If there is no extended flag (or no row deletion), the deletion is assumed not shadowable.
 
     public void serialize(Unfiltered unfiltered, SerializationHeader header, DataOutputPlus out, int version)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/Filter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/Filter.java b/src/java/org/apache/cassandra/db/transform/Filter.java
index 747983f..48a1634 100644
--- a/src/java/org/apache/cassandra/db/transform/Filter.java
+++ b/src/java/org/apache/cassandra/db/transform/Filter.java
@@ -26,10 +26,12 @@ import org.apache.cassandra.db.rows.*;
 public final class Filter extends Transformation
 {
     private final int nowInSec;
+    private final boolean enforceStrictLiveness;
 
-    public Filter(int nowInSec)
+    public Filter(int nowInSec, boolean enforceStrictLiveness)
     {
         this.nowInSec = nowInSec;
+        this.enforceStrictLiveness = enforceStrictLiveness;
     }
 
     @Override
@@ -46,14 +48,14 @@ public final class Filter extends Transformation
         if (row.isEmpty())
             return Rows.EMPTY_STATIC_ROW;
 
-        row = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        row = row.purge(DeletionPurger.PURGE_ALL, nowInSec, enforceStrictLiveness);
         return row == null ? Rows.EMPTY_STATIC_ROW : row;
     }
 
     @Override
     protected Row applyToRow(Row row)
     {
-        return row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        return row.purge(DeletionPurger.PURGE_ALL, nowInSec, enforceStrictLiveness);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
index ad9446d..b835a6b 100644
--- a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
@@ -52,7 +52,9 @@ public final class FilteredPartitions extends BasePartitions<RowIterator, BasePa
      */
     public static FilteredPartitions filter(UnfilteredPartitionIterator iterator, int nowInSecs)
     {
-        FilteredPartitions filtered = filter(iterator, new Filter(nowInSecs));
+        FilteredPartitions filtered = filter(iterator,
+                                             new Filter(nowInSecs,
+                                                        iterator.metadata().enforceStrictLiveness()));
 
         return iterator.isForThrift()
              ? filtered

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/FilteredRows.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/FilteredRows.java b/src/java/org/apache/cassandra/db/transform/FilteredRows.java
index 5b635eb..349183c 100644
--- a/src/java/org/apache/cassandra/db/transform/FilteredRows.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredRows.java
@@ -55,6 +55,6 @@ public final class FilteredRows extends BaseRows<Row, BaseRowIterator<?>> implem
      */
     public static RowIterator filter(UnfilteredRowIterator iterator, int nowInSecs)
     {
-        return new Filter(nowInSecs).applyToPartition(iterator);
+        return new Filter(nowInSecs, iterator.metadata().enforceStrictLiveness()).applyToPartition(iterator);
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/TableViews.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/TableViews.java b/src/java/org/apache/cassandra/db/view/TableViews.java
index 1a3cbb1..d2d4a45 100644
--- a/src/java/org/apache/cassandra/db/view/TableViews.java
+++ b/src/java/org/apache/cassandra/db/view/TableViews.java
@@ -159,6 +159,7 @@ public class TableViews extends AbstractCollection<View>
      * but has simply some updated values. This will be empty for view building as we want to assume anything we'll pass
      * to {@code updates} is new.
      * @param nowInSec the current time in seconds.
+     * @param separateUpdates, if false, mutation is per partition.
      * @return the mutations to apply to the {@code views}. This can be empty.
      */
     public Iterator<Collection<Mutation>> generateViewUpdates(Collection<View> views,
@@ -282,7 +283,10 @@ public class TableViews extends AbstractCollection<View>
                             continue;
 
                         Row updateRow = (Row) update;
-                        addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                        addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                                  updateRow,
+                                                  generators,
+                                                  nowInSec);
 
                         // If the updates have been filtered, then we won't have any mutations; we need to make sure that we
                         // only return if the mutations are empty. Otherwise, we continue to search for an update which is
@@ -321,7 +325,10 @@ public class TableViews extends AbstractCollection<View>
                     continue;
 
                 Row updateRow = (Row) update;
-                addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                          updateRow,
+                                          generators,
+                                          nowInSec);
             }
 
             return Iterators.singletonIterator(buildMutations(baseTableMetadata, generators));
@@ -419,11 +426,12 @@ public class TableViews extends AbstractCollection<View>
         ClusteringIndexFilter clusteringFilter = names == null
                                                ? new ClusteringIndexSliceFilter(sliceBuilder.build(), false)
                                                : new ClusteringIndexNamesFilter(names, false);
+        // since unselected columns also affect view liveness, we need to query all base columns if base and view have same key columns.
         // If we have more than one view, we should merge the queried columns by each views but to keep it simple we just
         // include everything. We could change that in the future.
-        ColumnFilter queriedColumns = views.size() == 1
-                                    ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
-                                    : ColumnFilter.all(metadata);
+        ColumnFilter queriedColumns = views.size() == 1 && metadata.enforceStrictLiveness()
+                                   ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
+                                   : ColumnFilter.all(metadata);
         // Note that the views could have restrictions on regular columns, but even if that's the case we shouldn't apply those
         // when we read, because even if an existing row doesn't match the view filter, the update can change that in which
         // case we'll need to know the existing content. There is also no easy way to merge those RowFilter when we have multiple views.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/View.java b/src/java/org/apache/cassandra/db/view/View.java
index e471349..58e2a84 100644
--- a/src/java/org/apache/cassandra/db/view/View.java
+++ b/src/java/org/apache/cassandra/db/view/View.java
@@ -60,7 +60,6 @@ public class View
 
     public volatile List<ColumnDefinition> baseNonPKColumnsInViewPK;
 
-    private final boolean includeAllColumns;
     private ViewBuilder builder;
 
     // Only the raw statement can be final, because the statement cannot always be prepared when the MV is initialized.
@@ -75,7 +74,6 @@ public class View
     {
         this.baseCfs = baseCfs;
         this.name = definition.viewName;
-        this.includeAllColumns = definition.includeAllColumns;
         this.rawSelect = definition.select;
 
         updateDefinition(definition);
@@ -95,8 +93,6 @@ public class View
     public void updateDefinition(ViewDefinition definition)
     {
         this.definition = definition;
-
-        CFMetaData viewCfm = definition.metadata;
         List<ColumnDefinition> nonPKDefPartOfViewPK = new ArrayList<>();
         for (ColumnDefinition baseColumn : baseCfs.metadata.allColumns())
         {
@@ -148,21 +144,7 @@ public class View
         //    neither included in the view, nor used by the view filter).
         if (!getReadQuery().selectsClustering(partitionKey, update.clustering()))
             return false;
-
-        // We want to find if the update modify any of the columns that are part of the view (in which case the view is affected).
-        // But if the view include all the base table columns, or the update has either a row deletion or a row liveness (note
-        // that for the liveness, it would be more "precise" to check if it's live, but pushing an update that is already expired
-        // is dump so it's ok not to optimize for it and it saves us from having to pass nowInSec to the method), we know the view
-        // is affected right away.
-        if (includeAllColumns || !update.deletion().isLive() || !update.primaryKeyLivenessInfo().isEmpty())
-            return true;
-
-        for (ColumnData data : update)
-        {
-            if (definition.metadata.getColumnDefinition(data.column().name) != null)
-                return true;
-        }
-        return false;
+        return true;
     }
 
     /**
@@ -293,4 +275,27 @@ public class View
 
         return expressions.stream().collect(Collectors.joining(" AND "));
     }
+
+    public boolean hasSamePrimaryKeyColumnsAsBaseTable()
+    {
+        return baseNonPKColumnsInViewPK.isEmpty();
+    }
+
+    /**
+     * When views contains a primary key column that is not part
+     * of the base table primary key, we use that column liveness
+     * info as the view PK, to ensure that whenever that column
+     * is not live in the base, the row is not live in the view.
+     *
+     * This is done to prevent cells other than the view PK from
+     * making the view row alive when the view PK column is not
+     * live in the base. So in this case we tie the row liveness,
+     * to the primary key liveness.
+     *
+     * See CASSANDRA-11500 for context.
+     */
+    public boolean enforceStrictLiveness()
+    {
+        return !baseNonPKColumnsInViewPK.isEmpty();
+    }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
index 0a0fa7b..d1cfd9e 100644
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -161,6 +161,11 @@ public class ViewManager
         SystemKeyspace.setViewRemoved(keyspace.getName(), view.name);
     }
 
+    public View getByName(String name)
+    {
+        return viewsByName.get(name);
+    }
+
     public void buildAllViews()
     {
         for (View view : allViews())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index edb88d0..0c8e078 100644
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@ -70,7 +70,7 @@ public class ViewUpdateGenerator
         UPDATE_EXISTING, // There was an entry and the update modifies it
         SWITCH_ENTRY     // There was an entry and there is still one after update,
                          // but they are not the same one.
-    };
+    }
 
     /**
      * Creates a new {@code ViewUpdateBuilder}.
@@ -121,14 +121,14 @@ public class ViewUpdateGenerator
                 createEntry(mergedBaseRow);
                 return;
             case DELETE_OLD:
-                deleteOldEntry(existingBaseRow);
+                deleteOldEntry(existingBaseRow, mergedBaseRow);
                 return;
             case UPDATE_EXISTING:
                 updateEntry(existingBaseRow, mergedBaseRow);
                 return;
             case SWITCH_ENTRY:
                 createEntry(mergedBaseRow);
-                deleteOldEntry(existingBaseRow);
+                deleteOldEntry(existingBaseRow, mergedBaseRow);
                 return;
         }
     }
@@ -180,6 +180,7 @@ public class ViewUpdateGenerator
         }
 
         assert view.baseNonPKColumnsInViewPK.size() <= 1 : "We currently only support one base non-PK column in the view PK";
+
         if (view.baseNonPKColumnsInViewPK.isEmpty())
         {
             // The view entry is necessarily the same pre and post update.
@@ -204,7 +205,9 @@ public class ViewUpdateGenerator
         if (!isLive(before))
             return isLive(after) ? UpdateAction.NEW_ENTRY : UpdateAction.NONE;
         if (!isLive(after))
+        {
             return UpdateAction.DELETE_OLD;
+        }
 
         return baseColumn.cellValueType().compare(before.value(), after.value()) == 0
              ? UpdateAction.UPDATE_EXISTING
@@ -269,7 +272,7 @@ public class ViewUpdateGenerator
         }
         if (!matchesViewFilter(mergedBaseRow))
         {
-            deleteOldEntryInternal(existingBaseRow);
+            deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
             return;
         }
 
@@ -281,6 +284,12 @@ public class ViewUpdateGenerator
         currentViewEntryBuilder.addPrimaryKeyLivenessInfo(computeLivenessInfoForEntry(mergedBaseRow));
         currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
 
+        addDifferentCells(existingBaseRow, mergedBaseRow);
+        submitUpdate();
+    }
+
+    private void addDifferentCells(Row existingBaseRow, Row mergedBaseRow)
+    {
         // We only add to the view update the cells from mergedBaseRow that differs from
         // existingBaseRow. For that and for speed we can just cell pointer equality: if the update
         // hasn't touched a cell, we know it will be the same object in existingBaseRow and
@@ -362,8 +371,6 @@ public class ViewUpdateGenerator
                 addCell(viewColumn, (Cell)mergedData);
             }
         }
-
-        submitUpdate();
     }
 
     /**
@@ -371,20 +378,40 @@ public class ViewUpdateGenerator
      * <p>
      * This method checks that the base row does match the view filter before bothering.
      */
-    private void deleteOldEntry(Row existingBaseRow)
+    private void deleteOldEntry(Row existingBaseRow, Row mergedBaseRow)
     {
         // Before deleting an old entry, make sure it was matching the view filter (otherwise there is nothing to delete)
         if (!matchesViewFilter(existingBaseRow))
             return;
 
-        deleteOldEntryInternal(existingBaseRow);
+        deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
     }
 
-    private void deleteOldEntryInternal(Row existingBaseRow)
+    private void deleteOldEntryInternal(Row existingBaseRow, Row mergedBaseRow)
     {
         startNewUpdate(existingBaseRow);
-        DeletionTime dt = new DeletionTime(computeTimestampForEntryDeletion(existingBaseRow), nowInSec);
-        currentViewEntryBuilder.addRowDeletion(Row.Deletion.shadowable(dt));
+        long timestamp = computeTimestampForEntryDeletion(existingBaseRow, mergedBaseRow);
+        long rowDeletion = mergedBaseRow.deletion().time().markedForDeleteAt();
+        assert timestamp >= rowDeletion;
+
+        // If computed deletion timestamp greater than row deletion, it must be coming from
+        //  1. non-pk base column used in view pk, or
+        //  2. unselected base column
+        //  any case, we need to use it as expired livenessInfo
+        // If computed deletion timestamp is from row deletion, we only need row deletion itself
+        if (timestamp > rowDeletion)
+        {
+            /**
+              * TODO: This is a hack and overload of LivenessInfo and we should probably modify
+              * the storage engine to properly support this, but on the meantime this
+              * should be fine because it only happens in some specific scenarios explained above.
+              */
+            LivenessInfo info = LivenessInfo.create(timestamp, Integer.MAX_VALUE, nowInSec);
+            currentViewEntryBuilder.addPrimaryKeyLivenessInfo(info);
+        }
+        currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
+
+        addDifferentCells(existingBaseRow, mergedBaseRow);
         submitUpdate();
     }
 
@@ -413,78 +440,92 @@ public class ViewUpdateGenerator
 
     private LivenessInfo computeLivenessInfoForEntry(Row baseRow)
     {
-        /*
-         * We need to compute both the timestamp and expiration.
+        /**
+         * There 3 cases:
+         *  1. No extra primary key in view and all base columns are selected in MV. all base row's components(livenessInfo,
+         *     deletion, cells) are same as view row. Simply map base components to view row.
+         *  2. There is a base non-key column used in view pk. This base non-key column determines the liveness of view row. view's row level
+         *     info should based on this column.
+         *  3. Most tricky case is no extra primary key in view and some base columns are not selected in MV. We cannot use 1 livenessInfo or
+         *     row deletion to represent the liveness of unselected column properly, see CASSANDRA-11500.
+         *     We could make some simplification: the unselected columns will be used only when it affects view row liveness. eg. if view row
+         *     already exists and not expiring, there is no need to use unselected columns.
+         *     Note: if the view row is removed due to unselected column removal(ttl or cell tombstone), we will have problem keeping view
+         *     row alive with a smaller or equal timestamp than the max unselected column timestamp.
          *
-         * For the timestamp, it makes sense to use the bigger timestamp for all view PK columns.
-         *
-         * This is more complex for the expiration. We want to maintain consistency between the base and the view, so the
-         * entry should only exist as long as the base row exists _and_ has non-null values for all the columns that are part
-         * of the view PK.
-         * Which means we really have 2 cases:
-         *   1) either the columns for the base and view PKs are exactly the same: in that case, the view entry should live
-         *      as long as the base row lives. This means the view entry should only expire once *everything* in the base row
-         *      has expired. Which means the row TTL should be the max of any other TTL.
-         *   2) or there is a column that is not in the base PK but is in the view PK (we can only have one so far, we'll need
-         *      to slightly adapt if we allow more later): in that case, as long as that column lives the entry does too, but
-         *      as soon as it expires (or is deleted for that matter) the entry also should expire. So the expiration for the
-         *      view is the one of that column, irregarding of any other expiration.
-         *      To take an example of that case, if you have:
-         *        CREATE TABLE t (a int, b int, c int, PRIMARY KEY (a, b))
-         *        CREATE MATERIALIZED VIEW mv AS SELECT * FROM t WHERE c IS NOT NULL AND a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (c, a, b)
-         *        INSERT INTO t(a, b) VALUES (0, 0) USING TTL 3;
-         *        UPDATE t SET c = 0 WHERE a = 0 AND b = 0;
-         *      then even after 3 seconds elapsed, the row will still exist (it just won't have a "row marker" anymore) and so
-         *      the MV should still have a corresponding entry.
          */
         assert view.baseNonPKColumnsInViewPK.size() <= 1; // This may change, but is currently an enforced limitation
 
         LivenessInfo baseLiveness = baseRow.primaryKeyLivenessInfo();
 
-        if (view.baseNonPKColumnsInViewPK.isEmpty())
+        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
         {
-            int ttl = baseLiveness.ttl();
-            int expirationTime = baseLiveness.localExpirationTime();
+            if (view.getDefinition().includeAllColumns)
+                return baseLiveness;
+
+            long timestamp = baseLiveness.timestamp();
+            boolean hasNonExpiringLiveCell = false;
+            Cell biggestExpirationCell = null;
             for (Cell cell : baseRow.cells())
             {
-                if (cell.ttl() > ttl)
+                if (view.getViewColumn(cell.column()) != null)
+                    continue;
+                if (!isLive(cell))
+                    continue;
+                timestamp = Math.max(timestamp, cell.maxTimestamp());
+                if (!cell.isExpiring())
+                    hasNonExpiringLiveCell = true;
+                else
                 {
-                    ttl = cell.ttl();
-                    expirationTime = cell.localDeletionTime();
+                    if (biggestExpirationCell == null)
+                        biggestExpirationCell = cell;
+                    else if (cell.localDeletionTime() > biggestExpirationCell.localDeletionTime())
+                        biggestExpirationCell = cell;
                 }
             }
-            return ttl == baseLiveness.ttl()
-                 ? baseLiveness
-                 : LivenessInfo.create(baseLiveness.timestamp(), ttl, expirationTime);
+            if (baseLiveness.isLive(nowInSec) && !baseLiveness.isExpiring())
+                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
+            if (hasNonExpiringLiveCell)
+                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
+            if (biggestExpirationCell == null)
+                return baseLiveness;
+            if (biggestExpirationCell.localDeletionTime() > baseLiveness.localExpirationTime()
+                    || !baseLiveness.isLive(nowInSec))
+                return LivenessInfo.create(timestamp,
+                                                       biggestExpirationCell.ttl(),
+                                                       biggestExpirationCell.localDeletionTime());
+            return baseLiveness;
         }
 
-        ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0);
-        Cell cell = baseRow.getCell(baseColumn);
+        Cell cell = baseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
         assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry";
 
-        long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
-        return LivenessInfo.create(timestamp, cell.ttl(), cell.localDeletionTime());
+        return LivenessInfo.create(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
     }
 
-    private long computeTimestampForEntryDeletion(Row baseRow)
+    private long computeTimestampForEntryDeletion(Row existingBaseRow, Row mergedBaseRow)
     {
-        // We delete the old row with it's row entry timestamp using a shadowable deletion.
-        // We must make sure that the deletion deletes everything in the entry (or the entry will
-        // still show up), so we must use the bigger timestamp found in the existing row (for any
-        // column included in the view at least).
-        // TODO: We have a problem though: if the entry is "resurected" by a later update, we would
-        // need to ensure that the timestamp for then entry then is bigger than the tombstone
-        // we're just inserting, which is not currently guaranteed.
-        // This is a bug for a separate ticket though.
-        long timestamp = baseRow.primaryKeyLivenessInfo().timestamp();
-        for (ColumnData data : baseRow)
+        DeletionTime deletion = mergedBaseRow.deletion().time();
+        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
         {
-            if (!view.getDefinition().includes(data.column().name))
-                continue;
+            long timestamp = Math.max(deletion.markedForDeleteAt(), existingBaseRow.primaryKeyLivenessInfo().timestamp());
+            if (view.getDefinition().includeAllColumns)
+                return timestamp;
 
-            timestamp = Math.max(timestamp, data.maxTimestamp());
+            for (Cell cell : existingBaseRow.cells())
+            {
+                // selected column should not contribute to view deletion, itself is already included in view row
+                if (view.getViewColumn(cell.column()) != null)
+                    continue;
+                // unselected column is used regardless live or dead, because we don't know if it was used for liveness.
+                timestamp = Math.max(timestamp, cell.maxTimestamp());
+            }
+            return timestamp;
         }
-        return timestamp;
+        // has base non-pk column in view pk
+        Cell before = existingBaseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
+        assert isLive(before) : "We shouldn't have got there if the base row had no associated entry";
+        return deletion.deletes(before) ? deletion.markedForDeleteAt() : before.timestamp();
     }
 
     private void addColumnData(ColumnDefinition viewColumn, ColumnData baseTableData)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DataResolver.java b/src/java/org/apache/cassandra/service/DataResolver.java
index 72c4950..c59d688 100644
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@ -86,7 +86,9 @@ public class DataResolver extends ResponseResolver
         DataLimits.Counter counter = command.limits().newCounter(command.nowInSec(), true, command.selectsFullPartition());
 
         UnfilteredPartitionIterator merged = mergeWithShortReadProtection(iters, sources, counter);
-        FilteredPartitions filtered = FilteredPartitions.filter(merged, new Filter(command.nowInSec()));
+        FilteredPartitions filtered = FilteredPartitions.filter(merged,
+                                                                new Filter(command.nowInSec(),
+                                                                           command.metadata().enforceStrictLiveness()));
         PartitionIterator counted = counter.applyTo(filtered);
 
         return command.isForThrift()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 40aec88..3c0cefc 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -1001,7 +1001,7 @@ public abstract class CQLTester
         assert ignoreExtra || expectedRows.size() == actualRows.size();
     }
 
-    private static List<String> makeRowStrings(UntypedResultSet resultSet)
+    protected static List<String> makeRowStrings(UntypedResultSet resultSet)
     {
         List<List<ByteBuffer>> rows = new ArrayList<>();
         for (UntypedResultSet.Row row : resultSet)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[16/16] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by pa...@apache.org.
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6fb8302
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6fb8302
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6fb8302

Branch: refs/heads/trunk
Commit: e6fb8302848bc43888b0a742a9b0abce09872c45
Parents: 4603600 e624c66
Author: Paulo Motta <pa...@apache.org>
Authored: Tue Sep 5 01:05:32 2017 -0500
Committer: Paulo Motta <pa...@apache.org>
Committed: Tue Sep 5 01:06:24 2017 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   19 +
 doc/source/cql/mvs.rst                          |    8 +
 .../apache/cassandra/cql3/UpdateParameters.java |    2 +-
 .../cql3/statements/AlterTableStatement.java    |   19 +-
 .../org/apache/cassandra/db/LivenessInfo.java   |   17 +-
 .../org/apache/cassandra/db/ReadCommand.java    |    4 +-
 .../db/compaction/CompactionIterator.java       |    4 +-
 .../apache/cassandra/db/filter/RowFilter.java   |    4 +-
 .../cassandra/db/partitions/PurgeFunction.java  |   10 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |    6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   15 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |    5 +
 .../apache/cassandra/db/transform/Filter.java   |    8 +-
 .../db/transform/FilteredPartitions.java        |    2 +-
 .../cassandra/db/transform/FilteredRows.java    |    2 +-
 .../apache/cassandra/db/view/TableViews.java    |   14 +-
 src/java/org/apache/cassandra/db/view/View.java |   45 +-
 .../apache/cassandra/db/view/ViewManager.java   |    5 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  161 ++-
 .../apache/cassandra/schema/TableMetadata.java  |   13 +
 .../apache/cassandra/service/DataResolver.java  |    2 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |    2 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  | 1344 ++++++++++++++++++
 .../cassandra/cql3/ViewFilteringTest.java       | 1106 ++++++++------
 .../org/apache/cassandra/cql3/ViewTest.java     |   35 +-
 25 files changed, 2319 insertions(+), 533 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index c9963c3,0682ae9..7d0fe9a
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -33,41 -18,33 +33,60 @@@ New feature
  
  Upgrading
  ---------
 -    - Nothing specific to this version but please see previous upgrading sections,
 -      especially if you are upgrading from 2.2.
 +    - Support for legacy auth tables in the system_auth keyspace (users,
 +      permissions, credentials) and the migration code has been removed. Migration
 +      of these legacy auth tables must have been completed before the upgrade to
 +      4.0 and the legacy tables must have been removed. See the 'Upgrading' section
 +      for version 2.2 for migration instructions.
 +    - Cassandra 4.0 removed support for the deprecated Thrift interface. Amongst
 +      Tother things, this imply the removal of all yaml option related to thrift
 +      ('start_rpc', rpc_port, ...).
 +    - Cassandra 4.0 removed support for any pre-3.0 format. This means you
 +      cannot upgrade from a 2.x version to 4.0 directly, you have to upgrade to
 +      a 3.0.x/3.x version first (and run upgradesstable). In particular, this
 +      mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you
 +      will need to upgrade those sstable in 3.0.x/3.x first.
 +    - Upgrades from 3.0.x or 3.x are supported since 3.0.13 or 3.11.0, previous
 +      versions will causes issues during rolling upgrades (CASSANDRA-13274).
 +    - Cassandra will no longer allow invalid keyspace replication options, such
 +      as invalid datacenter names for NetworkTopologyStrategy. Operators MUST
 +      add new nodes to a datacenter before they can set set ALTER or CREATE
 +      keyspace replication policies using that datacenter. Existing keyspaces
 +      will continue to operate, but CREATE and ALTER will validate that all
 +      datacenters specified exist in the cluster.
 +    - Cassandra 4.0 fixes a problem with incremental repair which caused repaired
 +      data to be inconsistent between nodes. The fix changes the behavior of both
 +      full and incremental repairs. For full repairs, data is no longer marked
 +      repaired. For incremental repairs, anticompaction is run at the beginning
 +      of the repair, instead of at the end. If incremental repair was being used
 +      prior to upgrading, a full repair should be run after upgrading to resolve
 +      any inconsistencies.
 +    - Config option index_interval has been removed (it was deprecated since 2.0)
 +    - Deprecated repair JMX APIs are removed.
 +    - The version of snappy-java has been upgraded to 1.1.2.6
 +	- the miniumum value for internode message timeouts is 10ms. Previously, any
 +	  positive value was allowed. See cassandra.yaml entries like
 +	  read_request_timeout_in_ms for more details.
 +
+ 
+ Materialized Views
+ -------------------
+     - Cassandra will no longer allow dropping columns on tables with Materialized Views.
+     - A change was made in the way the Materialized View timestamp is computed, which
+       may cause an old deletion to a base column which is view primary key (PK) column
+       to not be reflected in the view when repairing the base table post-upgrade. This
+       condition is only possible when a column deletion to an MV primary key (PK) column
+       not present in the base table PK (via UPDATE base SET view_pk_col = null or DELETE
+       view_pk_col FROM base) is missed before the upgrade and received by repair after the upgrade.
+       If such column deletions are done on a view PK column which is not a base PK, it's advisable
+       to run repair on the base table of all nodes prior to the upgrade. Alternatively it's possible
+       to fix potential inconsistencies by running repair on the views after upgrade or drop and
+       re-create the views. See CASSANDRA-11500 for more details.
+     - Removal of columns not selected in the Materialized View (via UPDATE base SET unselected_column
+       = null or DELETE unselected_column FROM base) may not be properly reflected in the view in some
+       situations so we advise against doing deletions on base columns not selected in views
+       until this is fixed on CASSANDRA-13826.
 -    - Creating Materialized View with filtering on non-primary-key base column
 -      (added in CASSANDRA-10368) is disabled, because the liveness of view row
 -      is depending on multiple filtered base non-key columns and base non-key
 -      column used in view primary-key. This semantic cannot be supported without
 -      storage format change, see CASSANDRA-13826. For append-only use case, you
 -      may still use this feature with a startup flag: "-Dcassandra.mv.allow_filtering_nonkey_columns_unsafe=true"
+ 
  3.11.0
  ======
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/doc/source/cql/mvs.rst
----------------------------------------------------------------------
diff --cc doc/source/cql/mvs.rst
index aabea10,aabea10..55ede22
--- a/doc/source/cql/mvs.rst
+++ b/doc/source/cql/mvs.rst
@@@ -164,3 -164,3 +164,11 @@@ Dropping a materialized view users the 
  
  If the materialized view does not exists, the statement will return an error, unless ``IF EXISTS`` is used in which case
  the operation is a no-op.
++
++MV Limitations
++```````````````
++
++.. Note:: Removal of columns not selected in the Materialized View (via ``UPDATE base SET unselected_column = null`` or
++          ``DELETE unselected_column FROM base``) may shadow missed updates to other columns received by hints or repair.
++          For this reason, we advise against doing deletions on base columns not selected in views until this is
++          fixed on CASSANDRA-13826.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 0c45647,fdbcf7a..e6d997e
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -216,25 -234,12 +216,14 @@@ public class AlterTableStatement extend
                                                                              dependentIndexes.stream()
                                                                                              .map(i -> i.name)
                                                                                              .collect(Collectors.joining(","))));
 +                        }
                      }
  
-                     // If a column is dropped which is included in a view, we don't allow the drop to take place.
-                     boolean rejectAlter = false;
-                     StringBuilder viewNames = new StringBuilder();
-                     for (ViewMetadata view : views)
-                     {
-                         if (!view.includes(columnName)) continue;
-                         if (rejectAlter)
-                             viewNames.append(',');
-                         rejectAlter = true;
-                         viewNames.append(view.name);
-                     }
-                     if (rejectAlter)
-                         throw new InvalidRequestException(String.format("Cannot drop column %s, depended on by materialized views (%s.{%s})",
++
+                     if (!Iterables.isEmpty(views))
+                         throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
                                                                          columnName.toString(),
-                                                                         keyspace(),
-                                                                         viewNames.toString()));
+                                                                         keyspace()));
                  }
                  break;
              case OPTS:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index 35a3a32,bb4d5e8..08ebc86
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -553,7 -610,12 +553,9 @@@ public abstract class ReadCommand exten
          {
              public WithoutPurgeableTombstones()
              {
-                 super(nowInSec(), cfs.gcBefore(nowInSec()), oldestUnrepairedTombstone(), cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
 -                super(isForThrift,
 -                      nowInSec(),
 -                      cfs.gcBefore(nowInSec()),
 -                      oldestUnrepairedTombstone(),
++                super(nowInSec(), cfs.gcBefore(nowInSec()), oldestUnrepairedTombstone(),
+                       cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
 -                      cfs.metadata.enforceStrictLiveness());
++                      iterator.metadata().enforceStrictLiveness());
              }
  
              protected Predicate<Long> getPurgeEvaluator()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
index 8e94fd9,f2da989..a6161f2
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
@@@ -264,9 -270,14 +264,11 @@@ public class CompactionIterator extend
  
          private long compactedUnfiltered;
  
 -        private Purger(boolean isForThrift, CompactionController controller, int nowInSec)
 +        private Purger(CompactionController controller, int nowInSec)
          {
-             super(nowInSec, controller.gcBefore, controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE, controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
 -            super(isForThrift,
 -                  nowInSec,
 -                  controller.gcBefore,
 -                  controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE,
++            super(nowInSec, controller.gcBefore, controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE,
+                   controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
 -                  controller.cfs.metadata.enforceStrictLiveness());
++                  controller.cfs.metadata.get().enforceStrictLiveness());
              this.controller = controller;
          }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/filter/RowFilter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/filter/RowFilter.java
index cecfede,84a93ab..baafe8b
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@@ -147,10 -161,10 +147,10 @@@ public abstract class RowFilter impleme
       * @param nowInSec the current time in seconds (to know what is live and what isn't).
       * @return {@code true} if {@code row} in partition {@code partitionKey} satisfies this row filter.
       */
 -    public boolean isSatisfiedBy(CFMetaData metadata, DecoratedKey partitionKey, Row row, int nowInSec)
 +    public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, int nowInSec)
      {
          // We purge all tombstones as the expressions isSatisfiedBy methods expects it
-         Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+         Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
          if (purged == null)
              return expressions.isEmpty();
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
index b5580c6,5cc9145..83d4d38
--- a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
+++ b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
@@@ -25,12 -25,21 +25,15 @@@ import org.apache.cassandra.db.transfor
  
  public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator>
  {
 -    private final boolean isForThrift;
      private final DeletionPurger purger;
      private final int nowInSec;
+ 
+     private final boolean enforceStrictLiveness;
      private boolean isReverseOrder;
  
-     public PurgeFunction(int nowInSec, int gcBefore, int oldestUnrepairedTombstone, boolean onlyPurgeRepairedTombstones)
 -    public PurgeFunction(boolean isForThrift,
 -                         int nowInSec,
 -                         int gcBefore,
 -                         int oldestUnrepairedTombstone,
 -                         boolean onlyPurgeRepairedTombstones,
++    public PurgeFunction(int nowInSec, int gcBefore, int oldestUnrepairedTombstone, boolean onlyPurgeRepairedTombstones,
+                          boolean enforceStrictLiveness)
      {
 -        this.isForThrift = isForThrift;
          this.nowInSec = nowInSec;
          this.purger = (timestamp, localDeletionTime) ->
                        !(onlyPurgeRepairedTombstones && localDeletionTime >= oldestUnrepairedTombstone)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/rows/Row.java
index 5999864,9a8508b..13ef86d
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@@ -203,10 -203,20 +203,20 @@@ public interface Row extends Unfiltered
       *
       * @param purger the {@code DeletionPurger} to use to decide what can be purged.
       * @param nowInSec the current time to decide what is deleted and what isn't (in the case of expired cells).
+      * @param enforceStrictLiveness whether the row should be purged if there is no PK liveness info,
 -     *                              normally retrieved from {@link CFMetaData#enforceStrictLiveness()}
++     *                              normally retrieved from {@link TableMetadata#enforceStrictLiveness()}
+      *
+      *        When enforceStrictLiveness is set, rows with empty PK liveness info
+      *        and no row deletion are purged.
+      *
+      *        Currently this is only used by views with normal base column as PK column
+      *        so updates to other base columns do not make the row live when the PK column
+      *        is not live. See CASSANDRA-11500.
+      *
       * @return this row but without any deletion info purged by {@code purger}. If the purged row is empty, returns
--     * {@code null}.
++     *         {@code null}.
       */
-     public Row purge(DeletionPurger purger, int nowInSec);
+     public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness);
  
      /**
       * Returns a copy of this row which only include the data queried by {@code filter}, excluding anything _fetched_ for

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
index fa12c9c,b835a6b..6a19f76
--- a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
@@@ -52,8 -52,13 +52,8 @@@ public final class FilteredPartitions e
       */
      public static FilteredPartitions filter(UnfilteredPartitionIterator iterator, int nowInSecs)
      {
-         FilteredPartitions filtered = filter(iterator, new Filter(nowInSecs));
 -        FilteredPartitions filtered = filter(iterator,
 -                                             new Filter(nowInSecs,
 -                                                        iterator.metadata().enforceStrictLiveness()));
 -
 -        return iterator.isForThrift()
 -             ? filtered
 -             : (FilteredPartitions) Transformation.apply(filtered, new EmptyPartitionsDiscarder());
++        FilteredPartitions filtered = filter(iterator, new Filter(nowInSecs, iterator.metadata().enforceStrictLiveness()));
 +        return (FilteredPartitions) Transformation.apply(filtered, new EmptyPartitionsDiscarder());
      }
  
      public static FilteredPartitions filter(UnfilteredPartitionIterator iterator, Filter filter)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/view/TableViews.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/TableViews.java
index 0579429,f1f48f6..7a1373c
--- a/src/java/org/apache/cassandra/db/view/TableViews.java
+++ b/src/java/org/apache/cassandra/db/view/TableViews.java
@@@ -325,10 -326,13 +329,13 @@@ public class TableViews extends Abstrac
                      continue;
  
                  Row updateRow = (Row) update;
-                 addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                 addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                           updateRow,
+                                           generators,
+                                           nowInSec);
              }
  
 -            return Iterators.singletonIterator(buildMutations(baseTableMetadata, generators));
 +            return Iterators.singletonIterator(buildMutations(baseTableMetadata.get(), generators));
          }
      }
  
@@@ -423,11 -427,12 +430,12 @@@
          ClusteringIndexFilter clusteringFilter = names == null
                                                 ? new ClusteringIndexSliceFilter(sliceBuilder.build(), false)
                                                 : new ClusteringIndexNamesFilter(names, false);
+         // since unselected columns also affect view liveness, we need to query all base columns if base and view have same key columns.
          // If we have more than one view, we should merge the queried columns by each views but to keep it simple we just
          // include everything. We could change that in the future.
-         ColumnFilter queriedColumns = views.size() == 1
+         ColumnFilter queriedColumns = views.size() == 1 && metadata.enforceStrictLiveness()
 -                                   ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
 -                                   : ColumnFilter.all(metadata);
 +                                    ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
 +                                    : ColumnFilter.all(metadata);
          // Note that the views could have restrictions on regular columns, but even if that's the case we shouldn't apply those
          // when we read, because even if an existing row doesn't match the view filter, the update can change that in which
          // case we'll need to know the existing content. There is also no easy way to merge those RowFilter when we have multiple views.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/View.java
index 4bffe16,0baadc3..f601673
--- a/src/java/org/apache/cassandra/db/view/View.java
+++ b/src/java/org/apache/cassandra/db/view/View.java
@@@ -54,9 -51,8 +54,7 @@@ public class Vie
  
      private final ColumnFamilyStore baseCfs;
  
 -    public volatile List<ColumnDefinition> baseNonPKColumnsInViewPK;
 -
 +    public volatile List<ColumnMetadata> baseNonPKColumnsInViewPK;
- 
-     private final boolean includeAllColumns;
      private ViewBuilder builder;
  
      // Only the raw statement can be final, because the statement cannot always be prepared when the MV is initialized.
@@@ -70,8 -66,7 +68,7 @@@
                  ColumnFamilyStore baseCfs)
      {
          this.baseCfs = baseCfs;
 -        this.name = definition.viewName;
 +        this.name = definition.name;
-         this.includeAllColumns = definition.includeAllColumns;
          this.rawSelect = definition.select;
  
          updateDefinition(definition);
@@@ -83,16 -78,16 +80,15 @@@
      }
  
      /**
 -     * This updates the columns stored which are dependent on the base CFMetaData.
 +     * This updates the columns stored which are dependent on the base TableMetadata.
       */
 -    public void updateDefinition(ViewDefinition definition)
 +    public void updateDefinition(ViewMetadata definition)
      {
          this.definition = definition;
--
 -        List<ColumnDefinition> nonPKDefPartOfViewPK = new ArrayList<>();
 -        for (ColumnDefinition baseColumn : baseCfs.metadata.allColumns())
 +        List<ColumnMetadata> nonPKDefPartOfViewPK = new ArrayList<>();
-         for (ColumnMetadata baseColumn : baseCfs.metadata().columns())
++        for (ColumnMetadata baseColumn : baseCfs.metadata.get().columns())
          {
 -            ColumnDefinition viewColumn = getViewColumn(baseColumn);
 +            ColumnMetadata viewColumn = getViewColumn(baseColumn);
              if (viewColumn != null && !baseColumn.isPrimaryKeyColumn() && viewColumn.isPrimaryKeyColumn())
                  nonPKDefPartOfViewPK.add(baseColumn);
          }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index e276f62,74758e7..815a566
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@@ -377,14 -383,34 +384,34 @@@ public class ViewUpdateGenerato
          if (!matchesViewFilter(existingBaseRow))
              return;
  
-         deleteOldEntryInternal(existingBaseRow);
+         deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
      }
  
-     private void deleteOldEntryInternal(Row existingBaseRow)
+     private void deleteOldEntryInternal(Row existingBaseRow, Row mergedBaseRow)
      {
          startNewUpdate(existingBaseRow);
-         DeletionTime dt = new DeletionTime(computeTimestampForEntryDeletion(existingBaseRow), nowInSec);
-         currentViewEntryBuilder.addRowDeletion(Row.Deletion.shadowable(dt));
+         long timestamp = computeTimestampForEntryDeletion(existingBaseRow, mergedBaseRow);
+         long rowDeletion = mergedBaseRow.deletion().time().markedForDeleteAt();
+         assert timestamp >= rowDeletion;
 -
 -        // If computed deletion timestamp greater than row deletion, it must be coming from
++        
++        // If computed deletion timestamp greater than row deletion, it must be coming from 
+         //  1. non-pk base column used in view pk, or
+         //  2. unselected base column
+         //  any case, we need to use it as expired livenessInfo
+         // If computed deletion timestamp is from row deletion, we only need row deletion itself
+         if (timestamp > rowDeletion)
+         {
+             /**
+               * TODO: This is a hack and overload of LivenessInfo and we should probably modify
+               * the storage engine to properly support this, but on the meantime this
+               * should be fine because it only happens in some specific scenarios explained above.
+               */
+             LivenessInfo info = LivenessInfo.withExpirationTime(timestamp, Integer.MAX_VALUE, nowInSec);
+             currentViewEntryBuilder.addPrimaryKeyLivenessInfo(info);
+         }
+         currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
+ 
+         addDifferentCells(existingBaseRow, mergedBaseRow);
          submitUpdate();
      }
  
@@@ -441,53 -457,77 +458,77 @@@
  
          LivenessInfo baseLiveness = baseRow.primaryKeyLivenessInfo();
  
 -        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
 +        if (view.baseNonPKColumnsInViewPK.isEmpty())
          {
-             int ttl = baseLiveness.ttl();
-             int expirationTime = baseLiveness.localExpirationTime();
+             if (view.getDefinition().includeAllColumns)
+                 return baseLiveness;
+ 
+             long timestamp = baseLiveness.timestamp();
+             boolean hasNonExpiringLiveCell = false;
+             Cell biggestExpirationCell = null;
              for (Cell cell : baseRow.cells())
              {
-                 if (cell.ttl() > ttl)
+                 if (view.getViewColumn(cell.column()) != null)
+                     continue;
+                 if (!isLive(cell))
+                     continue;
+                 timestamp = Math.max(timestamp, cell.maxTimestamp());
+                 if (!cell.isExpiring())
+                     hasNonExpiringLiveCell = true;
+                 else
                  {
-                     ttl = cell.ttl();
-                     expirationTime = cell.localDeletionTime();
+                     if (biggestExpirationCell == null)
+                         biggestExpirationCell = cell;
+                     else if (cell.localDeletionTime() > biggestExpirationCell.localDeletionTime())
+                         biggestExpirationCell = cell;
                  }
              }
-             return ttl == baseLiveness.ttl()
-                  ? baseLiveness
-                  : LivenessInfo.withExpirationTime(baseLiveness.timestamp(), ttl, expirationTime);
+             if (baseLiveness.isLive(nowInSec) && !baseLiveness.isExpiring())
+                 return LivenessInfo.create(timestamp, nowInSec);
+             if (hasNonExpiringLiveCell)
+                 return LivenessInfo.create(timestamp, nowInSec);
+             if (biggestExpirationCell == null)
+                 return baseLiveness;
+             if (biggestExpirationCell.localDeletionTime() > baseLiveness.localExpirationTime()
+                     || !baseLiveness.isLive(nowInSec))
+                 return LivenessInfo.withExpirationTime(timestamp,
+                                                        biggestExpirationCell.ttl(),
+                                                        biggestExpirationCell.localDeletionTime());
+             return baseLiveness;
          }
  
-         ColumnMetadata baseColumn = view.baseNonPKColumnsInViewPK.get(0);
-         Cell cell = baseRow.getCell(baseColumn);
+         Cell cell = baseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
          assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry";
  
-         long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
-         return LivenessInfo.withExpirationTime(timestamp, cell.ttl(), cell.localDeletionTime());
+         return LivenessInfo.withExpirationTime(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
      }
  
-     private long computeTimestampForEntryDeletion(Row baseRow)
+     private long computeTimestampForEntryDeletion(Row existingBaseRow, Row mergedBaseRow)
      {
-         // We delete the old row with it's row entry timestamp using a shadowable deletion.
-         // We must make sure that the deletion deletes everything in the entry (or the entry will
-         // still show up), so we must use the bigger timestamp found in the existing row (for any
-         // column included in the view at least).
-         // TODO: We have a problem though: if the entry is "resurected" by a later update, we would
-         // need to ensure that the timestamp for then entry then is bigger than the tombstone
-         // we're just inserting, which is not currently guaranteed.
-         // This is a bug for a separate ticket though.
-         long timestamp = baseRow.primaryKeyLivenessInfo().timestamp();
-         for (ColumnData data : baseRow)
+         DeletionTime deletion = mergedBaseRow.deletion().time();
+         if (view.hasSamePrimaryKeyColumnsAsBaseTable())
          {
-             if (!view.getDefinition().includes(data.column().name))
-                 continue;
+             long timestamp = Math.max(deletion.markedForDeleteAt(), existingBaseRow.primaryKeyLivenessInfo().timestamp());
+             if (view.getDefinition().includeAllColumns)
+                 return timestamp;
  
-             timestamp = Math.max(timestamp, data.maxTimestamp());
+             for (Cell cell : existingBaseRow.cells())
+             {
+                 // selected column should not contribute to view deletion, itself is already included in view row
+                 if (view.getViewColumn(cell.column()) != null)
+                     continue;
+                 // unselected column is used regardless live or dead, because we don't know if it was used for liveness.
+                 timestamp = Math.max(timestamp, cell.maxTimestamp());
+             }
+             return timestamp;
          }
-         return timestamp;
+         // has base non-pk column in view pk
+         Cell before = existingBaseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
+         assert isLive(before) : "We shouldn't have got there if the base row had no associated entry";
+         return deletion.deletes(before) ? deletion.markedForDeleteAt() : before.timestamp();
      }
  
 -    private void addColumnData(ColumnDefinition viewColumn, ColumnData baseTableData)
 +    private void addColumnData(ColumnMetadata viewColumn, ColumnData baseTableData)
      {
          assert viewColumn.isComplex() == baseTableData.column().isComplex();
          if (!viewColumn.isComplex())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/schema/TableMetadata.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/TableMetadata.java
index 44b1f8a,0000000..86964cc
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/schema/TableMetadata.java
+++ b/src/java/org/apache/cassandra/schema/TableMetadata.java
@@@ -1,956 -1,0 +1,969 @@@
 +/*
 + * 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.schema;
 +
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +import java.util.Objects;
 +
 +import com.google.common.base.MoreObjects;
 +import com.google.common.collect.*;
 +
 +import org.apache.cassandra.auth.DataResource;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.marshal.*;
 +import org.apache.cassandra.dht.IPartitioner;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.utils.AbstractIterator;
 +import org.github.jamm.Unmetered;
 +
 +import static java.lang.String.format;
 +import static java.util.stream.Collectors.toList;
 +import static java.util.stream.Collectors.toSet;
 +
 +import static com.google.common.collect.Iterables.transform;
 +import static org.apache.cassandra.schema.IndexMetadata.isNameValid;
 +
 +@Unmetered
 +public final class TableMetadata
 +{
 +    public enum Flag
 +    {
 +        SUPER, COUNTER, DENSE, COMPOUND;
 +
 +        public static Set<Flag> fromStringSet(Set<String> strings)
 +        {
 +            return strings.stream().map(String::toUpperCase).map(Flag::valueOf).collect(toSet());
 +        }
 +
 +        public static Set<String> toStringSet(Set<Flag> flags)
 +        {
 +            return flags.stream().map(Flag::toString).map(String::toLowerCase).collect(toSet());
 +        }
 +    }
 +
 +    public final String keyspace;
 +    public final String name;
 +    public final TableId id;
 +
 +    public final IPartitioner partitioner;
 +    public final TableParams params;
 +    public final ImmutableSet<Flag> flags;
 +
 +    private final boolean isView;
 +    private final String indexName; // derived from table name
 +
 +    /*
 +     * All CQL3 columns definition are stored in the columns map.
 +     * On top of that, we keep separated collection of each kind of definition, to
 +     * 1) allow easy access to each kind and
 +     * 2) for the partition key and clustering key ones, those list are ordered by the "component index" of the elements.
 +     */
 +    public final ImmutableMap<ByteBuffer, DroppedColumn> droppedColumns;
 +    final ImmutableMap<ByteBuffer, ColumnMetadata> columns;
 +
 +    private final ImmutableList<ColumnMetadata> partitionKeyColumns;
 +    private final ImmutableList<ColumnMetadata> clusteringColumns;
 +    private final RegularAndStaticColumns regularAndStaticColumns;
 +
 +    public final Indexes indexes;
 +    public final Triggers triggers;
 +
 +    // derived automatically from flags and columns
 +    public final AbstractType<?> partitionKeyType;
 +    public final ClusteringComparator comparator;
 +
 +    /*
 +     * For dense tables, this alias the single non-PK column the table contains (since it can only have one). We keep
 +     * that as convenience to access that column more easily (but we could replace calls by regularAndStaticColumns().iterator().next()
 +     * for those tables in practice).
 +     */
 +    public final ColumnMetadata compactValueColumn;
 +
 +    // performance hacks; TODO see if all are really necessary
 +    public final DataResource resource;
 +
 +    private TableMetadata(Builder builder)
 +    {
 +        keyspace = builder.keyspace;
 +        name = builder.name;
 +        id = builder.id;
 +
 +        partitioner = builder.partitioner;
 +        params = builder.params.build();
 +        flags = Sets.immutableEnumSet(builder.flags);
 +        isView = builder.isView;
 +
 +        indexName = name.contains(".")
 +                  ? name.substring(name.indexOf('.') + 1)
 +                  : null;
 +
 +        droppedColumns = ImmutableMap.copyOf(builder.droppedColumns);
 +        Collections.sort(builder.partitionKeyColumns);
 +        partitionKeyColumns = ImmutableList.copyOf(builder.partitionKeyColumns);
 +        Collections.sort(builder.clusteringColumns);
 +        clusteringColumns = ImmutableList.copyOf(builder.clusteringColumns);
 +        regularAndStaticColumns = RegularAndStaticColumns.builder().addAll(builder.regularAndStaticColumns).build();
 +        columns = ImmutableMap.copyOf(builder.columns);
 +
 +        indexes = builder.indexes;
 +        triggers = builder.triggers;
 +
 +        partitionKeyType = partitionKeyColumns.size() == 1
 +                         ? partitionKeyColumns.get(0).type
 +                         : CompositeType.getInstance(transform(partitionKeyColumns, t -> t.type));
 +
 +        comparator = new ClusteringComparator(transform(clusteringColumns, c -> c.type));
 +
 +        compactValueColumn = isCompactTable()
 +                           ? CompactTables.getCompactValueColumn(regularAndStaticColumns, isSuper())
 +                           : null;
 +
 +        resource = DataResource.table(keyspace, name);
 +    }
 +
 +    public static Builder builder(String keyspace, String table)
 +    {
 +        return new Builder(keyspace, table);
 +    }
 +
 +    public static Builder builder(String keyspace, String table, TableId id)
 +    {
 +        return new Builder(keyspace, table, id);
 +    }
 +
 +    public Builder unbuild()
 +    {
 +        return builder(keyspace, name, id)
 +               .partitioner(partitioner)
 +               .params(params)
 +               .flags(flags)
 +               .isView(isView)
 +               .addColumns(columns())
 +               .droppedColumns(droppedColumns)
 +               .indexes(indexes)
 +               .triggers(triggers);
 +    }
 +
 +    public boolean isView()
 +    {
 +        return isView;
 +    }
 +
 +    public boolean isIndex()
 +    {
 +        return indexName != null;
 +    }
 +
 +    public Optional<String> indexName()
 +    {
 +        return Optional.ofNullable(indexName);
 +    }
 +
 +    /*
 +     *  We call dense a CF for which each component of the comparator is a clustering column, i.e. no
 +     * component is used to store a regular column names. In other words, non-composite static "thrift"
 +     * and CQL3 CF are *not* dense.
 +     */
 +    public boolean isDense()
 +    {
 +        return flags.contains(Flag.DENSE);
 +    }
 +
 +    public boolean isCompound()
 +    {
 +        return flags.contains(Flag.COMPOUND);
 +    }
 +
 +    public boolean isSuper()
 +    {
 +        return flags.contains(Flag.SUPER);
 +    }
 +
 +    public boolean isCounter()
 +    {
 +        return flags.contains(Flag.COUNTER);
 +    }
 +
 +    public boolean isCQLTable()
 +    {
 +        return !isSuper() && !isDense() && isCompound();
 +    }
 +
 +    public boolean isCompactTable()
 +    {
 +        return !isCQLTable();
 +    }
 +
 +    public boolean isStaticCompactTable()
 +    {
 +        return !isSuper() && !isDense() && !isCompound();
 +    }
 +
 +    public ImmutableCollection<ColumnMetadata> columns()
 +    {
 +        return columns.values();
 +    }
 +
 +    public Iterable<ColumnMetadata> primaryKeyColumns()
 +    {
 +        return Iterables.concat(partitionKeyColumns, clusteringColumns);
 +    }
 +
 +    public ImmutableList<ColumnMetadata> partitionKeyColumns()
 +    {
 +        return partitionKeyColumns;
 +    }
 +
 +    public ImmutableList<ColumnMetadata> clusteringColumns()
 +    {
 +        return clusteringColumns;
 +    }
 +
 +    public RegularAndStaticColumns regularAndStaticColumns()
 +    {
 +        return regularAndStaticColumns;
 +    }
 +
 +    public Columns regularColumns()
 +    {
 +        return regularAndStaticColumns.regulars;
 +    }
 +
 +    public Columns staticColumns()
 +    {
 +        return regularAndStaticColumns.statics;
 +    }
 +
 +    /*
 +     * An iterator over all column definitions but that respect the order of a SELECT *.
 +     * This also "hide" the clustering/regular columns for a non-CQL3 non-dense table for backward compatibility
 +     * sake.
 +     */
 +    public Iterator<ColumnMetadata> allColumnsInSelectOrder()
 +    {
 +        final boolean isStaticCompactTable = isStaticCompactTable();
 +        final boolean noNonPkColumns = isCompactTable() && CompactTables.hasEmptyCompactValue(this);
 +
 +        return new AbstractIterator<ColumnMetadata>()
 +        {
 +            private final Iterator<ColumnMetadata> partitionKeyIter = partitionKeyColumns.iterator();
 +            private final Iterator<ColumnMetadata> clusteringIter =
 +                isStaticCompactTable ? Collections.emptyIterator() : clusteringColumns.iterator();
 +            private final Iterator<ColumnMetadata> otherColumns =
 +                noNonPkColumns
 +              ? Collections.emptyIterator()
 +              : (isStaticCompactTable ? staticColumns().selectOrderIterator()
 +                                      : regularAndStaticColumns.selectOrderIterator());
 +
 +            protected ColumnMetadata computeNext()
 +            {
 +                if (partitionKeyIter.hasNext())
 +                    return partitionKeyIter.next();
 +
 +                if (clusteringIter.hasNext())
 +                    return clusteringIter.next();
 +
 +                return otherColumns.hasNext() ? otherColumns.next() : endOfData();
 +            }
 +        };
 +    }
 +
 +    /**
 +     * Returns the ColumnMetadata for {@code name}.
 +     */
 +    public ColumnMetadata getColumn(ColumnIdentifier name)
 +    {
 +        return columns.get(name.bytes);
 +    }
 +
 +    /*
 +     * In general it is preferable to work with ColumnIdentifier to make it
 +     * clear that we are talking about a CQL column, not a cell name, but there
 +     * is a few cases where all we have is a ByteBuffer (when dealing with IndexExpression
 +     * for instance) so...
 +     */
 +    public ColumnMetadata getColumn(ByteBuffer name)
 +    {
 +        return columns.get(name);
 +    }
 +
 +    public ColumnMetadata getDroppedColumn(ByteBuffer name)
 +    {
 +        DroppedColumn dropped = droppedColumns.get(name);
 +        return dropped == null ? null : dropped.column;
 +    }
 +
 +    /**
 +     * Returns a "fake" ColumnMetadata corresponding to the dropped column {@code name}
 +     * of {@code null} if there is no such dropped column.
 +     *
 +     * @param name - the column name
 +     * @param isStatic - whether the column was a static column, if known
 +     */
 +    public ColumnMetadata getDroppedColumn(ByteBuffer name, boolean isStatic)
 +    {
 +        DroppedColumn dropped = droppedColumns.get(name);
 +        if (dropped == null)
 +            return null;
 +
 +        if (isStatic && !dropped.column.isStatic())
 +            return ColumnMetadata.staticColumn(this, name, dropped.column.type);
 +
 +        return dropped.column;
 +    }
 +
 +    public boolean hasStaticColumns()
 +    {
 +        return !staticColumns().isEmpty();
 +    }
 +
 +    public void validate()
 +    {
 +        if (!isNameValid(keyspace))
 +            except("Keyspace name must not be empty, more than %s characters long, or contain non-alphanumeric-underscore characters (got \"%s\")", SchemaConstants.NAME_LENGTH, keyspace);
 +
 +        if (!isNameValid(name))
 +            except("Table name must not be empty, more than %s characters long, or contain non-alphanumeric-underscore characters (got \"%s\")", SchemaConstants.NAME_LENGTH, name);
 +
 +        params.validate();
 +
 +        if (partitionKeyColumns.stream().anyMatch(c -> c.type.isCounter()))
 +            except("PRIMARY KEY columns cannot contain counters");
 +
 +        // Mixing counter with non counter columns is not supported (#2614)
 +        if (isCounter())
 +        {
 +            for (ColumnMetadata column : regularAndStaticColumns)
 +                if (!(column.type.isCounter()) && !CompactTables.isSuperColumnMapColumn(column))
 +                    except("Cannot have a non counter column (\"%s\") in a counter table", column.name);
 +        }
 +        else
 +        {
 +            for (ColumnMetadata column : regularAndStaticColumns)
 +                if (column.type.isCounter())
 +                    except("Cannot have a counter column (\"%s\") in a non counter column table", column.name);
 +        }
 +
 +        // All tables should have a partition key
 +        if (partitionKeyColumns.isEmpty())
 +            except("Missing partition keys for table %s", toString());
 +
 +        // A compact table should always have a clustering
 +        if (isCompactTable() && clusteringColumns.isEmpty())
 +            except("For table %s, isDense=%b, isCompound=%b, clustering=%s", toString(), isDense(), isCompound(), clusteringColumns);
 +
 +        if (!indexes.isEmpty() && isSuper())
 +            except("Secondary indexes are not supported on super column families");
 +
 +        indexes.validate(this);
 +    }
 +
 +    void validateCompatibility(TableMetadata other)
 +    {
 +        if (isIndex())
 +            return;
 +
 +        if (!other.keyspace.equals(keyspace))
 +            except("Keyspace mismatch (found %s; expected %s)", other.keyspace, keyspace);
 +
 +        if (!other.name.equals(name))
 +            except("Table mismatch (found %s; expected %s)", other.name, name);
 +
 +        if (!other.id.equals(id))
 +            except("Table ID mismatch (found %s; expected %s)", other.id, id);
 +
 +        if (!other.flags.equals(flags))
 +            except("Table type mismatch (found %s; expected %s)", other.flags, flags);
 +
 +        if (other.partitionKeyColumns.size() != partitionKeyColumns.size())
 +            except("Partition keys of different length (found %s; expected %s)", other.partitionKeyColumns.size(), partitionKeyColumns.size());
 +
 +        for (int i = 0; i < partitionKeyColumns.size(); i++)
 +            if (!other.partitionKeyColumns.get(i).type.isCompatibleWith(partitionKeyColumns.get(i).type))
 +                except("Partition key column mismatch (found %s; expected %s)", other.partitionKeyColumns.get(i).type, partitionKeyColumns.get(i).type);
 +
 +        if (other.clusteringColumns.size() != clusteringColumns.size())
 +            except("Clustering columns of different length (found %s; expected %s)", other.clusteringColumns.size(), clusteringColumns.size());
 +
 +        for (int i = 0; i < clusteringColumns.size(); i++)
 +            if (!other.clusteringColumns.get(i).type.isCompatibleWith(clusteringColumns.get(i).type))
 +                except("Clustering column mismatch (found %s; expected %s)", other.clusteringColumns.get(i).type, clusteringColumns.get(i).type);
 +
 +        for (ColumnMetadata otherColumn : other.regularAndStaticColumns)
 +        {
 +            ColumnMetadata column = getColumn(otherColumn.name);
 +            if (column != null && !otherColumn.type.isCompatibleWith(column.type))
 +                except("Column mismatch (found %s; expected %s", otherColumn, column);
 +        }
 +    }
 +
 +    public ClusteringComparator partitionKeyAsClusteringComparator()
 +    {
 +        return new ClusteringComparator(partitionKeyColumns.stream().map(c -> c.type).collect(toList()));
 +    }
 +
 +    /**
 +     * The type to use to compare column names in "static compact"
 +     * tables or superColum ones.
 +     * <p>
 +     * This exists because for historical reasons, "static compact" tables as
 +     * well as super column ones can have non-UTF8 column names.
 +     * <p>
 +     * This method should only be called for superColumn tables and "static
 +     * compact" ones. For any other table, all column names are UTF8.
 +     */
 +    public AbstractType<?> staticCompactOrSuperTableColumnNameType()
 +    {
 +        if (isSuper())
 +        {
 +            assert compactValueColumn != null && compactValueColumn.type instanceof MapType;
 +            return ((MapType) compactValueColumn.type).nameComparator();
 +        }
 +
 +        assert isStaticCompactTable();
 +        return clusteringColumns.get(0).type;
 +    }
 +
 +    public AbstractType<?> columnDefinitionNameComparator(ColumnMetadata.Kind kind)
 +    {
 +        return (isSuper() && kind == ColumnMetadata.Kind.REGULAR) || (isStaticCompactTable() && kind == ColumnMetadata.Kind.STATIC)
 +             ? staticCompactOrSuperTableColumnNameType()
 +             : UTF8Type.instance;
 +    }
 +
 +    /**
 +     * Generate a table name for an index corresponding to the given column.
 +     * This is NOT the same as the index's name! This is only used in sstable filenames and is not exposed to users.
 +     *
 +     * @param info A definition of the column with index
 +     *
 +     * @return name of the index table
 +     */
 +    public String indexTableName(IndexMetadata info)
 +    {
 +        // TODO simplify this when info.index_name is guaranteed to be set
 +        return name + Directories.SECONDARY_INDEX_NAME_SEPARATOR + info.name;
 +    }
 +
 +    /**
 +     * @return true if the change as made impacts queries/updates on the table,
 +     *         e.g. any columns or indexes were added, removed, or altered; otherwise, false is returned.
 +     *         Used to determine whether prepared statements against this table need to be re-prepared.
 +     */
 +    boolean changeAffectsPreparedStatements(TableMetadata updated)
 +    {
 +        return !partitionKeyColumns.equals(updated.partitionKeyColumns)
 +            || !clusteringColumns.equals(updated.clusteringColumns)
 +            || !regularAndStaticColumns.equals(updated.regularAndStaticColumns)
 +            || !indexes.equals(updated.indexes)
 +            || params.defaultTimeToLive != updated.params.defaultTimeToLive
 +            || params.gcGraceSeconds != updated.params.gcGraceSeconds;
 +    }
 +
 +    /**
 +     * There is a couple of places in the code where we need a TableMetadata object and don't have one readily available
 +     * and know that only the keyspace and name matter. This creates such "fake" metadata. Use only if you know what
 +     * you're doing.
 +     */
 +    public static TableMetadata minimal(String keyspace, String name)
 +    {
 +        return TableMetadata.builder(keyspace, name)
 +                            .addPartitionKeyColumn("key", BytesType.instance)
 +                            .build();
 +    }
 +
 +    public TableMetadata updateIndexTableMetadata(TableParams baseTableParams)
 +    {
 +        TableParams.Builder builder =
 +            baseTableParams.unbuild()
 +                           .readRepairChance(0.0)
 +                           .dcLocalReadRepairChance(0.0)
 +                           .gcGraceSeconds(0);
 +
 +        // Depends on parent's cache setting, turn on its index table's cache.
 +        // Row caching is never enabled; see CASSANDRA-5732
 +        builder.caching(baseTableParams.caching.cacheKeys() ? CachingParams.CACHE_KEYS : CachingParams.CACHE_NOTHING);
 +
 +        return unbuild().params(builder.build()).build();
 +    }
 +
 +    private void except(String format, Object... args)
 +    {
 +        throw new ConfigurationException(format(format, args));
 +    }
 +
 +    @Override
 +    public boolean equals(Object o)
 +    {
 +        if (this == o)
 +            return true;
 +
 +        if (!(o instanceof TableMetadata))
 +            return false;
 +
 +        TableMetadata tm = (TableMetadata) o;
 +
 +        return keyspace.equals(tm.keyspace)
 +            && name.equals(tm.name)
 +            && id.equals(tm.id)
 +            && partitioner.equals(tm.partitioner)
 +            && params.equals(tm.params)
 +            && flags.equals(tm.flags)
 +            && isView == tm.isView
 +            && columns.equals(tm.columns)
 +            && droppedColumns.equals(tm.droppedColumns)
 +            && indexes.equals(tm.indexes)
 +            && triggers.equals(tm.triggers);
 +    }
 +
 +    @Override
 +    public int hashCode()
 +    {
 +        return Objects.hash(keyspace, name, id, partitioner, params, flags, isView, columns, droppedColumns, indexes, triggers);
 +    }
 +
 +    @Override
 +    public String toString()
 +    {
 +        return String.format("%s.%s", ColumnIdentifier.maybeQuote(keyspace), ColumnIdentifier.maybeQuote(name));
 +    }
 +
 +    public String toDebugString()
 +    {
 +        return MoreObjects.toStringHelper(this)
 +                          .add("keyspace", keyspace)
 +                          .add("table", name)
 +                          .add("id", id)
 +                          .add("partitioner", partitioner)
 +                          .add("params", params)
 +                          .add("flags", flags)
 +                          .add("isView", isView)
 +                          .add("columns", columns())
 +                          .add("droppedColumns", droppedColumns.values())
 +                          .add("indexes", indexes)
 +                          .add("triggers", triggers)
 +                          .toString();
 +    }
 +
 +    public static final class Builder
 +    {
 +        final String keyspace;
 +        final String name;
 +
 +        private TableId id;
 +
 +        private IPartitioner partitioner;
 +        private TableParams.Builder params = TableParams.builder();
 +
 +        // Setting compound as default as "normal" CQL tables are compound and that's what we want by default
 +        private Set<Flag> flags = EnumSet.of(Flag.COMPOUND);
 +        private Triggers triggers = Triggers.none();
 +        private Indexes indexes = Indexes.none();
 +
 +        private final Map<ByteBuffer, DroppedColumn> droppedColumns = new HashMap<>();
 +        private final Map<ByteBuffer, ColumnMetadata> columns = new HashMap<>();
 +        private final List<ColumnMetadata> partitionKeyColumns = new ArrayList<>();
 +        private final List<ColumnMetadata> clusteringColumns = new ArrayList<>();
 +        private final List<ColumnMetadata> regularAndStaticColumns = new ArrayList<>();
 +
 +        private boolean isView;
 +
 +        private Builder(String keyspace, String name, TableId id)
 +        {
 +            this.keyspace = keyspace;
 +            this.name = name;
 +            this.id = id;
 +        }
 +
 +        private Builder(String keyspace, String name)
 +        {
 +            this.keyspace = keyspace;
 +            this.name = name;
 +        }
 +
 +        public TableMetadata build()
 +        {
 +            if (partitioner == null)
 +                partitioner = DatabaseDescriptor.getPartitioner();
 +
 +            if (id == null)
 +                id = TableId.generate();
 +
 +            return new TableMetadata(this);
 +        }
 +
 +        public Builder id(TableId val)
 +        {
 +            id = val;
 +            return this;
 +        }
 +
 +        public Builder partitioner(IPartitioner val)
 +        {
 +            partitioner = val;
 +            return this;
 +        }
 +
 +        public Builder params(TableParams val)
 +        {
 +            params = val.unbuild();
 +            return this;
 +        }
 +
 +        public Builder bloomFilterFpChance(double val)
 +        {
 +            params.bloomFilterFpChance(val);
 +            return this;
 +        }
 +
 +        public Builder caching(CachingParams val)
 +        {
 +            params.caching(val);
 +            return this;
 +        }
 +
 +        public Builder comment(String val)
 +        {
 +            params.comment(val);
 +            return this;
 +        }
 +
 +        public Builder compaction(CompactionParams val)
 +        {
 +            params.compaction(val);
 +            return this;
 +        }
 +
 +        public Builder compression(CompressionParams val)
 +        {
 +            params.compression(val);
 +            return this;
 +        }
 +
 +        public Builder dcLocalReadRepairChance(double val)
 +        {
 +            params.dcLocalReadRepairChance(val);
 +            return this;
 +        }
 +
 +        public Builder defaultTimeToLive(int val)
 +        {
 +            params.defaultTimeToLive(val);
 +            return this;
 +        }
 +
 +        public Builder gcGraceSeconds(int val)
 +        {
 +            params.gcGraceSeconds(val);
 +            return this;
 +        }
 +
 +        public Builder maxIndexInterval(int val)
 +        {
 +            params.maxIndexInterval(val);
 +            return this;
 +        }
 +
 +        public Builder memtableFlushPeriod(int val)
 +        {
 +            params.memtableFlushPeriodInMs(val);
 +            return this;
 +        }
 +
 +        public Builder minIndexInterval(int val)
 +        {
 +            params.minIndexInterval(val);
 +            return this;
 +        }
 +
 +        public Builder readRepairChance(double val)
 +        {
 +            params.readRepairChance(val);
 +            return this;
 +        }
 +
 +        public Builder crcCheckChance(double val)
 +        {
 +            params.crcCheckChance(val);
 +            return this;
 +        }
 +
 +        public Builder speculativeRetry(SpeculativeRetryParam val)
 +        {
 +            params.speculativeRetry(val);
 +            return this;
 +        }
 +
 +        public Builder extensions(Map<String, ByteBuffer> val)
 +        {
 +            params.extensions(val);
 +            return this;
 +        }
 +
 +        public Builder isView(boolean val)
 +        {
 +            isView = val;
 +            return this;
 +        }
 +
 +        public Builder flags(Set<Flag> val)
 +        {
 +            flags = val;
 +            return this;
 +        }
 +
 +        public Builder isSuper(boolean val)
 +        {
 +            return flag(Flag.SUPER, val);
 +        }
 +
 +        public Builder isCounter(boolean val)
 +        {
 +            return flag(Flag.COUNTER, val);
 +        }
 +
 +        public Builder isDense(boolean val)
 +        {
 +            return flag(Flag.DENSE, val);
 +        }
 +
 +        public Builder isCompound(boolean val)
 +        {
 +            return flag(Flag.COMPOUND, val);
 +        }
 +
 +        private Builder flag(Flag flag, boolean set)
 +        {
 +            if (set) flags.add(flag); else flags.remove(flag);
 +            return this;
 +        }
 +
 +        public Builder triggers(Triggers val)
 +        {
 +            triggers = val;
 +            return this;
 +        }
 +
 +        public Builder indexes(Indexes val)
 +        {
 +            indexes = val;
 +            return this;
 +        }
 +
 +        public Builder addPartitionKeyColumn(String name, AbstractType type)
 +        {
 +            return addPartitionKeyColumn(ColumnIdentifier.getInterned(name, false), type);
 +        }
 +
 +        public Builder addPartitionKeyColumn(ColumnIdentifier name, AbstractType type)
 +        {
 +            return addColumn(new ColumnMetadata(keyspace, this.name, name, type, partitionKeyColumns.size(), ColumnMetadata.Kind.PARTITION_KEY));
 +        }
 +
 +        public Builder addClusteringColumn(String name, AbstractType type)
 +        {
 +            return addClusteringColumn(ColumnIdentifier.getInterned(name, false), type);
 +        }
 +
 +        public Builder addClusteringColumn(ColumnIdentifier name, AbstractType type)
 +        {
 +            return addColumn(new ColumnMetadata(keyspace, this.name, name, type, clusteringColumns.size(), ColumnMetadata.Kind.CLUSTERING));
 +        }
 +
 +        public Builder addRegularColumn(String name, AbstractType type)
 +        {
 +            return addRegularColumn(ColumnIdentifier.getInterned(name, false), type);
 +        }
 +
 +        public Builder addRegularColumn(ColumnIdentifier name, AbstractType type)
 +        {
 +            return addColumn(new ColumnMetadata(keyspace, this.name, name, type, ColumnMetadata.NO_POSITION, ColumnMetadata.Kind.REGULAR));
 +        }
 +
 +        public Builder addStaticColumn(String name, AbstractType type)
 +        {
 +            return addStaticColumn(ColumnIdentifier.getInterned(name, false), type);
 +        }
 +
 +        public Builder addStaticColumn(ColumnIdentifier name, AbstractType type)
 +        {
 +            return addColumn(new ColumnMetadata(keyspace, this.name, name, type, ColumnMetadata.NO_POSITION, ColumnMetadata.Kind.STATIC));
 +        }
 +
 +        public Builder addColumn(ColumnMetadata column)
 +        {
 +            if (columns.containsKey(column.name.bytes))
 +                throw new IllegalArgumentException();
 +
 +            switch (column.kind)
 +            {
 +                case PARTITION_KEY:
 +                    partitionKeyColumns.add(column);
 +                    Collections.sort(partitionKeyColumns);
 +                    break;
 +                case CLUSTERING:
 +                    column.type.checkComparable();
 +                    clusteringColumns.add(column);
 +                    Collections.sort(clusteringColumns);
 +                    break;
 +                default:
 +                    regularAndStaticColumns.add(column);
 +            }
 +
 +            columns.put(column.name.bytes, column);
 +
 +            return this;
 +        }
 +
 +        public Builder addColumns(Iterable<ColumnMetadata> columns)
 +        {
 +            columns.forEach(this::addColumn);
 +            return this;
 +        }
 +
 +        public Builder droppedColumns(Map<ByteBuffer, DroppedColumn> droppedColumns)
 +        {
 +            this.droppedColumns.clear();
 +            this.droppedColumns.putAll(droppedColumns);
 +            return this;
 +        }
 +
 +        /**
 +         * Records a deprecated column for a system table.
 +         */
 +        public Builder recordDeprecatedSystemColumn(String name, AbstractType<?> type)
 +        {
 +            // As we play fast and loose with the removal timestamp, make sure this is misued for a non system table.
 +            assert SchemaConstants.isSystemKeyspace(keyspace);
 +            recordColumnDrop(ColumnMetadata.regularColumn(keyspace, this.name, name, type), Long.MAX_VALUE);
 +            return this;
 +        }
 +
 +        public Builder recordColumnDrop(ColumnMetadata column, long timeMicros)
 +        {
 +            droppedColumns.put(column.name.bytes, new DroppedColumn(column, timeMicros));
 +            return this;
 +        }
 +
 +        public Iterable<ColumnMetadata> columns()
 +        {
 +            return columns.values();
 +        }
 +
 +        public Set<String> columnNames()
 +        {
 +            return columns.values().stream().map(c -> c.name.toString()).collect(toSet());
 +        }
 +
 +        public ColumnMetadata getColumn(ColumnIdentifier identifier)
 +        {
 +            return columns.get(identifier.bytes);
 +        }
 +
 +        public ColumnMetadata getColumn(ByteBuffer name)
 +        {
 +            return columns.get(name);
 +        }
 +
 +        public boolean hasRegularColumns()
 +        {
 +            return regularAndStaticColumns.stream().anyMatch(ColumnMetadata::isRegular);
 +        }
 +
 +        /*
 +         * The following methods all assume a Builder with valid set of partition key, clustering, regular and static columns.
 +         */
 +
 +        public Builder removeRegularOrStaticColumn(ColumnIdentifier identifier)
 +        {
 +            ColumnMetadata column = columns.get(identifier.bytes);
 +            if (column == null || column.isPrimaryKeyColumn())
 +                throw new IllegalArgumentException();
 +
 +            columns.remove(identifier.bytes);
 +            regularAndStaticColumns.remove(column);
 +
 +            return this;
 +        }
 +
 +        public Builder renamePrimaryKeyColumn(ColumnIdentifier from, ColumnIdentifier to)
 +        {
 +            if (columns.containsKey(to.bytes))
 +                throw new IllegalArgumentException();
 +
 +            ColumnMetadata column = columns.get(from.bytes);
 +            if (column == null || !column.isPrimaryKeyColumn())
 +                throw new IllegalArgumentException();
 +
 +            ColumnMetadata newColumn = column.withNewName(to);
 +            if (column.isPartitionKey())
 +                partitionKeyColumns.set(column.position(), newColumn);
 +            else
 +                clusteringColumns.set(column.position(), newColumn);
 +
 +            columns.remove(from.bytes);
 +            columns.put(to.bytes, newColumn);
 +
 +            return this;
 +        }
 +
 +        public Builder alterColumnType(ColumnIdentifier name, AbstractType<?> type)
 +        {
 +            ColumnMetadata column = columns.get(name.bytes);
 +            if (column == null)
 +                throw new IllegalArgumentException();
 +
 +            ColumnMetadata newColumn = column.withNewType(type);
 +
 +            switch (column.kind)
 +            {
 +                case PARTITION_KEY:
 +                    partitionKeyColumns.set(column.position(), newColumn);
 +                    break;
 +                case CLUSTERING:
 +                    clusteringColumns.set(column.position(), newColumn);
 +                    break;
 +                case REGULAR:
 +                case STATIC:
 +                    regularAndStaticColumns.remove(column);
 +                    regularAndStaticColumns.add(newColumn);
 +                    break;
 +            }
 +
 +            columns.put(column.name.bytes, newColumn);
 +
 +            return this;
 +        }
 +    }
++    
++    /**
++     * A table with strict liveness filters/ignores rows without PK liveness info,
++     * effectively tying the row liveness to its primary key liveness.
++     *
++     * Currently this is only used by views with normal base column as PK column
++     * so updates to other columns do not make the row live when the base column
++     * is not live. See CASSANDRA-11500.
++     */
++    public boolean enforceStrictLiveness()
++    {
++        return isView && Keyspace.open(keyspace).viewManager.getByName(name).enforceStrictLiveness();
++    }
 +}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/DataResolver.java
index f4a472d,aeb7c29..eb2553b
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@@ -91,9 -88,14 +91,9 @@@ public class DataResolver extends Respo
          DataLimits.Counter counter = command.limits().newCounter(command.nowInSec(), true, command.selectsFullPartition());
  
          UnfilteredPartitionIterator merged = mergeWithShortReadProtection(iters, sources, counter);
-         FilteredPartitions filtered = FilteredPartitions.filter(merged, new Filter(command.nowInSec()));
 -        FilteredPartitions filtered = FilteredPartitions.filter(merged,
 -                                                                new Filter(command.nowInSec(),
 -                                                                           command.metadata().enforceStrictLiveness()));
++        FilteredPartitions filtered = FilteredPartitions.filter(merged, new Filter(command.nowInSec(), command.metadata().enforceStrictLiveness()));
          PartitionIterator counted = counter.applyTo(filtered);
 -
 -        return command.isForThrift()
 -             ? counted
 -             : Transformation.apply(counted, new EmptyPartitionsDiscarder());
 +        return Transformation.apply(counted, new EmptyPartitionsDiscarder());
      }
  
      public void compareResponses()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[09/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

This patch introduces the following changes to fix MV timestamp issues:
 - Add strict liveness for view with non-key base column in pk
 - Deprecated shadowable tombstone and use expired livenessInfo instead
 - Include partition deletion for existing base row
 - Disallow dropping base column with MV

Patch by Zhao Yang and Paulo Motta; reviewed by Paulo Motta for CASSANDRA-11500


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b36740e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b36740e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b36740e

Branch: refs/heads/trunk
Commit: 1b36740ebe66b8ed4c3d6cb64eb2419a9279dfbf
Parents: b0eba5f
Author: Zhao Yang <zh...@gmail.com>
Authored: Wed Jul 12 17:49:38 2017 +0800
Committer: Paulo Motta <pa...@apache.org>
Committed: Tue Sep 5 01:03:24 2017 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   18 +
 doc/cql3/CQL.textile                            |    6 +
 .../org/apache/cassandra/config/CFMetaData.java |   13 +
 .../apache/cassandra/cql3/UpdateParameters.java |    2 +-
 .../cql3/statements/AlterTableStatement.java    |   18 +-
 .../org/apache/cassandra/db/LivenessInfo.java   |   17 +-
 .../org/apache/cassandra/db/ReadCommand.java    |    7 +-
 .../db/compaction/CompactionIterator.java       |    7 +-
 .../apache/cassandra/db/filter/RowFilter.java   |    4 +-
 .../cassandra/db/partitions/PurgeFunction.java  |   14 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |    6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   15 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |    5 +
 .../apache/cassandra/db/transform/Filter.java   |    8 +-
 .../db/transform/FilteredPartitions.java        |    4 +-
 .../cassandra/db/transform/FilteredRows.java    |    2 +-
 .../apache/cassandra/db/view/TableViews.java    |   18 +-
 src/java/org/apache/cassandra/db/view/View.java |   43 +-
 .../apache/cassandra/db/view/ViewManager.java   |    5 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  163 ++-
 .../apache/cassandra/service/DataResolver.java  |    4 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |    2 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  | 1343 ++++++++++++++++++
 .../cassandra/cql3/ViewFilteringTest.java       |  706 ++++-----
 .../org/apache/cassandra/cql3/ViewTest.java     |   31 +-
 25 files changed, 1973 insertions(+), 488 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index bb5fdfe..7064c5d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -21,6 +21,24 @@ Upgrading
    - Nothing specific to this release, but please see previous upgrading sections,
      especially if you are upgrading from 2.2.
 
+Materialized Views
+-------------------
+    - Cassandra will no longer allow dropping columns on tables with Materialized Views.
+    - A change was made in the way the Materialized View timestamp is computed, which
+      may cause an old deletion to a base column which is view primary key (PK) column
+      to not be reflected in the view when repairing the base table post-upgrade. This
+      condition is only possible when a column deletion to an MV primary key (PK) column
+      not present in the base table PK (via UPDATE base SET view_pk_col = null or DELETE
+      view_pk_col FROM base) is missed before the upgrade and received by repair after the upgrade.
+      If such column deletions are done on a view PK column which is not a base PK, it's advisable
+      to run repair on the base table of all nodes prior to the upgrade. Alternatively it's possible
+      to fix potential inconsistencies by running repair on the views after upgrade or drop and
+      re-create the views. See CASSANDRA-11500 for more details.
+    - Removal of columns not selected in the Materialized View (via UPDATE base SET unselected_column
+      = null or DELETE unselected_column FROM base) may not be properly reflected in the view in some
+      situations so we advise against doing deletions on base columns not selected in views
+      until this is fixed on CASSANDRA-13826.
+
 3.0.14
 ======
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 1efa6d4..54888b8 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -524,6 +524,12 @@ h4(#createMVWhere). @WHERE@ Clause
 
 The @<where-clause>@ is similar to the "where clause of a @SELECT@ statement":#selectWhere, with a few differences.  First, the where clause must contain an expression that disallows @NULL@ values in columns in the view's primary key.  If no other restriction is desired, this can be accomplished with an @IS NOT NULL@ expression.  Second, only columns which are in the base table's primary key may be restricted with expressions other than @IS NOT NULL@.  (Note that this second restriction may be lifted in the future.)
 
+h4. MV Limitations
+
+__Note:__
+Removal of columns not selected in the Materialized View (via `UPDATE base SET unselected_column = null` or `DELETE unselected_column FROM base`) may shadow missed updates to other columns received by hints or repair.
+For this reason, we advise against doing deletions on base columns not selected in views until this is fixed on CASSANDRA-13826.
+
 h3(#alterMVStmt). ALTER MATERIALIZED VIEW
 
 __Syntax:__

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 44f3a96..1eb991a 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1078,6 +1078,19 @@ public final class CFMetaData
         return isView;
     }
 
+    /**
+     * A table with strict liveness filters/ignores rows without PK liveness info,
+     * effectively tying the row liveness to its primary key liveness.
+     *
+     * Currently this is only used by views with normal base column as PK column
+     * so updates to other columns do not make the row live when the base column
+     * is not live. See CASSANDRA-11500.
+     */
+    public boolean enforceStrictLiveness()
+    {
+        return isView && Keyspace.open(ksName).viewManager.getByName(cfName).enforceStrictLiveness();
+    }
+
     public Serializers serializers()
     {
         return serializers;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 8ff5344..d070f61 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -233,6 +233,6 @@ public class UpdateParameters
             return pendingMutations;
 
         return Rows.merge(prefetchedRow, pendingMutations, nowInSec)
-                   .purge(DeletionPurger.PURGE_ALL, nowInSec);
+                   .purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 5db4b9f..befdd25 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -233,22 +233,10 @@ public class AlterTableStatement extends SchemaAlteringStatement
                                                                                         .collect(Collectors.joining(","))));
                 }
 
-                // If a column is dropped which is included in a view, we don't allow the drop to take place.
-                boolean rejectAlter = false;
-                StringBuilder builder = new StringBuilder();
-                for (ViewDefinition view : views)
-                {
-                    if (!view.includes(columnName)) continue;
-                    if (rejectAlter)
-                        builder.append(',');
-                    rejectAlter = true;
-                    builder.append(view.viewName);
-                }
-                if (rejectAlter)
-                    throw new InvalidRequestException(String.format("Cannot drop column %s, depended on by materialized views (%s.{%s})",
+                if (!Iterables.isEmpty(views))
+                    throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
                                                                     columnName.toString(),
-                                                                    keyspace(),
-                                                                    builder.toString()));
+                                                                    keyspace()));
                 break;
             case OPTS:
                 if (attrs == null)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/LivenessInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/LivenessInfo.java b/src/java/org/apache/cassandra/db/LivenessInfo.java
index 411fb9a..ab61a23 100644
--- a/src/java/org/apache/cassandra/db/LivenessInfo.java
+++ b/src/java/org/apache/cassandra/db/LivenessInfo.java
@@ -176,13 +176,26 @@ public class LivenessInfo
      * Whether this liveness information supersedes another one (that is
      * whether is has a greater timestamp than the other or not).
      *
-     * @param other the {@code LivenessInfo} to compare this info to.
+     * </br>
+     *
+     * If timestamps are the same, livenessInfo with greater TTL supersedes another.
+     *
+     * It also means, if timestamps are the same, ttl superseders no-ttl.
+     *
+     * This is the same rule as {@link Conflicts#resolveRegular}
+     *
+     * @param other
+     *            the {@code LivenessInfo} to compare this info to.
      *
      * @return whether this {@code LivenessInfo} supersedes {@code other}.
      */
     public boolean supersedes(LivenessInfo other)
     {
-        return timestamp > other.timestamp;
+        if (timestamp != other.timestamp)
+            return timestamp > other.timestamp;
+        if (isExpiring() == other.isExpiring())
+            return localExpirationTime() > other.localExpirationTime();
+        return isExpiring();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 6a21bb3..b73cdde 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -541,7 +541,12 @@ public abstract class ReadCommand implements ReadQuery
         {
             public WithoutPurgeableTombstones()
             {
-                super(isForThrift, nowInSec(), cfs.gcBefore(nowInSec()), oldestUnrepairedTombstone(), cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
+                super(isForThrift,
+                      nowInSec(),
+                      cfs.gcBefore(nowInSec()),
+                      oldestUnrepairedTombstone(),
+                      cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
+                      cfs.metadata.enforceStrictLiveness());
             }
 
             protected Predicate<Long> getPurgeEvaluator()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
index 9f0984f..bea365c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
@@ -266,7 +266,12 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
 
         private Purger(boolean isForThrift, CompactionController controller, int nowInSec)
         {
-            super(isForThrift, nowInSec, controller.gcBefore, controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE, controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
+            super(isForThrift,
+                  nowInSec,
+                  controller.gcBefore,
+                  controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE,
+                  controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
+                  controller.cfs.metadata.enforceStrictLiveness());
             this.controller = controller;
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/filter/RowFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java b/src/java/org/apache/cassandra/db/filter/RowFilter.java
index 8d11038..9f3b868 100644
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@ -148,7 +148,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression>
     public boolean isSatisfiedBy(CFMetaData metadata, DecoratedKey partitionKey, Row row, int nowInSec)
     {
         // We purge all tombstones as the expressions isSatisfiedBy methods expects it
-        Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
         if (purged == null)
             return expressions.isEmpty();
 
@@ -290,7 +290,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression>
 
                 public Row applyToRow(Row row)
                 {
-                    Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+                    Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
                     if (purged == null)
                         return null;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
index 6679bdf..5cc9145 100644
--- a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
+++ b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
@@ -28,9 +28,16 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
     private final boolean isForThrift;
     private final DeletionPurger purger;
     private final int nowInSec;
+
+    private final boolean enforceStrictLiveness;
     private boolean isReverseOrder;
 
-    public PurgeFunction(boolean isForThrift, int nowInSec, int gcBefore, int oldestUnrepairedTombstone, boolean onlyPurgeRepairedTombstones)
+    public PurgeFunction(boolean isForThrift,
+                         int nowInSec,
+                         int gcBefore,
+                         int oldestUnrepairedTombstone,
+                         boolean onlyPurgeRepairedTombstones,
+                         boolean enforceStrictLiveness)
     {
         this.isForThrift = isForThrift;
         this.nowInSec = nowInSec;
@@ -38,6 +45,7 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
                       !(onlyPurgeRepairedTombstones && localDeletionTime >= oldestUnrepairedTombstone)
                       && localDeletionTime < gcBefore
                       && getPurgeEvaluator().test(timestamp);
+        this.enforceStrictLiveness = enforceStrictLiveness;
     }
 
     protected abstract Predicate<Long> getPurgeEvaluator();
@@ -84,14 +92,14 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
     protected Row applyToStatic(Row row)
     {
         updateProgress();
-        return row.purge(purger, nowInSec);
+        return row.purge(purger, nowInSec, enforceStrictLiveness);
     }
 
     @Override
     protected Row applyToRow(Row row)
     {
         updateProgress();
-        return row.purge(purger, nowInSec);
+        return row.purge(purger, nowInSec, enforceStrictLiveness);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 41dad0a..b07960c 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -334,7 +334,7 @@ public class BTreeRow extends AbstractRow
              : new BTreeRow(clustering, primaryKeyLivenessInfo, Deletion.regular(newDeletion), btree, Integer.MIN_VALUE);
     }
 
-    public Row purge(DeletionPurger purger, int nowInSec)
+    public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness)
     {
         if (!hasDeletion(nowInSec))
             return this;
@@ -342,6 +342,10 @@ public class BTreeRow extends AbstractRow
         LivenessInfo newInfo = purger.shouldPurge(primaryKeyLivenessInfo, nowInSec) ? LivenessInfo.EMPTY : primaryKeyLivenessInfo;
         Deletion newDeletion = purger.shouldPurge(deletion.time()) ? Deletion.LIVE : deletion;
 
+        // when enforceStrictLiveness is set, a row is considered dead when it's PK liveness info is not present
+        if (enforceStrictLiveness && newDeletion.isLive() && newInfo.isEmpty())
+            return null;
+
         return transformAndFilter(newInfo, newDeletion, (cd) -> cd.purge(purger, nowInSec));
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 9ab1f09..3bcc220 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -200,10 +200,20 @@ public interface Row extends Unfiltered, Collection<ColumnData>
      *
      * @param purger the {@code DeletionPurger} to use to decide what can be purged.
      * @param nowInSec the current time to decide what is deleted and what isn't (in the case of expired cells).
+     * @param enforceStrictLiveness whether the row should be purged if there is no PK liveness info,
+     *                              normally retrieved from {@link CFMetaData#enforceStrictLiveness()}
+     *
+     *        When enforceStrictLiveness is set, rows with empty PK liveness info
+     *        and no row deletion are purged.
+     *
+     *        Currently this is only used by views with normal base column as PK column
+     *        so updates to other base columns do not make the row live when the PK column
+     *        is not live. See CASSANDRA-11500.
+     *
      * @return this row but without any deletion info purged by {@code purger}. If the purged row is empty, returns
      * {@code null}.
      */
-    public Row purge(DeletionPurger purger, int nowInSec);
+    public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness);
 
     /**
      * Returns a copy of this row where all counter cells have they "local" shard marked for clearing.
@@ -215,7 +225,7 @@ public interface Row extends Unfiltered, Collection<ColumnData>
      * timestamp by {@code newTimestamp - 1}.
      *
      * @param newTimestamp the timestamp to use for all live data in the returned row.
-     * @param a copy of this row with timestamp updated using {@code newTimestamp}. This can return {@code null} in the
+     * @return a copy of this row with timestamp updated using {@code newTimestamp}. This can return {@code null} in the
      * rare where the row only as a shadowable row deletion and the new timestamp supersedes it.
      *
      * @see Commit for why we need this.
@@ -277,6 +287,7 @@ public interface Row extends Unfiltered, Collection<ColumnData>
             return time.isLive() ? LIVE : new Deletion(time, false);
         }
 
+        @Deprecated
         public static Deletion shadowable(DeletionTime time)
         {
             return new Deletion(time, true);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
index bdc8388..c4684e1 100644
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
@@ -88,6 +88,11 @@ public class UnfilteredSerializer
      * Extended flags
      */
     private final static int IS_STATIC               = 0x01; // Whether the encoded row is a static. If there is no extended flag, the row is assumed not static.
+    /**
+     * A shadowable tombstone cannot replace a previous row deletion otherwise it could resurrect a
+     * previously deleted cell not updated by a subsequent update, SEE CASSANDRA-11500
+     */
+    @Deprecated
     private final static int HAS_SHADOWABLE_DELETION = 0x02; // Whether the row deletion is shadowable. If there is no extended flag (or no row deletion), the deletion is assumed not shadowable.
 
     public void serialize(Unfiltered unfiltered, SerializationHeader header, DataOutputPlus out, int version)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/Filter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/Filter.java b/src/java/org/apache/cassandra/db/transform/Filter.java
index 747983f..48a1634 100644
--- a/src/java/org/apache/cassandra/db/transform/Filter.java
+++ b/src/java/org/apache/cassandra/db/transform/Filter.java
@@ -26,10 +26,12 @@ import org.apache.cassandra.db.rows.*;
 public final class Filter extends Transformation
 {
     private final int nowInSec;
+    private final boolean enforceStrictLiveness;
 
-    public Filter(int nowInSec)
+    public Filter(int nowInSec, boolean enforceStrictLiveness)
     {
         this.nowInSec = nowInSec;
+        this.enforceStrictLiveness = enforceStrictLiveness;
     }
 
     @Override
@@ -46,14 +48,14 @@ public final class Filter extends Transformation
         if (row.isEmpty())
             return Rows.EMPTY_STATIC_ROW;
 
-        row = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        row = row.purge(DeletionPurger.PURGE_ALL, nowInSec, enforceStrictLiveness);
         return row == null ? Rows.EMPTY_STATIC_ROW : row;
     }
 
     @Override
     protected Row applyToRow(Row row)
     {
-        return row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        return row.purge(DeletionPurger.PURGE_ALL, nowInSec, enforceStrictLiveness);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
index ad9446d..b835a6b 100644
--- a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
@@ -52,7 +52,9 @@ public final class FilteredPartitions extends BasePartitions<RowIterator, BasePa
      */
     public static FilteredPartitions filter(UnfilteredPartitionIterator iterator, int nowInSecs)
     {
-        FilteredPartitions filtered = filter(iterator, new Filter(nowInSecs));
+        FilteredPartitions filtered = filter(iterator,
+                                             new Filter(nowInSecs,
+                                                        iterator.metadata().enforceStrictLiveness()));
 
         return iterator.isForThrift()
              ? filtered

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/FilteredRows.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/FilteredRows.java b/src/java/org/apache/cassandra/db/transform/FilteredRows.java
index 5b635eb..349183c 100644
--- a/src/java/org/apache/cassandra/db/transform/FilteredRows.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredRows.java
@@ -55,6 +55,6 @@ public final class FilteredRows extends BaseRows<Row, BaseRowIterator<?>> implem
      */
     public static RowIterator filter(UnfilteredRowIterator iterator, int nowInSecs)
     {
-        return new Filter(nowInSecs).applyToPartition(iterator);
+        return new Filter(nowInSecs, iterator.metadata().enforceStrictLiveness()).applyToPartition(iterator);
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/TableViews.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/TableViews.java b/src/java/org/apache/cassandra/db/view/TableViews.java
index 1a3cbb1..d2d4a45 100644
--- a/src/java/org/apache/cassandra/db/view/TableViews.java
+++ b/src/java/org/apache/cassandra/db/view/TableViews.java
@@ -159,6 +159,7 @@ public class TableViews extends AbstractCollection<View>
      * but has simply some updated values. This will be empty for view building as we want to assume anything we'll pass
      * to {@code updates} is new.
      * @param nowInSec the current time in seconds.
+     * @param separateUpdates, if false, mutation is per partition.
      * @return the mutations to apply to the {@code views}. This can be empty.
      */
     public Iterator<Collection<Mutation>> generateViewUpdates(Collection<View> views,
@@ -282,7 +283,10 @@ public class TableViews extends AbstractCollection<View>
                             continue;
 
                         Row updateRow = (Row) update;
-                        addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                        addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                                  updateRow,
+                                                  generators,
+                                                  nowInSec);
 
                         // If the updates have been filtered, then we won't have any mutations; we need to make sure that we
                         // only return if the mutations are empty. Otherwise, we continue to search for an update which is
@@ -321,7 +325,10 @@ public class TableViews extends AbstractCollection<View>
                     continue;
 
                 Row updateRow = (Row) update;
-                addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                          updateRow,
+                                          generators,
+                                          nowInSec);
             }
 
             return Iterators.singletonIterator(buildMutations(baseTableMetadata, generators));
@@ -419,11 +426,12 @@ public class TableViews extends AbstractCollection<View>
         ClusteringIndexFilter clusteringFilter = names == null
                                                ? new ClusteringIndexSliceFilter(sliceBuilder.build(), false)
                                                : new ClusteringIndexNamesFilter(names, false);
+        // since unselected columns also affect view liveness, we need to query all base columns if base and view have same key columns.
         // If we have more than one view, we should merge the queried columns by each views but to keep it simple we just
         // include everything. We could change that in the future.
-        ColumnFilter queriedColumns = views.size() == 1
-                                    ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
-                                    : ColumnFilter.all(metadata);
+        ColumnFilter queriedColumns = views.size() == 1 && metadata.enforceStrictLiveness()
+                                   ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
+                                   : ColumnFilter.all(metadata);
         // Note that the views could have restrictions on regular columns, but even if that's the case we shouldn't apply those
         // when we read, because even if an existing row doesn't match the view filter, the update can change that in which
         // case we'll need to know the existing content. There is also no easy way to merge those RowFilter when we have multiple views.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/View.java b/src/java/org/apache/cassandra/db/view/View.java
index e471349..58e2a84 100644
--- a/src/java/org/apache/cassandra/db/view/View.java
+++ b/src/java/org/apache/cassandra/db/view/View.java
@@ -60,7 +60,6 @@ public class View
 
     public volatile List<ColumnDefinition> baseNonPKColumnsInViewPK;
 
-    private final boolean includeAllColumns;
     private ViewBuilder builder;
 
     // Only the raw statement can be final, because the statement cannot always be prepared when the MV is initialized.
@@ -75,7 +74,6 @@ public class View
     {
         this.baseCfs = baseCfs;
         this.name = definition.viewName;
-        this.includeAllColumns = definition.includeAllColumns;
         this.rawSelect = definition.select;
 
         updateDefinition(definition);
@@ -95,8 +93,6 @@ public class View
     public void updateDefinition(ViewDefinition definition)
     {
         this.definition = definition;
-
-        CFMetaData viewCfm = definition.metadata;
         List<ColumnDefinition> nonPKDefPartOfViewPK = new ArrayList<>();
         for (ColumnDefinition baseColumn : baseCfs.metadata.allColumns())
         {
@@ -148,21 +144,7 @@ public class View
         //    neither included in the view, nor used by the view filter).
         if (!getReadQuery().selectsClustering(partitionKey, update.clustering()))
             return false;
-
-        // We want to find if the update modify any of the columns that are part of the view (in which case the view is affected).
-        // But if the view include all the base table columns, or the update has either a row deletion or a row liveness (note
-        // that for the liveness, it would be more "precise" to check if it's live, but pushing an update that is already expired
-        // is dump so it's ok not to optimize for it and it saves us from having to pass nowInSec to the method), we know the view
-        // is affected right away.
-        if (includeAllColumns || !update.deletion().isLive() || !update.primaryKeyLivenessInfo().isEmpty())
-            return true;
-
-        for (ColumnData data : update)
-        {
-            if (definition.metadata.getColumnDefinition(data.column().name) != null)
-                return true;
-        }
-        return false;
+        return true;
     }
 
     /**
@@ -293,4 +275,27 @@ public class View
 
         return expressions.stream().collect(Collectors.joining(" AND "));
     }
+
+    public boolean hasSamePrimaryKeyColumnsAsBaseTable()
+    {
+        return baseNonPKColumnsInViewPK.isEmpty();
+    }
+
+    /**
+     * When views contains a primary key column that is not part
+     * of the base table primary key, we use that column liveness
+     * info as the view PK, to ensure that whenever that column
+     * is not live in the base, the row is not live in the view.
+     *
+     * This is done to prevent cells other than the view PK from
+     * making the view row alive when the view PK column is not
+     * live in the base. So in this case we tie the row liveness,
+     * to the primary key liveness.
+     *
+     * See CASSANDRA-11500 for context.
+     */
+    public boolean enforceStrictLiveness()
+    {
+        return !baseNonPKColumnsInViewPK.isEmpty();
+    }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
index 0a0fa7b..d1cfd9e 100644
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -161,6 +161,11 @@ public class ViewManager
         SystemKeyspace.setViewRemoved(keyspace.getName(), view.name);
     }
 
+    public View getByName(String name)
+    {
+        return viewsByName.get(name);
+    }
+
     public void buildAllViews()
     {
         for (View view : allViews())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index edb88d0..0c8e078 100644
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@ -70,7 +70,7 @@ public class ViewUpdateGenerator
         UPDATE_EXISTING, // There was an entry and the update modifies it
         SWITCH_ENTRY     // There was an entry and there is still one after update,
                          // but they are not the same one.
-    };
+    }
 
     /**
      * Creates a new {@code ViewUpdateBuilder}.
@@ -121,14 +121,14 @@ public class ViewUpdateGenerator
                 createEntry(mergedBaseRow);
                 return;
             case DELETE_OLD:
-                deleteOldEntry(existingBaseRow);
+                deleteOldEntry(existingBaseRow, mergedBaseRow);
                 return;
             case UPDATE_EXISTING:
                 updateEntry(existingBaseRow, mergedBaseRow);
                 return;
             case SWITCH_ENTRY:
                 createEntry(mergedBaseRow);
-                deleteOldEntry(existingBaseRow);
+                deleteOldEntry(existingBaseRow, mergedBaseRow);
                 return;
         }
     }
@@ -180,6 +180,7 @@ public class ViewUpdateGenerator
         }
 
         assert view.baseNonPKColumnsInViewPK.size() <= 1 : "We currently only support one base non-PK column in the view PK";
+
         if (view.baseNonPKColumnsInViewPK.isEmpty())
         {
             // The view entry is necessarily the same pre and post update.
@@ -204,7 +205,9 @@ public class ViewUpdateGenerator
         if (!isLive(before))
             return isLive(after) ? UpdateAction.NEW_ENTRY : UpdateAction.NONE;
         if (!isLive(after))
+        {
             return UpdateAction.DELETE_OLD;
+        }
 
         return baseColumn.cellValueType().compare(before.value(), after.value()) == 0
              ? UpdateAction.UPDATE_EXISTING
@@ -269,7 +272,7 @@ public class ViewUpdateGenerator
         }
         if (!matchesViewFilter(mergedBaseRow))
         {
-            deleteOldEntryInternal(existingBaseRow);
+            deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
             return;
         }
 
@@ -281,6 +284,12 @@ public class ViewUpdateGenerator
         currentViewEntryBuilder.addPrimaryKeyLivenessInfo(computeLivenessInfoForEntry(mergedBaseRow));
         currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
 
+        addDifferentCells(existingBaseRow, mergedBaseRow);
+        submitUpdate();
+    }
+
+    private void addDifferentCells(Row existingBaseRow, Row mergedBaseRow)
+    {
         // We only add to the view update the cells from mergedBaseRow that differs from
         // existingBaseRow. For that and for speed we can just cell pointer equality: if the update
         // hasn't touched a cell, we know it will be the same object in existingBaseRow and
@@ -362,8 +371,6 @@ public class ViewUpdateGenerator
                 addCell(viewColumn, (Cell)mergedData);
             }
         }
-
-        submitUpdate();
     }
 
     /**
@@ -371,20 +378,40 @@ public class ViewUpdateGenerator
      * <p>
      * This method checks that the base row does match the view filter before bothering.
      */
-    private void deleteOldEntry(Row existingBaseRow)
+    private void deleteOldEntry(Row existingBaseRow, Row mergedBaseRow)
     {
         // Before deleting an old entry, make sure it was matching the view filter (otherwise there is nothing to delete)
         if (!matchesViewFilter(existingBaseRow))
             return;
 
-        deleteOldEntryInternal(existingBaseRow);
+        deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
     }
 
-    private void deleteOldEntryInternal(Row existingBaseRow)
+    private void deleteOldEntryInternal(Row existingBaseRow, Row mergedBaseRow)
     {
         startNewUpdate(existingBaseRow);
-        DeletionTime dt = new DeletionTime(computeTimestampForEntryDeletion(existingBaseRow), nowInSec);
-        currentViewEntryBuilder.addRowDeletion(Row.Deletion.shadowable(dt));
+        long timestamp = computeTimestampForEntryDeletion(existingBaseRow, mergedBaseRow);
+        long rowDeletion = mergedBaseRow.deletion().time().markedForDeleteAt();
+        assert timestamp >= rowDeletion;
+
+        // If computed deletion timestamp greater than row deletion, it must be coming from
+        //  1. non-pk base column used in view pk, or
+        //  2. unselected base column
+        //  any case, we need to use it as expired livenessInfo
+        // If computed deletion timestamp is from row deletion, we only need row deletion itself
+        if (timestamp > rowDeletion)
+        {
+            /**
+              * TODO: This is a hack and overload of LivenessInfo and we should probably modify
+              * the storage engine to properly support this, but on the meantime this
+              * should be fine because it only happens in some specific scenarios explained above.
+              */
+            LivenessInfo info = LivenessInfo.create(timestamp, Integer.MAX_VALUE, nowInSec);
+            currentViewEntryBuilder.addPrimaryKeyLivenessInfo(info);
+        }
+        currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
+
+        addDifferentCells(existingBaseRow, mergedBaseRow);
         submitUpdate();
     }
 
@@ -413,78 +440,92 @@ public class ViewUpdateGenerator
 
     private LivenessInfo computeLivenessInfoForEntry(Row baseRow)
     {
-        /*
-         * We need to compute both the timestamp and expiration.
+        /**
+         * There 3 cases:
+         *  1. No extra primary key in view and all base columns are selected in MV. all base row's components(livenessInfo,
+         *     deletion, cells) are same as view row. Simply map base components to view row.
+         *  2. There is a base non-key column used in view pk. This base non-key column determines the liveness of view row. view's row level
+         *     info should based on this column.
+         *  3. Most tricky case is no extra primary key in view and some base columns are not selected in MV. We cannot use 1 livenessInfo or
+         *     row deletion to represent the liveness of unselected column properly, see CASSANDRA-11500.
+         *     We could make some simplification: the unselected columns will be used only when it affects view row liveness. eg. if view row
+         *     already exists and not expiring, there is no need to use unselected columns.
+         *     Note: if the view row is removed due to unselected column removal(ttl or cell tombstone), we will have problem keeping view
+         *     row alive with a smaller or equal timestamp than the max unselected column timestamp.
          *
-         * For the timestamp, it makes sense to use the bigger timestamp for all view PK columns.
-         *
-         * This is more complex for the expiration. We want to maintain consistency between the base and the view, so the
-         * entry should only exist as long as the base row exists _and_ has non-null values for all the columns that are part
-         * of the view PK.
-         * Which means we really have 2 cases:
-         *   1) either the columns for the base and view PKs are exactly the same: in that case, the view entry should live
-         *      as long as the base row lives. This means the view entry should only expire once *everything* in the base row
-         *      has expired. Which means the row TTL should be the max of any other TTL.
-         *   2) or there is a column that is not in the base PK but is in the view PK (we can only have one so far, we'll need
-         *      to slightly adapt if we allow more later): in that case, as long as that column lives the entry does too, but
-         *      as soon as it expires (or is deleted for that matter) the entry also should expire. So the expiration for the
-         *      view is the one of that column, irregarding of any other expiration.
-         *      To take an example of that case, if you have:
-         *        CREATE TABLE t (a int, b int, c int, PRIMARY KEY (a, b))
-         *        CREATE MATERIALIZED VIEW mv AS SELECT * FROM t WHERE c IS NOT NULL AND a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (c, a, b)
-         *        INSERT INTO t(a, b) VALUES (0, 0) USING TTL 3;
-         *        UPDATE t SET c = 0 WHERE a = 0 AND b = 0;
-         *      then even after 3 seconds elapsed, the row will still exist (it just won't have a "row marker" anymore) and so
-         *      the MV should still have a corresponding entry.
          */
         assert view.baseNonPKColumnsInViewPK.size() <= 1; // This may change, but is currently an enforced limitation
 
         LivenessInfo baseLiveness = baseRow.primaryKeyLivenessInfo();
 
-        if (view.baseNonPKColumnsInViewPK.isEmpty())
+        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
         {
-            int ttl = baseLiveness.ttl();
-            int expirationTime = baseLiveness.localExpirationTime();
+            if (view.getDefinition().includeAllColumns)
+                return baseLiveness;
+
+            long timestamp = baseLiveness.timestamp();
+            boolean hasNonExpiringLiveCell = false;
+            Cell biggestExpirationCell = null;
             for (Cell cell : baseRow.cells())
             {
-                if (cell.ttl() > ttl)
+                if (view.getViewColumn(cell.column()) != null)
+                    continue;
+                if (!isLive(cell))
+                    continue;
+                timestamp = Math.max(timestamp, cell.maxTimestamp());
+                if (!cell.isExpiring())
+                    hasNonExpiringLiveCell = true;
+                else
                 {
-                    ttl = cell.ttl();
-                    expirationTime = cell.localDeletionTime();
+                    if (biggestExpirationCell == null)
+                        biggestExpirationCell = cell;
+                    else if (cell.localDeletionTime() > biggestExpirationCell.localDeletionTime())
+                        biggestExpirationCell = cell;
                 }
             }
-            return ttl == baseLiveness.ttl()
-                 ? baseLiveness
-                 : LivenessInfo.create(baseLiveness.timestamp(), ttl, expirationTime);
+            if (baseLiveness.isLive(nowInSec) && !baseLiveness.isExpiring())
+                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
+            if (hasNonExpiringLiveCell)
+                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
+            if (biggestExpirationCell == null)
+                return baseLiveness;
+            if (biggestExpirationCell.localDeletionTime() > baseLiveness.localExpirationTime()
+                    || !baseLiveness.isLive(nowInSec))
+                return LivenessInfo.create(timestamp,
+                                                       biggestExpirationCell.ttl(),
+                                                       biggestExpirationCell.localDeletionTime());
+            return baseLiveness;
         }
 
-        ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0);
-        Cell cell = baseRow.getCell(baseColumn);
+        Cell cell = baseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
         assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry";
 
-        long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
-        return LivenessInfo.create(timestamp, cell.ttl(), cell.localDeletionTime());
+        return LivenessInfo.create(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
     }
 
-    private long computeTimestampForEntryDeletion(Row baseRow)
+    private long computeTimestampForEntryDeletion(Row existingBaseRow, Row mergedBaseRow)
     {
-        // We delete the old row with it's row entry timestamp using a shadowable deletion.
-        // We must make sure that the deletion deletes everything in the entry (or the entry will
-        // still show up), so we must use the bigger timestamp found in the existing row (for any
-        // column included in the view at least).
-        // TODO: We have a problem though: if the entry is "resurected" by a later update, we would
-        // need to ensure that the timestamp for then entry then is bigger than the tombstone
-        // we're just inserting, which is not currently guaranteed.
-        // This is a bug for a separate ticket though.
-        long timestamp = baseRow.primaryKeyLivenessInfo().timestamp();
-        for (ColumnData data : baseRow)
+        DeletionTime deletion = mergedBaseRow.deletion().time();
+        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
         {
-            if (!view.getDefinition().includes(data.column().name))
-                continue;
+            long timestamp = Math.max(deletion.markedForDeleteAt(), existingBaseRow.primaryKeyLivenessInfo().timestamp());
+            if (view.getDefinition().includeAllColumns)
+                return timestamp;
 
-            timestamp = Math.max(timestamp, data.maxTimestamp());
+            for (Cell cell : existingBaseRow.cells())
+            {
+                // selected column should not contribute to view deletion, itself is already included in view row
+                if (view.getViewColumn(cell.column()) != null)
+                    continue;
+                // unselected column is used regardless live or dead, because we don't know if it was used for liveness.
+                timestamp = Math.max(timestamp, cell.maxTimestamp());
+            }
+            return timestamp;
         }
-        return timestamp;
+        // has base non-pk column in view pk
+        Cell before = existingBaseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
+        assert isLive(before) : "We shouldn't have got there if the base row had no associated entry";
+        return deletion.deletes(before) ? deletion.markedForDeleteAt() : before.timestamp();
     }
 
     private void addColumnData(ColumnDefinition viewColumn, ColumnData baseTableData)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DataResolver.java b/src/java/org/apache/cassandra/service/DataResolver.java
index 72c4950..c59d688 100644
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@ -86,7 +86,9 @@ public class DataResolver extends ResponseResolver
         DataLimits.Counter counter = command.limits().newCounter(command.nowInSec(), true, command.selectsFullPartition());
 
         UnfilteredPartitionIterator merged = mergeWithShortReadProtection(iters, sources, counter);
-        FilteredPartitions filtered = FilteredPartitions.filter(merged, new Filter(command.nowInSec()));
+        FilteredPartitions filtered = FilteredPartitions.filter(merged,
+                                                                new Filter(command.nowInSec(),
+                                                                           command.metadata().enforceStrictLiveness()));
         PartitionIterator counted = counter.applyTo(filtered);
 
         return command.isForThrift()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 40aec88..3c0cefc 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -1001,7 +1001,7 @@ public abstract class CQLTester
         assert ignoreExtra || expectedRows.size() == actualRows.size();
     }
 
-    private static List<String> makeRowStrings(UntypedResultSet resultSet)
+    protected static List<String> makeRowStrings(UntypedResultSet resultSet)
     {
         List<List<ByteBuffer>> rows = new ArrayList<>();
         for (UntypedResultSet.Row row : resultSet)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[14/16] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
index cb15e83,6803230..f2d8f2a
--- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
@@@ -80,7 -84,7 +81,7 @@@ public class ViewFilteringTest extends 
      {
          executeNet(protocolVersion, query, params);
          while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
--            && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
++                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
          {
              Thread.sleep(1);
          }
@@@ -92,6 -96,324 +93,318 @@@
          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
++    // TODO will revise the non-pk filter condition in MV, see CASSANDRA-11500
+     @Ignore
+     @Test
+     public void testViewFilteringWithFlush() throws Throwable
+     {
+         testViewFiltering(true);
+     }
+ 
 -    // TODO will revise the non-pk filter condition in MV, see CASSANDRA-13826
++    // TODO will revise the non-pk filter condition in MV, see CASSANDRA-11500
+     @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
++    // TODO will revise the non-pk filter condition in MV, see CASSANDRA-11500
+     @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
      {
@@@ -1440,61 -1753,61 +1753,61 @@@
                               "udtval";
  
          createTable(
-                 "CREATE TABLE %s (" +
-                         "asciival ascii, " +
-                         "bigintval bigint, " +
-                         "blobval blob, " +
-                         "booleanval boolean, " +
-                         "dateval date, " +
-                         "decimalval decimal, " +
-                         "doubleval double, " +
-                         "floatval float, " +
-                         "inetval inet, " +
-                         "intval int, " +
-                         "textval text, " +
-                         "timeval time, " +
-                         "timestampval timestamp, " +
-                         "timeuuidval timeuuid, " +
-                         "uuidval uuid," +
-                         "varcharval varchar, " +
-                         "varintval varint, " +
-                         "frozenlistval frozen<list<int>>, " +
-                         "frozensetval frozen<set<uuid>>, " +
-                         "frozenmapval frozen<map<ascii, int>>," +
-                         "tupleval frozen<tuple<int, ascii, uuid>>," +
-                         "udtval frozen<" + myType + ">, " +
-                         "PRIMARY KEY (" + columnNames + "))");
 -                    "CREATE TABLE %s (" +
 -                            "asciival ascii, " +
 -                            "bigintval bigint, " +
 -                            "blobval blob, " +
 -                            "booleanval boolean, " +
 -                            "dateval date, " +
 -                            "decimalval decimal, " +
 -                            "doubleval double, " +
 -                            "floatval float, " +
 -                            "inetval inet, " +
 -                            "intval int, " +
 -                            "textval text, " +
 -                            "timeval time, " +
 -                            "timestampval timestamp, " +
 -                            "timeuuidval timeuuid, " +
 -                            "uuidval uuid," +
 -                            "varcharval varchar, " +
 -                            "varintval varint, " +
 -                            "frozenlistval frozen<list<int>>, " +
 -                            "frozensetval frozen<set<uuid>>, " +
 -                            "frozenmapval frozen<map<ascii, int>>," +
 -                            "tupleval frozen<tuple<int, ascii, uuid>>," +
 -                            "udtval frozen<" + myType + ">, " +
 -                            "PRIMARY KEY (" + columnNames + "))");
++        "CREATE TABLE %s (" +
++        "asciival ascii, " +
++        "bigintval bigint, " +
++        "blobval blob, " +
++        "booleanval boolean, " +
++        "dateval date, " +
++        "decimalval decimal, " +
++        "doubleval double, " +
++        "floatval float, " +
++        "inetval inet, " +
++        "intval int, " +
++        "textval text, " +
++        "timeval time, " +
++        "timestampval timestamp, " +
++        "timeuuidval timeuuid, " +
++        "uuidval uuid," +
++        "varcharval varchar, " +
++        "varintval varint, " +
++        "frozenlistval frozen<list<int>>, " +
++        "frozensetval frozen<set<uuid>>, " +
++        "frozenmapval frozen<map<ascii, int>>," +
++        "tupleval frozen<tuple<int, ascii, uuid>>," +
++        "udtval frozen<" + myType + ">, " +
++        "PRIMARY KEY (" + columnNames + "))");
  
          execute("USE " + keyspace());
          executeNet(protocolVersion, "USE " + keyspace());
  
  
          createView(
-                 "mv_test",
-                 "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
-                         "asciival = 'abc' AND " +
-                         "bigintval = 123 AND " +
-                         "blobval = 0xfeed AND " +
-                         "booleanval = true AND " +
-                         "dateval = '1987-03-23' AND " +
-                         "decimalval = 123.123 AND " +
-                         "doubleval = 123.123 AND " +
-                         "floatval = 123.123 AND " +
-                         "inetval = '127.0.0.1' AND " +
-                         "intval = 123 AND " +
-                         "textval = 'abc' AND " +
-                         "timeval = '07:35:07.000111222' AND " +
-                         "timestampval = 123123123 AND " +
-                         "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                         "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                         "varcharval = 'abc' AND " +
-                         "varintval = 123123123 AND " +
-                         "frozenlistval = [1, 2, 3] AND " +
-                         "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
-                         "frozenmapval = {'a': 1, 'b': 2} AND " +
-                         "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
-                         "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
-                         "PRIMARY KEY (" + columnNames + ")");
 -                   "mv_test",
 -                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
 -                           "asciival = 'abc' AND " +
 -                           "bigintval = 123 AND " +
 -                           "blobval = 0xfeed AND " +
 -                           "booleanval = true AND " +
 -                           "dateval = '1987-03-23' AND " +
 -                           "decimalval = 123.123 AND " +
 -                           "doubleval = 123.123 AND " +
 -                           "floatval = 123.123 AND " +
 -                           "inetval = '127.0.0.1' AND " +
 -                           "intval = 123 AND " +
 -                           "textval = 'abc' AND " +
 -                           "timeval = '07:35:07.000111222' AND " +
 -                           "timestampval = 123123123 AND " +
 -                           "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
 -                           "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
 -                           "varcharval = 'abc' AND " +
 -                           "varintval = 123123123 AND " +
 -                           "frozenlistval = [1, 2, 3] AND " +
 -                           "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
 -                           "frozenmapval = {'a': 1, 'b': 2} AND " +
 -                           "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
 -                           "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
 -                           "PRIMARY KEY (" + columnNames + ")");
++        "mv_test",
++        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
++        "asciival = 'abc' AND " +
++        "bigintval = 123 AND " +
++        "blobval = 0xfeed AND " +
++        "booleanval = true AND " +
++        "dateval = '1987-03-23' AND " +
++        "decimalval = 123.123 AND " +
++        "doubleval = 123.123 AND " +
++        "floatval = 123.123 AND " +
++        "inetval = '127.0.0.1' AND " +
++        "intval = 123 AND " +
++        "textval = 'abc' AND " +
++        "timeval = '07:35:07.000111222' AND " +
++        "timestampval = 123123123 AND " +
++        "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
++        "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
++        "varcharval = 'abc' AND " +
++        "varintval = 123123123 AND " +
++        "frozenlistval = [1, 2, 3] AND " +
++        "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
++        "frozenmapval = {'a': 1, 'b': 2} AND " +
++        "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
++        "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
++        "PRIMARY KEY (" + columnNames + ")");
  
          execute("INSERT INTO %s (" + columnNames + ") VALUES (" +
                  "'abc'," +
@@@ -1568,77 -1881,77 +1881,77 @@@
              Thread.sleep(10);
  
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 0),
--            row(1, 1, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 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, 2, 0);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 0),
--            row(1, 1, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 0),
++                                row(1, 1, 1, 0)
          );
  
          // insert new row that does match the filter
          execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 0),
--            row(1, 1, 1, 0),
--            row(1, 2, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 0),
++                                row(1, 1, 1, 0),
++                                row(1, 2, 1, 0)
          );
  
          // update rows that don't match the filter
          execute("UPDATE %s SET d = ? WHERE a = ? AND b = ?", 2, 2, 0);
          execute("UPDATE %s SET d = ? WHERE a = ? AND b = ?", 1, 2, 1);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 0),
--            row(1, 1, 1, 0),
--            row(1, 2, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 0),
++                                row(1, 1, 1, 0),
++                                row(1, 2, 1, 0)
          );
  
          // update a row that does match the filter
          execute("UPDATE %s SET d = ? WHERE a = ? AND b = ?", 1, 1, 0);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 1),
--            row(1, 1, 1, 0),
--            row(1, 2, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 1),
++                                row(1, 1, 1, 0),
++                                row(1, 2, 1, 0)
          );
  
          // delete rows that don't match the filter
          execute("DELETE FROM %s WHERE a = ? AND b = ?", 2, 0);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 1),
--            row(1, 1, 1, 0),
--            row(1, 2, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 1),
++                                row(1, 1, 1, 0),
++                                row(1, 2, 1, 0)
          );
  
          // delete a row that does match the filter
          execute("DELETE FROM %s WHERE a = ? AND b = ?", 1, 2);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0),
--            row(1, 0, 1, 1),
--            row(1, 1, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0),
++                                row(1, 0, 1, 1),
++                                row(1, 1, 1, 0)
          );
  
          // delete a partition that matches the filter
          execute("DELETE FROM %s WHERE a = ?", 1);
          assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test"),
--            row(0, 0, 1, 0),
--            row(0, 1, 1, 0)
++                                row(0, 0, 1, 0),
++                                row(0, 1, 1, 0)
          );
  
          dropView("mv_test");
@@@ -1726,6 -2039,6 +2039,7 @@@
  
          //Tombstone c
          executeNet(protocolVersion, "DELETE FROM %s WHERE a = ? and b = ?", 0, 0);
++        assertRowsIgnoringOrder(execute("SELECT d from mv"));
          assertRows(execute("SELECT d from mv"));
  
          //Add back without D
@@@ -1745,18 -2058,18 +2059,18 @@@
          // delete with timestamp 0 (which should only delete d)
          executeNet(protocolVersion, "DELETE FROM %s USING TIMESTAMP 0 WHERE a = ? AND b = ?", 1, 0);
          assertRows(execute("SELECT a, b, c, d, e from mv WHERE c = ? and a = ? and b = ?", 1, 1, 0),
--            row(1, 0, 1, null, 0)
++                   row(1, 0, 1, null, 0)
          );
  
          executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 2 SET c = ? WHERE a = ? AND b = ?", 1, 1, 1);
          executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET c = ? WHERE a = ? AND b = ?", 1, 1, 0);
          assertRows(execute("SELECT a, b, c, d, e from mv WHERE c = ? and a = ? and b = ?", 1, 1, 0),
--            row(1, 0, 1, null, 0)
++                   row(1, 0, 1, null, 0)
          );
  
          executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET d = ? WHERE a = ? AND b = ?", 0, 1, 0);
          assertRows(execute("SELECT a, b, c, d, e from mv WHERE c = ? and a = ? and b = ?", 1, 1, 0),
--            row(1, 0, 1, 0, 0)
++                   row(1, 0, 1, 0, 0)
          );
      }
  
@@@ -1766,9 -2079,9 +2080,9 @@@
          // Regression test for CASSANDRA-10910
  
          createTable("CREATE TABLE %s (" +
--            "k int PRIMARY KEY, " +
--            "c int, " +
--            "val int)");
++                    "k int PRIMARY KEY, " +
++                    "c int, " +
++                    "val int)");
  
          execute("USE " + keyspace());
          executeNet(protocolVersion, "USE " + keyspace());
@@@ -1794,10 -2107,10 +2108,10 @@@
      public void testOldTimestampsWithRestrictions() throws Throwable
      {
          createTable("CREATE TABLE %s (" +
--            "k int, " +
--            "c int, " +
--            "val text, " + "" +
--            "PRIMARY KEY(k, c))");
++                    "k int, " +
++                    "c int, " +
++                    "val text, " + "" +
++                    "PRIMARY KEY(k, c))");
  
          execute("USE " + keyspace());
          executeNet(protocolVersion, "USE " + keyspace());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/test/unit/org/apache/cassandra/cql3/ViewTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewTest.java
index e65ea31,a4d227a..9421264
--- a/test/unit/org/apache/cassandra/cql3/ViewTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java
@@@ -122,7 -121,7 +121,6 @@@ public class ViewTest extends CQLTeste
          Assert.assertEquals(0, execute("select * from view1").size());
      }
  
--
      @Test
      public void createMvWithUnrestrictedPKParts() throws Throwable
      {
@@@ -400,9 -399,9 +398,6 @@@
          executeNet(protocolVersion, "INSERT INTO %s (a, b, c, d) VALUES (0, 0, 1, 0) USING TIMESTAMP 0");
          assertRows(execute("SELECT d from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0));
  
--        if (flush)
--            FBUtilities.waitOnFutures(ks.flush());
--
          //update c's timestamp TS=2
          executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 2 SET c = ? WHERE a = ? and b = ? ", 1, 0, 0);
          assertRows(execute("SELECT d from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0));
@@@ -1233,9 -1234,9 +1230,9 @@@
      public void testCreateMvWithTTL() throws Throwable
      {
          createTable("CREATE TABLE %s (" +
--                "k int PRIMARY KEY, " +
--                "c int, " +
--                "val int) WITH default_time_to_live = 60");
++                    "k int PRIMARY KEY, " +
++                    "c int, " +
++                    "val int) WITH default_time_to_live = 60");
  
          execute("USE " + keyspace());
          executeNet(protocolVersion, "USE " + keyspace());


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[03/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

This patch introduces the following changes to fix MV timestamp issues:
 - Add strict liveness for view with non-key base column in pk
 - Deprecated shadowable tombstone and use expired livenessInfo instead
 - Include partition deletion for existing base row
 - Disallow dropping base column with MV

Patch by Zhao Yang and Paulo Motta; reviewed by Paulo Motta for CASSANDRA-11500


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b36740e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b36740e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b36740e

Branch: refs/heads/cassandra-3.0
Commit: 1b36740ebe66b8ed4c3d6cb64eb2419a9279dfbf
Parents: b0eba5f
Author: Zhao Yang <zh...@gmail.com>
Authored: Wed Jul 12 17:49:38 2017 +0800
Committer: Paulo Motta <pa...@apache.org>
Committed: Tue Sep 5 01:03:24 2017 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   18 +
 doc/cql3/CQL.textile                            |    6 +
 .../org/apache/cassandra/config/CFMetaData.java |   13 +
 .../apache/cassandra/cql3/UpdateParameters.java |    2 +-
 .../cql3/statements/AlterTableStatement.java    |   18 +-
 .../org/apache/cassandra/db/LivenessInfo.java   |   17 +-
 .../org/apache/cassandra/db/ReadCommand.java    |    7 +-
 .../db/compaction/CompactionIterator.java       |    7 +-
 .../apache/cassandra/db/filter/RowFilter.java   |    4 +-
 .../cassandra/db/partitions/PurgeFunction.java  |   14 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |    6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   15 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |    5 +
 .../apache/cassandra/db/transform/Filter.java   |    8 +-
 .../db/transform/FilteredPartitions.java        |    4 +-
 .../cassandra/db/transform/FilteredRows.java    |    2 +-
 .../apache/cassandra/db/view/TableViews.java    |   18 +-
 src/java/org/apache/cassandra/db/view/View.java |   43 +-
 .../apache/cassandra/db/view/ViewManager.java   |    5 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  163 ++-
 .../apache/cassandra/service/DataResolver.java  |    4 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |    2 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  | 1343 ++++++++++++++++++
 .../cassandra/cql3/ViewFilteringTest.java       |  706 ++++-----
 .../org/apache/cassandra/cql3/ViewTest.java     |   31 +-
 25 files changed, 1973 insertions(+), 488 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index bb5fdfe..7064c5d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -21,6 +21,24 @@ Upgrading
    - Nothing specific to this release, but please see previous upgrading sections,
      especially if you are upgrading from 2.2.
 
+Materialized Views
+-------------------
+    - Cassandra will no longer allow dropping columns on tables with Materialized Views.
+    - A change was made in the way the Materialized View timestamp is computed, which
+      may cause an old deletion to a base column which is view primary key (PK) column
+      to not be reflected in the view when repairing the base table post-upgrade. This
+      condition is only possible when a column deletion to an MV primary key (PK) column
+      not present in the base table PK (via UPDATE base SET view_pk_col = null or DELETE
+      view_pk_col FROM base) is missed before the upgrade and received by repair after the upgrade.
+      If such column deletions are done on a view PK column which is not a base PK, it's advisable
+      to run repair on the base table of all nodes prior to the upgrade. Alternatively it's possible
+      to fix potential inconsistencies by running repair on the views after upgrade or drop and
+      re-create the views. See CASSANDRA-11500 for more details.
+    - Removal of columns not selected in the Materialized View (via UPDATE base SET unselected_column
+      = null or DELETE unselected_column FROM base) may not be properly reflected in the view in some
+      situations so we advise against doing deletions on base columns not selected in views
+      until this is fixed on CASSANDRA-13826.
+
 3.0.14
 ======
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 1efa6d4..54888b8 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -524,6 +524,12 @@ h4(#createMVWhere). @WHERE@ Clause
 
 The @<where-clause>@ is similar to the "where clause of a @SELECT@ statement":#selectWhere, with a few differences.  First, the where clause must contain an expression that disallows @NULL@ values in columns in the view's primary key.  If no other restriction is desired, this can be accomplished with an @IS NOT NULL@ expression.  Second, only columns which are in the base table's primary key may be restricted with expressions other than @IS NOT NULL@.  (Note that this second restriction may be lifted in the future.)
 
+h4. MV Limitations
+
+__Note:__
+Removal of columns not selected in the Materialized View (via `UPDATE base SET unselected_column = null` or `DELETE unselected_column FROM base`) may shadow missed updates to other columns received by hints or repair.
+For this reason, we advise against doing deletions on base columns not selected in views until this is fixed on CASSANDRA-13826.
+
 h3(#alterMVStmt). ALTER MATERIALIZED VIEW
 
 __Syntax:__

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 44f3a96..1eb991a 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1078,6 +1078,19 @@ public final class CFMetaData
         return isView;
     }
 
+    /**
+     * A table with strict liveness filters/ignores rows without PK liveness info,
+     * effectively tying the row liveness to its primary key liveness.
+     *
+     * Currently this is only used by views with normal base column as PK column
+     * so updates to other columns do not make the row live when the base column
+     * is not live. See CASSANDRA-11500.
+     */
+    public boolean enforceStrictLiveness()
+    {
+        return isView && Keyspace.open(ksName).viewManager.getByName(cfName).enforceStrictLiveness();
+    }
+
     public Serializers serializers()
     {
         return serializers;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 8ff5344..d070f61 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -233,6 +233,6 @@ public class UpdateParameters
             return pendingMutations;
 
         return Rows.merge(prefetchedRow, pendingMutations, nowInSec)
-                   .purge(DeletionPurger.PURGE_ALL, nowInSec);
+                   .purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 5db4b9f..befdd25 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -233,22 +233,10 @@ public class AlterTableStatement extends SchemaAlteringStatement
                                                                                         .collect(Collectors.joining(","))));
                 }
 
-                // If a column is dropped which is included in a view, we don't allow the drop to take place.
-                boolean rejectAlter = false;
-                StringBuilder builder = new StringBuilder();
-                for (ViewDefinition view : views)
-                {
-                    if (!view.includes(columnName)) continue;
-                    if (rejectAlter)
-                        builder.append(',');
-                    rejectAlter = true;
-                    builder.append(view.viewName);
-                }
-                if (rejectAlter)
-                    throw new InvalidRequestException(String.format("Cannot drop column %s, depended on by materialized views (%s.{%s})",
+                if (!Iterables.isEmpty(views))
+                    throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
                                                                     columnName.toString(),
-                                                                    keyspace(),
-                                                                    builder.toString()));
+                                                                    keyspace()));
                 break;
             case OPTS:
                 if (attrs == null)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/LivenessInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/LivenessInfo.java b/src/java/org/apache/cassandra/db/LivenessInfo.java
index 411fb9a..ab61a23 100644
--- a/src/java/org/apache/cassandra/db/LivenessInfo.java
+++ b/src/java/org/apache/cassandra/db/LivenessInfo.java
@@ -176,13 +176,26 @@ public class LivenessInfo
      * Whether this liveness information supersedes another one (that is
      * whether is has a greater timestamp than the other or not).
      *
-     * @param other the {@code LivenessInfo} to compare this info to.
+     * </br>
+     *
+     * If timestamps are the same, livenessInfo with greater TTL supersedes another.
+     *
+     * It also means, if timestamps are the same, ttl superseders no-ttl.
+     *
+     * This is the same rule as {@link Conflicts#resolveRegular}
+     *
+     * @param other
+     *            the {@code LivenessInfo} to compare this info to.
      *
      * @return whether this {@code LivenessInfo} supersedes {@code other}.
      */
     public boolean supersedes(LivenessInfo other)
     {
-        return timestamp > other.timestamp;
+        if (timestamp != other.timestamp)
+            return timestamp > other.timestamp;
+        if (isExpiring() == other.isExpiring())
+            return localExpirationTime() > other.localExpirationTime();
+        return isExpiring();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 6a21bb3..b73cdde 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -541,7 +541,12 @@ public abstract class ReadCommand implements ReadQuery
         {
             public WithoutPurgeableTombstones()
             {
-                super(isForThrift, nowInSec(), cfs.gcBefore(nowInSec()), oldestUnrepairedTombstone(), cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
+                super(isForThrift,
+                      nowInSec(),
+                      cfs.gcBefore(nowInSec()),
+                      oldestUnrepairedTombstone(),
+                      cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
+                      cfs.metadata.enforceStrictLiveness());
             }
 
             protected Predicate<Long> getPurgeEvaluator()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
index 9f0984f..bea365c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
@@ -266,7 +266,12 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
 
         private Purger(boolean isForThrift, CompactionController controller, int nowInSec)
         {
-            super(isForThrift, nowInSec, controller.gcBefore, controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE, controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones());
+            super(isForThrift,
+                  nowInSec,
+                  controller.gcBefore,
+                  controller.compactingRepaired() ? Integer.MAX_VALUE : Integer.MIN_VALUE,
+                  controller.cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones(),
+                  controller.cfs.metadata.enforceStrictLiveness());
             this.controller = controller;
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/filter/RowFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java b/src/java/org/apache/cassandra/db/filter/RowFilter.java
index 8d11038..9f3b868 100644
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@ -148,7 +148,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression>
     public boolean isSatisfiedBy(CFMetaData metadata, DecoratedKey partitionKey, Row row, int nowInSec)
     {
         // We purge all tombstones as the expressions isSatisfiedBy methods expects it
-        Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
         if (purged == null)
             return expressions.isEmpty();
 
@@ -290,7 +290,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression>
 
                 public Row applyToRow(Row row)
                 {
-                    Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+                    Row purged = row.purge(DeletionPurger.PURGE_ALL, nowInSec, metadata.enforceStrictLiveness());
                     if (purged == null)
                         return null;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
index 6679bdf..5cc9145 100644
--- a/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
+++ b/src/java/org/apache/cassandra/db/partitions/PurgeFunction.java
@@ -28,9 +28,16 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
     private final boolean isForThrift;
     private final DeletionPurger purger;
     private final int nowInSec;
+
+    private final boolean enforceStrictLiveness;
     private boolean isReverseOrder;
 
-    public PurgeFunction(boolean isForThrift, int nowInSec, int gcBefore, int oldestUnrepairedTombstone, boolean onlyPurgeRepairedTombstones)
+    public PurgeFunction(boolean isForThrift,
+                         int nowInSec,
+                         int gcBefore,
+                         int oldestUnrepairedTombstone,
+                         boolean onlyPurgeRepairedTombstones,
+                         boolean enforceStrictLiveness)
     {
         this.isForThrift = isForThrift;
         this.nowInSec = nowInSec;
@@ -38,6 +45,7 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
                       !(onlyPurgeRepairedTombstones && localDeletionTime >= oldestUnrepairedTombstone)
                       && localDeletionTime < gcBefore
                       && getPurgeEvaluator().test(timestamp);
+        this.enforceStrictLiveness = enforceStrictLiveness;
     }
 
     protected abstract Predicate<Long> getPurgeEvaluator();
@@ -84,14 +92,14 @@ public abstract class PurgeFunction extends Transformation<UnfilteredRowIterator
     protected Row applyToStatic(Row row)
     {
         updateProgress();
-        return row.purge(purger, nowInSec);
+        return row.purge(purger, nowInSec, enforceStrictLiveness);
     }
 
     @Override
     protected Row applyToRow(Row row)
     {
         updateProgress();
-        return row.purge(purger, nowInSec);
+        return row.purge(purger, nowInSec, enforceStrictLiveness);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 41dad0a..b07960c 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -334,7 +334,7 @@ public class BTreeRow extends AbstractRow
              : new BTreeRow(clustering, primaryKeyLivenessInfo, Deletion.regular(newDeletion), btree, Integer.MIN_VALUE);
     }
 
-    public Row purge(DeletionPurger purger, int nowInSec)
+    public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness)
     {
         if (!hasDeletion(nowInSec))
             return this;
@@ -342,6 +342,10 @@ public class BTreeRow extends AbstractRow
         LivenessInfo newInfo = purger.shouldPurge(primaryKeyLivenessInfo, nowInSec) ? LivenessInfo.EMPTY : primaryKeyLivenessInfo;
         Deletion newDeletion = purger.shouldPurge(deletion.time()) ? Deletion.LIVE : deletion;
 
+        // when enforceStrictLiveness is set, a row is considered dead when it's PK liveness info is not present
+        if (enforceStrictLiveness && newDeletion.isLive() && newInfo.isEmpty())
+            return null;
+
         return transformAndFilter(newInfo, newDeletion, (cd) -> cd.purge(purger, nowInSec));
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 9ab1f09..3bcc220 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -200,10 +200,20 @@ public interface Row extends Unfiltered, Collection<ColumnData>
      *
      * @param purger the {@code DeletionPurger} to use to decide what can be purged.
      * @param nowInSec the current time to decide what is deleted and what isn't (in the case of expired cells).
+     * @param enforceStrictLiveness whether the row should be purged if there is no PK liveness info,
+     *                              normally retrieved from {@link CFMetaData#enforceStrictLiveness()}
+     *
+     *        When enforceStrictLiveness is set, rows with empty PK liveness info
+     *        and no row deletion are purged.
+     *
+     *        Currently this is only used by views with normal base column as PK column
+     *        so updates to other base columns do not make the row live when the PK column
+     *        is not live. See CASSANDRA-11500.
+     *
      * @return this row but without any deletion info purged by {@code purger}. If the purged row is empty, returns
      * {@code null}.
      */
-    public Row purge(DeletionPurger purger, int nowInSec);
+    public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness);
 
     /**
      * Returns a copy of this row where all counter cells have they "local" shard marked for clearing.
@@ -215,7 +225,7 @@ public interface Row extends Unfiltered, Collection<ColumnData>
      * timestamp by {@code newTimestamp - 1}.
      *
      * @param newTimestamp the timestamp to use for all live data in the returned row.
-     * @param a copy of this row with timestamp updated using {@code newTimestamp}. This can return {@code null} in the
+     * @return a copy of this row with timestamp updated using {@code newTimestamp}. This can return {@code null} in the
      * rare where the row only as a shadowable row deletion and the new timestamp supersedes it.
      *
      * @see Commit for why we need this.
@@ -277,6 +287,7 @@ public interface Row extends Unfiltered, Collection<ColumnData>
             return time.isLive() ? LIVE : new Deletion(time, false);
         }
 
+        @Deprecated
         public static Deletion shadowable(DeletionTime time)
         {
             return new Deletion(time, true);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
index bdc8388..c4684e1 100644
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
@@ -88,6 +88,11 @@ public class UnfilteredSerializer
      * Extended flags
      */
     private final static int IS_STATIC               = 0x01; // Whether the encoded row is a static. If there is no extended flag, the row is assumed not static.
+    /**
+     * A shadowable tombstone cannot replace a previous row deletion otherwise it could resurrect a
+     * previously deleted cell not updated by a subsequent update, SEE CASSANDRA-11500
+     */
+    @Deprecated
     private final static int HAS_SHADOWABLE_DELETION = 0x02; // Whether the row deletion is shadowable. If there is no extended flag (or no row deletion), the deletion is assumed not shadowable.
 
     public void serialize(Unfiltered unfiltered, SerializationHeader header, DataOutputPlus out, int version)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/Filter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/Filter.java b/src/java/org/apache/cassandra/db/transform/Filter.java
index 747983f..48a1634 100644
--- a/src/java/org/apache/cassandra/db/transform/Filter.java
+++ b/src/java/org/apache/cassandra/db/transform/Filter.java
@@ -26,10 +26,12 @@ import org.apache.cassandra.db.rows.*;
 public final class Filter extends Transformation
 {
     private final int nowInSec;
+    private final boolean enforceStrictLiveness;
 
-    public Filter(int nowInSec)
+    public Filter(int nowInSec, boolean enforceStrictLiveness)
     {
         this.nowInSec = nowInSec;
+        this.enforceStrictLiveness = enforceStrictLiveness;
     }
 
     @Override
@@ -46,14 +48,14 @@ public final class Filter extends Transformation
         if (row.isEmpty())
             return Rows.EMPTY_STATIC_ROW;
 
-        row = row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        row = row.purge(DeletionPurger.PURGE_ALL, nowInSec, enforceStrictLiveness);
         return row == null ? Rows.EMPTY_STATIC_ROW : row;
     }
 
     @Override
     protected Row applyToRow(Row row)
     {
-        return row.purge(DeletionPurger.PURGE_ALL, nowInSec);
+        return row.purge(DeletionPurger.PURGE_ALL, nowInSec, enforceStrictLiveness);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
index ad9446d..b835a6b 100644
--- a/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredPartitions.java
@@ -52,7 +52,9 @@ public final class FilteredPartitions extends BasePartitions<RowIterator, BasePa
      */
     public static FilteredPartitions filter(UnfilteredPartitionIterator iterator, int nowInSecs)
     {
-        FilteredPartitions filtered = filter(iterator, new Filter(nowInSecs));
+        FilteredPartitions filtered = filter(iterator,
+                                             new Filter(nowInSecs,
+                                                        iterator.metadata().enforceStrictLiveness()));
 
         return iterator.isForThrift()
              ? filtered

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/transform/FilteredRows.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/FilteredRows.java b/src/java/org/apache/cassandra/db/transform/FilteredRows.java
index 5b635eb..349183c 100644
--- a/src/java/org/apache/cassandra/db/transform/FilteredRows.java
+++ b/src/java/org/apache/cassandra/db/transform/FilteredRows.java
@@ -55,6 +55,6 @@ public final class FilteredRows extends BaseRows<Row, BaseRowIterator<?>> implem
      */
     public static RowIterator filter(UnfilteredRowIterator iterator, int nowInSecs)
     {
-        return new Filter(nowInSecs).applyToPartition(iterator);
+        return new Filter(nowInSecs, iterator.metadata().enforceStrictLiveness()).applyToPartition(iterator);
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/TableViews.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/TableViews.java b/src/java/org/apache/cassandra/db/view/TableViews.java
index 1a3cbb1..d2d4a45 100644
--- a/src/java/org/apache/cassandra/db/view/TableViews.java
+++ b/src/java/org/apache/cassandra/db/view/TableViews.java
@@ -159,6 +159,7 @@ public class TableViews extends AbstractCollection<View>
      * but has simply some updated values. This will be empty for view building as we want to assume anything we'll pass
      * to {@code updates} is new.
      * @param nowInSec the current time in seconds.
+     * @param separateUpdates, if false, mutation is per partition.
      * @return the mutations to apply to the {@code views}. This can be empty.
      */
     public Iterator<Collection<Mutation>> generateViewUpdates(Collection<View> views,
@@ -282,7 +283,10 @@ public class TableViews extends AbstractCollection<View>
                             continue;
 
                         Row updateRow = (Row) update;
-                        addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                        addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                                  updateRow,
+                                                  generators,
+                                                  nowInSec);
 
                         // If the updates have been filtered, then we won't have any mutations; we need to make sure that we
                         // only return if the mutations are empty. Otherwise, we continue to search for an update which is
@@ -321,7 +325,10 @@ public class TableViews extends AbstractCollection<View>
                     continue;
 
                 Row updateRow = (Row) update;
-                addToViewUpdateGenerators(emptyRow(updateRow.clustering(), DeletionTime.LIVE), updateRow, generators, nowInSec);
+                addToViewUpdateGenerators(emptyRow(updateRow.clustering(), existingsDeletion.currentDeletion()),
+                                          updateRow,
+                                          generators,
+                                          nowInSec);
             }
 
             return Iterators.singletonIterator(buildMutations(baseTableMetadata, generators));
@@ -419,11 +426,12 @@ public class TableViews extends AbstractCollection<View>
         ClusteringIndexFilter clusteringFilter = names == null
                                                ? new ClusteringIndexSliceFilter(sliceBuilder.build(), false)
                                                : new ClusteringIndexNamesFilter(names, false);
+        // since unselected columns also affect view liveness, we need to query all base columns if base and view have same key columns.
         // If we have more than one view, we should merge the queried columns by each views but to keep it simple we just
         // include everything. We could change that in the future.
-        ColumnFilter queriedColumns = views.size() == 1
-                                    ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
-                                    : ColumnFilter.all(metadata);
+        ColumnFilter queriedColumns = views.size() == 1 && metadata.enforceStrictLiveness()
+                                   ? Iterables.getOnlyElement(views).getSelectStatement().queriedColumns()
+                                   : ColumnFilter.all(metadata);
         // Note that the views could have restrictions on regular columns, but even if that's the case we shouldn't apply those
         // when we read, because even if an existing row doesn't match the view filter, the update can change that in which
         // case we'll need to know the existing content. There is also no easy way to merge those RowFilter when we have multiple views.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/View.java b/src/java/org/apache/cassandra/db/view/View.java
index e471349..58e2a84 100644
--- a/src/java/org/apache/cassandra/db/view/View.java
+++ b/src/java/org/apache/cassandra/db/view/View.java
@@ -60,7 +60,6 @@ public class View
 
     public volatile List<ColumnDefinition> baseNonPKColumnsInViewPK;
 
-    private final boolean includeAllColumns;
     private ViewBuilder builder;
 
     // Only the raw statement can be final, because the statement cannot always be prepared when the MV is initialized.
@@ -75,7 +74,6 @@ public class View
     {
         this.baseCfs = baseCfs;
         this.name = definition.viewName;
-        this.includeAllColumns = definition.includeAllColumns;
         this.rawSelect = definition.select;
 
         updateDefinition(definition);
@@ -95,8 +93,6 @@ public class View
     public void updateDefinition(ViewDefinition definition)
     {
         this.definition = definition;
-
-        CFMetaData viewCfm = definition.metadata;
         List<ColumnDefinition> nonPKDefPartOfViewPK = new ArrayList<>();
         for (ColumnDefinition baseColumn : baseCfs.metadata.allColumns())
         {
@@ -148,21 +144,7 @@ public class View
         //    neither included in the view, nor used by the view filter).
         if (!getReadQuery().selectsClustering(partitionKey, update.clustering()))
             return false;
-
-        // We want to find if the update modify any of the columns that are part of the view (in which case the view is affected).
-        // But if the view include all the base table columns, or the update has either a row deletion or a row liveness (note
-        // that for the liveness, it would be more "precise" to check if it's live, but pushing an update that is already expired
-        // is dump so it's ok not to optimize for it and it saves us from having to pass nowInSec to the method), we know the view
-        // is affected right away.
-        if (includeAllColumns || !update.deletion().isLive() || !update.primaryKeyLivenessInfo().isEmpty())
-            return true;
-
-        for (ColumnData data : update)
-        {
-            if (definition.metadata.getColumnDefinition(data.column().name) != null)
-                return true;
-        }
-        return false;
+        return true;
     }
 
     /**
@@ -293,4 +275,27 @@ public class View
 
         return expressions.stream().collect(Collectors.joining(" AND "));
     }
+
+    public boolean hasSamePrimaryKeyColumnsAsBaseTable()
+    {
+        return baseNonPKColumnsInViewPK.isEmpty();
+    }
+
+    /**
+     * When views contains a primary key column that is not part
+     * of the base table primary key, we use that column liveness
+     * info as the view PK, to ensure that whenever that column
+     * is not live in the base, the row is not live in the view.
+     *
+     * This is done to prevent cells other than the view PK from
+     * making the view row alive when the view PK column is not
+     * live in the base. So in this case we tie the row liveness,
+     * to the primary key liveness.
+     *
+     * See CASSANDRA-11500 for context.
+     */
+    public boolean enforceStrictLiveness()
+    {
+        return !baseNonPKColumnsInViewPK.isEmpty();
+    }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
index 0a0fa7b..d1cfd9e 100644
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -161,6 +161,11 @@ public class ViewManager
         SystemKeyspace.setViewRemoved(keyspace.getName(), view.name);
     }
 
+    public View getByName(String name)
+    {
+        return viewsByName.get(name);
+    }
+
     public void buildAllViews()
     {
         for (View view : allViews())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index edb88d0..0c8e078 100644
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@ -70,7 +70,7 @@ public class ViewUpdateGenerator
         UPDATE_EXISTING, // There was an entry and the update modifies it
         SWITCH_ENTRY     // There was an entry and there is still one after update,
                          // but they are not the same one.
-    };
+    }
 
     /**
      * Creates a new {@code ViewUpdateBuilder}.
@@ -121,14 +121,14 @@ public class ViewUpdateGenerator
                 createEntry(mergedBaseRow);
                 return;
             case DELETE_OLD:
-                deleteOldEntry(existingBaseRow);
+                deleteOldEntry(existingBaseRow, mergedBaseRow);
                 return;
             case UPDATE_EXISTING:
                 updateEntry(existingBaseRow, mergedBaseRow);
                 return;
             case SWITCH_ENTRY:
                 createEntry(mergedBaseRow);
-                deleteOldEntry(existingBaseRow);
+                deleteOldEntry(existingBaseRow, mergedBaseRow);
                 return;
         }
     }
@@ -180,6 +180,7 @@ public class ViewUpdateGenerator
         }
 
         assert view.baseNonPKColumnsInViewPK.size() <= 1 : "We currently only support one base non-PK column in the view PK";
+
         if (view.baseNonPKColumnsInViewPK.isEmpty())
         {
             // The view entry is necessarily the same pre and post update.
@@ -204,7 +205,9 @@ public class ViewUpdateGenerator
         if (!isLive(before))
             return isLive(after) ? UpdateAction.NEW_ENTRY : UpdateAction.NONE;
         if (!isLive(after))
+        {
             return UpdateAction.DELETE_OLD;
+        }
 
         return baseColumn.cellValueType().compare(before.value(), after.value()) == 0
              ? UpdateAction.UPDATE_EXISTING
@@ -269,7 +272,7 @@ public class ViewUpdateGenerator
         }
         if (!matchesViewFilter(mergedBaseRow))
         {
-            deleteOldEntryInternal(existingBaseRow);
+            deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
             return;
         }
 
@@ -281,6 +284,12 @@ public class ViewUpdateGenerator
         currentViewEntryBuilder.addPrimaryKeyLivenessInfo(computeLivenessInfoForEntry(mergedBaseRow));
         currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
 
+        addDifferentCells(existingBaseRow, mergedBaseRow);
+        submitUpdate();
+    }
+
+    private void addDifferentCells(Row existingBaseRow, Row mergedBaseRow)
+    {
         // We only add to the view update the cells from mergedBaseRow that differs from
         // existingBaseRow. For that and for speed we can just cell pointer equality: if the update
         // hasn't touched a cell, we know it will be the same object in existingBaseRow and
@@ -362,8 +371,6 @@ public class ViewUpdateGenerator
                 addCell(viewColumn, (Cell)mergedData);
             }
         }
-
-        submitUpdate();
     }
 
     /**
@@ -371,20 +378,40 @@ public class ViewUpdateGenerator
      * <p>
      * This method checks that the base row does match the view filter before bothering.
      */
-    private void deleteOldEntry(Row existingBaseRow)
+    private void deleteOldEntry(Row existingBaseRow, Row mergedBaseRow)
     {
         // Before deleting an old entry, make sure it was matching the view filter (otherwise there is nothing to delete)
         if (!matchesViewFilter(existingBaseRow))
             return;
 
-        deleteOldEntryInternal(existingBaseRow);
+        deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
     }
 
-    private void deleteOldEntryInternal(Row existingBaseRow)
+    private void deleteOldEntryInternal(Row existingBaseRow, Row mergedBaseRow)
     {
         startNewUpdate(existingBaseRow);
-        DeletionTime dt = new DeletionTime(computeTimestampForEntryDeletion(existingBaseRow), nowInSec);
-        currentViewEntryBuilder.addRowDeletion(Row.Deletion.shadowable(dt));
+        long timestamp = computeTimestampForEntryDeletion(existingBaseRow, mergedBaseRow);
+        long rowDeletion = mergedBaseRow.deletion().time().markedForDeleteAt();
+        assert timestamp >= rowDeletion;
+
+        // If computed deletion timestamp greater than row deletion, it must be coming from
+        //  1. non-pk base column used in view pk, or
+        //  2. unselected base column
+        //  any case, we need to use it as expired livenessInfo
+        // If computed deletion timestamp is from row deletion, we only need row deletion itself
+        if (timestamp > rowDeletion)
+        {
+            /**
+              * TODO: This is a hack and overload of LivenessInfo and we should probably modify
+              * the storage engine to properly support this, but on the meantime this
+              * should be fine because it only happens in some specific scenarios explained above.
+              */
+            LivenessInfo info = LivenessInfo.create(timestamp, Integer.MAX_VALUE, nowInSec);
+            currentViewEntryBuilder.addPrimaryKeyLivenessInfo(info);
+        }
+        currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
+
+        addDifferentCells(existingBaseRow, mergedBaseRow);
         submitUpdate();
     }
 
@@ -413,78 +440,92 @@ public class ViewUpdateGenerator
 
     private LivenessInfo computeLivenessInfoForEntry(Row baseRow)
     {
-        /*
-         * We need to compute both the timestamp and expiration.
+        /**
+         * There 3 cases:
+         *  1. No extra primary key in view and all base columns are selected in MV. all base row's components(livenessInfo,
+         *     deletion, cells) are same as view row. Simply map base components to view row.
+         *  2. There is a base non-key column used in view pk. This base non-key column determines the liveness of view row. view's row level
+         *     info should based on this column.
+         *  3. Most tricky case is no extra primary key in view and some base columns are not selected in MV. We cannot use 1 livenessInfo or
+         *     row deletion to represent the liveness of unselected column properly, see CASSANDRA-11500.
+         *     We could make some simplification: the unselected columns will be used only when it affects view row liveness. eg. if view row
+         *     already exists and not expiring, there is no need to use unselected columns.
+         *     Note: if the view row is removed due to unselected column removal(ttl or cell tombstone), we will have problem keeping view
+         *     row alive with a smaller or equal timestamp than the max unselected column timestamp.
          *
-         * For the timestamp, it makes sense to use the bigger timestamp for all view PK columns.
-         *
-         * This is more complex for the expiration. We want to maintain consistency between the base and the view, so the
-         * entry should only exist as long as the base row exists _and_ has non-null values for all the columns that are part
-         * of the view PK.
-         * Which means we really have 2 cases:
-         *   1) either the columns for the base and view PKs are exactly the same: in that case, the view entry should live
-         *      as long as the base row lives. This means the view entry should only expire once *everything* in the base row
-         *      has expired. Which means the row TTL should be the max of any other TTL.
-         *   2) or there is a column that is not in the base PK but is in the view PK (we can only have one so far, we'll need
-         *      to slightly adapt if we allow more later): in that case, as long as that column lives the entry does too, but
-         *      as soon as it expires (or is deleted for that matter) the entry also should expire. So the expiration for the
-         *      view is the one of that column, irregarding of any other expiration.
-         *      To take an example of that case, if you have:
-         *        CREATE TABLE t (a int, b int, c int, PRIMARY KEY (a, b))
-         *        CREATE MATERIALIZED VIEW mv AS SELECT * FROM t WHERE c IS NOT NULL AND a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (c, a, b)
-         *        INSERT INTO t(a, b) VALUES (0, 0) USING TTL 3;
-         *        UPDATE t SET c = 0 WHERE a = 0 AND b = 0;
-         *      then even after 3 seconds elapsed, the row will still exist (it just won't have a "row marker" anymore) and so
-         *      the MV should still have a corresponding entry.
          */
         assert view.baseNonPKColumnsInViewPK.size() <= 1; // This may change, but is currently an enforced limitation
 
         LivenessInfo baseLiveness = baseRow.primaryKeyLivenessInfo();
 
-        if (view.baseNonPKColumnsInViewPK.isEmpty())
+        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
         {
-            int ttl = baseLiveness.ttl();
-            int expirationTime = baseLiveness.localExpirationTime();
+            if (view.getDefinition().includeAllColumns)
+                return baseLiveness;
+
+            long timestamp = baseLiveness.timestamp();
+            boolean hasNonExpiringLiveCell = false;
+            Cell biggestExpirationCell = null;
             for (Cell cell : baseRow.cells())
             {
-                if (cell.ttl() > ttl)
+                if (view.getViewColumn(cell.column()) != null)
+                    continue;
+                if (!isLive(cell))
+                    continue;
+                timestamp = Math.max(timestamp, cell.maxTimestamp());
+                if (!cell.isExpiring())
+                    hasNonExpiringLiveCell = true;
+                else
                 {
-                    ttl = cell.ttl();
-                    expirationTime = cell.localDeletionTime();
+                    if (biggestExpirationCell == null)
+                        biggestExpirationCell = cell;
+                    else if (cell.localDeletionTime() > biggestExpirationCell.localDeletionTime())
+                        biggestExpirationCell = cell;
                 }
             }
-            return ttl == baseLiveness.ttl()
-                 ? baseLiveness
-                 : LivenessInfo.create(baseLiveness.timestamp(), ttl, expirationTime);
+            if (baseLiveness.isLive(nowInSec) && !baseLiveness.isExpiring())
+                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
+            if (hasNonExpiringLiveCell)
+                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
+            if (biggestExpirationCell == null)
+                return baseLiveness;
+            if (biggestExpirationCell.localDeletionTime() > baseLiveness.localExpirationTime()
+                    || !baseLiveness.isLive(nowInSec))
+                return LivenessInfo.create(timestamp,
+                                                       biggestExpirationCell.ttl(),
+                                                       biggestExpirationCell.localDeletionTime());
+            return baseLiveness;
         }
 
-        ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0);
-        Cell cell = baseRow.getCell(baseColumn);
+        Cell cell = baseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
         assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry";
 
-        long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
-        return LivenessInfo.create(timestamp, cell.ttl(), cell.localDeletionTime());
+        return LivenessInfo.create(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
     }
 
-    private long computeTimestampForEntryDeletion(Row baseRow)
+    private long computeTimestampForEntryDeletion(Row existingBaseRow, Row mergedBaseRow)
     {
-        // We delete the old row with it's row entry timestamp using a shadowable deletion.
-        // We must make sure that the deletion deletes everything in the entry (or the entry will
-        // still show up), so we must use the bigger timestamp found in the existing row (for any
-        // column included in the view at least).
-        // TODO: We have a problem though: if the entry is "resurected" by a later update, we would
-        // need to ensure that the timestamp for then entry then is bigger than the tombstone
-        // we're just inserting, which is not currently guaranteed.
-        // This is a bug for a separate ticket though.
-        long timestamp = baseRow.primaryKeyLivenessInfo().timestamp();
-        for (ColumnData data : baseRow)
+        DeletionTime deletion = mergedBaseRow.deletion().time();
+        if (view.hasSamePrimaryKeyColumnsAsBaseTable())
         {
-            if (!view.getDefinition().includes(data.column().name))
-                continue;
+            long timestamp = Math.max(deletion.markedForDeleteAt(), existingBaseRow.primaryKeyLivenessInfo().timestamp());
+            if (view.getDefinition().includeAllColumns)
+                return timestamp;
 
-            timestamp = Math.max(timestamp, data.maxTimestamp());
+            for (Cell cell : existingBaseRow.cells())
+            {
+                // selected column should not contribute to view deletion, itself is already included in view row
+                if (view.getViewColumn(cell.column()) != null)
+                    continue;
+                // unselected column is used regardless live or dead, because we don't know if it was used for liveness.
+                timestamp = Math.max(timestamp, cell.maxTimestamp());
+            }
+            return timestamp;
         }
-        return timestamp;
+        // has base non-pk column in view pk
+        Cell before = existingBaseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
+        assert isLive(before) : "We shouldn't have got there if the base row had no associated entry";
+        return deletion.deletes(before) ? deletion.markedForDeleteAt() : before.timestamp();
     }
 
     private void addColumnData(ColumnDefinition viewColumn, ColumnData baseTableData)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DataResolver.java b/src/java/org/apache/cassandra/service/DataResolver.java
index 72c4950..c59d688 100644
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@ -86,7 +86,9 @@ public class DataResolver extends ResponseResolver
         DataLimits.Counter counter = command.limits().newCounter(command.nowInSec(), true, command.selectsFullPartition());
 
         UnfilteredPartitionIterator merged = mergeWithShortReadProtection(iters, sources, counter);
-        FilteredPartitions filtered = FilteredPartitions.filter(merged, new Filter(command.nowInSec()));
+        FilteredPartitions filtered = FilteredPartitions.filter(merged,
+                                                                new Filter(command.nowInSec(),
+                                                                           command.metadata().enforceStrictLiveness()));
         PartitionIterator counted = counter.applyTo(filtered);
 
         return command.isForThrift()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 40aec88..3c0cefc 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -1001,7 +1001,7 @@ public abstract class CQLTester
         assert ignoreExtra || expectedRows.size() == actualRows.size();
     }
 
-    private static List<String> makeRowStrings(UntypedResultSet resultSet)
+    protected static List<String> makeRowStrings(UntypedResultSet resultSet)
     {
         List<List<ByteBuffer>> rows = new ArrayList<>();
         for (UntypedResultSet.Row row : resultSet)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[08/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
new file mode 100644
index 0000000..9e32620
--- /dev/null
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@ -0,0 +1,1343 @@
+package org.apache.cassandra.cql3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.cassandra.concurrent.SEPExecutor;
+import org.apache.cassandra.concurrent.Stage;
+import org.apache.cassandra.concurrent.StageManager;
+import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.utils.FBUtilities;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.google.common.base.Objects;
+
+public class ViewComplexTest extends CQLTester
+{
+    int protocolVersion = 4;
+    private final List<String> views = new ArrayList<>();
+
+    @BeforeClass
+    public static void startup()
+    {
+        requireNetwork();
+    }
+    @Before
+    public void begin()
+    {
+        views.clear();
+    }
+
+    @After
+    public void end() throws Throwable
+    {
+        for (String viewName : views)
+            executeNet(protocolVersion, "DROP MATERIALIZED VIEW " + viewName);
+    }
+
+    private void createView(String name, String query) throws Throwable
+    {
+        executeNet(protocolVersion, String.format(query, name));
+        // If exception is thrown, the view will not be added to the list; since it shouldn't have been created, this is
+        // the desired behavior
+        views.add(name);
+    }
+
+    private void updateView(String query, Object... params) throws Throwable
+    {
+        updateViewWithFlush(query, false, params);
+    }
+
+    private void updateViewWithFlush(String query, boolean flush, Object... params) throws Throwable
+    {
+        executeNet(protocolVersion, query, params);
+        while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
+                && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+        {
+            Thread.sleep(1);
+        }
+        if (flush)
+            Keyspace.open(keyspace()).flush();
+    }
+
+    // for now, unselected column cannot be fully supported, SEE CASSANDRA-13826
+    @Ignore
+    @Test
+    public void testPartialDeleteUnselectedColumn() throws Throwable
+    {
+        boolean flush = true;
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT k,c FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+        updateView("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+        updateView("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+
+        execute("truncate %s;");
+
+        // removal generated by unselected column should not shadow PK update with smaller timestamp
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 20 SET a=null WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"));
+        assertRows(execute("SELECT * from mv"));
+
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+    }
+
+    @Test
+    public void testPartialDeleteSelectedColumnWithFlush() throws Throwable
+    {
+        testPartialDeleteSelectedColumn(true);
+    }
+
+    @Test
+    public void testPartialDeleteSelectedColumnWithoutFlush() throws Throwable
+    {
+        testPartialDeleteSelectedColumn(false);
+    }
+
+    private void testPartialDeleteSelectedColumn(boolean flush) throws Throwable
+    {
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, e int, f int, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+
+        updateViewWithFlush("DELETE a FROM %s USING TIMESTAMP 1 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        // view livenessInfo should not be affected by selected column ts or tb
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 0", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 12 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 13 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 14 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TTL 3 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        TimeUnit.SECONDS.sleep(4);
+
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 15 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        execute("truncate %s;");
+
+        // removal generated by unselected column should not shadow selected column with smaller timestamp
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=null WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"));
+        assertRows(execute("SELECT * from mv"));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 16 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+    }
+
+    @Test
+    public void testUpdateColumnInViewPKWithTTLWithFlush() throws Throwable
+    {
+        // CASSANDRA-13657
+        testUpdateColumnInViewPKWithTTL(true);
+    }
+
+    @Test
+    public void testUpdateColumnInViewPKWithTTLWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13657
+        testUpdateColumnInViewPKWithTTL(false);
+    }
+
+    private void testUpdateColumnInViewPKWithTTL(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13657 if base column used in view pk is ttled, then view row is considered dead
+        createTable("create table %s (k int primary key, a int, b int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (a, k)");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s SET a = 1 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null));
+
+        updateView("DELETE a FROM %s WHERE k = 1");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("INSERT INTO %s (k) VALUES (1);");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, null, null));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("UPDATE %s USING TTL 5 SET a = 10 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 10, null));
+        assertRows(execute("SELECT * from mv"), row(10, 1, null));
+
+        updateView("UPDATE %s SET b = 100 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 10, 100));
+        assertRows(execute("SELECT * from mv"), row(10, 1, 100));
+
+        Thread.sleep(5000);
+
+        // 'a' is TTL of 5 and removed.
+        assertRows(execute("SELECT * from %s"), row(1, null, 100));
+        assertEmpty(execute("SELECT * from mv"));
+        assertEmpty(execute("SELECT * from mv WHERE k = ? AND a = ?", 1, 10));
+
+        updateView("DELETE b FROM %s WHERE k=1");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, null, null));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("DELETE FROM %s WHERE k=1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testUpdateColumnNotInViewWithFlush() throws Throwable
+    {
+        testUpdateColumnNotInView(true);
+    }
+
+    @Test
+    public void testUpdateColumnNotInViewWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUpdateColumnNotInView(false);
+    }
+
+    private void testUpdateColumnNotInView(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13127: if base column not selected in view are alive, then pk of view row should be alive
+        createTable("create table %s (p int, c int, v1 int, v2 int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 0 SET v1 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v1 FROM %s USING TIMESTAMP 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        // shadowed by tombstone
+        updateView("UPDATE %s USING TIMESTAMP 1 SET v1 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v1 FROM %s USING TIMESTAMP 3 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v2 FROM %s USING TIMESTAMP 4 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s USING TTL 3 SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        assertInvalidMessage("Cannot drop column v2 on base table with materialized views", "ALTER TABLE %s DROP v2");
+        // // drop unselected base column, unselected metadata should be removed, thus view row is dead
+        // updateView("ALTER TABLE %s DROP v2");
+        // assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+        // assertRowsIgnoringOrder(execute("SELECT * from %s"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testPartialUpdateWithUnselectedCollectionsWithFlush() throws Throwable
+    {
+        testPartialUpdateWithUnselectedCollections(true);
+    }
+
+    @Test
+    public void testPartialUpdateWithUnselectedCollectionsWithoutFlush() throws Throwable
+    {
+        testPartialUpdateWithUnselectedCollections(false);
+    }
+
+    public void testPartialUpdateWithUnselectedCollections(boolean flush) throws Throwable
+    {
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s SET l=l+[1,2,3] WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateView("UPDATE %s SET l=l-[1,2] WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateView("UPDATE %s SET b=3 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 3));
+
+        updateView("UPDATE %s SET b=null, l=l-[3], s=s-{3} WHERE k = 1 AND c = 1");
+        if (flush)
+        {
+            FBUtilities.waitOnFutures(ks.flush());
+            ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        }
+        assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+        assertRowsIgnoringOrder(execute("SELECT * from mv"));
+
+        updateView("UPDATE %s SET m=m+{3:3}, l=l-[1], s=s-{2} WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null));
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m");
+        // executeNet(protocolVersion, "ALTER TABLE %s DROP m");
+        // ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE k = 1 AND c = 1"));
+        // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testUnselectedColumnsTTLWithFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUnselectedColumnsTTL(true);
+    }
+
+    @Test
+    public void testUnselectedColumnsTTLWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUnselectedColumnsTTL(false);
+    }
+
+    private void testUnselectedColumnsTTL(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13127 not ttled unselected column in base should keep view row alive
+        createTable("create table %s (p int, c int, v int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) USING TTL 3;", flush);
+
+        updateViewWithFlush("UPDATE %s USING TTL 1000 SET v = 0 WHERE p = 0 and c = 0;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        Thread.sleep(3000);
+
+        UntypedResultSet.Row row = execute("SELECT v, ttl(v) from %s WHERE c = ? AND p = ?", 0, 0).one();
+        assertTrue("row should have value of 0", row.getInt("v") == 0);
+        assertTrue("row should have ttl less than 1000", row.getInt("ttl(v)") < 1000);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateViewWithFlush("DELETE FROM %s WHERE p = 0 and c = 0;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) ", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        // already have a live row, no need to apply the unselected cell ttl
+        updateViewWithFlush("UPDATE %s USING TTL 3 SET v = 0 WHERE p = 0 and c = 0;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (1, 1) USING TTL 3", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+
+        Thread.sleep(4000);
+
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1));
+
+        // unselected should keep view row alive
+        updateViewWithFlush("UPDATE %s SET v = 0 WHERE p = 1 and c = 1;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+
+    }
+
+    @Test
+    public void testRangeDeletionWithFlush() throws Throwable
+    {
+        testRangeDeletion(true);
+    }
+
+    @Test
+    public void testRangeDeletionWithoutFlush() throws Throwable
+    {
+        testRangeDeletion(false);
+    }
+
+    public void testRangeDeletion(boolean flush) throws Throwable
+    {
+        // for partition range deletion, need to know that existing row is shadowed instead of not existed.
+        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 PRIMARY KEY (a, b)");
+
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
+
+        execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
+
+        // remove view row
+        updateView("UPDATE %s using timestamp 1 set b = null WHERE a=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+        // remove base row, no view updated generated.
+        updateView("DELETE FROM %s using timestamp 2 where a=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+
+        // restor view row with b,c column. d is still tombstone
+        updateView("UPDATE %s using timestamp 3 set b = 1,c = 1 where a=1"); // upsert
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
+    }
+
+    @Test
+    public void testBaseTTLWithSameTimestampTest() throws Throwable
+    {
+        // CASSANDRA-13127 when liveness timestamp tie, greater localDeletionTime should win if both are expiring.
+        createTable("create table %s (p int, c int, v int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) using timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        Thread.sleep(4000);
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+
+        // reversed order
+        execute("truncate %s;");
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        Thread.sleep(4000);
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+
+    }
+
+    @Test
+    public void testCommutativeRowDeletionFlush() throws Throwable
+    {
+        // CASSANDRA-13409
+        testCommutativeRowDeletion(true);
+    }
+
+    @Test
+    public void testCommutativeRowDeletionWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13409
+        testCommutativeRowDeletion(false);
+    }
+
+    private void testCommutativeRowDeletion(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13409 new update should not resurrect previous deleted data in view
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable-1, Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+        // sstable-2
+        updateView("Delete from %s using timestamp 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"));
+        // sstable-3
+        updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+        // sstable-4
+        updateView("UPdate %s using timestamp 4 set v1 = 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+        // sstable-5
+        updateView("UPdate %s using timestamp 5 set v1 = 1 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+
+        if (flush)
+        {
+            // compact sstable 2 and 4, 5;
+            ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+            List<String> sstables = cfs.getLiveSSTables()
+                                       .stream()
+                                       .sorted((s1, s2) -> s1.descriptor.generation - s2.descriptor.generation)
+                                       .map(s -> s.getFilename())
+                                       .collect(Collectors.toList());
+            String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(3), sstables.get(4)));
+            CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+            assertEquals(3, cfs.getLiveSSTables().size());
+        }
+        // regular tombstone should be retained after compaction
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+    }
+
+    @Test
+    public void testUnselectedColumnWithExpiredLivenessInfo() throws Throwable
+    {
+        boolean flush = true;
+        createTable("create table %s (k int, c int, a int, b int, PRIMARY KEY(k, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select k,c,b from %%s where c is not null and k is not null primary key (c, k);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable-1, Set initial values TS=1
+        updateViewWithFlush("UPDATE %s SET a = 1 WHERE k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        // sstable-2
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TTL 5", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        Thread.sleep(5001);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        // sstable-3
+        updateViewWithFlush("Update %s set a = null where k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"));
+
+        // sstable-4
+        updateViewWithFlush("Update %s USING TIMESTAMP 1 set b = 1 where k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1));
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampSmallerThanPkWithFlush() throws Throwable
+    {
+        testUpdateWithColumnTimestampSmallerThanPk(true);
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampSmallerThanPkWithoutFlush() throws Throwable
+    {
+        testUpdateWithColumnTimestampSmallerThanPk(false);
+    }
+
+    public void testUpdateWithColumnTimestampSmallerThanPk(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // reset value
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 6;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+        // increase pk's timestamp to 20
+        updateView("Insert into %s (p) values (3) using timestamp 20;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+        // change v1's to 2 and remove existing view row with ts7
+        updateView("UPdate %s using timestamp 7 set v1 = 2 where p = 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, 3, 6L));
+        // change v1's to 1 and remove existing view row with ts8
+        updateView("UPdate %s using timestamp 8 set v1 = 1 where p = 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampBiggerThanPkWithFlush() throws Throwable
+    {
+        // CASSANDRA-11500
+        testUpdateWithColumnTimestampBiggerThanPk(true);
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampBiggerThanPkWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-11500
+        testUpdateWithColumnTimestampBiggerThanPk(false);
+    }
+
+    public void testUpdateWithColumnTimestampBiggerThanPk(boolean flush) throws Throwable
+    {
+        // CASSANDRA-11500 able to shadow old view row with column ts greater tahn pk's ts and re-insert the view row
+        createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int);");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (k, a);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+        updateView("DELETE FROM %s USING TIMESTAMP 0 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // sstable-1, Set initial values TS=1
+        updateView("INSERT INTO %s(k, a, b) VALUES (1, 1, 1) USING TIMESTAMP 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 1));
+        updateView("UPDATE %s USING TIMESTAMP 10 SET b = 2 WHERE k = 1;");
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        updateView("UPDATE %s USING TIMESTAMP 2 SET a = 2 WHERE k = 1;");
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+        updateView("UPDATE %s USING TIMESTAMP 11 SET a = 1 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+
+        // set non-key base column as tombstone, view row is removed with shadowable
+        updateView("UPDATE %s USING TIMESTAMP 12 SET a = null WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, null, 2));
+
+        // column b should be alive
+        updateView("UPDATE %s USING TIMESTAMP 13 SET a = 1 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+
+        assertInvalidMessage("Cannot drop column a on base table with materialized views", "ALTER TABLE %s DROP a");
+    }
+
+    @Test
+    public void testNonBaseColumnInViewPkWithFlush() throws Throwable
+    {
+        testNonBaseColumnInViewPk(true);
+    }
+
+    @Test
+    public void testNonBaseColumnInViewPkWithoutFlush() throws Throwable
+    {
+        testNonBaseColumnInViewPk(true);
+    }
+
+    public void testNonBaseColumnInViewPk(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key (p1,p2))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1)"
+                           + " with gc_grace_seconds=5;");
+        ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+        cfs.disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 1 set v1 =1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, 1, null));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 set v1 = null, v2 = 1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 set v2 = null where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+
+        updateView("INSERT INTO %s (p1,p2) VALUES(1,1) USING TIMESTAMP 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, null));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, null));
+
+        updateView("DELETE FROM %s USING TIMESTAMP 4 WHERE p1 =1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+
+        updateView("UPDATE %s USING TIMESTAMP 5 set v2 = 1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+    }
+
+    @Test
+    public void testStrictLivenessTombstone() throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p)"
+                           + " with gc_grace_seconds=5;");
+        ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+        cfs.disableAutoCompaction();
+
+        updateView("Insert into %s (p, v1, v2) values (1, 1, 1) ;");
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        updateView("Update %s set v1 = null WHERE p = 1");
+        FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+
+        cfs.forceMajorCompaction(); // before gc grace second, strict-liveness tombstoned dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+
+        Thread.sleep(6000);
+        assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+
+        cfs.forceMajorCompaction(); // after gc grace second, no data left
+        assertEquals(0, cfs.getLiveSSTables().size());
+
+        updateView("Update %s using ttl 5 set v1 = 1 WHERE p = 1");
+        FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        cfs.forceMajorCompaction(); // before ttl+gc_grace_second, strict-liveness ttled dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        Thread.sleep(5500); // after expired, before gc_grace_second
+        cfs.forceMajorCompaction();// before ttl+gc_grace_second, strict-liveness ttled dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+
+        Thread.sleep(5500); // after expired + gc_grace_second
+        assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+
+        cfs.forceMajorCompaction(); // after gc grace second, no data left
+        assertEquals(0, cfs.getLiveSSTables().size());
+    }
+
+    @Test
+    public void testCellTombstoneAndShadowableTombstonesWithFlush() throws Throwable
+    {
+        testCellTombstoneAndShadowableTombstones(true);
+    }
+
+    @Test
+    public void testCellTombstoneAndShadowableTombstonesWithoutFlush() throws Throwable
+    {
+        testCellTombstoneAndShadowableTombstones(false);
+    }
+
+    private void testCellTombstoneAndShadowableTombstones(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable 1, Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+        // sstable 2
+        updateView("UPdate %s using timestamp 2 set v2 = null where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3),
+                                row(null, null));
+        // sstable 3
+        updateView("UPdate %s using timestamp 3 set v1 = 2 where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+        // sstable 4
+        updateView("UPdate %s using timestamp 4 set v1 = 1 where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+
+        if (flush)
+        {
+            // compact sstable 2 and 3;
+            ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+            List<String> sstables = cfs.getLiveSSTables()
+                                       .stream()
+                                       .sorted(Comparator.comparingInt(s -> s.descriptor.generation))
+                                       .map(s -> s.getFilename())
+                                       .collect(Collectors.toList());
+            System.out.println("SSTables " + sstables);
+            String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(2)));
+            CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+        }
+        // cell-tombstone in sstable 4 is not compacted away, because the shadowable tombstone is shadowed by new row.
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+    }
+
+    @Test
+    public void complexTimestampDeletionTestWithFlush() throws Throwable
+    {
+        complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(true);
+        complexTimestampWithbasePKColumnsInViewPKDeletionTest(true);
+    }
+
+    @Test
+    public void complexTimestampDeletionTestWithoutFlush() throws Throwable
+    {
+        complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(false);
+        complexTimestampWithbasePKColumnsInViewPKDeletionTest(false);
+    }
+
+    private void complexTimestampWithbasePKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key(p1, p2))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv2",
+                   "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1);");
+        ks.getColumnFamilyStore("mv2").disableAutoCompaction();
+
+        // Set initial values TS=1
+        updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 4, 1L));
+        // remove row/mv TS=2
+        updateView("Delete from %s using timestamp 2 where p1 = 1 and p2 = 2;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // view are empty
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"));
+        // insert PK with TS=3
+        updateView("Insert into %s (p1, p2) values (1, 2) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+
+        ks.getColumnFamilyStore("mv2").forceMajorCompaction();
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+
+        // reset values
+        updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 10;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 4, 10L));
+
+        updateView("UPDATE %s using timestamp 20 SET v2 = 5 WHERE p1 = 1 and p2 = 2");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 5, 20L));
+
+        updateView("DELETE FROM %s using timestamp 10 WHERE p1 = 1 and p2 = 2");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(null, 5, 20L));
+    }
+
+    public void complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(5, 1L));
+        // remove row/mv TS=2
+        updateView("Delete from %s using timestamp 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // view are empty
+        assertRowsIgnoringOrder(execute("SELECT * from mv"));
+        // insert PK with TS=3
+        updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+
+        // insert values TS=2, it should be considered dead due to previous tombstone
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 2;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+
+        // insert values TS=2, it should be considered dead due to previous tombstone
+        executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET v2 = ? WHERE p = ?", 4, 3);
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+
+        ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+    }
+
+    @Test
+    public void testMVWithDifferentColumnsWithFlush() throws Throwable
+    {
+        testMVWithDifferentColumns(true);
+    }
+
+    @Test
+    public void testMVWithDifferentColumnsWithoutFlush() throws Throwable
+    {
+        testMVWithDifferentColumns(false);
+    }
+
+    private void testMVWithDifferentColumns(boolean flush) throws Throwable
+    {
+        createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY(a, b))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        List<String> viewNames = new ArrayList<>();
+        List<String> mvStatements = Arrays.asList(
+                                                  // all selected
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // unselected e,f
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // no selected
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // all selected, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                  // unselected e,f, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                  // no selected, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)");
+
+        Keyspace ks = Keyspace.open(keyspace());
+
+        for (int i = 0; i < mvStatements.size(); i++)
+        {
+            String name = "mv" + i;
+            viewNames.add(name);
+            createView(name, mvStatements.get(i));
+            ks.getColumnFamilyStore(name).disableAutoCompaction();
+        }
+
+        // insert
+        updateViewWithFlush("INSERT INTO %s (a,b,c,d,e,f) VALUES(1,1,1,1,1,1) using timestamp 1", flush);
+        assertBaseViews(row(1, 1, 1, 1, 1, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 2 SET c=0, d=0 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 0, 0, 1, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 2 SET e=0, f=0 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 0, 0, 0, 0), viewNames);
+
+        updateViewWithFlush("DELETE FROM %s using timestamp 2 WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        // partial update unselected, selected
+        updateViewWithFlush("UPDATE %s using timestamp 3 SET f=1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 4 SET e = 1, f=null WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, 1, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 4 SET e = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 5 SET c = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 5 SET c = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET d = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, 1, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 7 SET d = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 8 SET f = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET c = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, 1), viewNames);
+
+        // view row still alive due to c=1@6
+        updateViewWithFlush("UPDATE %s using timestamp 8 SET f = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET c = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+    }
+
+    private void assertBaseViews(Object[] row, List<String> viewNames) throws Throwable
+    {
+        UntypedResultSet result = execute("SELECT * FROM %s");
+        if (row == null)
+            assertRowsIgnoringOrder(result);
+        else
+            assertRowsIgnoringOrder(result, row);
+        for (int i = 0; i < viewNames.size(); i++)
+            assertBaseView(result, execute(String.format("SELECT * FROM %s", viewNames.get(i))), viewNames.get(i));
+    }
+
+    private void assertBaseView(UntypedResultSet base, UntypedResultSet view, String mv)
+    {
+        List<ColumnSpecification> baseMeta = base.metadata();
+        List<ColumnSpecification> viewMeta = view.metadata();
+
+        Iterator<UntypedResultSet.Row> iter = base.iterator();
+        Iterator<UntypedResultSet.Row> viewIter = view.iterator();
+
+        List<UntypedResultSet.Row> baseData = com.google.common.collect.Lists.newArrayList(iter);
+        List<UntypedResultSet.Row> viewData = com.google.common.collect.Lists.newArrayList(viewIter);
+
+        if (baseData.size() != viewData.size())
+            fail(String.format("Mismatch number of rows in view %s: <%s>, in base <%s>",
+                               mv,
+                               makeRowStrings(view),
+                               makeRowStrings(base)));
+        if (baseData.size() == 0)
+            return;
+        if (viewData.size() != 1)
+            fail(String.format("Expect only one row in view %s, but got <%s>",
+                               mv,
+                               makeRowStrings(view)));
+
+        UntypedResultSet.Row row = baseData.get(0);
+        UntypedResultSet.Row viewRow = viewData.get(0);
+
+        Map<String, ByteBuffer> baseValues = new HashMap<>();
+        for (int j = 0; j < baseMeta.size(); j++)
+        {
+            ColumnSpecification column = baseMeta.get(j);
+            ByteBuffer actualValue = row.getBytes(column.name.toString());
+            baseValues.put(column.name.toString(), actualValue);
+        }
+        for (int j = 0; j < viewMeta.size(); j++)
+        {
+            ColumnSpecification column = viewMeta.get(j);
+            String name = column.name.toString();
+            ByteBuffer viewValue = viewRow.getBytes(name);
+            if (!baseValues.containsKey(name))
+            {
+                fail(String.format("Extra column: %s with value %s in view", name, column.type.compose(viewValue)));
+            }
+            else if (!Objects.equal(baseValues.get(name), viewValue))
+            {
+                fail(String.format("Non equal column: %s, expected <%s> but got <%s>",
+                                   name,
+                                   column.type.compose(baseValues.get(name)),
+                                   column.type.compose(viewValue)));
+            }
+        }
+    }
+
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[10/16] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by pa...@apache.org.
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


[15/16] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6fb8302/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
index 0000000,ece3e6d..1992b17
mode 000000,100644..100644
--- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@@ -1,0 -1,1344 +1,1344 @@@
+ package org.apache.cassandra.cql3;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Comparator;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.concurrent.TimeUnit;
+ import java.util.stream.Collectors;
+ 
+ import org.apache.cassandra.concurrent.SEPExecutor;
+ import org.apache.cassandra.concurrent.Stage;
+ import org.apache.cassandra.concurrent.StageManager;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.compaction.CompactionManager;
+ import org.apache.cassandra.transport.ProtocolVersion;
+ import org.apache.cassandra.utils.FBUtilities;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Ignore;
+ import org.junit.Test;
+ 
+ import com.google.common.base.Objects;
+ 
+ public class ViewComplexTest extends CQLTester
+ {
+     ProtocolVersion protocolVersion = ProtocolVersion.V4;
+     private final List<String> views = new ArrayList<>();
+ 
+     @BeforeClass
+     public static void startup()
+     {
+         requireNetwork();
+     }
++
+     @Before
+     public void begin()
+     {
+         views.clear();
+     }
+ 
+     @After
+     public void end() throws Throwable
+     {
+         for (String viewName : views)
+             executeNet(protocolVersion, "DROP MATERIALIZED VIEW " + viewName);
+     }
+ 
+     private void createView(String name, String query) throws Throwable
+     {
+         executeNet(protocolVersion, String.format(query, name));
+         // If exception is thrown, the view will not be added to the list; since it shouldn't have been created, this is
+         // the desired behavior
+         views.add(name);
+     }
+ 
+     private void updateView(String query, Object... params) throws Throwable
+     {
+         updateViewWithFlush(query, false, params);
+     }
+ 
+     private void updateViewWithFlush(String query, boolean flush, Object... params) throws Throwable
+     {
+         executeNet(protocolVersion, query, params);
+         while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
+                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+         {
+             Thread.sleep(1);
+         }
+         if (flush)
+             Keyspace.open(keyspace()).flush();
+     }
+ 
 -    // for now, unselected column cannot be fully supported, SEE CASSANDRA-13826
++    // for now, unselected column cannot be fully supported, SEE CASSANDRA-11500
+     @Ignore
+     @Test
+     public void testPartialDeleteUnselectedColumn() throws Throwable
+     {
+         boolean flush = true;
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT k,c FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+         updateView("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+         updateView("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+ 
+         execute("truncate %s;");
+ 
+         // removal generated by unselected column should not shadow PK update with smaller timestamp
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 20 SET a=null WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"));
+         assertRows(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+     }
+ 
+     @Test
+     public void testPartialDeleteSelectedColumnWithFlush() throws Throwable
+     {
+         testPartialDeleteSelectedColumn(true);
+     }
+ 
+     @Test
+     public void testPartialDeleteSelectedColumnWithoutFlush() throws Throwable
+     {
+         testPartialDeleteSelectedColumn(false);
+     }
+ 
+     private void testPartialDeleteSelectedColumn(boolean flush) throws Throwable
+     {
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, e int, f int, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+ 
+         updateViewWithFlush("DELETE a FROM %s USING TIMESTAMP 1 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         // view livenessInfo should not be affected by selected column ts or tb
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 0", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 12 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 13 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 14 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TTL 3 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         TimeUnit.SECONDS.sleep(4);
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 15 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         execute("truncate %s;");
+ 
+         // removal generated by unselected column should not shadow selected column with smaller timestamp
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=null WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"));
+         assertRows(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 16 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+     }
+ 
+     @Test
+     public void testUpdateColumnInViewPKWithTTLWithFlush() throws Throwable
+     {
+         // CASSANDRA-13657
+         testUpdateColumnInViewPKWithTTL(true);
+     }
+ 
+     @Test
+     public void testUpdateColumnInViewPKWithTTLWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13657
+         testUpdateColumnInViewPKWithTTL(false);
+     }
+ 
+     private void testUpdateColumnInViewPKWithTTL(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13657 if base column used in view pk is ttled, then view row is considered dead
+         createTable("create table %s (k int primary key, a int, b int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (a, k)");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s SET a = 1 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null));
+ 
+         updateView("DELETE a FROM %s WHERE k = 1");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("INSERT INTO %s (k) VALUES (1);");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, null, null));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("UPDATE %s USING TTL 5 SET a = 10 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 10, null));
+         assertRows(execute("SELECT * from mv"), row(10, 1, null));
+ 
+         updateView("UPDATE %s SET b = 100 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 10, 100));
+         assertRows(execute("SELECT * from mv"), row(10, 1, 100));
+ 
+         Thread.sleep(5000);
+ 
+         // 'a' is TTL of 5 and removed.
+         assertRows(execute("SELECT * from %s"), row(1, null, 100));
+         assertEmpty(execute("SELECT * from mv"));
+         assertEmpty(execute("SELECT * from mv WHERE k = ? AND a = ?", 1, 10));
+ 
+         updateView("DELETE b FROM %s WHERE k=1");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, null, null));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("DELETE FROM %s WHERE k=1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testUpdateColumnNotInViewWithFlush() throws Throwable
+     {
+         testUpdateColumnNotInView(true);
+     }
+ 
+     @Test
+     public void testUpdateColumnNotInViewWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUpdateColumnNotInView(false);
+     }
+ 
+     private void testUpdateColumnNotInView(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13127: if base column not selected in view are alive, then pk of view row should be alive
+         createTable("create table %s (p int, c int, v1 int, v2 int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 0 SET v1 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v1 FROM %s USING TIMESTAMP 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         // shadowed by tombstone
+         updateView("UPDATE %s USING TIMESTAMP 1 SET v1 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v1 FROM %s USING TIMESTAMP 3 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v2 FROM %s USING TIMESTAMP 4 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s USING TTL 3 SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         assertInvalidMessage("Cannot drop column v2 on base table with materialized views", "ALTER TABLE %s DROP v2");
+         // // drop unselected base column, unselected metadata should be removed, thus view row is dead
+         // updateView("ALTER TABLE %s DROP v2");
+         // assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+         // assertRowsIgnoringOrder(execute("SELECT * from %s"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testPartialUpdateWithUnselectedCollectionsWithFlush() throws Throwable
+     {
+         testPartialUpdateWithUnselectedCollections(true);
+     }
+ 
+     @Test
+     public void testPartialUpdateWithUnselectedCollectionsWithoutFlush() throws Throwable
+     {
+         testPartialUpdateWithUnselectedCollections(false);
+     }
+ 
+     public void testPartialUpdateWithUnselectedCollections(boolean flush) throws Throwable
+     {
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s SET l=l+[1,2,3] WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateView("UPDATE %s SET l=l-[1,2] WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateView("UPDATE %s SET b=3 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 3));
+ 
+         updateView("UPDATE %s SET b=null, l=l-[3], s=s-{3} WHERE k = 1 AND c = 1");
+         if (flush)
+         {
+             FBUtilities.waitOnFutures(ks.flush());
+             ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         }
+         assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+         assertRowsIgnoringOrder(execute("SELECT * from mv"));
+ 
+         updateView("UPDATE %s SET m=m+{3:3}, l=l-[1], s=s-{2} WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null));
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m");
+         // executeNet(protocolVersion, "ALTER TABLE %s DROP m");
+         // ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE k = 1 AND c = 1"));
+         // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testUnselectedColumnsTTLWithFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUnselectedColumnsTTL(true);
+     }
+ 
+     @Test
+     public void testUnselectedColumnsTTLWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUnselectedColumnsTTL(false);
+     }
+ 
+     private void testUnselectedColumnsTTL(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13127 not ttled unselected column in base should keep view row alive
+         createTable("create table %s (p int, c int, v int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) USING TTL 3;", flush);
+ 
+         updateViewWithFlush("UPDATE %s USING TTL 1000 SET v = 0 WHERE p = 0 and c = 0;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         Thread.sleep(3000);
+ 
+         UntypedResultSet.Row row = execute("SELECT v, ttl(v) from %s WHERE c = ? AND p = ?", 0, 0).one();
+         assertTrue("row should have value of 0", row.getInt("v") == 0);
+         assertTrue("row should have ttl less than 1000", row.getInt("ttl(v)") < 1000);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateViewWithFlush("DELETE FROM %s WHERE p = 0 and c = 0;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) ", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         // already have a live row, no need to apply the unselected cell ttl
+         updateViewWithFlush("UPDATE %s USING TTL 3 SET v = 0 WHERE p = 0 and c = 0;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (1, 1) USING TTL 3", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+ 
+         Thread.sleep(4000);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1));
+ 
+         // unselected should keep view row alive
+         updateViewWithFlush("UPDATE %s SET v = 0 WHERE p = 1 and c = 1;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+ 
+     }
+ 
+     @Test
+     public void testRangeDeletionWithFlush() throws Throwable
+     {
+         testRangeDeletion(true);
+     }
+ 
+     @Test
+     public void testRangeDeletionWithoutFlush() throws Throwable
+     {
+         testRangeDeletion(false);
+     }
+ 
+     public void testRangeDeletion(boolean flush) throws Throwable
+     {
+         // for partition range deletion, need to know that existing row is shadowed instead of not existed.
+         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 PRIMARY KEY (a, b)");
+ 
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
+ 
+         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
+ 
+         // remove view row
+         updateView("UPDATE %s using timestamp 1 set b = null WHERE a=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+         // remove base row, no view updated generated.
+         updateView("DELETE FROM %s using timestamp 2 where a=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+ 
+         // restor view row with b,c column. d is still tombstone
+         updateView("UPDATE %s using timestamp 3 set b = 1,c = 1 where a=1"); // upsert
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
+     }
+ 
+     @Test
+     public void testBaseTTLWithSameTimestampTest() throws Throwable
+     {
+         // CASSANDRA-13127 when liveness timestamp tie, greater localDeletionTime should win if both are expiring.
+         createTable("create table %s (p int, c int, v int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) using timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         Thread.sleep(4000);
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+ 
+         // reversed order
+         execute("truncate %s;");
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         Thread.sleep(4000);
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+ 
+     }
+ 
+     @Test
+     public void testCommutativeRowDeletionFlush() throws Throwable
+     {
+         // CASSANDRA-13409
+         testCommutativeRowDeletion(true);
+     }
+ 
+     @Test
+     public void testCommutativeRowDeletionWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13409
+         testCommutativeRowDeletion(false);
+     }
+ 
+     private void testCommutativeRowDeletion(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13409 new update should not resurrect previous deleted data in view
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable-1, Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+         // sstable-2
+         updateView("Delete from %s using timestamp 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"));
+         // sstable-3
+         updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+         // sstable-4
+         updateView("UPdate %s using timestamp 4 set v1 = 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+         // sstable-5
+         updateView("UPdate %s using timestamp 5 set v1 = 1 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+ 
+         if (flush)
+         {
+             // compact sstable 2 and 4, 5;
+             ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+             List<String> sstables = cfs.getLiveSSTables()
+                                        .stream()
+                                        .sorted((s1, s2) -> s1.descriptor.generation - s2.descriptor.generation)
+                                        .map(s -> s.getFilename())
+                                        .collect(Collectors.toList());
+             String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(3), sstables.get(4)));
+             CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+             assertEquals(3, cfs.getLiveSSTables().size());
+         }
+         // regular tombstone should be retained after compaction
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+     }
+ 
+     @Test
+     public void testUnselectedColumnWithExpiredLivenessInfo() throws Throwable
+     {
+         boolean flush = true;
+         createTable("create table %s (k int, c int, a int, b int, PRIMARY KEY(k, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select k,c,b from %%s where c is not null and k is not null primary key (c, k);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable-1, Set initial values TS=1
+         updateViewWithFlush("UPDATE %s SET a = 1 WHERE k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         // sstable-2
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TTL 5", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         Thread.sleep(5001);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         // sstable-3
+         updateViewWithFlush("Update %s set a = null where k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"));
+ 
+         // sstable-4
+         updateViewWithFlush("Update %s USING TIMESTAMP 1 set b = 1 where k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1));
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampSmallerThanPkWithFlush() throws Throwable
+     {
+         testUpdateWithColumnTimestampSmallerThanPk(true);
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampSmallerThanPkWithoutFlush() throws Throwable
+     {
+         testUpdateWithColumnTimestampSmallerThanPk(false);
+     }
+ 
+     public void testUpdateWithColumnTimestampSmallerThanPk(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // reset value
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 6;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+         // increase pk's timestamp to 20
+         updateView("Insert into %s (p) values (3) using timestamp 20;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+         // change v1's to 2 and remove existing view row with ts7
+         updateView("UPdate %s using timestamp 7 set v1 = 2 where p = 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, 3, 6L));
+         // change v1's to 1 and remove existing view row with ts8
+         updateView("UPdate %s using timestamp 8 set v1 = 1 where p = 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampBiggerThanPkWithFlush() throws Throwable
+     {
+         // CASSANDRA-11500
+         testUpdateWithColumnTimestampBiggerThanPk(true);
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampBiggerThanPkWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-11500
+         testUpdateWithColumnTimestampBiggerThanPk(false);
+     }
+ 
+     public void testUpdateWithColumnTimestampBiggerThanPk(boolean flush) throws Throwable
+     {
+         // CASSANDRA-11500 able to shadow old view row with column ts greater tahn pk's ts and re-insert the view row
+         createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int);");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (k, a);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+         updateView("DELETE FROM %s USING TIMESTAMP 0 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // sstable-1, Set initial values TS=1
+         updateView("INSERT INTO %s(k, a, b) VALUES (1, 1, 1) USING TIMESTAMP 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 1));
+         updateView("UPDATE %s USING TIMESTAMP 10 SET b = 2 WHERE k = 1;");
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         updateView("UPDATE %s USING TIMESTAMP 2 SET a = 2 WHERE k = 1;");
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+         updateView("UPDATE %s USING TIMESTAMP 11 SET a = 1 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+ 
+         // set non-key base column as tombstone, view row is removed with shadowable
+         updateView("UPDATE %s USING TIMESTAMP 12 SET a = null WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, null, 2));
+ 
+         // column b should be alive
+         updateView("UPDATE %s USING TIMESTAMP 13 SET a = 1 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+ 
+         assertInvalidMessage("Cannot drop column a on base table with materialized views", "ALTER TABLE %s DROP a");
+     }
+ 
+     @Test
+     public void testNonBaseColumnInViewPkWithFlush() throws Throwable
+     {
+         testNonBaseColumnInViewPk(true);
+     }
+ 
+     @Test
+     public void testNonBaseColumnInViewPkWithoutFlush() throws Throwable
+     {
+         testNonBaseColumnInViewPk(true);
+     }
+ 
+     public void testNonBaseColumnInViewPk(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key (p1,p2))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1)"
+                            + " with gc_grace_seconds=5;");
+         ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+         cfs.disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 1 set v1 =1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, 1, null));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 set v1 = null, v2 = 1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 set v2 = null where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+ 
+         updateView("INSERT INTO %s (p1,p2) VALUES(1,1) USING TIMESTAMP 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, null));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, null));
+ 
+         updateView("DELETE FROM %s USING TIMESTAMP 4 WHERE p1 =1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 5 set v2 = 1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+     }
+ 
+     @Test
+     public void testStrictLivenessTombstone() throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p)"
+                            + " with gc_grace_seconds=5;");
+         ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+         cfs.disableAutoCompaction();
+ 
+         updateView("Insert into %s (p, v1, v2) values (1, 1, 1) ;");
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         updateView("Update %s set v1 = null WHERE p = 1");
+         FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+ 
+         cfs.forceMajorCompaction(); // before gc grace second, strict-liveness tombstoned dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+ 
+         Thread.sleep(6000);
+         assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+ 
+         cfs.forceMajorCompaction(); // after gc grace second, no data left
+         assertEquals(0, cfs.getLiveSSTables().size());
+ 
+         updateView("Update %s using ttl 5 set v1 = 1 WHERE p = 1");
+         FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         cfs.forceMajorCompaction(); // before ttl+gc_grace_second, strict-liveness ttled dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         Thread.sleep(5500); // after expired, before gc_grace_second
+         cfs.forceMajorCompaction();// before ttl+gc_grace_second, strict-liveness ttled dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+ 
+         Thread.sleep(5500); // after expired + gc_grace_second
+         assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+ 
+         cfs.forceMajorCompaction(); // after gc grace second, no data left
+         assertEquals(0, cfs.getLiveSSTables().size());
+     }
+ 
+     @Test
+     public void testCellTombstoneAndShadowableTombstonesWithFlush() throws Throwable
+     {
+         testCellTombstoneAndShadowableTombstones(true);
+     }
+ 
+     @Test
+     public void testCellTombstoneAndShadowableTombstonesWithoutFlush() throws Throwable
+     {
+         testCellTombstoneAndShadowableTombstones(false);
+     }
+ 
+     private void testCellTombstoneAndShadowableTombstones(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable 1, Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+         // sstable 2
+         updateView("UPdate %s using timestamp 2 set v2 = null where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3),
+                                 row(null, null));
+         // sstable 3
+         updateView("UPdate %s using timestamp 3 set v1 = 2 where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+         // sstable 4
+         updateView("UPdate %s using timestamp 4 set v1 = 1 where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+ 
+         if (flush)
+         {
+             // compact sstable 2 and 3;
+             ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+             List<String> sstables = cfs.getLiveSSTables()
+                                        .stream()
+                                        .sorted(Comparator.comparingInt(s -> s.descriptor.generation))
+                                        .map(s -> s.getFilename())
+                                        .collect(Collectors.toList());
+             System.out.println("SSTables " + sstables);
+             String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(2)));
+             CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+         }
+         // cell-tombstone in sstable 4 is not compacted away, because the shadowable tombstone is shadowed by new row.
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+     }
+ 
+     @Test
+     public void complexTimestampDeletionTestWithFlush() throws Throwable
+     {
+         complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(true);
+         complexTimestampWithbasePKColumnsInViewPKDeletionTest(true);
+     }
+ 
+     @Test
+     public void complexTimestampDeletionTestWithoutFlush() throws Throwable
+     {
+         complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(false);
+         complexTimestampWithbasePKColumnsInViewPKDeletionTest(false);
+     }
+ 
+     private void complexTimestampWithbasePKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key(p1, p2))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv2",
+                    "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1);");
+         ks.getColumnFamilyStore("mv2").disableAutoCompaction();
+ 
+         // Set initial values TS=1
+         updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 4, 1L));
+         // remove row/mv TS=2
+         updateView("Delete from %s using timestamp 2 where p1 = 1 and p2 = 2;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // view are empty
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"));
+         // insert PK with TS=3
+         updateView("Insert into %s (p1, p2) values (1, 2) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+ 
+         ks.getColumnFamilyStore("mv2").forceMajorCompaction();
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+ 
+         // reset values
+         updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 10;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 4, 10L));
+ 
+         updateView("UPDATE %s using timestamp 20 SET v2 = 5 WHERE p1 = 1 and p2 = 2");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 5, 20L));
+ 
+         updateView("DELETE FROM %s using timestamp 10 WHERE p1 = 1 and p2 = 2");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(null, 5, 20L));
+     }
+ 
+     public void complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(5, 1L));
+         // remove row/mv TS=2
+         updateView("Delete from %s using timestamp 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // view are empty
+         assertRowsIgnoringOrder(execute("SELECT * from mv"));
+         // insert PK with TS=3
+         updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+ 
+         // insert values TS=2, it should be considered dead due to previous tombstone
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 2;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+ 
+         // insert values TS=2, it should be considered dead due to previous tombstone
+         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET v2 = ? WHERE p = ?", 4, 3);
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+ 
+         ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+     }
+ 
+     @Test
+     public void testMVWithDifferentColumnsWithFlush() throws Throwable
+     {
+         testMVWithDifferentColumns(true);
+     }
+ 
+     @Test
+     public void testMVWithDifferentColumnsWithoutFlush() throws Throwable
+     {
+         testMVWithDifferentColumns(false);
+     }
+ 
+     private void testMVWithDifferentColumns(boolean flush) throws Throwable
+     {
+         createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY(a, b))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         List<String> viewNames = new ArrayList<>();
+         List<String> mvStatements = Arrays.asList(
+                                                   // all selected
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // unselected e,f
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // no selected
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // all selected, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                   // unselected e,f, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                   // no selected, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)");
+ 
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         for (int i = 0; i < mvStatements.size(); i++)
+         {
+             String name = "mv" + i;
+             viewNames.add(name);
+             createView(name, mvStatements.get(i));
+             ks.getColumnFamilyStore(name).disableAutoCompaction();
+         }
+ 
+         // insert
+         updateViewWithFlush("INSERT INTO %s (a,b,c,d,e,f) VALUES(1,1,1,1,1,1) using timestamp 1", flush);
+         assertBaseViews(row(1, 1, 1, 1, 1, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 2 SET c=0, d=0 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 0, 0, 1, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 2 SET e=0, f=0 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 0, 0, 0, 0), viewNames);
+ 
+         updateViewWithFlush("DELETE FROM %s using timestamp 2 WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         // partial update unselected, selected
+         updateViewWithFlush("UPDATE %s using timestamp 3 SET f=1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 4 SET e = 1, f=null WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, 1, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 4 SET e = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 5 SET c = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 5 SET c = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET d = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, 1, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 7 SET d = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 8 SET f = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET c = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, 1), viewNames);
+ 
+         // view row still alive due to c=1@6
+         updateViewWithFlush("UPDATE %s using timestamp 8 SET f = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET c = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+     }
+ 
+     private void assertBaseViews(Object[] row, List<String> viewNames) throws Throwable
+     {
+         UntypedResultSet result = execute("SELECT * FROM %s");
+         if (row == null)
+             assertRowsIgnoringOrder(result);
+         else
+             assertRowsIgnoringOrder(result, row);
+         for (int i = 0; i < viewNames.size(); i++)
+             assertBaseView(result, execute(String.format("SELECT * FROM %s", viewNames.get(i))), viewNames.get(i));
+     }
+ 
+     private void assertBaseView(UntypedResultSet base, UntypedResultSet view, String mv)
+     {
+         List<ColumnSpecification> baseMeta = base.metadata();
+         List<ColumnSpecification> viewMeta = view.metadata();
+ 
+         Iterator<UntypedResultSet.Row> iter = base.iterator();
+         Iterator<UntypedResultSet.Row> viewIter = view.iterator();
+ 
+         List<UntypedResultSet.Row> baseData = com.google.common.collect.Lists.newArrayList(iter);
+         List<UntypedResultSet.Row> viewData = com.google.common.collect.Lists.newArrayList(viewIter);
+ 
+         if (baseData.size() != viewData.size())
+             fail(String.format("Mismatch number of rows in view %s: <%s>, in base <%s>",
+                                mv,
+                                makeRowStrings(view),
+                                makeRowStrings(base)));
+         if (baseData.size() == 0)
+             return;
+         if (viewData.size() != 1)
+             fail(String.format("Expect only one row in view %s, but got <%s>",
+                                mv,
+                                makeRowStrings(view)));
+ 
+         UntypedResultSet.Row row = baseData.get(0);
+         UntypedResultSet.Row viewRow = viewData.get(0);
+ 
+         Map<String, ByteBuffer> baseValues = new HashMap<>();
+         for (int j = 0; j < baseMeta.size(); j++)
+         {
+             ColumnSpecification column = baseMeta.get(j);
+             ByteBuffer actualValue = row.getBytes(column.name.toString());
+             baseValues.put(column.name.toString(), actualValue);
+         }
+         for (int j = 0; j < viewMeta.size(); j++)
+         {
+             ColumnSpecification column = viewMeta.get(j);
+             String name = column.name.toString();
+             ByteBuffer viewValue = viewRow.getBytes(name);
+             if (!baseValues.containsKey(name))
+             {
+                 fail(String.format("Extra column: %s with value %s in view", name, column.type.compose(viewValue)));
+             }
+             else if (!Objects.equal(baseValues.get(name), viewValue))
+             {
+                 fail(String.format("Non equal column: %s, expected <%s> but got <%s>",
+                                    name,
+                                    column.type.compose(baseValues.get(name)),
+                                    column.type.compose(viewValue)));
+             }
+         }
+     }
 -
+ }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[13/16] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e624c663
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e624c663
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e624c663

Branch: refs/heads/cassandra-3.11
Commit: e624c6638254ea410691f085a10d08d412eb5ac1
Parents: 14d67d8 1b36740
Author: Paulo Motta <pa...@apache.org>
Authored: Tue Sep 5 01:04:34 2017 -0500
Committer: Paulo Motta <pa...@apache.org>
Committed: Tue Sep 5 01:05:06 2017 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   30 +-
 doc/cql3/CQL.textile                            |    6 +
 .../org/apache/cassandra/config/CFMetaData.java |   13 +
 .../apache/cassandra/cql3/UpdateParameters.java |    2 +-
 .../cql3/statements/AlterTableStatement.java    |   18 +-
 .../org/apache/cassandra/db/LivenessInfo.java   |   17 +-
 .../org/apache/cassandra/db/ReadCommand.java    |    7 +-
 .../db/compaction/CompactionIterator.java       |    7 +-
 .../apache/cassandra/db/filter/RowFilter.java   |    4 +-
 .../cassandra/db/partitions/PurgeFunction.java  |   14 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |    6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   13 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |    5 +
 .../apache/cassandra/db/transform/Filter.java   |    8 +-
 .../db/transform/FilteredPartitions.java        |    4 +-
 .../cassandra/db/transform/FilteredRows.java    |    2 +-
 .../apache/cassandra/db/view/TableViews.java    |   18 +-
 src/java/org/apache/cassandra/db/view/View.java |   41 +-
 .../apache/cassandra/db/view/ViewManager.java   |    5 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  163 ++-
 .../apache/cassandra/service/DataResolver.java  |    4 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |    2 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  | 1344 ++++++++++++++++++
 .../cassandra/cql3/ViewFilteringTest.java       | 1030 +++++++++-----
 .../org/apache/cassandra/cql3/ViewTest.java     |   25 +-
 25 files changed, 2293 insertions(+), 495 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 8e39667,7064c5d..0682ae9
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,10 -18,28 +18,34 @@@ using the provided 'sstableupgrade' too
  
  Upgrading
  ---------
 -   - Nothing specific to this release, but please see previous upgrading sections,
 -     especially if you are upgrading from 2.2.
 +    - Nothing specific to this version but please see previous upgrading sections,
 +      especially if you are upgrading from 2.2.
  
+ Materialized Views
+ -------------------
+     - Cassandra will no longer allow dropping columns on tables with Materialized Views.
+     - A change was made in the way the Materialized View timestamp is computed, which
+       may cause an old deletion to a base column which is view primary key (PK) column
+       to not be reflected in the view when repairing the base table post-upgrade. This
+       condition is only possible when a column deletion to an MV primary key (PK) column
+       not present in the base table PK (via UPDATE base SET view_pk_col = null or DELETE
+       view_pk_col FROM base) is missed before the upgrade and received by repair after the upgrade.
+       If such column deletions are done on a view PK column which is not a base PK, it's advisable
+       to run repair on the base table of all nodes prior to the upgrade. Alternatively it's possible
+       to fix potential inconsistencies by running repair on the views after upgrade or drop and
+       re-create the views. See CASSANDRA-11500 for more details.
+     - Removal of columns not selected in the Materialized View (via UPDATE base SET unselected_column
+       = null or DELETE unselected_column FROM base) may not be properly reflected in the view in some
+       situations so we advise against doing deletions on base columns not selected in views
+       until this is fixed on CASSANDRA-13826.
 -
 -3.0.14
++    - Creating Materialized View with filtering on non-primary-key base column
++      (added in CASSANDRA-10368) is disabled, because the liveness of view row
++      is depending on multiple filtered base non-key columns and base non-key
++      column used in view primary-key. This semantic cannot be supported without
++      storage format change, see CASSANDRA-13826. For append-only use case, you
++      may still use this feature with a startup flag: "-Dcassandra.mv.allow_filtering_nonkey_columns_unsafe=true"
++
 +3.11.0
  ======
  
  Upgrading

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 3ac790b,befdd25..fdbcf7a
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -187,72 -189,54 +187,60 @@@ public class AlterTableStatement extend
                  break;
  
              case DROP:
 -                assert columnName != null;
                  if (!cfm.isCQLTable())
                      throw new InvalidRequestException("Cannot drop columns from a non-CQL3 table");
 -                if (def == null)
 -                    throw new InvalidRequestException(String.format("Column %s was not found in table %s", columnName, columnFamily()));
  
 -                switch (def.kind)
 +                for (AlterTableStatementColumn colData : colNameList)
                  {
 -                    case PARTITION_KEY:
 -                    case CLUSTERING:
 -                        throw new InvalidRequestException(String.format("Cannot drop PRIMARY KEY part %s", columnName));
 -                    case REGULAR:
 -                    case STATIC:
 -                        ColumnDefinition toDelete = null;
 -                        for (ColumnDefinition columnDef : cfm.partitionColumns())
 -                        {
 -                            if (columnDef.name.equals(columnName))
 -                            {
 -                                toDelete = columnDef;
 -                                break;
 -                            }
 -                        }
 -                        assert toDelete != null;
 -                        cfm.removeColumnDefinition(toDelete);
 -                        cfm.recordColumnDrop(toDelete, deleteTimestamp == null ? queryState.getTimestamp() : deleteTimestamp);
 -                        break;
 -                }
 +                    columnName = colData.getColumnName().getIdentifier(cfm);
 +                    def = cfm.getColumnDefinition(columnName);
  
 -                // If the dropped column is required by any secondary indexes
 -                // we reject the operation, as the indexes must be dropped first
 -                Indexes allIndexes = cfm.getIndexes();
 -                if (!allIndexes.isEmpty())
 -                {
 -                    ColumnFamilyStore store = Keyspace.openAndGetStore(cfm);
 -                    Set<IndexMetadata> dependentIndexes = store.indexManager.getDependentIndexes(def);
 -                    if (!dependentIndexes.isEmpty())
 -                        throw new InvalidRequestException(String.format("Cannot drop column %s because it has " +
 -                                                                        "dependent secondary indexes (%s)",
 -                                                                        def,
 -                                                                        dependentIndexes.stream()
 -                                                                                        .map(i -> i.name)
 -                                                                                        .collect(Collectors.joining(","))));
 -                }
 +                    if (def == null)
 +                        throw new InvalidRequestException(String.format("Column %s was not found in table %s", columnName, columnFamily()));
 +
 +                    switch (def.kind)
 +                    {
 +                         case PARTITION_KEY:
 +                         case CLUSTERING:
 +                              throw new InvalidRequestException(String.format("Cannot drop PRIMARY KEY part %s", columnName));
 +                         case REGULAR:
 +                         case STATIC:
 +                              ColumnDefinition toDelete = null;
 +                              for (ColumnDefinition columnDef : cfm.partitionColumns())
 +                              {
 +                                   if (columnDef.name.equals(columnName))
 +                                   {
 +                                       toDelete = columnDef;
 +                                       break;
 +                                   }
 +                               }
 +                             assert toDelete != null;
 +                             cfm.removeColumnDefinition(toDelete);
 +                             cfm.recordColumnDrop(toDelete, deleteTimestamp  == null ? queryState.getTimestamp() : deleteTimestamp);
 +                             break;
 +                    }
  
 -                if (!Iterables.isEmpty(views))
 -                    throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
 -                                                                    columnName.toString(),
 -                                                                    keyspace()));
 +                    // If the dropped column is required by any secondary indexes
 +                    // we reject the operation, as the indexes must be dropped first
 +                    Indexes allIndexes = cfm.getIndexes();
 +                    if (!allIndexes.isEmpty())
 +                    {
 +                        ColumnFamilyStore store = Keyspace.openAndGetStore(cfm);
 +                        Set<IndexMetadata> dependentIndexes = store.indexManager.getDependentIndexes(def);
 +                        if (!dependentIndexes.isEmpty())
 +                            throw new InvalidRequestException(String.format("Cannot drop column %s because it has " +
 +                                                                            "dependent secondary indexes (%s)",
 +                                                                            def,
 +                                                                            dependentIndexes.stream()
 +                                                                                            .map(i -> i.name)
 +                                                                                            .collect(Collectors.joining(","))));
 +                    }
 +
-                     // If a column is dropped which is included in a view, we don't allow the drop to take place.
-                     boolean rejectAlter = false;
-                     StringBuilder builder = new StringBuilder();
-                     for (ViewDefinition view : views)
-                     {
-                         if (!view.includes(columnName)) continue;
-                         if (rejectAlter)
-                             builder.append(',');
-                         rejectAlter = true;
-                         builder.append(view.viewName);
-                     }
-                     if (rejectAlter)
-                         throw new InvalidRequestException(String.format("Cannot drop column %s, depended on by materialized views (%s.{%s})",
++                    if (!Iterables.isEmpty(views))
++                        throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
 +                                                                        columnName.toString(),
-                                                                         keyspace(),
-                                                                         builder.toString()));
++                                                                        keyspace()));
 +                }
                  break;
              case OPTS:
                  if (attrs == null)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/LivenessInfo.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/filter/RowFilter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/rows/Row.java
index 60ee4d4,3bcc220..9a8508b
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@@ -206,19 -213,9 +216,19 @@@ public interface Row extends Unfiltered
       * @return this row but without any deletion info purged by {@code purger}. If the purged row is empty, returns
       * {@code null}.
       */
-     public Row purge(DeletionPurger purger, int nowInSec);
+     public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness);
  
      /**
 +     * Returns a copy of this row which only include the data queried by {@code filter}, excluding anything _fetched_ for
 +     * internal reasons but not queried by the user (see {@link ColumnFilter} for details).
 +     *
 +     * @param filter the {@code ColumnFilter} to use when deciding what is user queried. This should be the filter
 +     * that was used when querying the row on which this method is called.
 +     * @return the row but with all data that wasn't queried by the user skipped.
 +     */
 +    public Row withOnlyQueriedData(ColumnFilter filter);
 +
 +    /**
       * Returns a copy of this row where all counter cells have they "local" shard marked for clearing.
       */
      public Row markCounterLocalToBeCleared();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/TableViews.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewManager.java
index 5c72bb2,d1cfd9e..cb1e02b
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@@ -172,9 -159,13 +172,14 @@@ public class ViewManage
  
          forTable(view.getDefinition().baseTableMetadata()).removeByName(name);
          SystemKeyspace.setViewRemoved(keyspace.getName(), view.name);
 +        SystemDistributedKeyspace.setViewRemoved(keyspace.getName(), view.name);
      }
  
+     public View getByName(String name)
+     {
+         return viewsByName.get(name);
+     }
+ 
      public void buildAllViews()
      {
          for (View view : allViews())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index edbda1c,0c8e078..74758e7
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@@ -376,14 -384,34 +383,34 @@@ public class ViewUpdateGenerato
          if (!matchesViewFilter(existingBaseRow))
              return;
  
-         deleteOldEntryInternal(existingBaseRow);
+         deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
      }
  
-     private void deleteOldEntryInternal(Row existingBaseRow)
+     private void deleteOldEntryInternal(Row existingBaseRow, Row mergedBaseRow)
      {
          startNewUpdate(existingBaseRow);
-         DeletionTime dt = new DeletionTime(computeTimestampForEntryDeletion(existingBaseRow), nowInSec);
-         currentViewEntryBuilder.addRowDeletion(Row.Deletion.shadowable(dt));
+         long timestamp = computeTimestampForEntryDeletion(existingBaseRow, mergedBaseRow);
+         long rowDeletion = mergedBaseRow.deletion().time().markedForDeleteAt();
+         assert timestamp >= rowDeletion;
+ 
+         // If computed deletion timestamp greater than row deletion, it must be coming from
+         //  1. non-pk base column used in view pk, or
+         //  2. unselected base column
+         //  any case, we need to use it as expired livenessInfo
+         // If computed deletion timestamp is from row deletion, we only need row deletion itself
+         if (timestamp > rowDeletion)
+         {
+             /**
+               * TODO: This is a hack and overload of LivenessInfo and we should probably modify
+               * the storage engine to properly support this, but on the meantime this
+               * should be fine because it only happens in some specific scenarios explained above.
+               */
 -            LivenessInfo info = LivenessInfo.create(timestamp, Integer.MAX_VALUE, nowInSec);
++            LivenessInfo info = LivenessInfo.withExpirationTime(timestamp, Integer.MAX_VALUE, nowInSec);
+             currentViewEntryBuilder.addPrimaryKeyLivenessInfo(info);
+         }
+         currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
+ 
+         addDifferentCells(existingBaseRow, mergedBaseRow);
          submitUpdate();
      }
  
@@@ -440,50 -458,74 +457,74 @@@
  
          LivenessInfo baseLiveness = baseRow.primaryKeyLivenessInfo();
  
-         if (view.baseNonPKColumnsInViewPK.isEmpty())
+         if (view.hasSamePrimaryKeyColumnsAsBaseTable())
          {
-             int ttl = baseLiveness.ttl();
-             int expirationTime = baseLiveness.localExpirationTime();
+             if (view.getDefinition().includeAllColumns)
+                 return baseLiveness;
+ 
+             long timestamp = baseLiveness.timestamp();
+             boolean hasNonExpiringLiveCell = false;
+             Cell biggestExpirationCell = null;
              for (Cell cell : baseRow.cells())
              {
-                 if (cell.ttl() > ttl)
+                 if (view.getViewColumn(cell.column()) != null)
+                     continue;
+                 if (!isLive(cell))
+                     continue;
+                 timestamp = Math.max(timestamp, cell.maxTimestamp());
+                 if (!cell.isExpiring())
+                     hasNonExpiringLiveCell = true;
+                 else
                  {
-                     ttl = cell.ttl();
-                     expirationTime = cell.localDeletionTime();
+                     if (biggestExpirationCell == null)
+                         biggestExpirationCell = cell;
+                     else if (cell.localDeletionTime() > biggestExpirationCell.localDeletionTime())
+                         biggestExpirationCell = cell;
                  }
              }
-             return ttl == baseLiveness.ttl()
-                  ? baseLiveness
-                  : LivenessInfo.withExpirationTime(baseLiveness.timestamp(), ttl, expirationTime);
+             if (baseLiveness.isLive(nowInSec) && !baseLiveness.isExpiring())
 -                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
++                return LivenessInfo.create(timestamp, nowInSec);
+             if (hasNonExpiringLiveCell)
 -                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
++                return LivenessInfo.create(timestamp, nowInSec);
+             if (biggestExpirationCell == null)
+                 return baseLiveness;
+             if (biggestExpirationCell.localDeletionTime() > baseLiveness.localExpirationTime()
+                     || !baseLiveness.isLive(nowInSec))
 -                return LivenessInfo.create(timestamp,
++                return LivenessInfo.withExpirationTime(timestamp,
+                                                        biggestExpirationCell.ttl(),
+                                                        biggestExpirationCell.localDeletionTime());
+             return baseLiveness;
          }
  
-         ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0);
-         Cell cell = baseRow.getCell(baseColumn);
+         Cell cell = baseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
          assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry";
  
-         long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
-         return LivenessInfo.withExpirationTime(timestamp, cell.ttl(), cell.localDeletionTime());
 -        return LivenessInfo.create(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
++        return LivenessInfo.withExpirationTime(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
      }
  
-     private long computeTimestampForEntryDeletion(Row baseRow)
+     private long computeTimestampForEntryDeletion(Row existingBaseRow, Row mergedBaseRow)
      {
-         // We delete the old row with it's row entry timestamp using a shadowable deletion.
-         // We must make sure that the deletion deletes everything in the entry (or the entry will
-         // still show up), so we must use the bigger timestamp found in the existing row (for any
-         // column included in the view at least).
-         // TODO: We have a problem though: if the entry is "resurected" by a later update, we would
-         // need to ensure that the timestamp for then entry then is bigger than the tombstone
-         // we're just inserting, which is not currently guaranteed.
-         // This is a bug for a separate ticket though.
-         long timestamp = baseRow.primaryKeyLivenessInfo().timestamp();
-         for (ColumnData data : baseRow)
+         DeletionTime deletion = mergedBaseRow.deletion().time();
+         if (view.hasSamePrimaryKeyColumnsAsBaseTable())
          {
-             if (!view.getDefinition().includes(data.column().name))
-                 continue;
+             long timestamp = Math.max(deletion.markedForDeleteAt(), existingBaseRow.primaryKeyLivenessInfo().timestamp());
+             if (view.getDefinition().includeAllColumns)
+                 return timestamp;
  
-             timestamp = Math.max(timestamp, data.maxTimestamp());
+             for (Cell cell : existingBaseRow.cells())
+             {
+                 // selected column should not contribute to view deletion, itself is already included in view row
+                 if (view.getViewColumn(cell.column()) != null)
+                     continue;
+                 // unselected column is used regardless live or dead, because we don't know if it was used for liveness.
+                 timestamp = Math.max(timestamp, cell.maxTimestamp());
+             }
+             return timestamp;
          }
-         return timestamp;
+         // has base non-pk column in view pk
+         Cell before = existingBaseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
+         assert isLive(before) : "We shouldn't have got there if the base row had no associated entry";
+         return deletion.deletes(before) ? deletion.markedForDeleteAt() : before.timestamp();
      }
  
      private void addColumnData(ColumnDefinition viewColumn, ColumnData baseTableData)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
index 0000000,9e32620..ece3e6d
mode 000000,100644..100644
--- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@@ -1,0 -1,1343 +1,1344 @@@
+ package org.apache.cassandra.cql3;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Comparator;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.concurrent.TimeUnit;
+ import java.util.stream.Collectors;
+ 
+ import org.apache.cassandra.concurrent.SEPExecutor;
+ import org.apache.cassandra.concurrent.Stage;
+ import org.apache.cassandra.concurrent.StageManager;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.compaction.CompactionManager;
++import org.apache.cassandra.transport.ProtocolVersion;
+ import org.apache.cassandra.utils.FBUtilities;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Ignore;
+ import org.junit.Test;
+ 
+ import com.google.common.base.Objects;
+ 
+ public class ViewComplexTest extends CQLTester
+ {
 -    int protocolVersion = 4;
++    ProtocolVersion protocolVersion = ProtocolVersion.V4;
+     private final List<String> views = new ArrayList<>();
+ 
+     @BeforeClass
+     public static void startup()
+     {
+         requireNetwork();
+     }
+     @Before
+     public void begin()
+     {
+         views.clear();
+     }
+ 
+     @After
+     public void end() throws Throwable
+     {
+         for (String viewName : views)
+             executeNet(protocolVersion, "DROP MATERIALIZED VIEW " + viewName);
+     }
+ 
+     private void createView(String name, String query) throws Throwable
+     {
+         executeNet(protocolVersion, String.format(query, name));
+         // If exception is thrown, the view will not be added to the list; since it shouldn't have been created, this is
+         // the desired behavior
+         views.add(name);
+     }
+ 
+     private void updateView(String query, Object... params) throws Throwable
+     {
+         updateViewWithFlush(query, false, params);
+     }
+ 
+     private void updateViewWithFlush(String query, boolean flush, Object... params) throws Throwable
+     {
+         executeNet(protocolVersion, query, params);
+         while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
+                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+         {
+             Thread.sleep(1);
+         }
+         if (flush)
+             Keyspace.open(keyspace()).flush();
+     }
+ 
+     // for now, unselected column cannot be fully supported, SEE CASSANDRA-13826
+     @Ignore
+     @Test
+     public void testPartialDeleteUnselectedColumn() throws Throwable
+     {
+         boolean flush = true;
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT k,c FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+         updateView("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+         updateView("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+ 
+         execute("truncate %s;");
+ 
+         // removal generated by unselected column should not shadow PK update with smaller timestamp
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 20 SET a=null WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"));
+         assertRows(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+     }
+ 
+     @Test
+     public void testPartialDeleteSelectedColumnWithFlush() throws Throwable
+     {
+         testPartialDeleteSelectedColumn(true);
+     }
+ 
+     @Test
+     public void testPartialDeleteSelectedColumnWithoutFlush() throws Throwable
+     {
+         testPartialDeleteSelectedColumn(false);
+     }
+ 
+     private void testPartialDeleteSelectedColumn(boolean flush) throws Throwable
+     {
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, e int, f int, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+ 
+         updateViewWithFlush("DELETE a FROM %s USING TIMESTAMP 1 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         // view livenessInfo should not be affected by selected column ts or tb
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 0", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 12 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 13 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 14 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TTL 3 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         TimeUnit.SECONDS.sleep(4);
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 15 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         execute("truncate %s;");
+ 
+         // removal generated by unselected column should not shadow selected column with smaller timestamp
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=null WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"));
+         assertRows(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 16 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+     }
+ 
+     @Test
+     public void testUpdateColumnInViewPKWithTTLWithFlush() throws Throwable
+     {
+         // CASSANDRA-13657
+         testUpdateColumnInViewPKWithTTL(true);
+     }
+ 
+     @Test
+     public void testUpdateColumnInViewPKWithTTLWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13657
+         testUpdateColumnInViewPKWithTTL(false);
+     }
+ 
+     private void testUpdateColumnInViewPKWithTTL(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13657 if base column used in view pk is ttled, then view row is considered dead
+         createTable("create table %s (k int primary key, a int, b int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (a, k)");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s SET a = 1 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null));
+ 
+         updateView("DELETE a FROM %s WHERE k = 1");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("INSERT INTO %s (k) VALUES (1);");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, null, null));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("UPDATE %s USING TTL 5 SET a = 10 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 10, null));
+         assertRows(execute("SELECT * from mv"), row(10, 1, null));
+ 
+         updateView("UPDATE %s SET b = 100 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 10, 100));
+         assertRows(execute("SELECT * from mv"), row(10, 1, 100));
+ 
+         Thread.sleep(5000);
+ 
+         // 'a' is TTL of 5 and removed.
+         assertRows(execute("SELECT * from %s"), row(1, null, 100));
+         assertEmpty(execute("SELECT * from mv"));
+         assertEmpty(execute("SELECT * from mv WHERE k = ? AND a = ?", 1, 10));
+ 
+         updateView("DELETE b FROM %s WHERE k=1");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, null, null));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("DELETE FROM %s WHERE k=1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testUpdateColumnNotInViewWithFlush() throws Throwable
+     {
+         testUpdateColumnNotInView(true);
+     }
+ 
+     @Test
+     public void testUpdateColumnNotInViewWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUpdateColumnNotInView(false);
+     }
+ 
+     private void testUpdateColumnNotInView(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13127: if base column not selected in view are alive, then pk of view row should be alive
+         createTable("create table %s (p int, c int, v1 int, v2 int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 0 SET v1 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v1 FROM %s USING TIMESTAMP 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         // shadowed by tombstone
+         updateView("UPDATE %s USING TIMESTAMP 1 SET v1 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v1 FROM %s USING TIMESTAMP 3 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v2 FROM %s USING TIMESTAMP 4 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s USING TTL 3 SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         assertInvalidMessage("Cannot drop column v2 on base table with materialized views", "ALTER TABLE %s DROP v2");
+         // // drop unselected base column, unselected metadata should be removed, thus view row is dead
+         // updateView("ALTER TABLE %s DROP v2");
+         // assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+         // assertRowsIgnoringOrder(execute("SELECT * from %s"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testPartialUpdateWithUnselectedCollectionsWithFlush() throws Throwable
+     {
+         testPartialUpdateWithUnselectedCollections(true);
+     }
+ 
+     @Test
+     public void testPartialUpdateWithUnselectedCollectionsWithoutFlush() throws Throwable
+     {
+         testPartialUpdateWithUnselectedCollections(false);
+     }
+ 
+     public void testPartialUpdateWithUnselectedCollections(boolean flush) throws Throwable
+     {
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s SET l=l+[1,2,3] WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateView("UPDATE %s SET l=l-[1,2] WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateView("UPDATE %s SET b=3 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 3));
+ 
+         updateView("UPDATE %s SET b=null, l=l-[3], s=s-{3} WHERE k = 1 AND c = 1");
+         if (flush)
+         {
+             FBUtilities.waitOnFutures(ks.flush());
+             ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         }
+         assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+         assertRowsIgnoringOrder(execute("SELECT * from mv"));
+ 
+         updateView("UPDATE %s SET m=m+{3:3}, l=l-[1], s=s-{2} WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null));
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m");
+         // executeNet(protocolVersion, "ALTER TABLE %s DROP m");
+         // ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE k = 1 AND c = 1"));
+         // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testUnselectedColumnsTTLWithFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUnselectedColumnsTTL(true);
+     }
+ 
+     @Test
+     public void testUnselectedColumnsTTLWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUnselectedColumnsTTL(false);
+     }
+ 
+     private void testUnselectedColumnsTTL(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13127 not ttled unselected column in base should keep view row alive
+         createTable("create table %s (p int, c int, v int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) USING TTL 3;", flush);
+ 
+         updateViewWithFlush("UPDATE %s USING TTL 1000 SET v = 0 WHERE p = 0 and c = 0;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         Thread.sleep(3000);
+ 
+         UntypedResultSet.Row row = execute("SELECT v, ttl(v) from %s WHERE c = ? AND p = ?", 0, 0).one();
+         assertTrue("row should have value of 0", row.getInt("v") == 0);
+         assertTrue("row should have ttl less than 1000", row.getInt("ttl(v)") < 1000);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateViewWithFlush("DELETE FROM %s WHERE p = 0 and c = 0;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) ", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         // already have a live row, no need to apply the unselected cell ttl
+         updateViewWithFlush("UPDATE %s USING TTL 3 SET v = 0 WHERE p = 0 and c = 0;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (1, 1) USING TTL 3", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+ 
+         Thread.sleep(4000);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1));
+ 
+         // unselected should keep view row alive
+         updateViewWithFlush("UPDATE %s SET v = 0 WHERE p = 1 and c = 1;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+ 
+     }
+ 
+     @Test
+     public void testRangeDeletionWithFlush() throws Throwable
+     {
+         testRangeDeletion(true);
+     }
+ 
+     @Test
+     public void testRangeDeletionWithoutFlush() throws Throwable
+     {
+         testRangeDeletion(false);
+     }
+ 
+     public void testRangeDeletion(boolean flush) throws Throwable
+     {
+         // for partition range deletion, need to know that existing row is shadowed instead of not existed.
+         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 PRIMARY KEY (a, b)");
+ 
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
+ 
+         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
+ 
+         // remove view row
+         updateView("UPDATE %s using timestamp 1 set b = null WHERE a=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+         // remove base row, no view updated generated.
+         updateView("DELETE FROM %s using timestamp 2 where a=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+ 
+         // restor view row with b,c column. d is still tombstone
+         updateView("UPDATE %s using timestamp 3 set b = 1,c = 1 where a=1"); // upsert
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
+     }
+ 
+     @Test
+     public void testBaseTTLWithSameTimestampTest() throws Throwable
+     {
+         // CASSANDRA-13127 when liveness timestamp tie, greater localDeletionTime should win if both are expiring.
+         createTable("create table %s (p int, c int, v int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) using timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         Thread.sleep(4000);
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+ 
+         // reversed order
+         execute("truncate %s;");
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         Thread.sleep(4000);
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+ 
+     }
+ 
+     @Test
+     public void testCommutativeRowDeletionFlush() throws Throwable
+     {
+         // CASSANDRA-13409
+         testCommutativeRowDeletion(true);
+     }
+ 
+     @Test
+     public void testCommutativeRowDeletionWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13409
+         testCommutativeRowDeletion(false);
+     }
+ 
+     private void testCommutativeRowDeletion(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13409 new update should not resurrect previous deleted data in view
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable-1, Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+         // sstable-2
+         updateView("Delete from %s using timestamp 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"));
+         // sstable-3
+         updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+         // sstable-4
+         updateView("UPdate %s using timestamp 4 set v1 = 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+         // sstable-5
+         updateView("UPdate %s using timestamp 5 set v1 = 1 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+ 
+         if (flush)
+         {
+             // compact sstable 2 and 4, 5;
+             ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+             List<String> sstables = cfs.getLiveSSTables()
+                                        .stream()
+                                        .sorted((s1, s2) -> s1.descriptor.generation - s2.descriptor.generation)
+                                        .map(s -> s.getFilename())
+                                        .collect(Collectors.toList());
+             String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(3), sstables.get(4)));
+             CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+             assertEquals(3, cfs.getLiveSSTables().size());
+         }
+         // regular tombstone should be retained after compaction
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+     }
+ 
+     @Test
+     public void testUnselectedColumnWithExpiredLivenessInfo() throws Throwable
+     {
+         boolean flush = true;
+         createTable("create table %s (k int, c int, a int, b int, PRIMARY KEY(k, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select k,c,b from %%s where c is not null and k is not null primary key (c, k);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable-1, Set initial values TS=1
+         updateViewWithFlush("UPDATE %s SET a = 1 WHERE k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         // sstable-2
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TTL 5", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         Thread.sleep(5001);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         // sstable-3
+         updateViewWithFlush("Update %s set a = null where k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"));
+ 
+         // sstable-4
+         updateViewWithFlush("Update %s USING TIMESTAMP 1 set b = 1 where k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1));
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampSmallerThanPkWithFlush() throws Throwable
+     {
+         testUpdateWithColumnTimestampSmallerThanPk(true);
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampSmallerThanPkWithoutFlush() throws Throwable
+     {
+         testUpdateWithColumnTimestampSmallerThanPk(false);
+     }
+ 
+     public void testUpdateWithColumnTimestampSmallerThanPk(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // reset value
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 6;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+         // increase pk's timestamp to 20
+         updateView("Insert into %s (p) values (3) using timestamp 20;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+         // change v1's to 2 and remove existing view row with ts7
+         updateView("UPdate %s using timestamp 7 set v1 = 2 where p = 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, 3, 6L));
+         // change v1's to 1 and remove existing view row with ts8
+         updateView("UPdate %s using timestamp 8 set v1 = 1 where p = 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampBiggerThanPkWithFlush() throws Throwable
+     {
+         // CASSANDRA-11500
+         testUpdateWithColumnTimestampBiggerThanPk(true);
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampBiggerThanPkWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-11500
+         testUpdateWithColumnTimestampBiggerThanPk(false);
+     }
+ 
+     public void testUpdateWithColumnTimestampBiggerThanPk(boolean flush) throws Throwable
+     {
+         // CASSANDRA-11500 able to shadow old view row with column ts greater tahn pk's ts and re-insert the view row
+         createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int);");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (k, a);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+         updateView("DELETE FROM %s USING TIMESTAMP 0 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // sstable-1, Set initial values TS=1
+         updateView("INSERT INTO %s(k, a, b) VALUES (1, 1, 1) USING TIMESTAMP 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 1));
+         updateView("UPDATE %s USING TIMESTAMP 10 SET b = 2 WHERE k = 1;");
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         updateView("UPDATE %s USING TIMESTAMP 2 SET a = 2 WHERE k = 1;");
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+         updateView("UPDATE %s USING TIMESTAMP 11 SET a = 1 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+ 
+         // set non-key base column as tombstone, view row is removed with shadowable
+         updateView("UPDATE %s USING TIMESTAMP 12 SET a = null WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, null, 2));
+ 
+         // column b should be alive
+         updateView("UPDATE %s USING TIMESTAMP 13 SET a = 1 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+ 
+         assertInvalidMessage("Cannot drop column a on base table with materialized views", "ALTER TABLE %s DROP a");
+     }
+ 
+     @Test
+     public void testNonBaseColumnInViewPkWithFlush() throws Throwable
+     {
+         testNonBaseColumnInViewPk(true);
+     }
+ 
+     @Test
+     public void testNonBaseColumnInViewPkWithoutFlush() throws Throwable
+     {
+         testNonBaseColumnInViewPk(true);
+     }
+ 
+     public void testNonBaseColumnInViewPk(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key (p1,p2))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1)"
+                            + " with gc_grace_seconds=5;");
+         ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+         cfs.disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 1 set v1 =1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, 1, null));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 set v1 = null, v2 = 1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 set v2 = null where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+ 
+         updateView("INSERT INTO %s (p1,p2) VALUES(1,1) USING TIMESTAMP 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, null));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, null));
+ 
+         updateView("DELETE FROM %s USING TIMESTAMP 4 WHERE p1 =1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 5 set v2 = 1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+     }
+ 
+     @Test
+     public void testStrictLivenessTombstone() throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p)"
+                            + " with gc_grace_seconds=5;");
+         ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+         cfs.disableAutoCompaction();
+ 
+         updateView("Insert into %s (p, v1, v2) values (1, 1, 1) ;");
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         updateView("Update %s set v1 = null WHERE p = 1");
+         FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+ 
+         cfs.forceMajorCompaction(); // before gc grace second, strict-liveness tombstoned dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+ 
+         Thread.sleep(6000);
+         assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+ 
+         cfs.forceMajorCompaction(); // after gc grace second, no data left
+         assertEquals(0, cfs.getLiveSSTables().size());
+ 
+         updateView("Update %s using ttl 5 set v1 = 1 WHERE p = 1");
+         FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         cfs.forceMajorCompaction(); // before ttl+gc_grace_second, strict-liveness ttled dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         Thread.sleep(5500); // after expired, before gc_grace_second
+         cfs.forceMajorCompaction();// before ttl+gc_grace_second, strict-liveness ttled dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+ 
+         Thread.sleep(5500); // after expired + gc_grace_second
+         assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+ 
+         cfs.forceMajorCompaction(); // after gc grace second, no data left
+         assertEquals(0, cfs.getLiveSSTables().size());
+     }
+ 
+     @Test
+     public void testCellTombstoneAndShadowableTombstonesWithFlush() throws Throwable
+     {
+         testCellTombstoneAndShadowableTombstones(true);
+     }
+ 
+     @Test
+     public void testCellTombstoneAndShadowableTombstonesWithoutFlush() throws Throwable
+     {
+         testCellTombstoneAndShadowableTombstones(false);
+     }
+ 
+     private void testCellTombstoneAndShadowableTombstones(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable 1, Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+         // sstable 2
+         updateView("UPdate %s using timestamp 2 set v2 = null where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3),
+                                 row(null, null));
+         // sstable 3
+         updateView("UPdate %s using timestamp 3 set v1 = 2 where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+         // sstable 4
+         updateView("UPdate %s using timestamp 4 set v1 = 1 where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+ 
+         if (flush)
+         {
+             // compact sstable 2 and 3;
+             ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+             List<String> sstables = cfs.getLiveSSTables()
+                                        .stream()
+                                        .sorted(Comparator.comparingInt(s -> s.descriptor.generation))
+                                        .map(s -> s.getFilename())
+                                        .collect(Collectors.toList());
+             System.out.println("SSTables " + sstables);
+             String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(2)));
+             CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+         }
+         // cell-tombstone in sstable 4 is not compacted away, because the shadowable tombstone is shadowed by new row.
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+     }
+ 
+     @Test
+     public void complexTimestampDeletionTestWithFlush() throws Throwable
+     {
+         complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(true);
+         complexTimestampWithbasePKColumnsInViewPKDeletionTest(true);
+     }
+ 
+     @Test
+     public void complexTimestampDeletionTestWithoutFlush() throws Throwable
+     {
+         complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(false);
+         complexTimestampWithbasePKColumnsInViewPKDeletionTest(false);
+     }
+ 
+     private void complexTimestampWithbasePKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key(p1, p2))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv2",
+                    "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1);");
+         ks.getColumnFamilyStore("mv2").disableAutoCompaction();
+ 
+         // Set initial values TS=1
+         updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 4, 1L));
+         // remove row/mv TS=2
+         updateView("Delete from %s using timestamp 2 where p1 = 1 and p2 = 2;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // view are empty
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"));
+         // insert PK with TS=3
+         updateView("Insert into %s (p1, p2) values (1, 2) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+ 
+         ks.getColumnFamilyStore("mv2").forceMajorCompaction();
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+ 
+         // reset values
+         updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 10;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 4, 10L));
+ 
+         updateView("UPDATE %s using timestamp 20 SET v2 = 5 WHERE p1 = 1 and p2 = 2");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 5, 20L));
+ 
+         updateView("DELETE FROM %s using timestamp 10 WHERE p1 = 1 and p2 = 2");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(null, 5, 20L));
+     }
+ 
+     public void complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(5, 1L));
+         // remove row/mv TS=2
+         updateView("Delete from %s using timestamp 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // view are empty
+         assertRowsIgnoringOrder(execute("SELECT * from mv"));
+         // insert PK with TS=3
+         updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+ 
+         // insert values TS=2, it should be considered dead due to previous tombstone
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 2;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+ 
+         // insert values TS=2, it should be considered dead due to previous tombstone
+         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET v2 = ? WHERE p = ?", 4, 3);
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+ 
+         ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+     }
+ 
+     @Test
+     public void testMVWithDifferentColumnsWithFlush() throws Throwable
+     {
+         testMVWithDifferentColumns(true);
+     }
+ 
+     @Test
+     public void testMVWithDifferentColumnsWithoutFlush() throws Throwable
+     {
+         testMVWithDifferentColumns(false);
+     }
+ 
+     private void testMVWithDifferentColumns(boolean flush) throws Throwable
+     {
+         createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY(a, b))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         List<String> viewNames = new ArrayList<>();
+         List<String> mvStatements = Arrays.asList(
+                                                   // all selected
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // unselected e,f
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // no selected
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // all selected, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                   // unselected e,f, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                   // no selected, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)");
+ 
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         for (int i = 0; i < mvStatements.size(); i++)
+         {
+             String name = "mv" + i;
+             viewNames.add(name);
+             createView(name, mvStatements.get(i));
+             ks.getColumnFamilyStore(name).disableAutoCompaction();
+         }
+ 
+         // insert
+         updateViewWithFlush("INSERT INTO %s (a,b,c,d,e,f) VALUES(1,1,1,1,1,1) using timestamp 1", flush);
+         assertBaseViews(row(1, 1, 1, 1, 1, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 2 SET c=0, d=0 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 0, 0, 1, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 2 SET e=0, f=0 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 0, 0, 0, 0), viewNames);
+ 
+         updateViewWithFlush("DELETE FROM %s using timestamp 2 WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         // partial update unselected, selected
+         updateViewWithFlush("UPDATE %s using timestamp 3 SET f=1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 4 SET e = 1, f=null WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, 1, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 4 SET e = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 5 SET c = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 5 SET c = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET d = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, 1, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 7 SET d = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 8 SET f = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET c = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, 1), viewNames);
+ 
+         // view row still alive due to c=1@6
+         updateViewWithFlush("UPDATE %s using timestamp 8 SET f = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET c = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+     }
+ 
+     private void assertBaseViews(Object[] row, List<String> viewNames) throws Throwable
+     {
+         UntypedResultSet result = execute("SELECT * FROM %s");
+         if (row == null)
+             assertRowsIgnoringOrder(result);
+         else
+             assertRowsIgnoringOrder(result, row);
+         for (int i = 0; i < viewNames.size(); i++)
+             assertBaseView(result, execute(String.format("SELECT * FROM %s", viewNames.get(i))), viewNames.get(i));
+     }
+ 
+     private void assertBaseView(UntypedResultSet base, UntypedResultSet view, String mv)
+     {
+         List<ColumnSpecification> baseMeta = base.metadata();
+         List<ColumnSpecification> viewMeta = view.metadata();
+ 
+         Iterator<UntypedResultSet.Row> iter = base.iterator();
+         Iterator<UntypedResultSet.Row> viewIter = view.iterator();
+ 
+         List<UntypedResultSet.Row> baseData = com.google.common.collect.Lists.newArrayList(iter);
+         List<UntypedResultSet.Row> viewData = com.google.common.collect.Lists.newArrayList(viewIter);
+ 
+         if (baseData.size() != viewData.size())
+             fail(String.format("Mismatch number of rows in view %s: <%s>, in base <%s>",
+                                mv,
+                                makeRowStrings(view),
+                                makeRowStrings(base)));
+         if (baseData.size() == 0)
+             return;
+         if (viewData.size() != 1)
+             fail(String.format("Expect only one row in view %s, but got <%s>",
+                                mv,
+                                makeRowStrings(view)));
+ 
+         UntypedResultSet.Row row = baseData.get(0);
+         UntypedResultSet.Row viewRow = viewData.get(0);
+ 
+         Map<String, ByteBuffer> baseValues = new HashMap<>();
+         for (int j = 0; j < baseMeta.size(); j++)
+         {
+             ColumnSpecification column = baseMeta.get(j);
+             ByteBuffer actualValue = row.getBytes(column.name.toString());
+             baseValues.put(column.name.toString(), actualValue);
+         }
+         for (int j = 0; j < viewMeta.size(); j++)
+         {
+             ColumnSpecification column = viewMeta.get(j);
+             String name = column.name.toString();
+             ByteBuffer viewValue = viewRow.getBytes(name);
+             if (!baseValues.containsKey(name))
+             {
+                 fail(String.format("Extra column: %s with value %s in view", name, column.type.compose(viewValue)));
+             }
+             else if (!Objects.equal(baseValues.get(name), viewValue))
+             {
+                 fail(String.format("Non equal column: %s, expected <%s> but got <%s>",
+                                    name,
+                                    column.type.compose(baseValues.get(name)),
+                                    column.type.compose(viewValue)));
+             }
+         }
+     }
+ 
+ }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[02/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
new file mode 100644
index 0000000..9e32620
--- /dev/null
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@ -0,0 +1,1343 @@
+package org.apache.cassandra.cql3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.cassandra.concurrent.SEPExecutor;
+import org.apache.cassandra.concurrent.Stage;
+import org.apache.cassandra.concurrent.StageManager;
+import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.utils.FBUtilities;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.google.common.base.Objects;
+
+public class ViewComplexTest extends CQLTester
+{
+    int protocolVersion = 4;
+    private final List<String> views = new ArrayList<>();
+
+    @BeforeClass
+    public static void startup()
+    {
+        requireNetwork();
+    }
+    @Before
+    public void begin()
+    {
+        views.clear();
+    }
+
+    @After
+    public void end() throws Throwable
+    {
+        for (String viewName : views)
+            executeNet(protocolVersion, "DROP MATERIALIZED VIEW " + viewName);
+    }
+
+    private void createView(String name, String query) throws Throwable
+    {
+        executeNet(protocolVersion, String.format(query, name));
+        // If exception is thrown, the view will not be added to the list; since it shouldn't have been created, this is
+        // the desired behavior
+        views.add(name);
+    }
+
+    private void updateView(String query, Object... params) throws Throwable
+    {
+        updateViewWithFlush(query, false, params);
+    }
+
+    private void updateViewWithFlush(String query, boolean flush, Object... params) throws Throwable
+    {
+        executeNet(protocolVersion, query, params);
+        while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
+                && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+        {
+            Thread.sleep(1);
+        }
+        if (flush)
+            Keyspace.open(keyspace()).flush();
+    }
+
+    // for now, unselected column cannot be fully supported, SEE CASSANDRA-13826
+    @Ignore
+    @Test
+    public void testPartialDeleteUnselectedColumn() throws Throwable
+    {
+        boolean flush = true;
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT k,c FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+        updateView("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+        updateView("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+
+        execute("truncate %s;");
+
+        // removal generated by unselected column should not shadow PK update with smaller timestamp
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 20 SET a=null WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"));
+        assertRows(execute("SELECT * from mv"));
+
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1));
+    }
+
+    @Test
+    public void testPartialDeleteSelectedColumnWithFlush() throws Throwable
+    {
+        testPartialDeleteSelectedColumn(true);
+    }
+
+    @Test
+    public void testPartialDeleteSelectedColumnWithoutFlush() throws Throwable
+    {
+        testPartialDeleteSelectedColumn(false);
+    }
+
+    private void testPartialDeleteSelectedColumn(boolean flush) throws Throwable
+    {
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, e int, f int, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+
+        updateViewWithFlush("DELETE a FROM %s USING TIMESTAMP 1 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        // view livenessInfo should not be affected by selected column ts or tb
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 0", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 12 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 13 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 14 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TTL 3 SET b=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+
+        TimeUnit.SECONDS.sleep(4);
+
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 15 WHERE k=1 AND c=1", flush);
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        execute("truncate %s;");
+
+        // removal generated by unselected column should not shadow selected column with smaller timestamp
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, null, null, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=null WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"));
+        assertRows(execute("SELECT * from mv"));
+
+        updateViewWithFlush("UPDATE %s USING TIMESTAMP 16 SET a=1 WHERE k=1 AND c=1", flush);
+        assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+    }
+
+    @Test
+    public void testUpdateColumnInViewPKWithTTLWithFlush() throws Throwable
+    {
+        // CASSANDRA-13657
+        testUpdateColumnInViewPKWithTTL(true);
+    }
+
+    @Test
+    public void testUpdateColumnInViewPKWithTTLWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13657
+        testUpdateColumnInViewPKWithTTL(false);
+    }
+
+    private void testUpdateColumnInViewPKWithTTL(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13657 if base column used in view pk is ttled, then view row is considered dead
+        createTable("create table %s (k int primary key, a int, b int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (a, k)");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s SET a = 1 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 1, null));
+        assertRows(execute("SELECT * from mv"), row(1, 1, null));
+
+        updateView("DELETE a FROM %s WHERE k = 1");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("INSERT INTO %s (k) VALUES (1);");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, null, null));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("UPDATE %s USING TTL 5 SET a = 10 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 10, null));
+        assertRows(execute("SELECT * from mv"), row(10, 1, null));
+
+        updateView("UPDATE %s SET b = 100 WHERE k = 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, 10, 100));
+        assertRows(execute("SELECT * from mv"), row(10, 1, 100));
+
+        Thread.sleep(5000);
+
+        // 'a' is TTL of 5 and removed.
+        assertRows(execute("SELECT * from %s"), row(1, null, 100));
+        assertEmpty(execute("SELECT * from mv"));
+        assertEmpty(execute("SELECT * from mv WHERE k = ? AND a = ?", 1, 10));
+
+        updateView("DELETE b FROM %s WHERE k=1");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT * from %s"), row(1, null, null));
+        assertEmpty(execute("SELECT * from mv"));
+
+        updateView("DELETE FROM %s WHERE k=1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s"));
+        assertEmpty(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testUpdateColumnNotInViewWithFlush() throws Throwable
+    {
+        testUpdateColumnNotInView(true);
+    }
+
+    @Test
+    public void testUpdateColumnNotInViewWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUpdateColumnNotInView(false);
+    }
+
+    private void testUpdateColumnNotInView(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13127: if base column not selected in view are alive, then pk of view row should be alive
+        createTable("create table %s (p int, c int, v1 int, v2 int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 0 SET v1 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v1 FROM %s USING TIMESTAMP 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        // shadowed by tombstone
+        updateView("UPDATE %s USING TIMESTAMP 1 SET v1 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v1 FROM %s USING TIMESTAMP 3 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateView("DELETE v2 FROM %s USING TIMESTAMP 4 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s USING TTL 3 SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateView("UPDATE %s SET v2 = 1 WHERE p = 0 AND c = 0");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        assertInvalidMessage("Cannot drop column v2 on base table with materialized views", "ALTER TABLE %s DROP v2");
+        // // drop unselected base column, unselected metadata should be removed, thus view row is dead
+        // updateView("ALTER TABLE %s DROP v2");
+        // assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+        // assertRowsIgnoringOrder(execute("SELECT * from %s"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testPartialUpdateWithUnselectedCollectionsWithFlush() throws Throwable
+    {
+        testPartialUpdateWithUnselectedCollections(true);
+    }
+
+    @Test
+    public void testPartialUpdateWithUnselectedCollectionsWithoutFlush() throws Throwable
+    {
+        testPartialUpdateWithUnselectedCollections(false);
+    }
+
+    public void testPartialUpdateWithUnselectedCollections(boolean flush) throws Throwable
+    {
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        createTable("CREATE TABLE %s (k int, c int, a int, b int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (k, c))");
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)");
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateView("UPDATE %s SET l=l+[1,2,3] WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateView("UPDATE %s SET l=l-[1,2] WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        updateView("UPDATE %s SET b=3 WHERE k=1 AND c=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRows(execute("SELECT * from mv"), row(1, 1, null, 3));
+
+        updateView("UPDATE %s SET b=null, l=l-[3], s=s-{3} WHERE k = 1 AND c = 1");
+        if (flush)
+        {
+            FBUtilities.waitOnFutures(ks.flush());
+            ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        }
+        assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+        assertRowsIgnoringOrder(execute("SELECT * from mv"));
+
+        updateView("UPDATE %s SET m=m+{3:3}, l=l-[1], s=s-{2} WHERE k = 1 AND c = 1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null));
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null));
+
+        assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m");
+        // executeNet(protocolVersion, "ALTER TABLE %s DROP m");
+        // ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE k = 1 AND c = 1"));
+        // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+        // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+    }
+
+    @Test
+    public void testUnselectedColumnsTTLWithFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUnselectedColumnsTTL(true);
+    }
+
+    @Test
+    public void testUnselectedColumnsTTLWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13127
+        testUnselectedColumnsTTL(false);
+    }
+
+    private void testUnselectedColumnsTTL(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13127 not ttled unselected column in base should keep view row alive
+        createTable("create table %s (p int, c int, v int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) USING TTL 3;", flush);
+
+        updateViewWithFlush("UPDATE %s USING TTL 1000 SET v = 0 WHERE p = 0 and c = 0;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        Thread.sleep(3000);
+
+        UntypedResultSet.Row row = execute("SELECT v, ttl(v) from %s WHERE c = ? AND p = ?", 0, 0).one();
+        assertTrue("row should have value of 0", row.getInt("v") == 0);
+        assertTrue("row should have ttl less than 1000", row.getInt("ttl(v)") < 1000);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateViewWithFlush("DELETE FROM %s WHERE p = 0 and c = 0;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) ", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        // already have a live row, no need to apply the unselected cell ttl
+        updateViewWithFlush("UPDATE %s USING TTL 3 SET v = 0 WHERE p = 0 and c = 0;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+
+        updateViewWithFlush("INSERT INTO %s (p, c) VALUES (1, 1) USING TTL 3", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+
+        Thread.sleep(4000);
+
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1));
+
+        // unselected should keep view row alive
+        updateViewWithFlush("UPDATE %s SET v = 0 WHERE p = 1 and c = 1;", flush);
+        assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+
+    }
+
+    @Test
+    public void testRangeDeletionWithFlush() throws Throwable
+    {
+        testRangeDeletion(true);
+    }
+
+    @Test
+    public void testRangeDeletionWithoutFlush() throws Throwable
+    {
+        testRangeDeletion(false);
+    }
+
+    public void testRangeDeletion(boolean flush) throws Throwable
+    {
+        // for partition range deletion, need to know that existing row is shadowed instead of not existed.
+        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 PRIMARY KEY (a, b)");
+
+        Keyspace ks = Keyspace.open(keyspace());
+        ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
+
+        execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
+
+        // remove view row
+        updateView("UPDATE %s using timestamp 1 set b = null WHERE a=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+        // remove base row, no view updated generated.
+        updateView("DELETE FROM %s using timestamp 2 where a=1");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+
+        // restor view row with b,c column. d is still tombstone
+        updateView("UPDATE %s using timestamp 3 set b = 1,c = 1 where a=1"); // upsert
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
+    }
+
+    @Test
+    public void testBaseTTLWithSameTimestampTest() throws Throwable
+    {
+        // CASSANDRA-13127 when liveness timestamp tie, greater localDeletionTime should win if both are expiring.
+        createTable("create table %s (p int, c int, v int, primary key(p, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) using timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        Thread.sleep(4000);
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+
+        // reversed order
+        execute("truncate %s;");
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING timestamp 1;");
+
+        FBUtilities.waitOnFutures(ks.flush());
+
+        Thread.sleep(4000);
+
+        assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+
+    }
+
+    @Test
+    public void testCommutativeRowDeletionFlush() throws Throwable
+    {
+        // CASSANDRA-13409
+        testCommutativeRowDeletion(true);
+    }
+
+    @Test
+    public void testCommutativeRowDeletionWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-13409
+        testCommutativeRowDeletion(false);
+    }
+
+    private void testCommutativeRowDeletion(boolean flush) throws Throwable
+    {
+        // CASSANDRA-13409 new update should not resurrect previous deleted data in view
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable-1, Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+        // sstable-2
+        updateView("Delete from %s using timestamp 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"));
+        // sstable-3
+        updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+        // sstable-4
+        updateView("UPdate %s using timestamp 4 set v1 = 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+        // sstable-5
+        updateView("UPdate %s using timestamp 5 set v1 = 1 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+
+        if (flush)
+        {
+            // compact sstable 2 and 4, 5;
+            ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+            List<String> sstables = cfs.getLiveSSTables()
+                                       .stream()
+                                       .sorted((s1, s2) -> s1.descriptor.generation - s2.descriptor.generation)
+                                       .map(s -> s.getFilename())
+                                       .collect(Collectors.toList());
+            String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(3), sstables.get(4)));
+            CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+            assertEquals(3, cfs.getLiveSSTables().size());
+        }
+        // regular tombstone should be retained after compaction
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+    }
+
+    @Test
+    public void testUnselectedColumnWithExpiredLivenessInfo() throws Throwable
+    {
+        boolean flush = true;
+        createTable("create table %s (k int, c int, a int, b int, PRIMARY KEY(k, c))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select k,c,b from %%s where c is not null and k is not null primary key (c, k);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable-1, Set initial values TS=1
+        updateViewWithFlush("UPDATE %s SET a = 1 WHERE k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        // sstable-2
+        updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TTL 5", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        Thread.sleep(5001);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null));
+
+        // sstable-3
+        updateViewWithFlush("Update %s set a = null where k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"));
+
+        // sstable-4
+        updateViewWithFlush("Update %s USING TIMESTAMP 1 set b = 1 where k = 1 AND c = 1;", flush);
+
+        assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                row(1, 1, 1));
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampSmallerThanPkWithFlush() throws Throwable
+    {
+        testUpdateWithColumnTimestampSmallerThanPk(true);
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampSmallerThanPkWithoutFlush() throws Throwable
+    {
+        testUpdateWithColumnTimestampSmallerThanPk(false);
+    }
+
+    public void testUpdateWithColumnTimestampSmallerThanPk(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // reset value
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 6;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+        // increase pk's timestamp to 20
+        updateView("Insert into %s (p) values (3) using timestamp 20;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+        // change v1's to 2 and remove existing view row with ts7
+        updateView("UPdate %s using timestamp 7 set v1 = 2 where p = 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, 3, 6L));
+        // change v1's to 1 and remove existing view row with ts8
+        updateView("UPdate %s using timestamp 8 set v1 = 1 where p = 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampBiggerThanPkWithFlush() throws Throwable
+    {
+        // CASSANDRA-11500
+        testUpdateWithColumnTimestampBiggerThanPk(true);
+    }
+
+    @Test
+    public void testUpdateWithColumnTimestampBiggerThanPkWithoutFlush() throws Throwable
+    {
+        // CASSANDRA-11500
+        testUpdateWithColumnTimestampBiggerThanPk(false);
+    }
+
+    public void testUpdateWithColumnTimestampBiggerThanPk(boolean flush) throws Throwable
+    {
+        // CASSANDRA-11500 able to shadow old view row with column ts greater tahn pk's ts and re-insert the view row
+        createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int);");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (k, a);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+        updateView("DELETE FROM %s USING TIMESTAMP 0 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // sstable-1, Set initial values TS=1
+        updateView("INSERT INTO %s(k, a, b) VALUES (1, 1, 1) USING TIMESTAMP 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 1));
+        updateView("UPDATE %s USING TIMESTAMP 10 SET b = 2 WHERE k = 1;");
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        updateView("UPDATE %s USING TIMESTAMP 2 SET a = 2 WHERE k = 1;");
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+        updateView("UPDATE %s USING TIMESTAMP 11 SET a = 1 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+
+        // set non-key base column as tombstone, view row is removed with shadowable
+        updateView("UPDATE %s USING TIMESTAMP 12 SET a = null WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, null, 2));
+
+        // column b should be alive
+        updateView("UPDATE %s USING TIMESTAMP 13 SET a = 1 WHERE k = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+        assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+
+        assertInvalidMessage("Cannot drop column a on base table with materialized views", "ALTER TABLE %s DROP a");
+    }
+
+    @Test
+    public void testNonBaseColumnInViewPkWithFlush() throws Throwable
+    {
+        testNonBaseColumnInViewPk(true);
+    }
+
+    @Test
+    public void testNonBaseColumnInViewPkWithoutFlush() throws Throwable
+    {
+        testNonBaseColumnInViewPk(true);
+    }
+
+    public void testNonBaseColumnInViewPk(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key (p1,p2))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1)"
+                           + " with gc_grace_seconds=5;");
+        ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+        cfs.disableAutoCompaction();
+
+        updateView("UPDATE %s USING TIMESTAMP 1 set v1 =1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, 1, null));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, 1, null));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 set v1 = null, v2 = 1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+
+        updateView("UPDATE %s USING TIMESTAMP 2 set v2 = null where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+
+        updateView("INSERT INTO %s (p1,p2) VALUES(1,1) USING TIMESTAMP 3;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, null));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, null));
+
+        updateView("DELETE FROM %s USING TIMESTAMP 4 WHERE p1 =1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+
+        updateView("UPDATE %s USING TIMESTAMP 5 set v2 = 1 where p1 = 1 AND p2 = 1;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+        assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+    }
+
+    @Test
+    public void testStrictLivenessTombstone() throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p)"
+                           + " with gc_grace_seconds=5;");
+        ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+        cfs.disableAutoCompaction();
+
+        updateView("Insert into %s (p, v1, v2) values (1, 1, 1) ;");
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        updateView("Update %s set v1 = null WHERE p = 1");
+        FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+
+        cfs.forceMajorCompaction(); // before gc grace second, strict-liveness tombstoned dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+
+        Thread.sleep(6000);
+        assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+
+        cfs.forceMajorCompaction(); // after gc grace second, no data left
+        assertEquals(0, cfs.getLiveSSTables().size());
+
+        updateView("Update %s using ttl 5 set v1 = 1 WHERE p = 1");
+        FBUtilities.waitOnFutures(ks.flush());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        cfs.forceMajorCompaction(); // before ttl+gc_grace_second, strict-liveness ttled dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+
+        Thread.sleep(5500); // after expired, before gc_grace_second
+        cfs.forceMajorCompaction();// before ttl+gc_grace_second, strict-liveness ttled dead row remains
+        assertEquals(1, cfs.getLiveSSTables().size());
+        assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+
+        Thread.sleep(5500); // after expired + gc_grace_second
+        assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+
+        cfs.forceMajorCompaction(); // after gc grace second, no data left
+        assertEquals(0, cfs.getLiveSSTables().size());
+    }
+
+    @Test
+    public void testCellTombstoneAndShadowableTombstonesWithFlush() throws Throwable
+    {
+        testCellTombstoneAndShadowableTombstones(true);
+    }
+
+    @Test
+    public void testCellTombstoneAndShadowableTombstonesWithoutFlush() throws Throwable
+    {
+        testCellTombstoneAndShadowableTombstones(false);
+    }
+
+    private void testCellTombstoneAndShadowableTombstones(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // sstable 1, Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+        // sstable 2
+        updateView("UPdate %s using timestamp 2 set v2 = null where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3),
+                                row(null, null));
+        // sstable 3
+        updateView("UPdate %s using timestamp 3 set v1 = 2 where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+        // sstable 4
+        updateView("UPdate %s using timestamp 4 set v1 = 1 where p = 3");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+
+        if (flush)
+        {
+            // compact sstable 2 and 3;
+            ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+            List<String> sstables = cfs.getLiveSSTables()
+                                       .stream()
+                                       .sorted(Comparator.comparingInt(s -> s.descriptor.generation))
+                                       .map(s -> s.getFilename())
+                                       .collect(Collectors.toList());
+            System.out.println("SSTables " + sstables);
+            String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(2)));
+            CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+        }
+        // cell-tombstone in sstable 4 is not compacted away, because the shadowable tombstone is shadowed by new row.
+        assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+    }
+
+    @Test
+    public void complexTimestampDeletionTestWithFlush() throws Throwable
+    {
+        complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(true);
+        complexTimestampWithbasePKColumnsInViewPKDeletionTest(true);
+    }
+
+    @Test
+    public void complexTimestampDeletionTestWithoutFlush() throws Throwable
+    {
+        complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(false);
+        complexTimestampWithbasePKColumnsInViewPKDeletionTest(false);
+    }
+
+    private void complexTimestampWithbasePKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key(p1, p2))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv2",
+                   "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1);");
+        ks.getColumnFamilyStore("mv2").disableAutoCompaction();
+
+        // Set initial values TS=1
+        updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 4, 1L));
+        // remove row/mv TS=2
+        updateView("Delete from %s using timestamp 2 where p1 = 1 and p2 = 2;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // view are empty
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"));
+        // insert PK with TS=3
+        updateView("Insert into %s (p1, p2) values (1, 2) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+
+        ks.getColumnFamilyStore("mv2").forceMajorCompaction();
+        assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+
+        // reset values
+        updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 10;");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 4, 10L));
+
+        updateView("UPDATE %s using timestamp 20 SET v2 = 5 WHERE p1 = 1 and p2 = 2");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(3, 5, 20L));
+
+        updateView("DELETE FROM %s using timestamp 10 WHERE p1 = 1 and p2 = 2");
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                row(null, 5, 20L));
+    }
+
+    public void complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+    {
+        createTable("create table %s (p int primary key, v1 int, v2 int)");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        Keyspace ks = Keyspace.open(keyspace());
+
+        createView("mv",
+                   "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+        ks.getColumnFamilyStore("mv").disableAutoCompaction();
+
+        // Set initial values TS=1
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 1;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(5, 1L));
+        // remove row/mv TS=2
+        updateView("Delete from %s using timestamp 2 where p = 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // view are empty
+        assertRowsIgnoringOrder(execute("SELECT * from mv"));
+        // insert PK with TS=3
+        updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+
+        // insert values TS=2, it should be considered dead due to previous tombstone
+        updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 2;");
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+        // deleted column in MV remained dead
+        assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+
+        // insert values TS=2, it should be considered dead due to previous tombstone
+        executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET v2 = ? WHERE p = ?", 4, 3);
+
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
+
+        assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+
+        ks.getColumnFamilyStore("mv").forceMajorCompaction();
+        assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+    }
+
+    @Test
+    public void testMVWithDifferentColumnsWithFlush() throws Throwable
+    {
+        testMVWithDifferentColumns(true);
+    }
+
+    @Test
+    public void testMVWithDifferentColumnsWithoutFlush() throws Throwable
+    {
+        testMVWithDifferentColumns(false);
+    }
+
+    private void testMVWithDifferentColumns(boolean flush) throws Throwable
+    {
+        createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY(a, b))");
+
+        execute("USE " + keyspace());
+        executeNet(protocolVersion, "USE " + keyspace());
+        List<String> viewNames = new ArrayList<>();
+        List<String> mvStatements = Arrays.asList(
+                                                  // all selected
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // unselected e,f
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // no selected
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                  // all selected, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                  // unselected e,f, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                  // no selected, re-order keys
+                                                  "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)");
+
+        Keyspace ks = Keyspace.open(keyspace());
+
+        for (int i = 0; i < mvStatements.size(); i++)
+        {
+            String name = "mv" + i;
+            viewNames.add(name);
+            createView(name, mvStatements.get(i));
+            ks.getColumnFamilyStore(name).disableAutoCompaction();
+        }
+
+        // insert
+        updateViewWithFlush("INSERT INTO %s (a,b,c,d,e,f) VALUES(1,1,1,1,1,1) using timestamp 1", flush);
+        assertBaseViews(row(1, 1, 1, 1, 1, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 2 SET c=0, d=0 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 0, 0, 1, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 2 SET e=0, f=0 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 0, 0, 0, 0), viewNames);
+
+        updateViewWithFlush("DELETE FROM %s using timestamp 2 WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        // partial update unselected, selected
+        updateViewWithFlush("UPDATE %s using timestamp 3 SET f=1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 4 SET e = 1, f=null WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, 1, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 4 SET e = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 5 SET c = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 5 SET c = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET d = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, 1, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 7 SET d = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 8 SET f = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET c = 1 WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, 1), viewNames);
+
+        // view row still alive due to c=1@6
+        updateViewWithFlush("UPDATE %s using timestamp 8 SET f = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+
+        updateViewWithFlush("UPDATE %s using timestamp 6 SET c = null WHERE a=1 AND b=1", flush);
+        assertBaseViews(null, viewNames);
+    }
+
+    private void assertBaseViews(Object[] row, List<String> viewNames) throws Throwable
+    {
+        UntypedResultSet result = execute("SELECT * FROM %s");
+        if (row == null)
+            assertRowsIgnoringOrder(result);
+        else
+            assertRowsIgnoringOrder(result, row);
+        for (int i = 0; i < viewNames.size(); i++)
+            assertBaseView(result, execute(String.format("SELECT * FROM %s", viewNames.get(i))), viewNames.get(i));
+    }
+
+    private void assertBaseView(UntypedResultSet base, UntypedResultSet view, String mv)
+    {
+        List<ColumnSpecification> baseMeta = base.metadata();
+        List<ColumnSpecification> viewMeta = view.metadata();
+
+        Iterator<UntypedResultSet.Row> iter = base.iterator();
+        Iterator<UntypedResultSet.Row> viewIter = view.iterator();
+
+        List<UntypedResultSet.Row> baseData = com.google.common.collect.Lists.newArrayList(iter);
+        List<UntypedResultSet.Row> viewData = com.google.common.collect.Lists.newArrayList(viewIter);
+
+        if (baseData.size() != viewData.size())
+            fail(String.format("Mismatch number of rows in view %s: <%s>, in base <%s>",
+                               mv,
+                               makeRowStrings(view),
+                               makeRowStrings(base)));
+        if (baseData.size() == 0)
+            return;
+        if (viewData.size() != 1)
+            fail(String.format("Expect only one row in view %s, but got <%s>",
+                               mv,
+                               makeRowStrings(view)));
+
+        UntypedResultSet.Row row = baseData.get(0);
+        UntypedResultSet.Row viewRow = viewData.get(0);
+
+        Map<String, ByteBuffer> baseValues = new HashMap<>();
+        for (int j = 0; j < baseMeta.size(); j++)
+        {
+            ColumnSpecification column = baseMeta.get(j);
+            ByteBuffer actualValue = row.getBytes(column.name.toString());
+            baseValues.put(column.name.toString(), actualValue);
+        }
+        for (int j = 0; j < viewMeta.size(); j++)
+        {
+            ColumnSpecification column = viewMeta.get(j);
+            String name = column.name.toString();
+            ByteBuffer viewValue = viewRow.getBytes(name);
+            if (!baseValues.containsKey(name))
+            {
+                fail(String.format("Extra column: %s with value %s in view", name, column.type.compose(viewValue)));
+            }
+            else if (!Objects.equal(baseValues.get(name), viewValue))
+            {
+                fail(String.format("Non equal column: %s, expected <%s> but got <%s>",
+                                   name,
+                                   column.type.compose(baseValues.get(name)),
+                                   column.type.compose(viewValue)));
+            }
+        }
+    }
+
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[04/16] cassandra git commit: Fix outstanding MV timestamp issues and add documentation about unsupported cases (see CASSANDRA-11500 for a summary of fixes)

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
index 245ceb7..fe618b6 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java
@@ -77,13 +77,13 @@ public class ViewFilteringTest extends CQLTester
 
         // IS NOT NULL is required on all PK statements that are not otherwise restricted
         List<String> badStatements = Arrays.asList(
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE b IS NOT NULL 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 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 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 is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = ? AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(?) AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s PRIMARY KEY (a, b, c, d)"
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE b IS NOT NULL 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 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 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 is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = ? AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a = blobAsInt(?) AND b IS NOT NULL AND c is NOT NULL PRIMARY KEY ((a, b), c, d)",
+        "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s PRIMARY KEY (a, b, c, d)"
         );
 
         for (String badStatement : badStatements)
@@ -96,19 +96,19 @@ public class ViewFilteringTest extends CQLTester
             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)"
+            );
 
         for (int i = 0; i < goodStatements.size(); i++)
         {
@@ -153,21 +153,21 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (\"theKey\", \"theClustering\", \"the\"\"Value\") VALUES (?, ?, ?)", 1, 1, 0);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
-                "PRIMARY KEY (\"theKey\", \"theClustering\")");
+                              "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
+                              "PRIMARY KEY (\"theKey\", \"theClustering\")");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
         createView("mv_test2", "CREATE MATERIALIZED VIEW %s AS SELECT \"theKey\", \"theClustering\", \"the\"\"Value\" FROM %%s " +
-                "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
-                "PRIMARY KEY (\"theKey\", \"theClustering\")");
+                               "WHERE \"theKey\" = 1 AND \"theClustering\" = 1 AND \"the\"\"Value\" IS NOT NULL " +
+                               "PRIMARY KEY (\"theKey\", \"theClustering\")");
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test2"))
             Thread.sleep(10);
 
         for (String mvname : Arrays.asList("mv_test", "mv_test2"))
         {
             assertRowsIgnoringOrder(execute("SELECT \"theKey\", \"theClustering\", \"the\"\"Value\" FROM " + mvname),
-                    row(1, 1, 0)
+                                    row(1, 1, 0)
             );
         }
 
@@ -176,7 +176,7 @@ public class ViewFilteringTest extends CQLTester
         for (String mvname : Arrays.asList("mv_test", "mv_test2"))
         {
             assertRowsIgnoringOrder(execute("SELECT \"theKey\", \"Col\", \"the\"\"Value\" FROM " + mvname),
-                    row(1, 1, 0)
+                                    row(1, 1, 0)
             );
         }
     }
@@ -195,22 +195,22 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 1, 1, 3);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE a = blobAsInt(intAsBlob(1)) AND b IS NOT NULL " +
-                "PRIMARY KEY (a, b)");
+                              "WHERE a = blobAsInt(intAsBlob(1)) AND b IS NOT NULL " +
+                              "PRIMARY KEY (a, b)");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
 
         assertRows(execute("SELECT a, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
 
         executeNet(protocolVersion, "ALTER TABLE %s RENAME a TO foo");
 
         assertRows(execute("SELECT foo, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
     }
 
@@ -228,22 +228,22 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 1, 1, 3);
 
         createView("mv_test", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s " +
-                "WHERE a = (int) 1 AND b IS NOT NULL " +
-                "PRIMARY KEY (a, b)");
+                              "WHERE a = (int) 1 AND b IS NOT NULL " +
+                              "PRIMARY KEY (a, b)");
 
         while (!SystemKeyspace.isViewBuilt(keyspace(), "mv_test"))
             Thread.sleep(10);
 
         assertRows(execute("SELECT a, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
 
         executeNet(protocolVersion, "ALTER TABLE %s RENAME a TO foo");
 
         assertRows(execute("SELECT foo, b, c FROM mv_test"),
-                row(1, 0, 2),
-                row(1, 1, 3)
+                   row(1, 0, 2),
+                   row(1, 1, 3)
         );
     }
 
@@ -274,51 +274,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             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, 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)
+                                    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)
+                                    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)
+                                    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)
+                                    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
@@ -326,20 +326,20 @@ public class ViewFilteringTest extends CQLTester
             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)
+                                    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)
+                                    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
@@ -377,8 +377,8 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
@@ -386,16 +386,16 @@ public class ViewFilteringTest extends CQLTester
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 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, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // update rows that don't match the filter
@@ -403,17 +403,17 @@ public class ViewFilteringTest extends CQLTester
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 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, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 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, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // delete rows that don't match the filter
@@ -422,16 +422,16 @@ public class ViewFilteringTest extends CQLTester
             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, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 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, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0)
             );
 
             // delete a partition that matches the filter
@@ -463,8 +463,8 @@ public class ViewFilteringTest extends CQLTester
             Thread.sleep(10);
 
         assertRows(execute("SELECT * FROM mv_test"),
-            row(1, 1, 0),
-            row(1, 1, 1)
+                   row(1, 1, 0),
+                   row(1, 1, 1)
         );
 
         // insert new rows that do not match the filter
@@ -472,16 +472,16 @@ public class ViewFilteringTest extends CQLTester
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, 0, 0);
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 0, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1)
+                   row(1, 1, 0),
+                   row(1, 1, 1)
         );
 
         // insert new row that does match the filter
         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 2, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // update rows that don't match the filter
@@ -489,17 +489,17 @@ public class ViewFilteringTest extends CQLTester
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 0, 0);
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 0, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // update a row that does match the filter
         execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete rows that don't match the filter
@@ -508,16 +508,16 @@ public class ViewFilteringTest extends CQLTester
         execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 0, 1, 0);
         execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 0),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 0),
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete a row that does match the filter
         execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 0);
         assertRows(execute("SELECT * FROM mv_test"),
-                row(1, 1, 1),
-                row(1, 1, 2)
+                   row(1, 1, 1),
+                   row(1, 1, 2)
         );
 
         // delete a partition that matches the filter
@@ -554,51 +554,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, 0, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 2, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -606,27 +606,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 2, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                row(0, 1, 0, 0),
-                row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -662,51 +662,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, -1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -714,27 +714,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -772,56 +772,56 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // insert new rows that do not match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, -1, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -829,29 +829,29 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 1),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 1, 2, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
             execute("DELETE FROM %s WHERE a = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -889,10 +889,10 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 1, 0, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
@@ -900,20 +900,20 @@ public class ViewFilteringTest extends CQLTester
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 0, 0, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 2, 1, -1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -921,21 +921,21 @@ public class ViewFilteringTest extends CQLTester
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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
@@ -944,27 +944,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 0, 1),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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(0, 1, 0, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 1, 2, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 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 = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 1, 0, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 1, 0, 0),
+                                    row(0, 1, 1, 0)
             );
 
             dropView("mv_test" + i);
@@ -1002,51 +1002,51 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 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, -1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new row that does match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 2, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update a row that does match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 2, 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -1055,27 +1055,27 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 0);
             execute("DELETE FROM %s WHERE a = ? AND b = ?", 0, -1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a row that does match the filter
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(1, 0, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(1, 0, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
             execute("DELETE FROM %s WHERE a = ?", 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0)
             );
 
             // insert a partition with one matching and one non-matching row using a batch (CASSANDRA-10614)
@@ -1087,9 +1087,9 @@ public class ViewFilteringTest extends CQLTester
                     4, 4, 0, 0,
                     4, 4, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(0, 0, 1, 0),
-                    row(0, 1, 1, 0),
-                    row(4, 4, 1, 1)
+                                    row(0, 0, 1, 0),
+                                    row(0, 1, 1, 0),
+                                    row(4, 4, 1, 1)
             );
 
             dropView("mv_test" + i);
@@ -1127,41 +1127,41 @@ public class ViewFilteringTest extends CQLTester
                 Thread.sleep(10);
 
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new rows that do not match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 0);
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 1, 0, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0)
             );
 
             // insert new row that does match the filter
             execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 1, 2, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update rows that don't match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 1, 1, -1, 0);
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 0, 1, 1, 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // update a row that does match the filter
             execute("UPDATE %s SET d = ? WHERE a = ? AND b = ? AND c = ?", 2, 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete rows that don't match the filter
@@ -1169,16 +1169,16 @@ public class ViewFilteringTest extends CQLTester
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 2, 0, 1);
             execute("DELETE FROM %s WHERE a = ?", 0);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 1, 1, 2),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 1, 1, 2),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a row that does match the filter
             execute("DELETE FROM %s WHERE a = ? AND b = ? AND c = ?", 1, 1, 1);
             assertRowsIgnoringOrder(execute("SELECT a, b, c, d FROM mv_test" + i),
-                    row(1, 0, 1, 0),
-                    row(1, 2, 1, 0)
+                                    row(1, 0, 1, 0),
+                                    row(1, 2, 1, 0)
             );
 
             // delete a partition that matches the filter
@@ -1218,61 +1218,61 @@ public class ViewFilteringTest extends CQLTester
                              "udtval";
 
         createTable(
-                "CREATE TABLE %s (" +
-                        "asciival ascii, " +
-                        "bigintval bigint, " +
-                        "blobval blob, " +
-                        "booleanval boolean, " +
-                        "dateval date, " +
-                        "decimalval decimal, " +
-                        "doubleval double, " +
-                        "floatval float, " +
-                        "inetval inet, " +
-                        "intval int, " +
-                        "textval text, " +
-                        "timeval time, " +
-                        "timestampval timestamp, " +
-                        "timeuuidval timeuuid, " +
-                        "uuidval uuid," +
-                        "varcharval varchar, " +
-                        "varintval varint, " +
-                        "frozenlistval frozen<list<int>>, " +
-                        "frozensetval frozen<set<uuid>>, " +
-                        "frozenmapval frozen<map<ascii, int>>," +
-                        "tupleval frozen<tuple<int, ascii, uuid>>," +
-                        "udtval frozen<" + myType + ">, " +
-                        "PRIMARY KEY (" + columnNames + "))");
+                    "CREATE TABLE %s (" +
+                            "asciival ascii, " +
+                            "bigintval bigint, " +
+                            "blobval blob, " +
+                            "booleanval boolean, " +
+                            "dateval date, " +
+                            "decimalval decimal, " +
+                            "doubleval double, " +
+                            "floatval float, " +
+                            "inetval inet, " +
+                            "intval int, " +
+                            "textval text, " +
+                            "timeval time, " +
+                            "timestampval timestamp, " +
+                            "timeuuidval timeuuid, " +
+                            "uuidval uuid," +
+                            "varcharval varchar, " +
+                            "varintval varint, " +
+                            "frozenlistval frozen<list<int>>, " +
+                            "frozensetval frozen<set<uuid>>, " +
+                            "frozenmapval frozen<map<ascii, int>>," +
+                            "tupleval frozen<tuple<int, ascii, uuid>>," +
+                            "udtval frozen<" + myType + ">, " +
+                            "PRIMARY KEY (" + columnNames + "))");
 
         execute("USE " + keyspace());
         executeNet(protocolVersion, "USE " + keyspace());
 
 
         createView(
-                "mv_test",
-                "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
-                        "asciival = 'abc' AND " +
-                        "bigintval = 123 AND " +
-                        "blobval = 0xfeed AND " +
-                        "booleanval = true AND " +
-                        "dateval = '1987-03-23' AND " +
-                        "decimalval = 123.123 AND " +
-                        "doubleval = 123.123 AND " +
-                        "floatval = 123.123 AND " +
-                        "inetval = '127.0.0.1' AND " +
-                        "intval = 123 AND " +
-                        "textval = 'abc' AND " +
-                        "timeval = '07:35:07.000111222' AND " +
-                        "timestampval = 123123123 AND " +
-                        "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                        "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
-                        "varcharval = 'abc' AND " +
-                        "varintval = 123123123 AND " +
-                        "frozenlistval = [1, 2, 3] AND " +
-                        "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
-                        "frozenmapval = {'a': 1, 'b': 2} AND " +
-                        "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
-                        "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
-                        "PRIMARY KEY (" + columnNames + ")");
+                   "mv_test",
+                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE " +
+                           "asciival = 'abc' AND " +
+                           "bigintval = 123 AND " +
+                           "blobval = 0xfeed AND " +
+                           "booleanval = true AND " +
+                           "dateval = '1987-03-23' AND " +
+                           "decimalval = 123.123 AND " +
+                           "doubleval = 123.123 AND " +
+                           "floatval = 123.123 AND " +
+                           "inetval = '127.0.0.1' AND " +
+                           "intval = 123 AND " +
+                           "textval = 'abc' AND " +
+                           "timeval = '07:35:07.000111222' AND " +
+                           "timestampval = 123123123 AND " +
+                           "timeuuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
+                           "uuidval = 6BDDC89A-5644-11E4-97FC-56847AFE9799 AND " +
+                           "varcharval = 'abc' AND " +
+                           "varintval = 123123123 AND " +
+                           "frozenlistval = [1, 2, 3] AND " +
+                           "frozensetval = {6BDDC89A-5644-11E4-97FC-56847AFE9799} AND " +
+                           "frozenmapval = {'a': 1, 'b': 2} AND " +
+                           "tupleval = (1, 'foobar', 6BDDC89A-5644-11E4-97FC-56847AFE9799) AND " +
+                           "udtval = {a: 1, b: 6BDDC89A-5644-11E4-97FC-56847AFE9799, c: {'foo', 'bar'}} " +
+                           "PRIMARY KEY (" + columnNames + ")");
 
         execute("INSERT INTO %s (" + columnNames + ") VALUES (" +
                 "'abc'," +

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b36740e/test/unit/org/apache/cassandra/cql3/ViewTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java b/test/unit/org/apache/cassandra/cql3/ViewTest.java
index f8f8c9f..61f4b4a 100644
--- a/test/unit/org/apache/cassandra/cql3/ViewTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java
@@ -18,12 +18,13 @@
 
 package org.apache.cassandra.cql3;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import com.google.common.util.concurrent.Uninterruptibles;
 
 import junit.framework.Assert;
@@ -46,8 +47,6 @@ import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.utils.FBUtilities;
 
-import static org.junit.Assert.assertTrue;
-
 public class ViewTest extends CQLTester
 {
     int protocolVersion = 4;
@@ -83,7 +82,7 @@ public class ViewTest extends CQLTester
     {
         executeNet(protocolVersion, query, params);
         while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
-                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+                && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
         {
             Thread.sleep(1);
         }
@@ -342,9 +341,9 @@ public class ViewTest extends CQLTester
     public void testCreateMvWithTTL() throws Throwable
     {
         createTable("CREATE TABLE %s (" +
-                "k int PRIMARY KEY, " +
-                "c int, " +
-                "val int) WITH default_time_to_live = 60");
+                    "k int PRIMARY KEY, " +
+                    "c int, " +
+                    "val int) WITH default_time_to_live = 60");
 
         execute("USE " + keyspace());
         executeNet(protocolVersion, "USE " + keyspace());
@@ -421,8 +420,10 @@ public class ViewTest extends CQLTester
         if (flush)
             FBUtilities.waitOnFutures(ks.flush());
 
-            //change c's value and TS=3, tombstones c=1 and adds c=0 record
+        // change c's value and TS=3, tombstones c=1 and adds c=0 record
         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET c = ? WHERE a = ? and b = ? ", 0, 0, 0);
+        if (flush)
+            FBUtilities.waitOnFutures(ks.flush());
         assertRows(execute("SELECT d from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0));
 
         if(flush)
@@ -443,7 +444,7 @@ public class ViewTest extends CQLTester
         assertRows(execute("SELECT d,e from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0, null));
 
 
-            //Add e value @ TS=1
+        //Add e value @ TS=1
         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 1 SET e = ? WHERE a = ? and b = ? ", 1, 0, 0);
         assertRows(execute("SELECT d,e from mv WHERE c = ? and a = ? and b = ?", 1, 0, 0), row(0, 1));
 
@@ -838,12 +839,12 @@ public class ViewTest extends CQLTester
         String table = KEYSPACE + "." + currentTable();
         updateView("BEGIN BATCH " +
                 "INSERT INTO " + table + " (a, b, c, d) VALUES (?, ?, ?, ?); " + // should be accepted
-                "UPDATE " + table + " SET d = ? WHERE a = ? AND b = ?; " +  // should be ignored
+                "UPDATE " + table + " SET d = ? WHERE a = ? AND b = ?; " +  // should be accepted
                 "APPLY BATCH",
                 0, 0, 0, 0,
                 1, 0, 1);
         assertRows(execute("SELECT a, b, c from mv WHERE b = ?", 0), row(0, 0, 0));
-        assertEmpty(execute("SELECT a, b, c from mv WHERE b = ?", 1));
+        assertRows(execute("SELECT a, b, c from mv WHERE b = ?", 1), row(0, 1, null));
 
         ColumnFamilyStore cfs = Keyspace.open(keyspace()).getColumnFamilyStore("mv");
         cfs.forceBlockingFlush();
@@ -1005,9 +1006,9 @@ public class ViewTest extends CQLTester
                       row(1, 3));
 
         updateView(String.format("BEGIN UNLOGGED BATCH " +
-                   "DELETE FROM %s WHERE a = 1 AND b > 1 AND b < 3;" +
-                   "DELETE FROM %s WHERE a = 1;" +
-                   "APPLY BATCH", currentTable(), currentTable()));
+                                 "DELETE FROM %s WHERE a = 1 AND b > 1 AND b < 3;" +
+                                 "DELETE FROM %s WHERE a = 1;" +
+                                 "APPLY BATCH", currentTable(), currentTable()));
 
         mvRows = executeNet(protocolVersion, "SELECT a, b FROM mv1");
         assertRowsNet(protocolVersion, mvRows);
@@ -1295,4 +1296,4 @@ public class ViewTest extends CQLTester
         assertRows(execute("SELECT k, toJson(listval) from mv"),
                    row(0, "[[\"a\", \"1\"], [\"b\", \"2\"], [\"c\", \"3\"]]"));
     }
-}
+}
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[11/16] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e624c663
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e624c663
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e624c663

Branch: refs/heads/trunk
Commit: e624c6638254ea410691f085a10d08d412eb5ac1
Parents: 14d67d8 1b36740
Author: Paulo Motta <pa...@apache.org>
Authored: Tue Sep 5 01:04:34 2017 -0500
Committer: Paulo Motta <pa...@apache.org>
Committed: Tue Sep 5 01:05:06 2017 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   30 +-
 doc/cql3/CQL.textile                            |    6 +
 .../org/apache/cassandra/config/CFMetaData.java |   13 +
 .../apache/cassandra/cql3/UpdateParameters.java |    2 +-
 .../cql3/statements/AlterTableStatement.java    |   18 +-
 .../org/apache/cassandra/db/LivenessInfo.java   |   17 +-
 .../org/apache/cassandra/db/ReadCommand.java    |    7 +-
 .../db/compaction/CompactionIterator.java       |    7 +-
 .../apache/cassandra/db/filter/RowFilter.java   |    4 +-
 .../cassandra/db/partitions/PurgeFunction.java  |   14 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |    6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   13 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |    5 +
 .../apache/cassandra/db/transform/Filter.java   |    8 +-
 .../db/transform/FilteredPartitions.java        |    4 +-
 .../cassandra/db/transform/FilteredRows.java    |    2 +-
 .../apache/cassandra/db/view/TableViews.java    |   18 +-
 src/java/org/apache/cassandra/db/view/View.java |   41 +-
 .../apache/cassandra/db/view/ViewManager.java   |    5 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  163 ++-
 .../apache/cassandra/service/DataResolver.java  |    4 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |    2 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  | 1344 ++++++++++++++++++
 .../cassandra/cql3/ViewFilteringTest.java       | 1030 +++++++++-----
 .../org/apache/cassandra/cql3/ViewTest.java     |   25 +-
 25 files changed, 2293 insertions(+), 495 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 8e39667,7064c5d..0682ae9
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,10 -18,28 +18,34 @@@ using the provided 'sstableupgrade' too
  
  Upgrading
  ---------
 -   - Nothing specific to this release, but please see previous upgrading sections,
 -     especially if you are upgrading from 2.2.
 +    - Nothing specific to this version but please see previous upgrading sections,
 +      especially if you are upgrading from 2.2.
  
+ Materialized Views
+ -------------------
+     - Cassandra will no longer allow dropping columns on tables with Materialized Views.
+     - A change was made in the way the Materialized View timestamp is computed, which
+       may cause an old deletion to a base column which is view primary key (PK) column
+       to not be reflected in the view when repairing the base table post-upgrade. This
+       condition is only possible when a column deletion to an MV primary key (PK) column
+       not present in the base table PK (via UPDATE base SET view_pk_col = null or DELETE
+       view_pk_col FROM base) is missed before the upgrade and received by repair after the upgrade.
+       If such column deletions are done on a view PK column which is not a base PK, it's advisable
+       to run repair on the base table of all nodes prior to the upgrade. Alternatively it's possible
+       to fix potential inconsistencies by running repair on the views after upgrade or drop and
+       re-create the views. See CASSANDRA-11500 for more details.
+     - Removal of columns not selected in the Materialized View (via UPDATE base SET unselected_column
+       = null or DELETE unselected_column FROM base) may not be properly reflected in the view in some
+       situations so we advise against doing deletions on base columns not selected in views
+       until this is fixed on CASSANDRA-13826.
 -
 -3.0.14
++    - Creating Materialized View with filtering on non-primary-key base column
++      (added in CASSANDRA-10368) is disabled, because the liveness of view row
++      is depending on multiple filtered base non-key columns and base non-key
++      column used in view primary-key. This semantic cannot be supported without
++      storage format change, see CASSANDRA-13826. For append-only use case, you
++      may still use this feature with a startup flag: "-Dcassandra.mv.allow_filtering_nonkey_columns_unsafe=true"
++
 +3.11.0
  ======
  
  Upgrading

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 3ac790b,befdd25..fdbcf7a
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -187,72 -189,54 +187,60 @@@ public class AlterTableStatement extend
                  break;
  
              case DROP:
 -                assert columnName != null;
                  if (!cfm.isCQLTable())
                      throw new InvalidRequestException("Cannot drop columns from a non-CQL3 table");
 -                if (def == null)
 -                    throw new InvalidRequestException(String.format("Column %s was not found in table %s", columnName, columnFamily()));
  
 -                switch (def.kind)
 +                for (AlterTableStatementColumn colData : colNameList)
                  {
 -                    case PARTITION_KEY:
 -                    case CLUSTERING:
 -                        throw new InvalidRequestException(String.format("Cannot drop PRIMARY KEY part %s", columnName));
 -                    case REGULAR:
 -                    case STATIC:
 -                        ColumnDefinition toDelete = null;
 -                        for (ColumnDefinition columnDef : cfm.partitionColumns())
 -                        {
 -                            if (columnDef.name.equals(columnName))
 -                            {
 -                                toDelete = columnDef;
 -                                break;
 -                            }
 -                        }
 -                        assert toDelete != null;
 -                        cfm.removeColumnDefinition(toDelete);
 -                        cfm.recordColumnDrop(toDelete, deleteTimestamp == null ? queryState.getTimestamp() : deleteTimestamp);
 -                        break;
 -                }
 +                    columnName = colData.getColumnName().getIdentifier(cfm);
 +                    def = cfm.getColumnDefinition(columnName);
  
 -                // If the dropped column is required by any secondary indexes
 -                // we reject the operation, as the indexes must be dropped first
 -                Indexes allIndexes = cfm.getIndexes();
 -                if (!allIndexes.isEmpty())
 -                {
 -                    ColumnFamilyStore store = Keyspace.openAndGetStore(cfm);
 -                    Set<IndexMetadata> dependentIndexes = store.indexManager.getDependentIndexes(def);
 -                    if (!dependentIndexes.isEmpty())
 -                        throw new InvalidRequestException(String.format("Cannot drop column %s because it has " +
 -                                                                        "dependent secondary indexes (%s)",
 -                                                                        def,
 -                                                                        dependentIndexes.stream()
 -                                                                                        .map(i -> i.name)
 -                                                                                        .collect(Collectors.joining(","))));
 -                }
 +                    if (def == null)
 +                        throw new InvalidRequestException(String.format("Column %s was not found in table %s", columnName, columnFamily()));
 +
 +                    switch (def.kind)
 +                    {
 +                         case PARTITION_KEY:
 +                         case CLUSTERING:
 +                              throw new InvalidRequestException(String.format("Cannot drop PRIMARY KEY part %s", columnName));
 +                         case REGULAR:
 +                         case STATIC:
 +                              ColumnDefinition toDelete = null;
 +                              for (ColumnDefinition columnDef : cfm.partitionColumns())
 +                              {
 +                                   if (columnDef.name.equals(columnName))
 +                                   {
 +                                       toDelete = columnDef;
 +                                       break;
 +                                   }
 +                               }
 +                             assert toDelete != null;
 +                             cfm.removeColumnDefinition(toDelete);
 +                             cfm.recordColumnDrop(toDelete, deleteTimestamp  == null ? queryState.getTimestamp() : deleteTimestamp);
 +                             break;
 +                    }
  
 -                if (!Iterables.isEmpty(views))
 -                    throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
 -                                                                    columnName.toString(),
 -                                                                    keyspace()));
 +                    // If the dropped column is required by any secondary indexes
 +                    // we reject the operation, as the indexes must be dropped first
 +                    Indexes allIndexes = cfm.getIndexes();
 +                    if (!allIndexes.isEmpty())
 +                    {
 +                        ColumnFamilyStore store = Keyspace.openAndGetStore(cfm);
 +                        Set<IndexMetadata> dependentIndexes = store.indexManager.getDependentIndexes(def);
 +                        if (!dependentIndexes.isEmpty())
 +                            throw new InvalidRequestException(String.format("Cannot drop column %s because it has " +
 +                                                                            "dependent secondary indexes (%s)",
 +                                                                            def,
 +                                                                            dependentIndexes.stream()
 +                                                                                            .map(i -> i.name)
 +                                                                                            .collect(Collectors.joining(","))));
 +                    }
 +
-                     // If a column is dropped which is included in a view, we don't allow the drop to take place.
-                     boolean rejectAlter = false;
-                     StringBuilder builder = new StringBuilder();
-                     for (ViewDefinition view : views)
-                     {
-                         if (!view.includes(columnName)) continue;
-                         if (rejectAlter)
-                             builder.append(',');
-                         rejectAlter = true;
-                         builder.append(view.viewName);
-                     }
-                     if (rejectAlter)
-                         throw new InvalidRequestException(String.format("Cannot drop column %s, depended on by materialized views (%s.{%s})",
++                    if (!Iterables.isEmpty(views))
++                        throw new InvalidRequestException(String.format("Cannot drop column %s on base table with materialized views.",
 +                                                                        columnName.toString(),
-                                                                         keyspace(),
-                                                                         builder.toString()));
++                                                                        keyspace()));
 +                }
                  break;
              case OPTS:
                  if (attrs == null)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/LivenessInfo.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/filter/RowFilter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/rows/Row.java
index 60ee4d4,3bcc220..9a8508b
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@@ -206,19 -213,9 +216,19 @@@ public interface Row extends Unfiltered
       * @return this row but without any deletion info purged by {@code purger}. If the purged row is empty, returns
       * {@code null}.
       */
-     public Row purge(DeletionPurger purger, int nowInSec);
+     public Row purge(DeletionPurger purger, int nowInSec, boolean enforceStrictLiveness);
  
      /**
 +     * Returns a copy of this row which only include the data queried by {@code filter}, excluding anything _fetched_ for
 +     * internal reasons but not queried by the user (see {@link ColumnFilter} for details).
 +     *
 +     * @param filter the {@code ColumnFilter} to use when deciding what is user queried. This should be the filter
 +     * that was used when querying the row on which this method is called.
 +     * @return the row but with all data that wasn't queried by the user skipped.
 +     */
 +    public Row withOnlyQueriedData(ColumnFilter filter);
 +
 +    /**
       * Returns a copy of this row where all counter cells have they "local" shard marked for clearing.
       */
      public Row markCounterLocalToBeCleared();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/TableViews.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewManager.java
index 5c72bb2,d1cfd9e..cb1e02b
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@@ -172,9 -159,13 +172,14 @@@ public class ViewManage
  
          forTable(view.getDefinition().baseTableMetadata()).removeByName(name);
          SystemKeyspace.setViewRemoved(keyspace.getName(), view.name);
 +        SystemDistributedKeyspace.setViewRemoved(keyspace.getName(), view.name);
      }
  
+     public View getByName(String name)
+     {
+         return viewsByName.get(name);
+     }
+ 
      public void buildAllViews()
      {
          for (View view : allViews())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index edbda1c,0c8e078..74758e7
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@@ -376,14 -384,34 +383,34 @@@ public class ViewUpdateGenerato
          if (!matchesViewFilter(existingBaseRow))
              return;
  
-         deleteOldEntryInternal(existingBaseRow);
+         deleteOldEntryInternal(existingBaseRow, mergedBaseRow);
      }
  
-     private void deleteOldEntryInternal(Row existingBaseRow)
+     private void deleteOldEntryInternal(Row existingBaseRow, Row mergedBaseRow)
      {
          startNewUpdate(existingBaseRow);
-         DeletionTime dt = new DeletionTime(computeTimestampForEntryDeletion(existingBaseRow), nowInSec);
-         currentViewEntryBuilder.addRowDeletion(Row.Deletion.shadowable(dt));
+         long timestamp = computeTimestampForEntryDeletion(existingBaseRow, mergedBaseRow);
+         long rowDeletion = mergedBaseRow.deletion().time().markedForDeleteAt();
+         assert timestamp >= rowDeletion;
+ 
+         // If computed deletion timestamp greater than row deletion, it must be coming from
+         //  1. non-pk base column used in view pk, or
+         //  2. unselected base column
+         //  any case, we need to use it as expired livenessInfo
+         // If computed deletion timestamp is from row deletion, we only need row deletion itself
+         if (timestamp > rowDeletion)
+         {
+             /**
+               * TODO: This is a hack and overload of LivenessInfo and we should probably modify
+               * the storage engine to properly support this, but on the meantime this
+               * should be fine because it only happens in some specific scenarios explained above.
+               */
 -            LivenessInfo info = LivenessInfo.create(timestamp, Integer.MAX_VALUE, nowInSec);
++            LivenessInfo info = LivenessInfo.withExpirationTime(timestamp, Integer.MAX_VALUE, nowInSec);
+             currentViewEntryBuilder.addPrimaryKeyLivenessInfo(info);
+         }
+         currentViewEntryBuilder.addRowDeletion(mergedBaseRow.deletion());
+ 
+         addDifferentCells(existingBaseRow, mergedBaseRow);
          submitUpdate();
      }
  
@@@ -440,50 -458,74 +457,74 @@@
  
          LivenessInfo baseLiveness = baseRow.primaryKeyLivenessInfo();
  
-         if (view.baseNonPKColumnsInViewPK.isEmpty())
+         if (view.hasSamePrimaryKeyColumnsAsBaseTable())
          {
-             int ttl = baseLiveness.ttl();
-             int expirationTime = baseLiveness.localExpirationTime();
+             if (view.getDefinition().includeAllColumns)
+                 return baseLiveness;
+ 
+             long timestamp = baseLiveness.timestamp();
+             boolean hasNonExpiringLiveCell = false;
+             Cell biggestExpirationCell = null;
              for (Cell cell : baseRow.cells())
              {
-                 if (cell.ttl() > ttl)
+                 if (view.getViewColumn(cell.column()) != null)
+                     continue;
+                 if (!isLive(cell))
+                     continue;
+                 timestamp = Math.max(timestamp, cell.maxTimestamp());
+                 if (!cell.isExpiring())
+                     hasNonExpiringLiveCell = true;
+                 else
                  {
-                     ttl = cell.ttl();
-                     expirationTime = cell.localDeletionTime();
+                     if (biggestExpirationCell == null)
+                         biggestExpirationCell = cell;
+                     else if (cell.localDeletionTime() > biggestExpirationCell.localDeletionTime())
+                         biggestExpirationCell = cell;
                  }
              }
-             return ttl == baseLiveness.ttl()
-                  ? baseLiveness
-                  : LivenessInfo.withExpirationTime(baseLiveness.timestamp(), ttl, expirationTime);
+             if (baseLiveness.isLive(nowInSec) && !baseLiveness.isExpiring())
 -                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
++                return LivenessInfo.create(timestamp, nowInSec);
+             if (hasNonExpiringLiveCell)
 -                return LivenessInfo.create(viewMetadata, timestamp, nowInSec);
++                return LivenessInfo.create(timestamp, nowInSec);
+             if (biggestExpirationCell == null)
+                 return baseLiveness;
+             if (biggestExpirationCell.localDeletionTime() > baseLiveness.localExpirationTime()
+                     || !baseLiveness.isLive(nowInSec))
 -                return LivenessInfo.create(timestamp,
++                return LivenessInfo.withExpirationTime(timestamp,
+                                                        biggestExpirationCell.ttl(),
+                                                        biggestExpirationCell.localDeletionTime());
+             return baseLiveness;
          }
  
-         ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0);
-         Cell cell = baseRow.getCell(baseColumn);
+         Cell cell = baseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
          assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry";
  
-         long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
-         return LivenessInfo.withExpirationTime(timestamp, cell.ttl(), cell.localDeletionTime());
 -        return LivenessInfo.create(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
++        return LivenessInfo.withExpirationTime(cell.timestamp(), cell.ttl(), cell.localDeletionTime());
      }
  
-     private long computeTimestampForEntryDeletion(Row baseRow)
+     private long computeTimestampForEntryDeletion(Row existingBaseRow, Row mergedBaseRow)
      {
-         // We delete the old row with it's row entry timestamp using a shadowable deletion.
-         // We must make sure that the deletion deletes everything in the entry (or the entry will
-         // still show up), so we must use the bigger timestamp found in the existing row (for any
-         // column included in the view at least).
-         // TODO: We have a problem though: if the entry is "resurected" by a later update, we would
-         // need to ensure that the timestamp for then entry then is bigger than the tombstone
-         // we're just inserting, which is not currently guaranteed.
-         // This is a bug for a separate ticket though.
-         long timestamp = baseRow.primaryKeyLivenessInfo().timestamp();
-         for (ColumnData data : baseRow)
+         DeletionTime deletion = mergedBaseRow.deletion().time();
+         if (view.hasSamePrimaryKeyColumnsAsBaseTable())
          {
-             if (!view.getDefinition().includes(data.column().name))
-                 continue;
+             long timestamp = Math.max(deletion.markedForDeleteAt(), existingBaseRow.primaryKeyLivenessInfo().timestamp());
+             if (view.getDefinition().includeAllColumns)
+                 return timestamp;
  
-             timestamp = Math.max(timestamp, data.maxTimestamp());
+             for (Cell cell : existingBaseRow.cells())
+             {
+                 // selected column should not contribute to view deletion, itself is already included in view row
+                 if (view.getViewColumn(cell.column()) != null)
+                     continue;
+                 // unselected column is used regardless live or dead, because we don't know if it was used for liveness.
+                 timestamp = Math.max(timestamp, cell.maxTimestamp());
+             }
+             return timestamp;
          }
-         return timestamp;
+         // has base non-pk column in view pk
+         Cell before = existingBaseRow.getCell(view.baseNonPKColumnsInViewPK.get(0));
+         assert isLive(before) : "We shouldn't have got there if the base row had no associated entry";
+         return deletion.deletes(before) ? deletion.markedForDeleteAt() : before.timestamp();
      }
  
      private void addColumnData(ColumnDefinition viewColumn, ColumnData baseTableData)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e624c663/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
index 0000000,9e32620..ece3e6d
mode 000000,100644..100644
--- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java
@@@ -1,0 -1,1343 +1,1344 @@@
+ package org.apache.cassandra.cql3;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Comparator;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.concurrent.TimeUnit;
+ import java.util.stream.Collectors;
+ 
+ import org.apache.cassandra.concurrent.SEPExecutor;
+ import org.apache.cassandra.concurrent.Stage;
+ import org.apache.cassandra.concurrent.StageManager;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.compaction.CompactionManager;
++import org.apache.cassandra.transport.ProtocolVersion;
+ import org.apache.cassandra.utils.FBUtilities;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Ignore;
+ import org.junit.Test;
+ 
+ import com.google.common.base.Objects;
+ 
+ public class ViewComplexTest extends CQLTester
+ {
 -    int protocolVersion = 4;
++    ProtocolVersion protocolVersion = ProtocolVersion.V4;
+     private final List<String> views = new ArrayList<>();
+ 
+     @BeforeClass
+     public static void startup()
+     {
+         requireNetwork();
+     }
+     @Before
+     public void begin()
+     {
+         views.clear();
+     }
+ 
+     @After
+     public void end() throws Throwable
+     {
+         for (String viewName : views)
+             executeNet(protocolVersion, "DROP MATERIALIZED VIEW " + viewName);
+     }
+ 
+     private void createView(String name, String query) throws Throwable
+     {
+         executeNet(protocolVersion, String.format(query, name));
+         // If exception is thrown, the view will not be added to the list; since it shouldn't have been created, this is
+         // the desired behavior
+         views.add(name);
+     }
+ 
+     private void updateView(String query, Object... params) throws Throwable
+     {
+         updateViewWithFlush(query, false, params);
+     }
+ 
+     private void updateViewWithFlush(String query, boolean flush, Object... params) throws Throwable
+     {
+         executeNet(protocolVersion, query, params);
+         while (!(((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getPendingTasks() == 0
+                 && ((SEPExecutor) StageManager.getStage(Stage.VIEW_MUTATION)).getActiveCount() == 0))
+         {
+             Thread.sleep(1);
+         }
+         if (flush)
+             Keyspace.open(keyspace()).flush();
+     }
+ 
+     // for now, unselected column cannot be fully supported, SEE CASSANDRA-13826
+     @Ignore
+     @Test
+     public void testPartialDeleteUnselectedColumn() throws Throwable
+     {
+         boolean flush = true;
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT k,c FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+         updateView("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+         updateView("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+ 
+         execute("truncate %s;");
+ 
+         // removal generated by unselected column should not shadow PK update with smaller timestamp
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 20 SET a=null WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"));
+         assertRows(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1));
+     }
+ 
+     @Test
+     public void testPartialDeleteSelectedColumnWithFlush() throws Throwable
+     {
+         testPartialDeleteSelectedColumn(true);
+     }
+ 
+     @Test
+     public void testPartialDeleteSelectedColumnWithoutFlush() throws Throwable
+     {
+         testPartialDeleteSelectedColumn(false);
+     }
+ 
+     private void testPartialDeleteSelectedColumn(boolean flush) throws Throwable
+     {
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, e int, f int, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 10 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 11 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 1 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+ 
+         updateViewWithFlush("DELETE a FROM %s USING TIMESTAMP 1 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         // view livenessInfo should not be affected by selected column ts or tb
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 0", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 12 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         updateViewWithFlush("DELETE b FROM %s USING TIMESTAMP 13 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 14 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TIMESTAMP 15", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TTL 3 SET b=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, 1, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 1));
+ 
+         TimeUnit.SECONDS.sleep(4);
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("DELETE FROM %s USING TIMESTAMP 15 WHERE k=1 AND c=1", flush);
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         execute("truncate %s;");
+ 
+         // removal generated by unselected column should not shadow selected column with smaller timestamp
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, null, null, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 18 SET e=null WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"));
+         assertRows(execute("SELECT * from mv"));
+ 
+         updateViewWithFlush("UPDATE %s USING TIMESTAMP 16 SET a=1 WHERE k=1 AND c=1", flush);
+         assertRows(execute("SELECT * from %s"), row(1, 1, 1, null, null, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, 1, null));
+     }
+ 
+     @Test
+     public void testUpdateColumnInViewPKWithTTLWithFlush() throws Throwable
+     {
+         // CASSANDRA-13657
+         testUpdateColumnInViewPKWithTTL(true);
+     }
+ 
+     @Test
+     public void testUpdateColumnInViewPKWithTTLWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13657
+         testUpdateColumnInViewPKWithTTL(false);
+     }
+ 
+     private void testUpdateColumnInViewPKWithTTL(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13657 if base column used in view pk is ttled, then view row is considered dead
+         createTable("create table %s (k int primary key, a int, b int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (a, k)");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s SET a = 1 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 1, null));
+         assertRows(execute("SELECT * from mv"), row(1, 1, null));
+ 
+         updateView("DELETE a FROM %s WHERE k = 1");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("INSERT INTO %s (k) VALUES (1);");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, null, null));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("UPDATE %s USING TTL 5 SET a = 10 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 10, null));
+         assertRows(execute("SELECT * from mv"), row(10, 1, null));
+ 
+         updateView("UPDATE %s SET b = 100 WHERE k = 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, 10, 100));
+         assertRows(execute("SELECT * from mv"), row(10, 1, 100));
+ 
+         Thread.sleep(5000);
+ 
+         // 'a' is TTL of 5 and removed.
+         assertRows(execute("SELECT * from %s"), row(1, null, 100));
+         assertEmpty(execute("SELECT * from mv"));
+         assertEmpty(execute("SELECT * from mv WHERE k = ? AND a = ?", 1, 10));
+ 
+         updateView("DELETE b FROM %s WHERE k=1");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT * from %s"), row(1, null, null));
+         assertEmpty(execute("SELECT * from mv"));
+ 
+         updateView("DELETE FROM %s WHERE k=1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s"));
+         assertEmpty(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testUpdateColumnNotInViewWithFlush() throws Throwable
+     {
+         testUpdateColumnNotInView(true);
+     }
+ 
+     @Test
+     public void testUpdateColumnNotInViewWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUpdateColumnNotInView(false);
+     }
+ 
+     private void testUpdateColumnNotInView(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13127: if base column not selected in view are alive, then pk of view row should be alive
+         createTable("create table %s (p int, c int, v1 int, v2 int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 0 SET v1 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v1 FROM %s USING TIMESTAMP 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         // shadowed by tombstone
+         updateView("UPDATE %s USING TIMESTAMP 1 SET v1 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v1 FROM %s USING TIMESTAMP 3 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateView("DELETE v2 FROM %s USING TIMESTAMP 4 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertEmpty(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s USING TTL 3 SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateView("UPDATE %s SET v2 = 1 WHERE p = 0 AND c = 0");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0), row(0, 0, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         assertInvalidMessage("Cannot drop column v2 on base table with materialized views", "ALTER TABLE %s DROP v2");
+         // // drop unselected base column, unselected metadata should be removed, thus view row is dead
+         // updateView("ALTER TABLE %s DROP v2");
+         // assertRowsIgnoringOrder(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+         // assertRowsIgnoringOrder(execute("SELECT * from %s"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testPartialUpdateWithUnselectedCollectionsWithFlush() throws Throwable
+     {
+         testPartialUpdateWithUnselectedCollections(true);
+     }
+ 
+     @Test
+     public void testPartialUpdateWithUnselectedCollectionsWithoutFlush() throws Throwable
+     {
+         testPartialUpdateWithUnselectedCollections(false);
+     }
+ 
+     public void testPartialUpdateWithUnselectedCollections(boolean flush) throws Throwable
+     {
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         createTable("CREATE TABLE %s (k int, c int, a int, b int, l list<int>, s set<int>, m map<int,int>, PRIMARY KEY (k, c))");
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)");
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateView("UPDATE %s SET l=l+[1,2,3] WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateView("UPDATE %s SET l=l-[1,2] WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         updateView("UPDATE %s SET b=3 WHERE k=1 AND c=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRows(execute("SELECT * from mv"), row(1, 1, null, 3));
+ 
+         updateView("UPDATE %s SET b=null, l=l-[3], s=s-{3} WHERE k = 1 AND c = 1");
+         if (flush)
+         {
+             FBUtilities.waitOnFutures(ks.flush());
+             ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         }
+         assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+         assertRowsIgnoringOrder(execute("SELECT * from mv"));
+ 
+         updateView("UPDATE %s SET m=m+{3:3}, l=l-[1], s=s-{2} WHERE k = 1 AND c = 1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null));
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null));
+ 
+         assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m");
+         // executeNet(protocolVersion, "ALTER TABLE %s DROP m");
+         // ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv WHERE k = 1 AND c = 1"));
+         // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"));
+         // assertRowsIgnoringOrder(execute("SELECT * from mv"));
+     }
+ 
+     @Test
+     public void testUnselectedColumnsTTLWithFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUnselectedColumnsTTL(true);
+     }
+ 
+     @Test
+     public void testUnselectedColumnsTTLWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13127
+         testUnselectedColumnsTTL(false);
+     }
+ 
+     private void testUnselectedColumnsTTL(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13127 not ttled unselected column in base should keep view row alive
+         createTable("create table %s (p int, c int, v int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT p, c FROM %%s WHERE p IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) USING TTL 3;", flush);
+ 
+         updateViewWithFlush("UPDATE %s USING TTL 1000 SET v = 0 WHERE p = 0 and c = 0;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         Thread.sleep(3000);
+ 
+         UntypedResultSet.Row row = execute("SELECT v, ttl(v) from %s WHERE c = ? AND p = ?", 0, 0).one();
+         assertTrue("row should have value of 0", row.getInt("v") == 0);
+         assertTrue("row should have ttl less than 1000", row.getInt("ttl(v)") < 1000);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateViewWithFlush("DELETE FROM %s WHERE p = 0 and c = 0;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0));
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (0, 0) ", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         // already have a live row, no need to apply the unselected cell ttl
+         updateViewWithFlush("UPDATE %s USING TTL 3 SET v = 0 WHERE p = 0 and c = 0;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+ 
+         updateViewWithFlush("INSERT INTO %s (p, c) VALUES (1, 1) USING TTL 3", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+ 
+         Thread.sleep(4000);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 0, 0), row(0, 0));
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1));
+ 
+         // unselected should keep view row alive
+         updateViewWithFlush("UPDATE %s SET v = 0 WHERE p = 1 and c = 1;", flush);
+         assertRowsIgnoringOrder(execute("SELECT * from mv WHERE c = ? AND p = ?", 1, 1), row(1, 1));
+ 
+     }
+ 
+     @Test
+     public void testRangeDeletionWithFlush() throws Throwable
+     {
+         testRangeDeletion(true);
+     }
+ 
+     @Test
+     public void testRangeDeletionWithoutFlush() throws Throwable
+     {
+         testRangeDeletion(false);
+     }
+ 
+     public void testRangeDeletion(boolean flush) throws Throwable
+     {
+         // for partition range deletion, need to know that existing row is shadowed instead of not existed.
+         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 PRIMARY KEY (a, b)");
+ 
+         Keyspace ks = Keyspace.open(keyspace());
+         ks.getColumnFamilyStore("mv_test1").disableAutoCompaction();
+ 
+         execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?) using timestamp 0", 1, 1, 1, 1);
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, 1));
+ 
+         // remove view row
+         updateView("UPDATE %s using timestamp 1 set b = null WHERE a=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+         // remove base row, no view updated generated.
+         updateView("DELETE FROM %s using timestamp 2 where a=1");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"));
+ 
+         // restor view row with b,c column. d is still tombstone
+         updateView("UPDATE %s using timestamp 3 set b = 1,c = 1 where a=1"); // upsert
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT * FROM mv_test1"), row(1, 1, 1, null));
+     }
+ 
+     @Test
+     public void testBaseTTLWithSameTimestampTest() throws Throwable
+     {
+         // CASSANDRA-13127 when liveness timestamp tie, greater localDeletionTime should win if both are expiring.
+         createTable("create table %s (p int, c int, v int, primary key(p, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) using timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         Thread.sleep(4000);
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+ 
+         // reversed order
+         execute("truncate %s;");
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING TTL 3 and timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         updateView("INSERT INTO %s (p, c, v) VALUES (0, 0, 0) USING timestamp 1;");
+ 
+         FBUtilities.waitOnFutures(ks.flush());
+ 
+         Thread.sleep(4000);
+ 
+         assertEmpty(execute("SELECT * from %s WHERE c = ? AND p = ?", 0, 0));
+ 
+     }
+ 
+     @Test
+     public void testCommutativeRowDeletionFlush() throws Throwable
+     {
+         // CASSANDRA-13409
+         testCommutativeRowDeletion(true);
+     }
+ 
+     @Test
+     public void testCommutativeRowDeletionWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-13409
+         testCommutativeRowDeletion(false);
+     }
+ 
+     private void testCommutativeRowDeletion(boolean flush) throws Throwable
+     {
+         // CASSANDRA-13409 new update should not resurrect previous deleted data in view
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable-1, Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+         // sstable-2
+         updateView("Delete from %s using timestamp 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"));
+         // sstable-3
+         updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+         // sstable-4
+         updateView("UPdate %s using timestamp 4 set v1 = 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+         // sstable-5
+         updateView("UPdate %s using timestamp 5 set v1 = 1 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+ 
+         if (flush)
+         {
+             // compact sstable 2 and 4, 5;
+             ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+             List<String> sstables = cfs.getLiveSSTables()
+                                        .stream()
+                                        .sorted((s1, s2) -> s1.descriptor.generation - s2.descriptor.generation)
+                                        .map(s -> s.getFilename())
+                                        .collect(Collectors.toList());
+             String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(3), sstables.get(4)));
+             CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+             assertEquals(3, cfs.getLiveSSTables().size());
+         }
+         // regular tombstone should be retained after compaction
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+     }
+ 
+     @Test
+     public void testUnselectedColumnWithExpiredLivenessInfo() throws Throwable
+     {
+         boolean flush = true;
+         createTable("create table %s (k int, c int, a int, b int, PRIMARY KEY(k, c))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select k,c,b from %%s where c is not null and k is not null primary key (c, k);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable-1, Set initial values TS=1
+         updateViewWithFlush("UPDATE %s SET a = 1 WHERE k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         // sstable-2
+         updateViewWithFlush("INSERT INTO %s(k,c) VALUES(1,1) USING TTL 5", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         Thread.sleep(5001);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null));
+ 
+         // sstable-3
+         updateViewWithFlush("Update %s set a = null where k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"));
+ 
+         // sstable-4
+         updateViewWithFlush("Update %s USING TIMESTAMP 1 set b = 1 where k = 1 AND c = 1;", flush);
+ 
+         assertRowsIgnoringOrder(execute("SELECT * from %s WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT k,c,b from mv WHERE k = 1 AND c = 1;"),
+                                 row(1, 1, 1));
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampSmallerThanPkWithFlush() throws Throwable
+     {
+         testUpdateWithColumnTimestampSmallerThanPk(true);
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampSmallerThanPkWithoutFlush() throws Throwable
+     {
+         testUpdateWithColumnTimestampSmallerThanPk(false);
+     }
+ 
+     public void testUpdateWithColumnTimestampSmallerThanPk(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // reset value
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 6;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+         // increase pk's timestamp to 20
+         updateView("Insert into %s (p) values (3) using timestamp 20;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+         // change v1's to 2 and remove existing view row with ts7
+         updateView("UPdate %s using timestamp 7 set v1 = 2 where p = 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, 3, 6L));
+         // change v1's to 1 and remove existing view row with ts8
+         updateView("UPdate %s using timestamp 8 set v1 = 1 where p = 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 3, 6L));
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampBiggerThanPkWithFlush() throws Throwable
+     {
+         // CASSANDRA-11500
+         testUpdateWithColumnTimestampBiggerThanPk(true);
+     }
+ 
+     @Test
+     public void testUpdateWithColumnTimestampBiggerThanPkWithoutFlush() throws Throwable
+     {
+         // CASSANDRA-11500
+         testUpdateWithColumnTimestampBiggerThanPk(false);
+     }
+ 
+     public void testUpdateWithColumnTimestampBiggerThanPk(boolean flush) throws Throwable
+     {
+         // CASSANDRA-11500 able to shadow old view row with column ts greater tahn pk's ts and re-insert the view row
+         createTable("CREATE TABLE %s (k int PRIMARY KEY, a int, b int);");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND a IS NOT NULL PRIMARY KEY (k, a);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+         updateView("DELETE FROM %s USING TIMESTAMP 0 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // sstable-1, Set initial values TS=1
+         updateView("INSERT INTO %s(k, a, b) VALUES (1, 1, 1) USING TIMESTAMP 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 1));
+         updateView("UPDATE %s USING TIMESTAMP 10 SET b = 2 WHERE k = 1;");
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         updateView("UPDATE %s USING TIMESTAMP 2 SET a = 2 WHERE k = 1;");
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 2, 2));
+         updateView("UPDATE %s USING TIMESTAMP 11 SET a = 1 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+ 
+         // set non-key base column as tombstone, view row is removed with shadowable
+         updateView("UPDATE %s USING TIMESTAMP 12 SET a = null WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, null, 2));
+ 
+         // column b should be alive
+         updateView("UPDATE %s USING TIMESTAMP 13 SET a = 1 WHERE k = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from mv"), row(1, 1, 2));
+         assertRowsIgnoringOrder(execute("SELECT k,a,b from %s"), row(1, 1, 2));
+ 
+         assertInvalidMessage("Cannot drop column a on base table with materialized views", "ALTER TABLE %s DROP a");
+     }
+ 
+     @Test
+     public void testNonBaseColumnInViewPkWithFlush() throws Throwable
+     {
+         testNonBaseColumnInViewPk(true);
+     }
+ 
+     @Test
+     public void testNonBaseColumnInViewPkWithoutFlush() throws Throwable
+     {
+         testNonBaseColumnInViewPk(true);
+     }
+ 
+     public void testNonBaseColumnInViewPk(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key (p1,p2))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1)"
+                            + " with gc_grace_seconds=5;");
+         ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+         cfs.disableAutoCompaction();
+ 
+         updateView("UPDATE %s USING TIMESTAMP 1 set v1 =1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, 1, null));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, 1, null));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 set v1 = null, v2 = 1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 2 set v2 = null where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+ 
+         updateView("INSERT INTO %s (p1,p2) VALUES(1,1) USING TIMESTAMP 3;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, null));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, null));
+ 
+         updateView("DELETE FROM %s USING TIMESTAMP 4 WHERE p1 =1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"));
+ 
+         updateView("UPDATE %s USING TIMESTAMP 5 set v2 = 1 where p1 = 1 AND p2 = 1;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from %s"), row(1, 1, null, 1));
+         assertRowsIgnoringOrder(execute("SELECT p1, p2, v1, v2 from mv"), row(1, 1, null, 1));
+     }
+ 
+     @Test
+     public void testStrictLivenessTombstone() throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p)"
+                            + " with gc_grace_seconds=5;");
+         ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+         cfs.disableAutoCompaction();
+ 
+         updateView("Insert into %s (p, v1, v2) values (1, 1, 1) ;");
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         updateView("Update %s set v1 = null WHERE p = 1");
+         FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+ 
+         cfs.forceMajorCompaction(); // before gc grace second, strict-liveness tombstoned dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+ 
+         Thread.sleep(6000);
+         assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+ 
+         cfs.forceMajorCompaction(); // after gc grace second, no data left
+         assertEquals(0, cfs.getLiveSSTables().size());
+ 
+         updateView("Update %s using ttl 5 set v1 = 1 WHERE p = 1");
+         FBUtilities.waitOnFutures(ks.flush());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         cfs.forceMajorCompaction(); // before ttl+gc_grace_second, strict-liveness ttled dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"), row(1, 1, 1));
+ 
+         Thread.sleep(5500); // after expired, before gc_grace_second
+         cfs.forceMajorCompaction();// before ttl+gc_grace_second, strict-liveness ttled dead row remains
+         assertEquals(1, cfs.getLiveSSTables().size());
+         assertRowsIgnoringOrder(execute("SELECT p, v1, v2 from mv"));
+ 
+         Thread.sleep(5500); // after expired + gc_grace_second
+         assertEquals(1, cfs.getLiveSSTables().size()); // no auto compaction.
+ 
+         cfs.forceMajorCompaction(); // after gc grace second, no data left
+         assertEquals(0, cfs.getLiveSSTables().size());
+     }
+ 
+     @Test
+     public void testCellTombstoneAndShadowableTombstonesWithFlush() throws Throwable
+     {
+         testCellTombstoneAndShadowableTombstones(true);
+     }
+ 
+     @Test
+     public void testCellTombstoneAndShadowableTombstonesWithoutFlush() throws Throwable
+     {
+         testCellTombstoneAndShadowableTombstones(false);
+     }
+ 
+     private void testCellTombstoneAndShadowableTombstones(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // sstable 1, Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 3) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(3, 1L));
+         // sstable 2
+         updateView("UPdate %s using timestamp 2 set v2 = null where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3),
+                                 row(null, null));
+         // sstable 3
+         updateView("UPdate %s using timestamp 3 set v1 = 2 where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(2, 3, null, null));
+         // sstable 4
+         updateView("UPdate %s using timestamp 4 set v1 = 1 where p = 3");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+ 
+         if (flush)
+         {
+             // compact sstable 2 and 3;
+             ColumnFamilyStore cfs = ks.getColumnFamilyStore("mv");
+             List<String> sstables = cfs.getLiveSSTables()
+                                        .stream()
+                                        .sorted(Comparator.comparingInt(s -> s.descriptor.generation))
+                                        .map(s -> s.getFilename())
+                                        .collect(Collectors.toList());
+             System.out.println("SSTables " + sstables);
+             String dataFiles = String.join(",", Arrays.asList(sstables.get(1), sstables.get(2)));
+             CompactionManager.instance.forceUserDefinedCompaction(dataFiles);
+         }
+         // cell-tombstone in sstable 4 is not compacted away, because the shadowable tombstone is shadowed by new row.
+         assertRowsIgnoringOrder(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, null, null));
+     }
+ 
+     @Test
+     public void complexTimestampDeletionTestWithFlush() throws Throwable
+     {
+         complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(true);
+         complexTimestampWithbasePKColumnsInViewPKDeletionTest(true);
+     }
+ 
+     @Test
+     public void complexTimestampDeletionTestWithoutFlush() throws Throwable
+     {
+         complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(false);
+         complexTimestampWithbasePKColumnsInViewPKDeletionTest(false);
+     }
+ 
+     private void complexTimestampWithbasePKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p1 int, p2 int, v1 int, v2 int, primary key(p1, p2))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv2",
+                    "create materialized view %s as select * from %%s where p1 is not null and p2 is not null primary key (p2, p1);");
+         ks.getColumnFamilyStore("mv2").disableAutoCompaction();
+ 
+         // Set initial values TS=1
+         updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 4, 1L));
+         // remove row/mv TS=2
+         updateView("Delete from %s using timestamp 2 where p1 = 1 and p2 = 2;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // view are empty
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"));
+         // insert PK with TS=3
+         updateView("Insert into %s (p1, p2) values (1, 2) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+ 
+         ks.getColumnFamilyStore("mv2").forceMajorCompaction();
+         assertRowsIgnoringOrder(execute("SELECT * from mv2"), row(2, 1, null, null));
+ 
+         // reset values
+         updateView("Insert into %s (p1, p2, v1, v2) values (1, 2, 3, 4) using timestamp 10;");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 4, 10L));
+ 
+         updateView("UPDATE %s using timestamp 20 SET v2 = 5 WHERE p1 = 1 and p2 = 2");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(3, 5, 20L));
+ 
+         updateView("DELETE FROM %s using timestamp 10 WHERE p1 = 1 and p2 = 2");
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v1, v2, WRITETIME(v2) from mv2 WHERE p1 = ? AND p2 = ?", 1, 2),
+                                 row(null, 5, 20L));
+     }
+ 
+     public void complexTimestampWithbaseNonPKColumnsInViewPKDeletionTest(boolean flush) throws Throwable
+     {
+         createTable("create table %s (p int primary key, v1 int, v2 int)");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         createView("mv",
+                    "create materialized view %s as select * from %%s where p is not null and v1 is not null primary key (v1, p);");
+         ks.getColumnFamilyStore("mv").disableAutoCompaction();
+ 
+         // Set initial values TS=1
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 1;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRowsIgnoringOrder(execute("SELECT v2, WRITETIME(v2) from mv WHERE v1 = ? AND p = ?", 1, 3), row(5, 1L));
+         // remove row/mv TS=2
+         updateView("Delete from %s using timestamp 2 where p = 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // view are empty
+         assertRowsIgnoringOrder(execute("SELECT * from mv"));
+         // insert PK with TS=3
+         updateView("Insert into %s (p, v1) values (3, 1) using timestamp 3;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+ 
+         // insert values TS=2, it should be considered dead due to previous tombstone
+         updateView("Insert into %s (p, v1, v2) values (3, 1, 5) using timestamp 2;");
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+         // deleted column in MV remained dead
+         assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 3, null));
+ 
+         // insert values TS=2, it should be considered dead due to previous tombstone
+         executeNet(protocolVersion, "UPDATE %s USING TIMESTAMP 3 SET v2 = ? WHERE p = ?", 4, 3);
+ 
+         if (flush)
+             FBUtilities.waitOnFutures(ks.flush());
+ 
+         assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+ 
+         ks.getColumnFamilyStore("mv").forceMajorCompaction();
+         assertRows(execute("SELECT v1, p, v2, WRITETIME(v2) from mv"), row(1, 3, 4, 3L));
+     }
+ 
+     @Test
+     public void testMVWithDifferentColumnsWithFlush() throws Throwable
+     {
+         testMVWithDifferentColumns(true);
+     }
+ 
+     @Test
+     public void testMVWithDifferentColumnsWithoutFlush() throws Throwable
+     {
+         testMVWithDifferentColumns(false);
+     }
+ 
+     private void testMVWithDifferentColumns(boolean flush) throws Throwable
+     {
+         createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, f int, PRIMARY KEY(a, b))");
+ 
+         execute("USE " + keyspace());
+         executeNet(protocolVersion, "USE " + keyspace());
+         List<String> viewNames = new ArrayList<>();
+         List<String> mvStatements = Arrays.asList(
+                                                   // all selected
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // unselected e,f
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // no selected
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (a,b)",
+                                                   // all selected, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                   // unselected e,f, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b,c,d FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)",
+                                                   // no selected, re-order keys
+                                                   "CREATE MATERIALIZED VIEW %s AS SELECT a,b FROM %%s WHERE a IS NOT NULL AND b IS NOT NULL PRIMARY KEY (b,a)");
+ 
+         Keyspace ks = Keyspace.open(keyspace());
+ 
+         for (int i = 0; i < mvStatements.size(); i++)
+         {
+             String name = "mv" + i;
+             viewNames.add(name);
+             createView(name, mvStatements.get(i));
+             ks.getColumnFamilyStore(name).disableAutoCompaction();
+         }
+ 
+         // insert
+         updateViewWithFlush("INSERT INTO %s (a,b,c,d,e,f) VALUES(1,1,1,1,1,1) using timestamp 1", flush);
+         assertBaseViews(row(1, 1, 1, 1, 1, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 2 SET c=0, d=0 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 0, 0, 1, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 2 SET e=0, f=0 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 0, 0, 0, 0), viewNames);
+ 
+         updateViewWithFlush("DELETE FROM %s using timestamp 2 WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         // partial update unselected, selected
+         updateViewWithFlush("UPDATE %s using timestamp 3 SET f=1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 4 SET e = 1, f=null WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, 1, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 4 SET e = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 5 SET c = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 5 SET c = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET d = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, 1, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 7 SET d = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 8 SET f = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, null, null, null, 1), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET c = 1 WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, 1), viewNames);
+ 
+         // view row still alive due to c=1@6
+         updateViewWithFlush("UPDATE %s using timestamp 8 SET f = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(row(1, 1, 1, null, null, null), viewNames);
+ 
+         updateViewWithFlush("UPDATE %s using timestamp 6 SET c = null WHERE a=1 AND b=1", flush);
+         assertBaseViews(null, viewNames);
+     }
+ 
+     private void assertBaseViews(Object[] row, List<String> viewNames) throws Throwable
+     {
+         UntypedResultSet result = execute("SELECT * FROM %s");
+         if (row == null)
+             assertRowsIgnoringOrder(result);
+         else
+             assertRowsIgnoringOrder(result, row);
+         for (int i = 0; i < viewNames.size(); i++)
+             assertBaseView(result, execute(String.format("SELECT * FROM %s", viewNames.get(i))), viewNames.get(i));
+     }
+ 
+     private void assertBaseView(UntypedResultSet base, UntypedResultSet view, String mv)
+     {
+         List<ColumnSpecification> baseMeta = base.metadata();
+         List<ColumnSpecification> viewMeta = view.metadata();
+ 
+         Iterator<UntypedResultSet.Row> iter = base.iterator();
+         Iterator<UntypedResultSet.Row> viewIter = view.iterator();
+ 
+         List<UntypedResultSet.Row> baseData = com.google.common.collect.Lists.newArrayList(iter);
+         List<UntypedResultSet.Row> viewData = com.google.common.collect.Lists.newArrayList(viewIter);
+ 
+         if (baseData.size() != viewData.size())
+             fail(String.format("Mismatch number of rows in view %s: <%s>, in base <%s>",
+                                mv,
+                                makeRowStrings(view),
+                                makeRowStrings(base)));
+         if (baseData.size() == 0)
+             return;
+         if (viewData.size() != 1)
+             fail(String.format("Expect only one row in view %s, but got <%s>",
+                                mv,
+                                makeRowStrings(view)));
+ 
+         UntypedResultSet.Row row = baseData.get(0);
+         UntypedResultSet.Row viewRow = viewData.get(0);
+ 
+         Map<String, ByteBuffer> baseValues = new HashMap<>();
+         for (int j = 0; j < baseMeta.size(); j++)
+         {
+             ColumnSpecification column = baseMeta.get(j);
+             ByteBuffer actualValue = row.getBytes(column.name.toString());
+             baseValues.put(column.name.toString(), actualValue);
+         }
+         for (int j = 0; j < viewMeta.size(); j++)
+         {
+             ColumnSpecification column = viewMeta.get(j);
+             String name = column.name.toString();
+             ByteBuffer viewValue = viewRow.getBytes(name);
+             if (!baseValues.containsKey(name))
+             {
+                 fail(String.format("Extra column: %s with value %s in view", name, column.type.compose(viewValue)));
+             }
+             else if (!Objects.equal(baseValues.get(name), viewValue))
+             {
+                 fail(String.format("Non equal column: %s, expected <%s> but got <%s>",
+                                    name,
+                                    column.type.compose(baseValues.get(name)),
+                                    column.type.compose(viewValue)));
+             }
+         }
+     }
+ 
+ }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[12/16] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by pa...@apache.org.
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