From 972dcbc0ad501a60d73c60bf76dbffd92b56ed06 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Thu, 7 Jun 2018 16:44:20 -0400 Subject: [PATCH] Update ignore_unmapped serialization after backport Update the serialization version of ignore_unmapped flag after backport to 6.4 Relates #31153 --- .../elasticsearch/search/sort/GeoDistanceSortBuilder.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java index 712af37de5f..30f1dfb14fc 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java @@ -175,8 +175,7 @@ public class GeoDistanceSortBuilder extends SortBuilder nestedSort = in.readOptionalWriteable(NestedSortBuilder::new); } validation = GeoValidationMethod.readFromStream(in); - // TODO: Change to 6_4_0 after backport - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { ignoreUnmapped = in.readBoolean(); } } @@ -195,8 +194,7 @@ public class GeoDistanceSortBuilder extends SortBuilder out.writeOptionalWriteable(nestedSort); } validation.writeTo(out); - // TODO: Change to 6_4_0 after backport - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { out.writeBoolean(ignoreUnmapped); } }