Add isFieldMapped method to QueryShardContext #63322
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
As part of elastic#63239 we have moved some usages of `QueryShardContext#getMapperService` that were looking up a field type through the `fieldType` method, to use the existing `QueryShardContext#fieldMapper`. The latter though has additional handling for unmapped fields when the functionality is enabled, and may throw exception if the field is not mapped. This additional behaviour is not desirable and may cause issues in cases where the callers have their own specific handling for situations where the field is not mapped. To address this we introduce an additional fieldType method to `QueryShardContext` that allows to simply look up a field type given its name. relates to elastic#63239
javanna
added
:Search Foundations/Mapping
|
Pinging @elastic/es-search (:Search/Mapping) |
romseygeek
approved these changes
Oct 6, 2020
| @@ -231,6 +231,10 @@ public MappedFieldType fieldMapper(String name) { | |||
| return failIfFieldMappingNotFound(name, mapperService.fieldType(name)); | |||
| } | |||
|
|
|||
| public MappedFieldType fieldType(String name) { | |||
There was a problem hiding this comment.
Can we put some javadocs on here, specifically around the fact that it may return null?
There was a problem hiding this comment.
Too fast! Can you add a note about null?
javanna
commented
Oct 6, 2020
| @@ -90,10 +90,6 @@ public Status needsField(FieldInfo fieldInfo) { | |||
| public final void postProcess(Function<String, MappedFieldType> fieldTypeLookup) { | |||
| for (Map.Entry<String, List<Object>> entry : fields().entrySet()) { | |||
| MappedFieldType fieldType = fieldTypeLookup.apply(entry.getKey()); | |||
| if (fieldType == null) { | |||
There was a problem hiding this comment.
I moved this logic to the caller, it is now part of the lookup function that is provided.
javanna
changed the title
romseygeek
approved these changes
Oct 6, 2020
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Oct 12, 2020
As part of elastic#63239 we have moved some usages of QueryShardContext#getMapperService that were looking up a field type through the fieldType method, to use the existing QueryShardContext#fieldMapper. The latter though has additional handling for unmapped fields when the functionality is enabled, and may throw exception if the field is not mapped. This additional behaviour is not desirable and may cause issues in cases where the callers have their own specific handling for situations where the field is not mapped. To address this we introduce an additional isFieldMapped method to QueryShardContext that allows to check if a field is mapped or not. relates to elastic#63239
javanna
added a commit
that referenced
this pull request
Oct 12, 2020
As part of #63239 we have moved some usages of QueryShardContext#getMapperService that were looking up a field type through the fieldType method, to use the existing QueryShardContext#fieldMapper. The latter though has additional handling for unmapped fields when the functionality is enabled, and may throw exception if the field is not mapped. This additional behaviour is not desirable and may cause issues in cases where the callers have their own specific handling for situations where the field is not mapped. To address this we introduce an additional isFieldMapped method to QueryShardContext that allows to check if a field is mapped or not. relates to #63239
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.
As part of #63239 we have moved some usages of
QueryShardContext#getMapperServicethat were looking up a field type through thefieldTypemethod, to use the existingQueryShardContext#fieldMapper. The latter though has additional handling for unmapped fields when the functionality is enabled, and may throw exception if the field is not mapped. This additional behaviour is not desirable and may cause issues in cases where the callers have their own specific handling for situations where the field is not mapped.To address this we introduce an additional
isFieldMappedmethod toQueryShardContextthat allows to check if a field is mapped or not.relates to #63239