Deduplicate the name of the aggregation when deserializing InternalAg…

…gregation (elastic#116307)
iverase · Nov 8, 2024 · d07ba89 · d07ba89
1 parent 69b89ae
commit d07ba89
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.search.aggregations;
 
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.io.stream.DelayableWriteable;
 import org.elasticsearch.common.io.stream.NamedWriteable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -51,7 +52,12 @@ protected InternalAggregation(String name, Map<String, Object> metadata) {
      * Read from a stream.
      */
     protected InternalAggregation(StreamInput in) throws IOException {
-        name = in.readString();
+        final String name = in.readString();
+        if (in instanceof DelayableWriteable.Deduplicator d) {
+            this.name = d.deduplicate(name);
+        } else {
+            this.name = name;
+        }
         metadata = in.readGenericMap();
     }