Fix validate_* merge policy for GeoPointFieldMapper #10165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nknize
added
>bug
v2.0.0-beta1
good first issue
|
@rjernst can you take a look at this please? |
| DocumentMapper stage1 = parser.parse(stage1Mapping); | ||
| String stage2Mapping = XContentFactory.jsonBuilder().startObject().startObject("type") | ||
| .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("geohash", true) | ||
| .field("validate", false).field("normalize", false).endObject().endObject() |
There was a problem hiding this comment.
why change normalize to false here? aren't you just trying to check validate?
There was a problem hiding this comment.
correct. normalize will be changing in a separate PR. I must have accidentally included it in this one. :) Made changes.
|
LGTM, just two tiny comments. Thanks for merging these test suites! |
nknize
force-pushed
the
fix/10164
branch
2 times, most recently
from
c5a6e6f
to
cde3f02
Compare
Fail merge if validate_lat or validate_lon values are not equal. This will prevent inconsistencies between geo_points in a merged index, and parse exceptions for bounding_box and distance filters. Also merged separate GeoPoint test classes into a single GeoPointFieldMapperTest to be consistent with GeoShapeFieldMapperTests. closes elastic#10164
clintongormley
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fail merge if validate_lat or validate_lon values are not equal. This will prevent inconsistencies between geo_points in a merged index, and parse exceptions for bounding_box and distance filters.
Also merged separate GeoPoint test classes into a single GeoPointFieldMapperTest to be consistent with GeoShapeFieldMapperTests.
closes #10164