honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update ignore_unmapped serialization after backport 

Update the serialization version of ignore_unmapped flag after backport
to 6.4

Relates #31153
This commit is contained in:
Igor Motov 2018-06-07 16:44:20 -04:00
parent d49c85d2e8
commit 972dcbc0ad
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
View File

@ -175,8 +175,7 @@ public class GeoDistanceSortBuilder extends SortBuilder<GeoDistanceSortBuilder>
nestedSort = in.readOptionalWriteable(NestedSortBuilder::new); nestedSort = in.readOptionalWriteable(NestedSortBuilder::new);
} }
validation = GeoValidationMethod.readFromStream(in); validation = GeoValidationMethod.readFromStream(in);
// TODO: Change to 6_4_0 after backport if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
ignoreUnmapped = in.readBoolean(); ignoreUnmapped = in.readBoolean();
} }
} }
@ -195,8 +194,7 @@ public class GeoDistanceSortBuilder extends SortBuilder<GeoDistanceSortBuilder>
out.writeOptionalWriteable(nestedSort); out.writeOptionalWriteable(nestedSort);
} }
validation.writeTo(out); validation.writeTo(out);
// TODO: Change to 6_4_0 after backport if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
out.writeBoolean(ignoreUnmapped); out.writeBoolean(ignoreUnmapped);
} }
} }