Enrich validate nested mappings #42452
Merged
Conversation
This file contains hidden or 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
jbaiera
added
>enhancement
:Data Management/Ingest Node
Collaborator
|
Pinging @elastic/es-core-features |
martijnvg
reviewed
May 24, 2019
Member
martijnvg
left a comment
martijnvg
left a comment
There was a problem hiding this comment.
This looks good. I left a few comments.
|
|
||
| private ActionListener<PolicyExecutionResult> createTestListener(final CountDownLatch latch, | ||
| final Consumer<Exception> exceptionConsumer) { | ||
| return new ActionListener<>() { |
Member
There was a problem hiding this comment.
maybe use LatchedActionListener and ActionListener#wrap(...) instead?
| // Ensure that the current field is of object type only (not a nested type or a non compound field) | ||
| Object type = currentField.get("type"); | ||
| if (type != null) { | ||
| throw new ElasticsearchException( |
Member
There was a problem hiding this comment.
an object field can be specifically configured with: type: object, so we need to check for this here
| .endObject() | ||
| .startObject("field3") | ||
| .field("type", "keyword") | ||
| .endObject() |
Member
There was a problem hiding this comment.
maybe also add a test that has a mapping with two nested object fields (level1.level2.*)?
| assertThat(shard.getSegments().size(), is(equalTo(1))); | ||
| Segment segment = shard.getSegments().iterator().next(); | ||
| assertThat(segment.getNumDocs(), is(equalTo(3))); | ||
| assertThat(segment.getNumDocs(), is(equalTo(expectedDocs))); |
Member
There was a problem hiding this comment.
maybe also add a thing test that configures object fields with a type (type: object)?
hub-cap
approved these changes
May 28, 2019
| } | ||
|
|
||
| private void validateField(Map<?, ?> properties, String fieldName, boolean fieldRequired) { | ||
| assert fieldName != null && !fieldName.isEmpty() : "Field name cannot be null or empty"; |
Contributor
There was a problem hiding this comment.
assert Strings.isEmpty(fieldName) == false: "..";
| for (String fieldPart : fieldParts) { | ||
| // Ensure that the current field is of object type only (not a nested type or a non compound field) | ||
| Object type = currentField.get("type"); | ||
| if (type != null && !"object".equals(type)) { |
Contributor
There was a problem hiding this comment.
"object".equals(type) == false
|
|
||
| // Validate Mapping | ||
| Map<String, Object> mapping = enrichIndex.getMappings().get(createdEnrichIndex).get("_doc").sourceAsMap(); | ||
| logger.info(mapping); |
jbaiera
added a commit
that referenced
this pull request
Jun 3, 2019
Ensures that fields retained in an enrich index from a source are not contained under a nested field. It additionally makes sure that key fields exist, and that value fields are checked if they are present. The policy runner test has also been expanded with some faulty mapping test cases.
55 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This PR ensures that fields retained in an enrich index from a source are not contained under a nested field. It additionally makes sure that key fields exist, and that value fields are checked if they are present. The policy runner test has also been expanded with some faulty mapping test cases.