Skip to content

Release AggregationContext more eagerly #127484

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
Apr 29, 2025
+22 −14
Merged

Release AggregationContext more eagerly #127484

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
9de1215
Release AggregationContext more eagerly
original-brownbear Apr 28, 2025
85c1e92
Merge branch 'main' into release-aggs-context-more-eagerly
original-brownbear Apr 29, 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
6 changes: 3 additions & 3 deletions server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.elasticsearch.common.breaker.CircuitBreaker;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Releasable;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.index.IndexService;
Expand All @@ -51,6 +50,7 @@
import org.elasticsearch.index.search.NestedHelper;
import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.search.aggregations.SearchContextAggregations;
import org.elasticsearch.search.aggregations.support.AggregationContext;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.collapse.CollapseContext;
import org.elasticsearch.search.dfs.DfsSearchResult;
Expand Down Expand Up @@ -861,8 +861,8 @@ public QuerySearchResult queryResult() {
return queryResult;
}

public void addQuerySearchResultReleasable(Releasable releasable) {
queryResult.addReleasable(releasable);
public void addAggregationContext(AggregationContext aggregationContext) {
queryResult.addAggregationContext(aggregationContext);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/search/SearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,7 +1613,7 @@ private void parseSource(DefaultSearchContext context, SearchSourceBuilder sourc
enableRewriteAggsToFilterByFilter,
source.aggregations().isInSortOrderExecutionRequired()
);
context.addQuerySearchResultReleasable(aggContext);
context.addAggregationContext(aggContext);
try {
final AggregatorFactories factories = source.aggregations().build(aggContext, null);
context.aggregations(
Expand Down
28 changes: 18 additions & 10 deletions server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
import org.apache.lucene.search.TotalHits;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.SubscribableListener;
import org.elasticsearch.common.io.stream.DelayableWriteable;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.RefCounted;
import org.elasticsearch.core.Releasable;
import org.elasticsearch.core.Releasables;
import org.elasticsearch.core.SimpleRefCounted;
import org.elasticsearch.search.DocValueFormat;
Expand All @@ -28,6 +29,7 @@
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.aggregations.InternalAggregation;
import org.elasticsearch.search.aggregations.InternalAggregations;
import org.elasticsearch.search.aggregations.support.AggregationContext;
import org.elasticsearch.search.internal.ShardSearchContextId;
import org.elasticsearch.search.internal.ShardSearchRequest;
import org.elasticsearch.search.profile.SearchProfileDfsPhaseResult;
Expand All @@ -37,8 +39,6 @@
import org.elasticsearch.transport.LeakTracker;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

import static org.elasticsearch.common.lucene.Lucene.readTopDocs;
import static org.elasticsearch.common.lucene.Lucene.writeTopDocs;
Expand Down Expand Up @@ -75,7 +75,7 @@ public final class QuerySearchResult extends SearchPhaseResult {

private final RefCounted refCounted;

private final List<Releasable> toRelease;
private final SubscribableListener<Void> aggsContextReleased;

public QuerySearchResult() {
this(false);
Expand All @@ -99,22 +99,22 @@ public QuerySearchResult(StreamInput in, boolean delayedAggregations) throws IOE
readFromWithId(id, in, delayedAggregations);
}
refCounted = null;
toRelease = null;
aggsContextReleased = null;
}

public QuerySearchResult(ShardSearchContextId contextId, SearchShardTarget shardTarget, ShardSearchRequest shardSearchRequest) {
this.contextId = contextId;
setSearchShardTarget(shardTarget);
isNull = false;
setShardSearchRequest(shardSearchRequest);
this.toRelease = new ArrayList<>();
this.refCounted = LeakTracker.wrap(new SimpleRefCounted());
this.aggsContextReleased = new SubscribableListener<>();
}

private QuerySearchResult(boolean isNull) {
this.isNull = isNull;
this.refCounted = null;
toRelease = null;
aggsContextReleased = null;
}

/**
Expand Down Expand Up @@ -275,16 +275,24 @@ public void releaseAggs() {
aggregations.close();
aggregations = null;
}
releaseAggsContext();
}

public void addReleasable(Releasable releasable) {
toRelease.add(releasable);
public void addAggregationContext(AggregationContext aggsContext) {
aggsContextReleased.addListener(ActionListener.releasing(aggsContext));
}

public void aggregations(InternalAggregations aggregations) {
assert this.aggregations == null : "aggregations already set to [" + this.aggregations + "]";
this.aggregations = aggregations == null ? null : DelayableWriteable.referencing(aggregations);
hasAggs = aggregations != null;
releaseAggsContext();
}

private void releaseAggsContext() {
if (aggsContextReleased != null) {
aggsContextReleased.onResponse(null);
}
}

@Nullable
Expand Down Expand Up @@ -547,7 +555,7 @@ public boolean tryIncRef() {
public boolean decRef() {
if (refCounted != null) {
if (refCounted.decRef()) {
Releasables.close(toRelease);
aggsContextReleased.onResponse(null);
return true;
}
return false;
Expand Down