Skip to content

Commit fc120f7

Browse files
authored
Deduplicate the name of the aggregation when deserializing InternalAggregation (#116307) (#116457)
1 parent d75ed26 commit fc120f7

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package org.elasticsearch.search.aggregations;
1010

1111
import org.elasticsearch.common.Strings;
12+
import org.elasticsearch.common.io.stream.DelayableWriteable;
1213
import org.elasticsearch.common.io.stream.NamedWriteable;
1314
import org.elasticsearch.common.io.stream.StreamInput;
1415
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -51,7 +52,12 @@ protected InternalAggregation(String name, Map<String, Object> metadata) {
5152
* Read from a stream.
5253
*/
5354
protected InternalAggregation(StreamInput in) throws IOException {
54-
name = in.readString();
55+
final String name = in.readString();
56+
if (in instanceof DelayableWriteable.Deduplicator d) {
57+
this.name = d.deduplicate(name);
58+
} else {
59+
this.name = name;
60+
}
5561
metadata = in.readGenericMap();
5662
}
5763

0 commit comments

Comments
 (0)