Skip to content

[9.0] Deduplicate created objects when deserializing InternalAggregations in SearchResponse (#124296) #124462

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 1 commit into from
Mar 10, 2025
Merged

[9.0] Deduplicate created objects when deserializing InternalAggregations in SearchResponse (#124296) #124462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion server/src/main/java/org/elasticsearch/action/search/SearchResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.collect.Iterators;
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.io.stream.Writeable;
Expand Down Expand Up @@ -92,7 +93,15 @@ public class SearchResponse extends ActionResponse implements ChunkedToXContentO
public SearchResponse(StreamInput in) throws IOException {
super(in);
this.hits = SearchHits.readFrom(in, true);
this.aggregations = in.readBoolean() ? InternalAggregations.readFrom(in) : null;
if (in.readBoolean()) {
// deserialize the aggregations trying to deduplicate the object created
// TODO: use DelayableWriteable instead.
this.aggregations = InternalAggregations.readFrom(
DelayableWriteable.wrapWithDeduplicatorStreamInput(in, in.getTransportVersion(), in.namedWriteableRegistry())
);
} else {
this.aggregations = null;
}
this.suggest = in.readBoolean() ? new Suggest(in) : null;
this.timedOut = in.readBoolean();
this.terminatedEarly = in.readOptionalBoolean();
Expand Down
23 changes: 16 additions & 7 deletions server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.bytes.ReleasableBytesReference;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Releasable;

import java.io.IOException;
Expand Down Expand Up @@ -231,16 +232,24 @@ private static <T> T deserialize(
NamedWriteableRegistry registry,
BytesReference serialized
) throws IOException {
try (
StreamInput in = registry == null
? new DeduplicateStreamInput(serialized.streamInput(), new DeduplicatorCache())
: new DeduplicateNamedWriteableAwareStreamInput(serialized.streamInput(), registry, new DeduplicatorCache())
) {
in.setTransportVersion(serializedAtVersion);
return reader.read(in);
try (StreamInput in = serialized.streamInput()) {
return reader.read(wrapWithDeduplicatorStreamInput(in, serializedAtVersion, registry));
}
}

/** Wraps the provided {@link StreamInput} with another stream that extends {@link Deduplicator} */
public static StreamInput wrapWithDeduplicatorStreamInput(
StreamInput in,
TransportVersion serializedAtVersion,
@Nullable NamedWriteableRegistry registry
) {
StreamInput out = registry == null
? new DeduplicateStreamInput(in, new DeduplicatorCache())
: new DeduplicateNamedWriteableAwareStreamInput(in, registry, new DeduplicatorCache());
out.setTransportVersion(serializedAtVersion);
return out;
}

/** An object implementing this interface can deduplicate instance of the provided objects.*/
public interface Deduplicator {
<T> T deduplicate(T object);
Expand Down