natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rebase - fix secondary index double free bug

This commit is contained in:
Blake Eggleston 2026-04-13 15:05:21 -07:00
parent e7524acfec
commit 7ef7c675d6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/apache/cassandra/service/reads/tracked/PartialTrackedIndexRead.java
View File

@ -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
}
}