Merge branch 'cassandra-5.0' into trunk

michaelsembwever · michaelsembwever · commit 0835822acc7d · 2025-10-27T11:05:25.000+01:00
* cassandra-5.0: 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
@@ -1065,7 +1065,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
`@@ -1065,7 +1065,6 @@ public void indexPartition(DecoratedKey key, Set<Index> indexes, int pageSize, R`
`1065`	`1065`	`SinglePartitionPager pager = new SinglePartitionPager(cmd, null, ProtocolVersion.CURRENT);`
`1066`	`1066`	`while (!pager.isExhausted())`
`1067`	`1067`	`{`
`1068`		`- @SuppressWarnings("resource")`
`1069`	`1068`	`UnfilteredRowIterator partition;`
`1070`	`1069`	`try (ReadExecutionController controller = cmd.executionController();`
`1071`	`1070`	`UnfilteredPartitionIterator page = pager.fetchPageUnfiltered(baseCfs.metadata(), pageSize, controller))`