Skip to content

Commit 7febb5f

Browse files
committed
Address TopFieldCollectoManager and TopScoreDocCollectorManager related deprecation warnings
The supportsConcurrency flag has been deprecated in Lucene, see apache/lucene#13977 .
1 parent 238b279 commit 7febb5f

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ protected TopDocs nextTopDocs() throws IOException {
190190
new Sort(sortBySeqNo),
191191
searchBatchSize,
192192
afterDoc,
193-
0,
194-
false
193+
0
195194
);
196195
TopDocs results = indexSearcher.search(rangeQuery, collectorManager);
197196

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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ PerShardCollector newPerShardCollector(ShardContext shardContext, List<SortBuild
289289
// SORT _score DESC
290290
return new ScoringPerShardCollector(
291291
shardContext,
292-
new TopScoreDocCollectorManager(limit, null, limit, false).newCollector()
292+
new TopScoreDocCollectorManager(limit, null, limit).newCollector()
293293
);
294294
} else {
295295
// SORT ..., _score, ...
@@ -302,7 +302,7 @@ PerShardCollector newPerShardCollector(ShardContext shardContext, List<SortBuild
302302
}
303303
return new ScoringPerShardCollector(
304304
shardContext,
305-
new TopFieldCollectorManager(sort, limit, null, limit, false).newCollector()
305+
new TopFieldCollectorManager(sort, limit, null, limit).newCollector()
306306
);
307307
}
308308
}
@@ -333,7 +333,7 @@ LeafCollector getLeafCollector(LeafReaderContext leafReaderContext) throws IOExc
333333
static final class NonScoringPerShardCollector extends PerShardCollector {
334334
NonScoringPerShardCollector(ShardContext shardContext, Sort sort, int limit) {
335335
// 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());
336+
super(shardContext, new TopFieldCollectorManager(sort, limit, null, 0).newCollector());
337337
}
338338
}
339339

0 commit comments

Comments
 (0)