Fix NPE during search with source filtering if the source is disabled. #20093
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
Instead of throwing an NPE, a search response with source filtering will not contain the source if it is disabled in the mapping. Closes elastic#7758
|
I mean the code LGTM but I wonder if we can start adding a unittest instead of an integration test for this? |
clintongormley
added
>bug
:Search/Search
…tchingIT. Removed SourceFetchingIT#testSourceDisabled (now covered via unit test FetchSourceSubPhaseTests#testSourceDisabled).
| } | ||
| } | ||
|
|
||
| public void test() throws IOException { |
There was a problem hiding this comment.
Maybe rename this testBasicOperation or something?
|
@s1monw added unit tests. reverted integration test for disabled source. |
|
Looks good to me. I left a few style comments if you are interested in them, otherwise I can test locally and merge. |
Renamed main unit test method. Use assertEquals and assertNull instead of assertThat (less code).
|
test this please |
|
Awesome. @s1monw's kicked off a CI build for this. |
|
@elasticmachine, test this please. |
|
@qwerty4030, tests passed last night so I've merged. Thanks for fixing this! |
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Sep 12, 2016
…xclude and source is disabled in the mappings. Fixing meant ignoring the _source parameter in the request as no fields can be extracted from it. We should rather throw a clear exception to clearly point out that we cannot extract fields from _source. Note that this happens only when explicitly trying to extract fields from source. When source is disabled and no _source parameter is specified, no errors will be thrown and no source will be returned. Closes elastic#20408 Relates to elastic#20093
javanna
added a commit
that referenced
this pull request
Sep 12, 2016
…and source is disabled in the mappings. Fixing meant ignoring the _source parameter in the request as no fields can be extracted from it. We should rather throw a clear exception to clearly point out that we cannot extract fields from _source. Note that this happens only when explicitly trying to extract fields from source. When source is disabled and no _source parameter is specified, no errors will be thrown and no source will be returned. Closes #20408 Relates to #20093
javanna
added a commit
that referenced
this pull request
Sep 12, 2016
…and source is disabled in the mappings. Fixing meant ignoring the _source parameter in the request as no fields can be extracted from it. We should rather throw a clear exception to clearly point out that we cannot extract fields from _source. Note that this happens only when explicitly trying to extract fields from source. When source is disabled and no _source parameter is specified, no errors will be thrown and no source will be returned. Closes #20408 Relates to #20093
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.
Fix NPE during search with source filtering if the source is disabled.
Instead of throwing an NPE, search response hits with source filtering will not contain the source if it is disabled in the mapping.
Tests pass:
gradle testgradle core:integTestCloses #7758