Add validation for field alias mappings. #31518
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
9 tasks
jtibshirani
force-pushed
the
field-aliases
branch
from
b71de74
to
b62c73a
Compare
jtibshirani
force-pushed
the
field-alias-validation
branch
from
3d2dfe4
to
df9f323
Compare
jtibshirani
added
the
:Search Foundations/Mapping
|
Pinging @elastic/es-search-aggs |
jpountz
approved these changes
Jun 25, 2018
| } | ||
| } | ||
|
|
||
| private void validateAlias(String aliasName, |
There was a problem hiding this comment.
maybe some docs would help on the two above methods, for instance to say that new aliases have not been added yet when validateField is called and that new fields have already been added when validateAlias is called
| import java.util.Set; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class MapperMergeValidator { |
There was a problem hiding this comment.
can it be pkg-private? please also add some minimal javadocs
| String pathScope = getNestedScope(path, fullPathObjectMappers); | ||
| if (!Objects.equals(aliasScope, pathScope)) { | ||
| throw new IllegalArgumentException("Invalid [path] value [" + path + "] for field alias [" + | ||
| aliasName + "]: an alias must have the same nested scope as its target."); |
There was a problem hiding this comment.
maybe add what we computed as the scope of the alias and the path to the error message
|
@jtibshirani Could you update the description of this PR to describe what is being validated? This is important since this PR might be linked from release notes. |
jtibshirani
force-pushed
the
field-alias-validation
branch
2 times, most recently
from
5c399fd
to
f4fabf5
Compare
jtibshirani
force-pushed
the
field-alias-validation
branch
from
f4fabf5
to
f34f57d
Compare
jtibshirani
added a commit
that referenced
this pull request
Jun 26, 2018
* Perform basic validation on the target of an alias. * Validate that an alias and its target have the same nested scope. * Pull out some validation logic into a separate class. * Validate the uniqueness of field alias mappings.
jtibshirani
added a commit
that referenced
this pull request
Jul 4, 2018
* Perform basic validation on the target of an alias. * Validate that an alias and its target have the same nested scope. * Pull out some validation logic into a separate class. * Validate the uniqueness of field alias mappings.
jtibshirani
added a commit
to jtibshirani/elasticsearch
that referenced
this pull request
Jul 16, 2018
* Perform basic validation on the target of an alias. * Validate that an alias and its target have the same nested scope. * Pull out some validation logic into a separate class. * Validate the uniqueness of field alias mappings.
jtibshirani
added a commit
that referenced
this pull request
Jul 17, 2018
* Perform basic validation on the target of an alias. * Validate that an alias and its target have the same nested scope. * Pull out some validation logic into a separate class. * Validate the uniqueness of field alias mappings.
jtibshirani
added a commit
that referenced
this pull request
Jul 18, 2018
* Perform basic validation on the target of an alias. * Validate that an alias and its target have the same nested scope. * Pull out some validation logic into a separate class. * Validate the uniqueness of field alias mappings.
jtibshirani
added a commit
that referenced
this pull request
Jul 18, 2018
* Add basic support for field aliases in index mappings. (#31287) * Allow for aliases when fetching stored fields. (#31411) * Add tests around accessing field aliases in scripts. (#31417) * Add documentation around field aliases. (#31538) * Add validation for field alias mappings. (#31518) * Return both concrete fields and aliases in DocumentFieldMappers#getMapper. (#31671) * Make sure that field-level security is enforced when using field aliases. (#31807) * Add more comprehensive tests for field aliases in queries + aggregations. (#31565) * Remove the deprecated method DocumentFieldMappers#getFieldMapper. (#32148)
jtibshirani
added a commit
to jtibshirani/elasticsearch
that referenced
this pull request
Jul 24, 2018
jtibshirani
added a commit
that referenced
this pull request
Jul 24, 2018
* Add basic support for field aliases in index mappings. (#31287) * Allow for aliases when fetching stored fields. (#31411) * Add tests around accessing field aliases in scripts. (#31417) * Return both concrete fields and aliases in DocumentFieldMappers#getMapper. (#31671) * Add documentation around field aliases. (#31538) * Add validation for field alias mappings. (#31518) * Make sure that field-level security is enforced when using field aliases. (#31807) * Add more comprehensive tests for field aliases in queries + aggregations. (#31565) * Remove the deprecated method DocumentFieldMappers#getFieldMapper. (#32148) * Ensure that field aliases cannot be used in multi-fields. (#32219) * Make sure that field aliases count towards the total fields limit. (#32222) * Fix a test bug around nested aggregations and field aliases. (#32287) * Make sure the _uid field is correctly loaded in scripts. * Fix the failing test case FieldLevelSecurityTests#testParentChild_parentField. * Enforce that field aliases can only be specified on indexes with a single type.
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.
The following restrictions are enforced on the target of an alias: