Replace some usages of QueryShardContext#getMapperService #63239
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
QueryShardContext a getter that allows to have access to the MapperService. In many cases, it is misused to lookup field types which QueryShardContext has a specific method for. This commit replaces those usages with a function String -> MappedFieldType .
javanna
added
:Search Foundations/Mapping
|
Pinging @elastic/es-search (:Search/Mapping) |
romseygeek
suggested changes
Oct 5, 2020
There was a problem hiding this comment.
This is a nice cleanup! And I think we can clean up yet further...
I think we can remove the field type lookup entirely from LuceneChangesSnapshot - it's used after we've loaded stored fields for a post-process step, but that step is done only to format numeric valued fields and the changes snapshot isn't looking at user-defined fields at all.
| @@ -144,7 +144,7 @@ protected int doHashCode() { | |||
|
|
|||
| @Override | |||
| protected ScoreFunction doToFunction(QueryShardContext context) { | |||
| MappedFieldType fieldType = context.getMapperService().fieldType(field); | |||
| MappedFieldType fieldType = context.fieldMapper(field); | |||
There was a problem hiding this comment.
Maybe we should rename this fieldType rather than fieldMapper?
There was a problem hiding this comment.
yes indeed, I planned to do it as a follow-up
| @@ -87,9 +87,9 @@ public Status needsField(FieldInfo fieldInfo) { | |||
| : Status.NO; | |||
| } | |||
|
|
|||
| public void postProcess(MapperService mapperService) { | |||
| public final void postProcess(Function<String, MappedFieldType> fieldTypeLookup) { | |||
There was a problem hiding this comment.
I do wonder if we can remove this step entirely, or replace it with the ValueFetcher functionality somehow - for a followup though.
There was a problem hiding this comment.
So this doesn't do anything to the _id, _source or _routing fields, so I think we can remove the call to it entirely from LuceneChangesSnapshot and possibly a few other places as well.
There was a problem hiding this comment.
ok I will look at it, possibly make this change in a separate PR then.
|
run elasticsearch-ci/packaging-sample-windows |
|
@romseygeek I went ahead and adapted some more places, the PR got quite bigger though, could you have another look please? |
romseygeek
approved these changes
Oct 5, 2020
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Oct 6, 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 fieldType method to `QueryShardContext` that allows to simply look up a field type given its name. relates to elastic#63239
javanna
added a commit
that referenced
this pull request
Oct 7, 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
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Oct 8, 2020
) QueryShardContext has a getter that allows to have access to MapperService. In many cases, it is misused to lookup field types which QueryShardContext has a specific method for. This commit replaces those usages with a function String -> MappedFieldType. There are also a few other places where MapperService is retrieved to call methods that are also available directly on QueryShardContext, which are replaced as part of this commit too.
javanna
added a commit
that referenced
this pull request
Oct 12, 2020
QueryShardContext has a getter that allows to have access to MapperService. In many cases, it is misused to lookup field types which QueryShardContext has a specific method for. This commit replaces those usages with a function String -> MappedFieldType. There are also a few other places where MapperService is retrieved to call methods that are also available directly on QueryShardContext, which are replaced as part of this commit too.
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.
QueryShardContexthas a getter that allows to have access toMapperService. In many cases, it is misused to lookup field types whichQueryShardContexthas a specific method for. This commit replaces those usages with a functionString->MappedFieldType.There are also a few other places where
MapperServiceis retrieved to call methods that are also available directly onQueryShardContext, which are replaced as part of this PR too.