From e1fd4b75b4f888d8d486baceeb9fd6fe7df44416 Mon Sep 17 00:00:00 2001
From: Subhobrata Dey <sbcd90@gmail.com>
Date: Mon, 7 Mar 2022 08:51:49 -0800
Subject: [PATCH] Add valuesField in PercentilesAggregationBuilder streamInput
 constructor (#2308)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
---
 ...AbstractPercentilesAggregationBuilder.java |  3 +-
 .../PercentileRanksAggregationBuilder.java    |  2 +-
 .../PercentilesAggregationBuilder.java        |  2 +-
 .../builder/SearchSourceBuilderTests.java     | 40 +++++++++++++++++++
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java
index 094c706053703..ac0baf18dfb55 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java
@@ -163,7 +163,7 @@ public static <T extends AbstractPercentilesAggregationBuilder<T>> ConstructingO
         this.valuesField = clone.valuesField;
     }
 
-    AbstractPercentilesAggregationBuilder(StreamInput in) throws IOException {
+    AbstractPercentilesAggregationBuilder(StreamInput in, ParseField valuesField) throws IOException {
         super(in);
         values = in.readDoubleArray();
         keyed = in.readBoolean();
@@ -175,6 +175,7 @@ public static <T extends AbstractPercentilesAggregationBuilder<T>> ConstructingO
             PercentilesMethod method = PercentilesMethod.readFromStream(in);
             percentilesConfig = PercentilesConfig.fromLegacy(method, compression, numberOfSignificantValueDigits);
         }
+        this.valuesField = valuesField;
     }
 
     @Override
diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentileRanksAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentileRanksAggregationBuilder.java
index d8f3c80f36ff3..037830c63ecdf 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentileRanksAggregationBuilder.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentileRanksAggregationBuilder.java
@@ -82,7 +82,7 @@ private PercentileRanksAggregationBuilder(String name, double[] values, Percenti
     }
 
     public PercentileRanksAggregationBuilder(StreamInput in) throws IOException {
-        super(in);
+        super(in, VALUES_FIELD);
     }
 
     private PercentileRanksAggregationBuilder(
diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentilesAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentilesAggregationBuilder.java
index 85e8d37d3fdba..323723bb6deb1 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentilesAggregationBuilder.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/PercentilesAggregationBuilder.java
@@ -80,7 +80,7 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) {
     }
 
     public PercentilesAggregationBuilder(StreamInput in) throws IOException {
-        super(in);
+        super(in, PERCENTS_FIELD);
     }
 
     public static AggregationBuilder parse(String aggregationName, XContentParser parser) throws IOException {
diff --git a/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java
index 59519226685e2..66b18bc42ad50 100644
--- a/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java
+++ b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java
@@ -118,6 +118,46 @@ public void testSerialization() throws IOException {
         }
     }
 
+    public void testSerializationWithPercentilesQueryObject() throws IOException {
+        String restContent = "{\n"
+            + "    \"aggregations\": {"
+            + "        \"percentiles_duration\": {\n"
+            + "            \"percentiles\" : {\n"
+            + "                \"field\": \"duration\"\n"
+            + "            }\n"
+            + "        }\n"
+            + "    }\n"
+            + "}\n";
+        String expectedContent = "{\"aggregations\":{"
+            + "\"percentiles_duration\":{"
+            + "\"percentiles\":{"
+            + "\"field\":\"duration\","
+            + "\"percents\":[1.0,5.0,25.0,50.0,75.0,95.0,99.0],"
+            + "\"keyed\":true,"
+            + "\"tdigest\":{"
+            + "\"compression\":100.0"
+            + "}"
+            + "}"
+            + "}"
+            + "}}";
+
+        try (XContentParser parser = createParser(JsonXContent.jsonXContent, restContent)) {
+            SearchSourceBuilder searchSourceBuilder = SearchSourceBuilder.fromXContent(parser);
+
+            try (BytesStreamOutput output = new BytesStreamOutput()) {
+                searchSourceBuilder.writeTo(output);
+                try (StreamInput in = new NamedWriteableAwareStreamInput(output.bytes().streamInput(), namedWriteableRegistry)) {
+                    SearchSourceBuilder deserializedBuilder = new SearchSourceBuilder(in);
+                    String actualContent = deserializedBuilder.toString();
+
+                    assertEquals(expectedContent, actualContent);
+                    assertEquals(searchSourceBuilder.hashCode(), deserializedBuilder.hashCode());
+                    assertNotSame(searchSourceBuilder, deserializedBuilder);
+                }
+            }
+        }
+    }
+
     public void testShallowCopy() {
         for (int i = 0; i < 10; i++) {
             SearchSourceBuilder original = createSearchSourceBuilder();