Merge branch 'cassandra-4.1' into cassandra-5.0

michaelsembwever · michaelsembwever · commit dcbadf4dbd04 · 2025-10-27T10:59:01.000+01:00
* cassandra-4.1: ninja-fix – Fix (again) eclipse-warnings error for CASSANDRA-19564
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -1049,7 +1049,6 @@ public void indexPartition(DecoratedKey key, Set<Index> indexes, int pageSize, R
             SinglePartitionPager pager = new SinglePartitionPager(cmd, null, ProtocolVersion.CURRENT);
             while (!pager.isExhausted())
             {
-                @SuppressWarnings("resource")
                 UnfilteredRowIterator partition;
                 try (ReadExecutionController controller = cmd.executionController();
                      UnfilteredPartitionIterator page = pager.fetchPageUnfiltered(baseCfs.metadata(), pageSize, controller))

Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,6 @@ public void indexPartition(DecoratedKey key, Set<Index> indexes, int pageSize, R`
`1049`	`1049`	`SinglePartitionPager pager = new SinglePartitionPager(cmd, null, ProtocolVersion.CURRENT);`
`1050`	`1050`	`while (!pager.isExhausted())`
`1051`	`1051`	`{`
`1052`		`- @SuppressWarnings("resource")`
`1053`	`1052`	`UnfilteredRowIterator partition;`
`1054`	`1053`	`try (ReadExecutionController controller = cmd.executionController();`
`1055`	`1054`	`UnfilteredPartitionIterator page = pager.fetchPageUnfiltered(baseCfs.metadata(), pageSize, controller))`