Skip to content

ES|QL: Infer score mode from collector #131006

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

Merged
merged 2 commits into from
Jul 10, 2025
Merged

ES|QL: Infer score mode from collector #131006

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
b6d48e7
Infer score mode from collector
ioanatia Jul 10, 2025
fa9fad8
[CI] Auto commit changes from spotless
Jul 10, 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: 1 addition & 1 deletion ...ugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneCountOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public Factory(
taskConcurrency,
limit,
false,
ScoreMode.COMPLETE_NO_SCORES
shardContext -> ScoreMode.COMPLETE_NO_SCORES
);
this.shardRefCounters = contexts;
}
Expand Down
2 changes: 1 addition & 1 deletion .../plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneMaxFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public LuceneMaxFactory(
taskConcurrency,
limit,
false,
ScoreMode.COMPLETE_NO_SCORES
shardContext -> ScoreMode.COMPLETE_NO_SCORES
);
this.contexts = contexts;
this.fieldName = fieldName;
Expand Down
2 changes: 1 addition & 1 deletion .../plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneMinFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public LuceneMinFactory(
taskConcurrency,
limit,
false,
ScoreMode.COMPLETE_NO_SCORES
shardContext -> ScoreMode.COMPLETE_NO_SCORES
);
this.shardRefCounters = contexts;
this.fieldName = fieldName;
Expand Down
11 changes: 9 additions & 2 deletions ...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,18 @@ protected Factory(
int taskConcurrency,
int limit,
boolean needsScore,
ScoreMode scoreMode
Function<ShardContext, ScoreMode> scoreModeFunction
) {
this.limit = limit;
this.dataPartitioning = dataPartitioning;
this.sliceQueue = LuceneSliceQueue.create(contexts, queryFunction, dataPartitioning, autoStrategy, taskConcurrency, scoreMode);
this.sliceQueue = LuceneSliceQueue.create(
contexts,
queryFunction,
dataPartitioning,
autoStrategy,
taskConcurrency,
scoreModeFunction
);
this.taskConcurrency = Math.min(sliceQueue.totalSlices(), taskConcurrency);
this.needsScore = needsScore;
}
Expand Down
4 changes: 3 additions & 1 deletion .../plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSliceQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,14 @@ public static LuceneSliceQueue create(
DataPartitioning dataPartitioning,
Function<Query, PartitioningStrategy> autoStrategy,
int taskConcurrency,
ScoreMode scoreMode
Function<ShardContext, ScoreMode> scoreModeFunction
) {
List<LuceneSlice> slices = new ArrayList<>();
Map<String, PartitioningStrategy> partitioningStrategies = new HashMap<>(contexts.size());

for (ShardContext ctx : contexts) {
for (QueryAndTags queryAndExtra : queryFunction.apply(ctx)) {
var scoreMode = scoreModeFunction.apply(ctx);
Query query = queryAndExtra.query;
query = scoreMode.needsScores() ? query : new ConstantScoreQuery(query);
/*
Expand Down
2 changes: 1 addition & 1 deletion ...gin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public Factory(
taskConcurrency,
limit,
needsScore,
needsScore ? COMPLETE : COMPLETE_NO_SCORES
shardContext -> needsScore ? COMPLETE : COMPLETE_NO_SCORES
);
this.contexts = contexts;
this.maxPageSize = maxPageSize;
Expand Down
19 changes: 4 additions & 15 deletions ...esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
import org.apache.lucene.search.CollectionTerminatedException;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopDocsCollector;
import org.apache.lucene.search.TopFieldCollectorManager;
import org.apache.lucene.search.TopScoreDocCollectorManager;
import org.apache.lucene.search.Weight;
import org.elasticsearch.common.Strings;
import org.elasticsearch.compute.data.BlockFactory;
import org.elasticsearch.compute.data.DocBlock;
Expand All @@ -44,9 +43,6 @@
import java.util.function.Function;
import java.util.stream.Collectors;

import static org.apache.lucene.search.ScoreMode.TOP_DOCS;
import static org.apache.lucene.search.ScoreMode.TOP_DOCS_WITH_SCORES;

/**
* Source operator that builds Pages out of the output of a TopFieldCollector (aka TopN)
*/
Expand Down Expand Up @@ -75,7 +71,7 @@ public Factory(
taskConcurrency,
limit,
needsScore,
needsScore ? TOP_DOCS_WITH_SCORES : TOP_DOCS
scoreModeFunction(sorts, needsScore)
);
this.contexts = contexts;
this.maxPageSize = maxPageSize;
Expand Down Expand Up @@ -331,18 +327,11 @@ static final class ScoringPerShardCollector extends PerShardCollector {
}
}

private static Function<ShardContext, Weight> weightFunction(
Function<ShardContext, Query> queryFunction,
List<SortBuilder<?>> sorts,
boolean needsScore
) {
private static Function<ShardContext, ScoreMode> scoreModeFunction(List<SortBuilder<?>> sorts, boolean needsScore) {
return ctx -> {
final var query = queryFunction.apply(ctx);
final var searcher = ctx.searcher();
try {
// we create a collector with a limit of 1 to determine the appropriate score mode to use.
var scoreMode = newPerShardCollector(ctx, sorts, needsScore, 1).collector.scoreMode();
return searcher.createWeight(searcher.rewrite(query), scoreMode, 1);
return newPerShardCollector(ctx, sorts, needsScore, 1).collector.scoreMode();
} catch (IOException e) {
throw new UncheckedIOException(e);
}
Expand Down
2 changes: 1 addition & 1 deletion ...mpute/src/main/java/org/elasticsearch/compute/lucene/TimeSeriesSourceOperatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private TimeSeriesSourceOperatorFactory(
taskConcurrency,
limit,
false,
ScoreMode.COMPLETE_NO_SCORES
shardContext -> ScoreMode.COMPLETE_NO_SCORES
);
this.contexts = contexts;
this.maxPageSize = maxPageSize;
Expand Down