Skip to content

Replace the deprecated construction method of TopScoreDocCollectorManager with the new method in Lucene #18395

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.

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

Merged
merged 2 commits into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Avoid NPE if on SnapshotInfo if 'shallow' boolean not present ([#18187](https://github.com/opensearch-project/OpenSearch/issues/18187))
- Fix 'system call filter not installed' caused when network.host: 0.0.0.0 ([#18309](https://github.com/opensearch-project/OpenSearch/pull/18309))
- Fix MatrixStatsAggregator reuse when mode parameter changes ([#18242](https://github.com/opensearch-project/OpenSearch/issues/18242))
- Replace the deprecated construction method of TopScoreDocCollectorManager with the new method ([#18395](https://github.com/opensearch-project/OpenSearch/pull/18395))

### Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
maxScoreCollector = new MaxScoreCollector();
}
} else {
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false).newCollector();
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE).newCollector();

Check warning on line 178 in modules/parent-join/src/main/java/org/opensearch/join/query/ParentChildInnerHitContextBuilder.java

View check run for this annotation

Codecov / codecov/patch

modules/parent-join/src/main/java/org/opensearch/join/query/ParentChildInnerHitContextBuilder.java#L178

Added line #L178 was not covered by tests
maxScoreCollector = new MaxScoreCollector();
}
for (LeafReaderContext ctx : context.searcher().getIndexReader().leaves()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@
maxScoreCollector = new MaxScoreCollector();
}
} else {
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false).newCollector();
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE).newCollector();

Check warning on line 498 in server/src/main/java/org/opensearch/index/query/NestedQueryBuilder.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/index/query/NestedQueryBuilder.java#L498

Added line #L498 was not covered by tests
maxScoreCollector = new MaxScoreCollector();
}
intersect(weight, innerHitQueryWeight, MultiCollector.wrap(topDocsCollector, maxScoreCollector), ctx);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void collect(int doc, long bucket) throws IOException {
// Designed to be overridden by subclasses that may score docs by criteria
// other than Lucene score
protected TopDocsCollector<? extends ScoreDoc> createTopDocsCollector(int size) throws IOException {
return new TopScoreDocCollectorManager(size, null, Integer.MAX_VALUE, false).newCollector();
return new TopScoreDocCollectorManager(size, null, Integer.MAX_VALUE).newCollector();
}

// Can be overridden by subclasses that have a different priority queue implementation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,7 @@ public void collect(int docId, long bucket) throws IOException {
// but here we create collectors ourselves and we need prevent OOM because of crazy an offset and size.
topN = Math.min(topN, subSearchContext.searcher().getIndexReader().maxDoc());
if (sort == null) {
collectors = new Collectors(
new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false).newCollector(),
null
);
collectors = new Collectors(new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE).newCollector(), null);
} else {
// TODO: can we pass trackTotalHits=subSearchContext.trackTotalHits(){
// Note that this would require to catch CollectionTerminatedException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,9 @@
int hitCountThreshold
) {
if (sortAndFormats == null) {
return new TopScoreDocCollectorManager(numHits, searchAfter, hitCountThreshold, false).newCollector();
return new TopScoreDocCollectorManager(numHits, searchAfter, hitCountThreshold).newCollector();
} else {
return new TopFieldCollectorManager(sortAndFormats.sort, numHits, (FieldDoc) searchAfter, hitCountThreshold, false)
.newCollector();
return new TopFieldCollectorManager(sortAndFormats.sort, numHits, (FieldDoc) searchAfter, hitCountThreshold).newCollector();
}
}

Expand All @@ -364,17 +363,12 @@
if (sortAndFormats == null) {
// See please https://github.com/apache/lucene/pull/450, should be fixed in 9.x
if (searchAfter != null) {
return new TopScoreDocCollectorManager(
numHits,
new FieldDoc(searchAfter.doc, searchAfter.score),
hitCountThreshold,
true
);
return new TopScoreDocCollectorManager(numHits, new FieldDoc(searchAfter.doc, searchAfter.score), hitCountThreshold);

Check warning on line 366 in server/src/main/java/org/opensearch/search/query/TopDocsCollectorContext.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/query/TopDocsCollectorContext.java#L366

Added line #L366 was not covered by tests
} else {
return new TopScoreDocCollectorManager(numHits, null, hitCountThreshold, true);
return new TopScoreDocCollectorManager(numHits, null, hitCountThreshold);
}
} else {
return new TopFieldCollectorManager(sortAndFormats.sort, numHits, (FieldDoc) searchAfter, hitCountThreshold, true);
return new TopFieldCollectorManager(sortAndFormats.sort, numHits, (FieldDoc) searchAfter, hitCountThreshold);
}
}

Expand Down
Loading