Test failure: materialized_views_test.TestMaterializedViewsConsistenc…

…y.test_multi_partition_consistent_reads_after_write Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-19056
apache · Dec 1, 2023 · bd25c05 · bd25c05
1 parent 390d8da
commit bd25c05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/java/org/apache/cassandra/db/view/TableViews.java b/src/java/org/apache/cassandra/db/view/TableViews.java
@@ -67,6 +67,7 @@
 import org.apache.cassandra.schema.TableMetadata;
 import org.apache.cassandra.schema.TableMetadataRef;
 import org.apache.cassandra.service.StorageProxy;
+import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.btree.BTree;
 import org.apache.cassandra.utils.btree.BTreeSet;
@@ -172,7 +173,7 @@ public void pushViewReplicaUpdates(PartitionUpdate update, boolean writeCommitLo
     {
         assert update.metadata().id.equals(baseTableMetadata.id);
 
-        Collection<View> views = updatedViews(update);
+        Collection<View> views = updatedViews(update, ClusterMetadata.currentNullable());
         if (views.isEmpty())
             return;
 
@@ -391,7 +392,7 @@ public Collection<Mutation> next()
      * @param updates the updates applied to the base table.
      * @return the views affected by {@code updates}.
      */
-    public Collection<View> updatedViews(PartitionUpdate updates)
+    public Collection<View> updatedViews(PartitionUpdate updates, ClusterMetadata metadata)
     {
         List<View> matchingViews = new ArrayList<>(views.size());
 
@@ -400,7 +401,8 @@ public Collection<View> updatedViews(PartitionUpdate updates)
             ReadQuery selectQuery = view.getReadQuery();
             if (!selectQuery.selectsKey(updates.partitionKey()))
                 continue;
-
+            if (metadata != null && !metadata.schema.getKeyspaceMetadata(view.getDefinition().keyspace()).hasView(view.name))
+                continue;
             matchingViews.add(view);
         }
         return matchingViews;

diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -32,6 +32,7 @@
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.partitions.*;
 import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.tcm.ClusterMetadata;
 
 import static org.apache.cassandra.config.CassandraRelevantProperties.MV_ENABLE_COORDINATOR_BATCHLOG;
 
@@ -72,6 +73,7 @@ public boolean updatesAffectView(Collection<? extends IMutation> mutations, bool
         if (!enableCoordinatorBatchlog && coordinatorBatchlog)
             return false;
 
+        ClusterMetadata metadata = ClusterMetadata.currentNullable();
         for (IMutation mutation : mutations)
         {
             for (PartitionUpdate update : mutation.getPartitionUpdates())
@@ -81,7 +83,7 @@ public boolean updatesAffectView(Collection<? extends IMutation> mutations, bool
                 if (coordinatorBatchlog && keyspace.getReplicationStrategy().getReplicationFactor().allReplicas == 1)
                     continue;
 
-                if (!forTable(update.metadata()).updatedViews(update).isEmpty())
+                if (!forTable(update.metadata()).updatedViews(update, metadata).isEmpty())
                     return true;
             }
         }