Skip to content

Commit 532b91f

Browse files
committed
Fix composite agg serialization error
Fix serialization after backport Relates #29465
1 parent 1ea9f11 commit 532b91f

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
7272
} else {
7373
this.missingBucket = false;
7474
}
75-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
76-
// skip missing value
75+
if (in.getVersion().before(Version.V_7_0_0_alpha1)) {
76+
// skip missing value for BWC
7777
in.readGenericValue();
7878
}
7979
this.order = SortOrder.readFromStream(in);
@@ -98,10 +98,11 @@ public final void writeTo(StreamOutput out) throws IOException {
9898
if (hasValueType) {
9999
valueType.writeTo(out);
100100
}
101-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
101+
if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
102102
out.writeBoolean(missingBucket);
103103
}
104-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
104+
if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
105+
// write missing value for BWC
105106
out.writeGenericValue(null);
106107
}
107108
order.writeTo(out);

0 commit comments

Comments
 (0)