Prevent field API NPEs from token_count fields inside nested #69068
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
cbuescher
added
>bug
:Search Foundations/Mapping
|
Pinging @elastic/es-search (Team:Search) |
Currently when a `token_count` field is defined inside a nested field, we get an NPE because the underlying DocValueFetcher needs its formattedDocValues to be loaded and the SourceLookup it sees needs to have a valid docId other than -1. This change fixes those issues so the whole fields request doesn't error. However this change doesn't solve the missing support for doc values lookup under nested fields described in 68983. Fortunately `token_count` seems to be the only mapping type currently affected. Relates to elastic#68983
cbuescher
force-pushed
the
fix-68983-npe
branch
from
a5b6867 to
c961ae0
Compare
|
@elasticsearchmachine run elasticsearch-ci/2 |
|
Sorry @cbuescher for the failure, it's a rare but pervasive bug and a fix is incoming in #69102. @elasticmachine please run elasticsearch-ci/2 |
|
@elasticmachine update branch |
|
Ugh you're being really unlucky with that bug. The fix is now merged. |
jtibshirani
reviewed
Feb 18, 2021
rest-api-spec/src/main/resources/rest-api-spec/test/search/330_fetch_fields.yml
Outdated
Show resolved
Hide resolved
rest-api-spec/src/main/resources/rest-api-spec/test/search/330_fetch_fields.yml
Outdated
Show resolved
Hide resolved
rest-api-spec/src/main/resources/rest-api-spec/test/search/330_fetch_fields.yml
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/NestedValueFetcher.java
Outdated
Show resolved
Hide resolved
|
@jtibshirani thanks for the review, I pushed the changes you suggested |
|
@elasticmachine update branch |
|
@elasticmachine run elasticsearch-ci/1 |
jtibshirani
approved these changes
Feb 18, 2021
| @@ -28,6 +29,7 @@ | |||
| // the name of the nested field without the full path, i.e. in foo.bar.baz it would be baz | |||
| private final String nestedFieldName; | |||
| private final String[] nestedPathParts; | |||
| private LeafReaderContext currentContext; | |||
There was a problem hiding this comment.
I don't think we need to track the context anymore.
There was a problem hiding this comment.
sure, leftover. I pushed an update
added 2 commits
February 18, 2021 19:18
cbuescher
pushed a commit
that referenced
this pull request
Feb 19, 2021
Currently when a `token_count` field is defined inside a nested field, we get an NPE because the underlying DocValueFetcher needs its formattedDocValues to be loaded and the SourceLookup it sees needs to have a valid docId other than -1. This change fixes those issues so the whole fields request doesn't error. However this change doesn't solve the missing support for doc values lookup under nested fields described in 68983. Fortunately `token_count` seems to be the only mapping type currently affected. Relates to #68983
cbuescher
pushed a commit
that referenced
this pull request
Feb 19, 2021
Currently when a `token_count` field is defined inside a nested field, we get an NPE because the underlying DocValueFetcher needs its formattedDocValues to be loaded and the SourceLookup it sees needs to have a valid docId other than -1. This change fixes those issues so the whole fields request doesn't error. However this change doesn't solve the missing support for doc values lookup under nested fields described in 68983. Fortunately `token_count` seems to be the only mapping type currently affected. Relates to #68983
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.
Currently when a
token_countfield is defined inside a nested field, we get anNPE because the underlying DocValueFetcher needs its formattedDocValues to be
loaded and the SourceLookup it sees needs to have a valid docId other than -1.
This change fixes those issues so the whole fields request doesn't error.
However this change doesn't solve the missing support for doc values lookup
under nested fields described in 68983. Fortunately
token_countseems to be the onlymapping type currently affected.
Relates to #68983