Skip to content

Commit b10d166

Browse files
committed
Adapt bwc version after backport #28310
1 parent c675407 commit b10d166

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ setup:
240240
---
241241
"Composite aggregation with format":
242242
- skip:
243-
version: " - 6.99.99"
244-
reason: this uses a new option (format) added in 7.0.0
243+
version: " - 6.2.99"
244+
reason: this uses a new option (format) added in 6.3.0
245245

246246
- do:
247247
search:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
7474
}
7575
this.missing = in.readGenericValue();
7676
this.order = SortOrder.readFromStream(in);
77-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
77+
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
7878
this.format = in.readOptionalString();
7979
} else {
8080
this.format = null;
@@ -97,7 +97,7 @@ public final void writeTo(StreamOutput out) throws IOException {
9797
}
9898
out.writeGenericValue(missing);
9999
order.writeTo(out);
100-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
100+
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
101101
out.writeOptionalString(format);
102102
}
103103
innerWriteTo(out);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public InternalComposite(StreamInput in) throws IOException {
7171
this.sourceNames = in.readList(StreamInput::readString);
7272
this.formats = new ArrayList<>(sourceNames.size());
7373
for (int i = 0; i < sourceNames.size(); i++) {
74-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
74+
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
7575
formats.add(in.readNamedWriteable(DocValueFormat.class));
7676
} else {
7777
formats.add(DocValueFormat.RAW);
@@ -85,7 +85,7 @@ public InternalComposite(StreamInput in) throws IOException {
8585
protected void doWriteTo(StreamOutput out) throws IOException {
8686
out.writeVInt(size);
8787
out.writeStringList(sourceNames);
88-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
88+
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
8989
for (DocValueFormat format : formats) {
9090
out.writeNamedWriteable(format);
9191
}

0 commit comments

Comments
 (0)