Skip to content

Commit 995be00

Browse files
authored
Adjusting bwc serialization after backport (#46400)
1 parent 565ba9c commit 995be00

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@ setup:
620620
---
621621
"Simple Composite aggregation with GeoTile grid":
622622
- skip:
623-
version: " - 7.99.99"
624-
reason: geotile_grid is not supported until 8.0.0
623+
version: " - 7.4.99"
624+
reason: geotile_grid is not supported until 7.5.0
625625
- do:
626626
search:
627627
rest_total_hits_as_int: true
@@ -663,8 +663,8 @@ setup:
663663
---
664664
"Simple Composite aggregation with geotile grid add aggregate after":
665665
- skip:
666-
version: " - 7.99.99"
667-
reason: geotile_grid is not supported until 8.0.0
666+
version: " - 7.4.99"
667+
reason: geotile_grid is not supported until 7.5.0
668668
- do:
669669
search:
670670
rest_total_hits_as_int: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static void writeTo(CompositeValuesSourceBuilder<?> builder, StreamOutput
6969
} else if (builder.getClass() == HistogramValuesSourceBuilder.class) {
7070
code = 2;
7171
} else if (builder.getClass() == GeoTileGridValuesSourceBuilder.class) {
72-
if (out.getVersion().before(Version.V_8_0_0)) {
72+
if (out.getVersion().before(Version.V_7_5_0)) {
7373
throw new IOException("Attempting to serialize [" + builder.getClass().getSimpleName()
7474
+ "] to a node with unsupported version [" + out.getVersion() + "]");
7575
}

0 commit comments

Comments
 (0)