Skip to content

Adjust versions after backporting 76740 to 7.x #77640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luegg merged 1 commit into from
Sep 13, 2021
Merged

Adjust versions after backporting 76740 to 7.x #77640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ...i-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/230_composite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,8 +1305,7 @@ setup:
---
"Simple Composite aggregation with missing_order":
- skip:
# TODO: replace with 7.15.99 once PR is backported to 7.16
version: " - 7.99.0"
version: " - 7.15.99"
reason: "`missing_order` has been introduced in 7.16"
- do:
search:
Expand All @@ -1333,8 +1332,7 @@ setup:
---
"missing_order with missing_bucket = false":
- skip:
# TODO: replace with 7.15.99 once PR is backported to 7.16
version: " - 7.99.0"
version: " - 7.15.99"
reason: "`missing_order` has been introduced in 7.16"
- do:
catch: /missingOrder can only be set if missingBucket is true/
Expand All @@ -1358,8 +1356,7 @@ setup:
---
"missing_order without missing_bucket":
- skip:
# TODO: replace with 7.15.99 once PR is backported to 7.16
version: " - 7.99.0"
version: " - 7.15.99"
reason: "`missing_order` has been introduced in 7.16"
- do:
catch: /missingOrder can only be set if missingBucket is true/
Expand All @@ -1382,8 +1379,7 @@ setup:
---
"Nested Composite aggregation with missing_order":
- skip:
# TODO: replace with 7.15.99 once PR is backported to 7.16
version: " - 7.99.0"
version: " - 7.15.99"
reason: "`missing_order` has been introduced in 7.16"
- do:
search:
Expand Down
6 changes: 2 additions & 4 deletions .../org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
this.userValueTypeHint = ValueType.readFromStream(in);
}
this.missingBucket = in.readBoolean();
// TODO: use V_7_16_0 once PR is backported to 7.x
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_16_0)) {
this.missingOrder = MissingOrder.readFromStream(in);
}
this.order = SortOrder.readFromStream(in);
Expand All @@ -78,8 +77,7 @@ public final void writeTo(StreamOutput out) throws IOException {
userValueTypeHint.writeTo(out);
}
out.writeBoolean(missingBucket);
// TODO: use V_7_16_0 once PR is backported to 7.x
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_16_0)) {
missingOrder.writeTo(out);
}
order.writeTo(out);
Expand Down