Browse Source

Adjusting bwc serialization after backport (#46400)

Benjamin Trent 6 năm trước cách đây
mục cha
commit
995be00746

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

@@ -620,8 +620,8 @@ setup:
 ---
 "Simple Composite aggregation with GeoTile grid":
   - skip:
-      version: " - 7.99.99"
-      reason: geotile_grid is not supported until 8.0.0
+      version: " - 7.4.99"
+      reason: geotile_grid is not supported until 7.5.0
   - do:
       search:
         rest_total_hits_as_int: true
@@ -663,8 +663,8 @@ setup:
 ---
 "Simple Composite aggregation with geotile grid add aggregate after":
   - skip:
-      version: " - 7.99.99"
-      reason: geotile_grid is not supported until 8.0.0
+      version: " - 7.4.99"
+      reason: geotile_grid is not supported until 7.5.0
   - do:
       search:
         rest_total_hits_as_int: true

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

@@ -69,7 +69,7 @@ public class CompositeValuesSourceParserHelper {
         } else if (builder.getClass() == HistogramValuesSourceBuilder.class) {
             code = 2;
         } else if (builder.getClass() == GeoTileGridValuesSourceBuilder.class) {
-            if (out.getVersion().before(Version.V_8_0_0)) {
+            if (out.getVersion().before(Version.V_7_5_0)) {
                 throw new IOException("Attempting to serialize [" + builder.getClass().getSimpleName()
                     + "] to a node with unsupported version [" + out.getVersion() + "]");
             }