Moved the decision to load p/c fielddata eagerly to a better place. #5569
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
| @@ -767,15 +768,8 @@ public TerminationHandle warm(final IndexShard indexShard, IndexMetaData indexMe | |||
| if (fieldDataType == null) { | |||
| continue; | |||
| } | |||
| if (fieldMapper instanceof ParentFieldMapper) { | |||
| ParentFieldMapper parentFieldMapper = (ParentFieldMapper) fieldMapper; | |||
| if (!parentFieldMapper.active()) { | |||
There was a problem hiding this comment.
there is no need to check that the mapper is active anymore?
There was a problem hiding this comment.
No, because if ParentFieldMapper is not active then the loading is always lazy and if it is active then it is always eager (that is what the change does in ParentFieldMapper).
|
LGTM, this is a nice cleanup! |
martijnvg
added a commit
that referenced
this pull request
Apr 3, 2014
clintongormley
added
:Fielddata
and removed
:Cache
:Core/Infra/Core
clintongormley
added
:Search/Search
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.
No description provided.