Skip to content

Fix wrong BitSet result in MemoryAccountingBitsetCollector #15656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gaobinlong wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix wrong BitSet result in MemoryAccountingBitsetCollector #15656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d404298
Fix wrong BitSet result in MemoryAccountingBitsetCollector
gaobinlong Feb 2, 2026
95d6f09
Modify change log
gaobinlong Feb 2, 2026
7c687e2
Remove public getBitSet() method
gaobinlong Feb 3, 2026
deb8854
merge main
gaobinlong Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lucene/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ Bug Fixes

* GITHUB#14616 : Fix mis-interpretation of `maxNumBytes` in FuzzySet#createSetBasedOnMaxMemory (Greg Miller)

* GITHUB#15656: Fix wrong BitSet result in MemoryAccountingBitsetCollector (Binlong Gao)

* GITHUB#15554: Fix tessellator failure by preferring the shared vertex that is the leftmost vertex of the hole
(Ignacio Vera)

Expand Down
1 change: 1 addition & 0 deletions lucene/misc/src/java/org/apache/lucene/misc/search/MemoryAccountingBitsetCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public MemoryAccountingBitsetCollector(CollectorMemoryTracker tracker) {

@Override
protected void doSetNextReader(LeafReaderContext context) throws IOException {
docBase = context.docBase;
length += context.reader().maxDoc();
FixedBitSet newBitSet = FixedBitSet.ensureCapacity(bitSet, length);
if (newBitSet != bitSet) {
Expand Down
14 changes: 14 additions & 0 deletions lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,18 @@ public void testMemoryAccountingBitsetCollectorMemoryLimit() {
searcher.search(MatchAllDocsQuery.INSTANCE, bitSetCollector);
});
}

public void testCollectedResult() throws Exception {
CollectorMemoryTracker tracker =
new CollectorMemoryTracker("testMemoryTracker", Long.MAX_VALUE);
MemoryAccountingBitsetCollector collector = new MemoryAccountingBitsetCollector(tracker);

IndexSearcher searcher = new IndexSearcher(reader);
searcher.search(MatchAllDocsQuery.INSTANCE, collector);

assertEquals(1000, collector.bitSet.cardinality());
for (int i = 0; i < 1000; i++) {
assertTrue(collector.bitSet.get(i));
}
}
}
Loading