Skip to content

Commit 8baba58

Browse files
authored
Address TopFieldCollectorManager and TopScoreDocCollectorManager related deprecation warnings (#123615)
The supportsConcurrency flag has been deprecated in Lucene, see apache/lucene#13977 .
1 parent 82668b4 commit 8baba58

File tree

6 files changed

+11
-23
lines changed

6 files changed

+11
-23
lines changed

modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ public TopDocsAndMaxScore topDocs(SearchHit hit) throws IOException {
137137
TopDocsCollector<?> topDocsCollector;
138138
MaxScoreCollector maxScoreCollector = null;
139139
if (sort() != null) {
140-
topDocsCollector = new TopFieldCollectorManager(sort().sort, topN, null, Integer.MAX_VALUE, false).newCollector();
140+
topDocsCollector = new TopFieldCollectorManager(sort().sort, topN, null, Integer.MAX_VALUE).newCollector();
141141
if (trackScores()) {
142142
maxScoreCollector = new MaxScoreCollector();
143143
}
144144
} else {
145-
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false).newCollector();
145+
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE).newCollector();
146146
maxScoreCollector = new MaxScoreCollector();
147147
}
148148
for (LeafReaderContext ctx : this.context.searcher().getIndexReader().leaves()) {

server/src/main/java/org/elasticsearch/index/engine/SearchBasedChangesSnapshot.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,7 @@ protected TopDocs nextTopDocs() throws IOException {
186186
Query rangeQuery = rangeQuery(Math.max(fromSeqNo, lastSeenSeqNo), toSeqNo, indexVersionCreated);
187187
SortField sortBySeqNo = new SortField(SeqNoFieldMapper.NAME, SortField.Type.LONG);
188188

189-
TopFieldCollectorManager collectorManager = new TopFieldCollectorManager(
190-
new Sort(sortBySeqNo),
191-
searchBatchSize,
192-
afterDoc,
193-
0,
194-
false
195-
);
189+
TopFieldCollectorManager collectorManager = new TopFieldCollectorManager(new Sort(sortBySeqNo), searchBatchSize, afterDoc, 0);
196190
TopDocs results = indexSearcher.search(rangeQuery, collectorManager);
197191

198192
if (results.scoreDocs.length > 0) {

server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,12 @@ public TopDocsAndMaxScore topDocs(SearchHit hit) throws IOException {
449449
TopDocsCollector<?> topDocsCollector;
450450
MaxScoreCollector maxScoreCollector = null;
451451
if (sort() != null) {
452-
topDocsCollector = new TopFieldCollectorManager(sort().sort, topN, null, Integer.MAX_VALUE, false).newCollector();
452+
topDocsCollector = new TopFieldCollectorManager(sort().sort, topN, null, Integer.MAX_VALUE).newCollector();
453453
if (trackScores()) {
454454
maxScoreCollector = new MaxScoreCollector();
455455
}
456456
} else {
457-
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false).newCollector();
457+
topDocsCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE).newCollector();
458458
maxScoreCollector = new MaxScoreCollector();
459459
}
460460
intersect(weight, innerHitQueryWeight, MultiCollector.wrap(topDocsCollector, maxScoreCollector), ctx);

server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void collect(int doc, long bucket) throws IOException {
100100
// Designed to be overridden by subclasses that may score docs by criteria
101101
// other than Lucene score
102102
protected TopDocsCollector<? extends ScoreDoc> createTopDocsCollector(int size) throws IOException {
103-
return new TopScoreDocCollectorManager(size, null, Integer.MAX_VALUE, false).newCollector();
103+
return new TopScoreDocCollectorManager(size, null, Integer.MAX_VALUE).newCollector();
104104
}
105105

106106
// Can be overridden by subclasses that have a different priority queue implementation

server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,14 @@ public void collect(int docId, long bucket) throws IOException {
138138
// but here we create collectors ourselves and we need prevent OOM because of crazy an offset and size.
139139
topN = Math.min(topN, subSearchContext.searcher().getIndexReader().maxDoc());
140140
if (sort == null) {
141-
TopScoreDocCollector topScoreDocCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false)
141+
TopScoreDocCollector topScoreDocCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE)
142142
.newCollector();
143143
collectors = new Collectors(topScoreDocCollector, null);
144144
} else {
145145
// TODO: can we pass trackTotalHits=subSearchContext.trackTotalHits(){
146146
// Note that this would require to catch CollectionTerminatedException
147147
collectors = new Collectors(
148-
new TopFieldCollectorManager(sort.sort, topN, null, Integer.MAX_VALUE, false).newCollector(),
148+
new TopFieldCollectorManager(sort.sort, topN, null, Integer.MAX_VALUE).newCollector(),
149149
subSearchContext.trackScores() ? new MaxScoreCollector() : null
150150
);
151151
}

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperator.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,7 @@ PerShardCollector newPerShardCollector(ShardContext shardContext, List<SortBuild
287287
SortField[] sortFields = sortAndFormats.get().sort.getSort();
288288
if (sortFields != null && sortFields.length == 1 && sortFields[0].needsScores() && sortFields[0].getReverse() == false) {
289289
// SORT _score DESC
290-
return new ScoringPerShardCollector(
291-
shardContext,
292-
new TopScoreDocCollectorManager(limit, null, limit, false).newCollector()
293-
);
290+
return new ScoringPerShardCollector(shardContext, new TopScoreDocCollectorManager(limit, null, limit).newCollector());
294291
} else {
295292
// SORT ..., _score, ...
296293
var sort = new Sort();
@@ -300,10 +297,7 @@ PerShardCollector newPerShardCollector(ShardContext shardContext, List<SortBuild
300297
l.add(SortField.FIELD_SCORE);
301298
sort = new Sort(l.toArray(SortField[]::new));
302299
}
303-
return new ScoringPerShardCollector(
304-
shardContext,
305-
new TopFieldCollectorManager(sort, limit, null, limit, false).newCollector()
306-
);
300+
return new ScoringPerShardCollector(shardContext, new TopFieldCollectorManager(sort, limit, null, limit).newCollector());
307301
}
308302
}
309303
}
@@ -333,7 +327,7 @@ LeafCollector getLeafCollector(LeafReaderContext leafReaderContext) throws IOExc
333327
static final class NonScoringPerShardCollector extends PerShardCollector {
334328
NonScoringPerShardCollector(ShardContext shardContext, Sort sort, int limit) {
335329
// We don't use CollectorManager here as we don't retrieve the total hits and sort by score.
336-
super(shardContext, new TopFieldCollectorManager(sort, limit, null, 0, false).newCollector());
330+
super(shardContext, new TopFieldCollectorManager(sort, limit, null, 0).newCollector());
337331
}
338332
}
339333

0 commit comments

Comments
 (0)