honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix composite agg serialization error 

Fix serialization after backport

Relates #29465
This commit is contained in:
Jim Ferenczi 2018-05-30 14:22:48 +02:00
parent 1ea9f11b03
commit 532b91ffa6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
View File

@ -72,8 +72,8 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
} else { } else {
this.missingBucket = false; this.missingBucket = false;
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0_alpha1)) {
// skip missing value // skip missing value for BWC
in.readGenericValue(); in.readGenericValue();
} }
this.order = SortOrder.readFromStream(in); this.order = SortOrder.readFromStream(in);
@ -98,10 +98,11 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
if (hasValueType) { if (hasValueType) {
valueType.writeTo(out); valueType.writeTo(out);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeBoolean(missingBucket); out.writeBoolean(missingBucket);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
// write missing value for BWC
out.writeGenericValue(null); out.writeGenericValue(null);
} }
order.writeTo(out); order.writeTo(out);