From b9f4a8ed15e5c0f8d5f6590aa23a1a726fc6207f Mon Sep 17 00:00:00 2001 From: Dmitry Kryukov Date: Sat, 18 May 2024 20:29:20 +0300 Subject: [PATCH] CASSANDRA-19647 implemented try-with-resources for Autocloseable --- .../cassandra/db/compaction/CompactionController.java | 9 +++++---- .../org/apache/cassandra/simulator/paxos/Ballots.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index a9fcad73c9..8bebcd9152 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -266,10 +266,11 @@ public class CompactionController extends AbstractCompactionController { if (memtable.getMinTimestamp() != Memtable.NO_MIN_TIMESTAMP) { - if (memtable.rowIterator(key) != null) - { - minTimestampSeen = Math.min(minTimestampSeen, memtable.getMinTimestamp()); - hasTimestamp = true; + try (UnfilteredRowIterator iterator = memtable.rowIterator(key)) { + if (iterator != null) { + minTimestampSeen = Math.min(minTimestampSeen, memtable.getMinTimestamp()); + hasTimestamp = true; + } } } } diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java index c57f49341f..d4f6b4672d 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java @@ -192,10 +192,11 @@ public class Ballots private static Row getRow(DecoratedKey key, TableMetadata metadata, ColumnFamilyStore paxos, Memtable memtable) { final ClusteringComparator comparator = paxos.metadata.get().comparator; - UnfilteredRowIterator iter = memtable.rowIterator(key, Slices.with(comparator, Slice.make(comparator.make(metadata.id))), ColumnFilter.NONE, false, SSTableReadsListener.NOOP_LISTENER); - if (iter == null || !iter.hasNext()) - return null; - return (Row) iter.next(); + try (UnfilteredRowIterator iter = memtable.rowIterator(key, Slices.with(comparator, Slice.make(comparator.make(metadata.id))), ColumnFilter.NONE, false, SSTableReadsListener.NOOP_LISTENER)) { + if (iter == null || !iter.hasNext()) + return null; + return (Row) iter.next(); + } } public static long latestBallotFromBaseTable(DecoratedKey key, TableMetadata metadata)