Do not track named queries that are null #12691
Merged
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
| .endObject() | ||
| .endObject() | ||
| .endObject(); | ||
| client().admin().indices().prepareCreate(index).addMapping(type, mapping).execute().actionGet(); |
There was a problem hiding this comment.
I think you can shorten the mapping here: addMapping(type, "name", "type=string, analyzer=stop" that hurts my eyes less :)
|
left a couple of minor comments, fix looks good though! |
|
LGTM |
Adding a named query that is null can lead to a NullPointerException when copying the named queries. This is due to an implementation detail in QueryParseContent.copyNamedQueries. In particular, this method uses com.google.common.collect.ImmutableMap.copyOf. A documented requirement of ImmutableMap is that none of the entries have a null key nor null value. Therefore, we should not add such queries to the namedQueries map. This will not change any behavior since Map.get returns null if no entry with the given key exists anyway. Closes #12683
|
@javanna Thanks for reviewing. |
jasontedor
added a commit
that referenced
this pull request
Aug 6, 2015
Do not track named queries that are null
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.
Adding a named query that is null can lead to a
NullPointerExceptionwhen copying the named queries. This is due to an implementation detail
in
QueryParseContent.copyNamedQueries. In particular, this method usescom.google.common.collect.ImmutableMap.copyOf. A documented requirementof
ImmutableMapis that none of the entries have a null key nor nullvalue. Therefore, we should not add such queries to the
namedQueriesmap. This will not change any behavior since
Map.getreturns null if noentry with the given key exists anyway.
Closes #12683