Merge branch 'cassandra-4.0' into cassandra-4.1

smiklosovic · smiklosovic · commit 8363417facd8 · 2025-08-20T13:23:40.000+02:00
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -473,9 +473,8 @@ private void maybeNotifyIndexersAboutRowsInFullyExpiredSSTables(Set<SSTableReade
             {
                 while (scanner.hasNext())
                 {
-                    UnfilteredRowIterator partition = scanner.next();
-
-                    try (WriteContext ctx = cfs.keyspace.getWriteHandler().createContextForIndexing())
+                    try (UnfilteredRowIterator partition = scanner.next();
+                         WriteContext ctx = cfs.keyspace.getWriteHandler().createContextForIndexing())
                     {
                         List<Index.Indexer> indexers = new ArrayList<>();
                         for (int i = 0; i < indexes.size(); i++)

Original file line number	Diff line number	Diff line change
`@@ -473,9 +473,8 @@ private void maybeNotifyIndexersAboutRowsInFullyExpiredSSTables(Set<SSTableReade`
`473`	`473`	`{`
`474`	`474`	`while (scanner.hasNext())`
`475`	`475`	`{`
`476`		`- UnfilteredRowIterator partition = scanner.next();`
`477`		`-`
`478`		`- try (WriteContext ctx = cfs.keyspace.getWriteHandler().createContextForIndexing())`
	`476`	`+ try (UnfilteredRowIterator partition = scanner.next();`
	`477`	`+ WriteContext ctx = cfs.keyspace.getWriteHandler().createContextForIndexing())`
`479`	`478`	`{`
`480`	`479`	`List<Index.Indexer> indexers = new ArrayList<>();`
`481`	`480`	`for (int i = 0; i < indexes.size(); i++)`