Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Enhancement, add the field type conflict check in semantic check #470

Merged
merged 2 commits into from
May 18, 2020
Merged

Enhancement, add the field type conflict check in semantic check #470

merged 2 commits into from
May 18, 2020

Conversation

penghuo
Copy link
Contributor

@penghuo penghuo commented May 15, 2020

Issue #, if available: #348, #445

Description of changes:

  • Add wildcard index handing in semantic. If the field is used in query have conflict type in wildcard index, semantic exception will be thrown.
  • The mapping conflict resolver logic in the TermFieldRewriter has been refined to do the lazy evaluation only when the field is accessed.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

This was linked to issues May 15, 2020
VerificationException: When using multiple indices, different mappings are not allowed for the same field #348
Closed
SQL Query with Different Mappings #445
Closed
dai-chen
dai-chen approved these changes May 15, 2020
View reviewed changes
Copy link
Member

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

Just minor comment. Thanks for this important improvement!

...st/java/com/amazon/opendistroforelasticsearch/sql/antlr/semantic/scope/TypeSupplierTest.java Outdated
import org.junit.Test;
import org.junit.rules.ExpectedException;

import static org.junit.Assert.*;
Copy link
Member

Choose a reason for hiding this comment

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

np: wildcard import

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

@abbashus abbashus merged commit bda0b47 into opendistro-for-elasticsearch:master May 18, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@chloe-zh chloe-zh chloe-zh approved these changes

@dai-chen dai-chen dai-chen approved these changes

@abbashus abbashus abbashus approved these changes

@zhongnansu zhongnansu Awaiting requested review from zhongnansu

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SQL Query with Different Mappings VerificationException: When using multiple indices, different mappings are not allowed for the same field
4 participants
@penghuo @chloe-zh @dai-chen @abbashus