Fix simple_query_string on invalid input#28219
Merged
jimczi merged 5 commits intoelastic:masterfrom Jan 18, 2018
Merged
Conversation
This change converts any exception that occurs during the parsing of a simple_query_string to a match_no_docs query (instead of a null query) when leniency is activated. Closes elastic#28204
cbuescher
reviewed
Jan 15, 2018
| private Query rethrowUnlessLenient(RuntimeException e) { | ||
| if (settings.lenient()) { | ||
| return null; | ||
| return Queries.newMatchNoDocsQuery("failed query, caused by " + e.getMessage()); |
Member
There was a problem hiding this comment.
nit: can you update the comment to reflect that we return MatchNoDocs instead of null now?
Member
|
@jimczi also looked at the additional commit, makes sense. I left one suggestion regarding changes in the comment, other than that this looks good. |
cbuescher
approved these changes
Jan 17, 2018
Member
cbuescher
left a comment
There was a problem hiding this comment.
Great, good to go once CI is green I think.
jimczi
added a commit
that referenced
this pull request
Jan 18, 2018
This change converts any exception that occurs during the parsing of a simple_query_string to a match_no_docs query (instead of a null query) when leniency is activated. Closes #28204
martijnvg
added a commit
that referenced
this pull request
Jan 22, 2018
* es/master: (38 commits) Build: Add pom generation to meta plugins (#28321) Add 6.3 version constant to master Minor improvements to translog docs (#28237) [Docs] Remove typo in painless-getting-started.asciidoc Build: Fix meta plugin usage in integ test clusters (#28307) Painless: Add spi jar that will be published for extending whitelists (#28302) mistyping in one of the highlighting examples comment -> content (#28139) Documents applicability of term query to range type (#28166) Build: Omit dependency licenses check for elasticsearch deps (#28304) Clean up commits when global checkpoint advanced (#28140) Implement socket and server ChannelContexts (#28275) Plugins: Fix meta plugins to install bundled plugins with their real name (#28285) Build: Fix meta plugin integ test installation (#28286) Modify Abstract transport tests to use impls (#28270) Fork Groovy compiler onto compile Java home [Docs] Update tophits-aggregation.asciidoc (#28273) Docs: match between snippet to its description (#28296) [TEST] fix RequestTests#testSearch in case search source is not set REST high-level client: remove index suffix from indices client method names (#28263) Fix simple_query_string on invalid input (#28219) ...
martijnvg
added a commit
that referenced
this pull request
Jan 22, 2018
* es/6.x: (38 commits) Build: Add pom generation to meta plugins (#28321) Add 6.3.0 version constant Minor improvements to translog docs (#28237) [Docs] Remove typo in painless-getting-started.asciidoc Build: Fix meta plugin usage in integ test clusters (#28307) Painless: Add spi jar that will be published for extending whitelists (#28302) mistyping in one of the highlighting examples comment -> content (#28139) Documents applicability of term query to range type (#28166) Build: Omit dependency licenses check for elasticsearch deps (#28304) Fix packaging test when checking for cgroups v2 Plugins: Fix meta plugins to install bundled plugins with their real name (#28285) Build: Fix meta plugin integ test installation (#28286) Fork Groovy compiler onto compile Java home [Docs] Update tophits-aggregation.asciidoc (#28273) Skip restart upgrades for buggy cgroup2 handling Skip packaging upgrade test when cgroups v2 enabled Docs: match between snippet to its description (#28296) [TEST] fix RequestTests#testSearch in case search source is not set REST high-level client: remove index suffix from indices client method names (#28263) Fix simple_query_string on invalid input (#28219) ...
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This change converts any exception that occurs during the parsing of
a simple_query_string to a match_no_docs query (instead of a null query)
when leniency is activated.
Closes #28204