Skip to content

ExitableDirectoryReader should not cover-up singletons #15498

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
HoustonPutman wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −2
Open

ExitableDirectoryReader should not cover-up singletons #15498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bac508
ExistableDirectoryReader should not cover-up singletons
HoustonPutman Dec 11, 2025
e7ac59f
Changes
HoustonPutman Dec 11, 2025
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 @@ -256,6 +256,8 @@ Optimizations
* GITHUB#15474: Use bulk scoring provided by RandomVectorScorers for new scalar quantized formats provided through
Lucene104ScalarQuantizedVectorsFormat and Lucene104HnswScalarQuantizedVectorsFormat (Ben Trent)

* GITHUB#15498: ExitableDirectoryReader keeps singleton SortedSetDocValues or SortedNumericDocValues as singletons. (Houston Putman)

Bug Fixes
---------------------
* GITHUB#14161: PointInSetQuery's constructor now throws IllegalArgumentException
Expand Down
18 changes: 16 additions & 2 deletions lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ public CacheHelper getCoreCacheHelper() {

@Override
public NumericDocValues getNumericDocValues(String field) throws IOException {
final NumericDocValues numericDocValues = super.getNumericDocValues(field);
return wrapNumericDocValues(super.getNumericDocValues(field));
}

private NumericDocValues wrapNumericDocValues(final NumericDocValues numericDocValues) {
if (numericDocValues == null) {
return null;
}
Expand Down Expand Up @@ -191,7 +194,10 @@ public int nextDoc() throws IOException {

@Override
public SortedDocValues getSortedDocValues(String field) throws IOException {
final SortedDocValues sortedDocValues = super.getSortedDocValues(field);
return wrapSortedDocValues(super.getSortedDocValues(field));
}

private SortedDocValues wrapSortedDocValues(final SortedDocValues sortedDocValues) {
if (sortedDocValues == null) {
return null;
}
Expand Down Expand Up @@ -234,6 +240,10 @@ public int nextDoc() throws IOException {
@Override
public SortedNumericDocValues getSortedNumericDocValues(String field) throws IOException {
final SortedNumericDocValues sortedNumericDocValues = super.getSortedNumericDocValues(field);
final NumericDocValues numericDocValues = DocValues.unwrapSingleton(sortedNumericDocValues);
if (numericDocValues != null) {
return DocValues.singleton(wrapNumericDocValues(numericDocValues));
}
if (sortedNumericDocValues == null) {
return null;
}
Expand Down Expand Up @@ -279,6 +289,10 @@ public SortedSetDocValues getSortedSetDocValues(String field) throws IOException
if (sortedSetDocValues == null) {
return null;
}
final SortedDocValues sortedDocValues = DocValues.unwrapSingleton(sortedSetDocValues);
if (sortedDocValues != null) {
return DocValues.singleton(wrapSortedDocValues(sortedDocValues));
}
return new FilterSortedSetDocValues(sortedSetDocValues) {

private int docToCheck = 0;
Expand Down