Merge branch 'cassandra-4.1' into cassandra-5.0

smiklosovic · smiklosovic · commit 673ec6638865 · 2025-08-20T13:25:17.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
@@ -497,9 +497,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
`@@ -497,9 +497,8 @@ private void maybeNotifyIndexersAboutRowsInFullyExpiredSSTables(Set<SSTableReade`
`497`	`497`	`{`
`498`	`498`	`while (scanner.hasNext())`
`499`	`499`	`{`
`500`		`- UnfilteredRowIterator partition = scanner.next();`
`501`		`-`
`502`		`- try (WriteContext ctx = cfs.keyspace.getWriteHandler().createContextForIndexing())`
	`500`	`+ try (UnfilteredRowIterator partition = scanner.next();`
	`501`	`+ WriteContext ctx = cfs.keyspace.getWriteHandler().createContextForIndexing())`
`503`	`502`	`{`
`504`	`503`	`List<Index.Indexer> indexers = new ArrayList<>();`
`505`	`504`	`for (int i = 0; i < indexes.size(); i++)`