From 7ef7c675d620948cc7cac747b803b3a096f33a99 Mon Sep 17 00:00:00 2001
From: Blake Eggleston <blake@ultrablake.com>
Date: Mon, 13 Apr 2026 15:05:21 -0700
Subject: [PATCH] rebase - fix secondary index double free bug

---
 .../reads/tracked/PartialTrackedIndexRead.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java/org/apache/cassandra/service/reads/tracked/PartialTrackedIndexRead.java b/src/java/org/apache/cassandra/service/reads/tracked/PartialTrackedIndexRead.java
index e335104458..01890e06da 100644
--- a/src/java/org/apache/cassandra/service/reads/tracked/PartialTrackedIndexRead.java
+++ b/src/java/org/apache/cassandra/service/reads/tracked/PartialTrackedIndexRead.java
@@ -123,7 +123,7 @@ public class PartialTrackedIndexRead<Match extends IndexMatch, Searcher extends
 
     public interface CompletedIndexPartitionRead<Match extends IndexMatch>
     {
-        UnfilteredRowIterator matchingRows(CloseablePeekingIterator<Match> matchIterator);
+        UnfilteredRowIterator matchingRows(PeekingIterator<Match> matchIterator);
     }
 
     public interface CompletedIndexRead<Match extends IndexMatch> extends CompletedRead
@@ -183,7 +183,7 @@ public class PartialTrackedIndexRead<Match extends IndexMatch, Searcher extends
         }
 
         @Override
-        public UnfilteredRowIterator matchingRows(CloseablePeekingIterator<Match> matchIterator)
+        public UnfilteredRowIterator matchingRows(PeekingIterator<Match> matchIterator)
         {
             Preconditions.checkState(matchIterator.hasNext());
             Preconditions.checkState(matchIterator.peek().key().equals(key));
@@ -372,7 +372,7 @@ public class PartialTrackedIndexRead<Match extends IndexMatch, Searcher extends
         }
 
         @Override
-        public UnfilteredRowIterator matchingRows(CloseablePeekingIterator<Match> matchIterator)
+        public UnfilteredRowIterator matchingRows(PeekingIterator<Match> matchIterator)
         {
             Preconditions.checkArgument(matchIterator.hasNext());
             Preconditions.checkArgument(matchIterator.peek().key().equals(partitionKey));
@@ -776,9 +776,9 @@ public class PartialTrackedIndexRead<Match extends IndexMatch, Searcher extends
 
         private class UnfilteredResultIterator extends AbstractIterator<UnfilteredRowIterator> implements UnfilteredPartitionIterator
         {
-            private final CloseablePeekingIterator<Match> matchIter;
+            private final PeekingIterator<Match> matchIter;
 
-            public UnfilteredResultIterator(CloseablePeekingIterator<Match> matchIter)
+            public UnfilteredResultIterator(PeekingIterator<Match> matchIter)
             {
                 this.matchIter = matchIter;
             }
@@ -815,7 +815,7 @@ public class PartialTrackedIndexRead<Match extends IndexMatch, Searcher extends
             @Override
             public void close()
             {
-                matchIter.close();
+                // match iterator will be closed by FilteringCompletedIndexRead
             }
         }