Skip to content

Disable concurrency when top_hits sorts on anything but _score #123610

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 6 commits into from
Feb 27, 2025
+55 −0
Merged

Disable concurrency when top_hits sorts on anything but _score #123610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47fc833
Disable concurrency when top_hits sorts on anything but _score
javanna Feb 27, 2025
5014e2c
Update docs/changelog/123610.yaml
javanna Feb 27, 2025
7c83103
[CI] Auto commit changes from spotless
elasticsearchmachine Feb 27, 2025
baf6f0b
fix changelog
javanna Feb 27, 2025
e60e08b
iter
javanna Feb 27, 2025
3079748
[CI] Auto commit changes from spotless
elasticsearchmachine Feb 27, 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
5 changes: 5 additions & 0 deletions docs/changelog/123610.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 123610
summary: Disable concurrency when `top_hits` sorts on anything but `_score`
area: "Aggregations"
type: bug
issues: []
15 changes: 15 additions & 0 deletions ...rc/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.ToLongFunction;

public class TopHitsAggregationBuilder extends AbstractAggregationBuilder<TopHitsAggregationBuilder> {
public static final String NAME = "top_hits";
Expand Down Expand Up @@ -822,4 +823,18 @@ public String getType() {
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
}

@Override
public boolean supportsParallelCollection(ToLongFunction<String> fieldCardinalityResolver) {
if (sorts != null) {
// the implicit sorting is by _score, which supports parallel collection
for (SortBuilder<?> sortBuilder : sorts) {
if (sortBuilder.supportsParallelCollection() == false) {
return false;
}
}
}

return super.supportsParallelCollection(fieldCardinalityResolver);
}
}
35 changes: 35 additions & 0 deletions server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.elasticsearch.search.SearchExtBuilder;
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
import org.elasticsearch.search.collapse.CollapseBuilder;
import org.elasticsearch.search.collapse.CollapseBuilderTests;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
Expand Down Expand Up @@ -993,6 +994,40 @@ public void testSupportsParallelCollection() {
searchSourceBuilder.aggregation(new TermsAggregationBuilder("terms"));
assertFalse(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.aggregation(new TopHitsAggregationBuilder("tophits"));
assertTrue(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.aggregation(new TopHitsAggregationBuilder("tophits").sort("_score"));
assertTrue(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.aggregation(new TopHitsAggregationBuilder("tophits").sort(SortBuilders.fieldSort("field")));
assertFalse(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.aggregation(new TermsAggregationBuilder("terms").subAggregation(new TopHitsAggregationBuilder("tophits")));
assertFalse(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this test unrelated to the "sort" change made here? Do we generally disallow parallel collection for nested aggs or is there something specific here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea I wanted to test the different combinations of top_hits within another agg as well as other agg with top_hits underneath.

}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.aggregation(new TopHitsAggregationBuilder("tophits").subAggregation(new TermsAggregationBuilder("terms")));
assertFalse(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.aggregation(
new TopHitsAggregationBuilder("terms").sort(
SortBuilders.scriptSort(new Script("id"), ScriptSortBuilder.ScriptSortType.NUMBER)
)
);
assertFalse(searchSourceBuilder.supportsParallelCollection(fieldCardinality));
}
{
SearchSourceBuilder searchSourceBuilder = newSearchSourceBuilder.get();
searchSourceBuilder.collapse(CollapseBuilderTests.randomCollapseBuilder());
Expand Down