Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add merge conflicts to GeoShapeFieldMapper #10533

Merged
merged 1 commit into from Apr 10, 2015
Merged

Conversation

nknize
Copy link
Contributor

@nknize nknize commented Apr 10, 2015

Prevents the user from changing strategies, tree, tree_level or precision. distance_error_pct changes are allowed as they do not compromise the integrity of the index. A separate issue #10514 is open for allowing users to change tree_level or precision.

closes #10513

@nknize nknize added review :Analytics/Geo Indexing, search aggregations of geo points and shapes labels Apr 10, 2015
@@ -263,6 +265,48 @@ public void parse(ParseContext context) throws IOException {
}

@Override
public void merge(Mapper mergeWith, MergeContext mergeContext) throws MergeMappingException {
super.merge(mergeWith, mergeContext);
if (!this.getClass().equals(mergeWith.getClass())) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be an error? It means they changed the type of the field?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 fixed.

@rjernst
Copy link
Member

rjernst commented Apr 10, 2015

LGTM, just a couple minor suggestions.

Prevents the user from changing strategies, tree, tree_level or precision. distance_error_pct changes are allowed as they do not compromise the integrity of the index. A separate issue is open for allowing users to change tree_level or precision.
@nknize nknize merged commit 7548562 into elastic:master Apr 10, 2015
@clintongormley clintongormley changed the title [GEO] Add merge conflicts to GeoShapeFieldMapper Add merge conflicts to GeoShapeFieldMapper May 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Analytics/Geo Indexing, search aggregations of geo points and shapes >enhancement v1.5.2 v1.6.0 v2.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[GEO] GeoShapeFieldMapper incorrectly acknowledges mapping changes
3 participants