From b40cb8e73c2f9ec0495b01d234454b1ccb2a48f3 Mon Sep 17 00:00:00 2001
From: nivy <nivy@apple.com>
Date: Thu, 30 Jul 2026 22:09:35 -0700
Subject: [PATCH] Avoid NPE in TableViews.allViewsCfs when a table has no views

---
 src/java/org/apache/cassandra/db/view/TableViews.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/java/org/apache/cassandra/db/view/TableViews.java b/src/java/org/apache/cassandra/db/view/TableViews.java
index 8e64ef3589..3725603e43 100644
--- a/src/java/org/apache/cassandra/db/view/TableViews.java
+++ b/src/java/org/apache/cassandra/db/view/TableViews.java
@@ -89,6 +89,9 @@ public class TableViews extends AbstractCollection<View>
 
     public Iterable<ColumnFamilyStore> allViewsCfs()
     {
+        if (views.isEmpty())
+            return Collections.emptyList();
+
         Keyspace keyspace = Keyspace.open(baseTableMetadata.keyspace);
         return Iterables.transform(views, view -> keyspace.getColumnFamilyStore(view.getDefinition().name()));
     }