Restore V_8_500_014 executionHint serialization. (#96965)

kkrik-es · web-flow · commit d6ff43b64586 · 2023-06-21T00:47:51.000+03:00
This was replaced by optional serialization in version V_8_500_018 (#96943), breaking backwards compatibility for serverless. Related to #95903
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregationBuilder.java
@@ -65,6 +65,8 @@ public MedianAbsoluteDeviationAggregationBuilder(StreamInput in) throws IOExcept
         compression = in.readDouble();
         if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {
             executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom);
+        } else if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {
+            executionHint = TDigestExecutionHint.readFrom(in);
         } else {
             executionHint = TDigestExecutionHint.HIGH_ACCURACY;
         }
@@ -128,6 +130,8 @@ protected void innerWriteTo(StreamOutput out) throws IOException {
         out.writeDouble(compression);
         if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {
             out.writeOptionalWriteable(executionHint);
+        } else if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {
+            (executionHint == null ? TDigestExecutionHint.DEFAULT : executionHint).writeTo(out);
         }
     }
 
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesConfig.java
@@ -143,8 +143,8 @@ public TDigest(double compression, TDigestExecutionHint executionHint) {
         TDigest(StreamInput in) throws IOException {
             this(
                 in.readDouble(),
-                in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)
-                    ? in.readOptionalWriteable(TDigestExecutionHint::readFrom)
+                in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018) ? in.readOptionalWriteable(TDigestExecutionHint::readFrom)
+                    : in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014) ? TDigestExecutionHint.readFrom(in)
                     : TDigestExecutionHint.HIGH_ACCURACY
             );
         }
@@ -250,6 +250,8 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeDouble(compression);
             if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {
                 out.writeOptionalWriteable(executionHint);
+            } else if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {
+                (executionHint == null ? TDigestExecutionHint.DEFAULT : executionHint).writeTo(out);
             }
         }
 
diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregationBuilder.java
@@ -84,6 +84,8 @@ public BoxplotAggregationBuilder(StreamInput in) throws IOException {
         compression = in.readDouble();
         if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {
             executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom);
+        } else if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {
+            executionHint = TDigestExecutionHint.readFrom(in);
         } else {
             executionHint = TDigestExecutionHint.HIGH_ACCURACY;
         }
@@ -99,6 +101,8 @@ protected void innerWriteTo(StreamOutput out) throws IOException {
         out.writeDouble(compression);
         if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {
             out.writeOptionalWriteable(executionHint);
+        } else if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {
+            (executionHint == null ? TDigestExecutionHint.DEFAULT : executionHint).writeTo(out);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ public MedianAbsoluteDeviationAggregationBuilder(StreamInput in) throws IOExcept`
`65`	`65`	`compression = in.readDouble();`
`66`	`66`	`if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {`
`67`	`67`	`executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom);`
	`68`	`+ } else if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {`
	`69`	`+ executionHint = TDigestExecutionHint.readFrom(in);`
`68`	`70`	`} else {`
`69`	`71`	`executionHint = TDigestExecutionHint.HIGH_ACCURACY;`
`70`	`72`	`}`
`@@ -128,6 +130,8 @@ protected void innerWriteTo(StreamOutput out) throws IOException {`
`128`	`130`	`out.writeDouble(compression);`
`129`	`131`	`if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {`
`130`	`132`	`out.writeOptionalWriteable(executionHint);`
	`133`	`+ } else if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {`
	`134`	`+ (executionHint == null ? TDigestExecutionHint.DEFAULT : executionHint).writeTo(out);`
`131`	`135`	`}`
`132`	`136`	`}`
`133`	`137`
Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,8 @@ public TDigest(double compression, TDigestExecutionHint executionHint) {`
`143`	`143`	`TDigest(StreamInput in) throws IOException {`
`144`	`144`	`this(`
`145`	`145`	`in.readDouble(),`
`146`		`- in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)`
`147`		`- ? in.readOptionalWriteable(TDigestExecutionHint::readFrom)`
	`146`	`+ in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018) ? in.readOptionalWriteable(TDigestExecutionHint::readFrom)`
	`147`	`+ : in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014) ? TDigestExecutionHint.readFrom(in)`
`148`	`148`	`: TDigestExecutionHint.HIGH_ACCURACY`
`149`	`149`	`);`
`150`	`150`	`}`
`@@ -250,6 +250,8 @@ public void writeTo(StreamOutput out) throws IOException {`
`250`	`250`	`out.writeDouble(compression);`
`251`	`251`	`if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {`
`252`	`252`	`out.writeOptionalWriteable(executionHint);`
	`253`	`+ } else if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {`
	`254`	`+ (executionHint == null ? TDigestExecutionHint.DEFAULT : executionHint).writeTo(out);`
`253`	`255`	`}`
`254`	`256`	`}`
`255`	`257`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ public BoxplotAggregationBuilder(StreamInput in) throws IOException {`
`84`	`84`	`compression = in.readDouble();`
`85`	`85`	`if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {`
`86`	`86`	`executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom);`
	`87`	`+ } else if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {`
	`88`	`+ executionHint = TDigestExecutionHint.readFrom(in);`
`87`	`89`	`} else {`
`88`	`90`	`executionHint = TDigestExecutionHint.HIGH_ACCURACY;`
`89`	`91`	`}`
`@@ -99,6 +101,8 @@ protected void innerWriteTo(StreamOutput out) throws IOException {`
`99`	`101`	`out.writeDouble(compression);`
`100`	`102`	`if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_018)) {`
`101`	`103`	`out.writeOptionalWriteable(executionHint);`
	`104`	`+ } else if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014)) {`
	`105`	`+ (executionHint == null ? TDigestExecutionHint.DEFAULT : executionHint).writeTo(out);`
`102`	`106`	`}`
`103`	`107`	`}`
`104`	`108`