Allow overriding all-field leniency when lenient option is specified
#21504
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
|
I'm not happy that the the lenient property can now be null and that the default needs to be handled in multiple places. Maybe instead the builders could keep track of whether the |
I agree that I don't like having it set to |
|
@jpountz I pushed another commit that changes the |
jpountz
approved these changes
Nov 21, 2016
| @@ -162,6 +164,9 @@ public SimpleQueryStringBuilder(StreamInput in) throws IOException { | |||
| in.readBoolean(); // lowercase_expanded_terms | |||
| } | |||
| settings.lenient(in.readBoolean()); | |||
| if (in.getVersion().after(V_5_1_0_UNRELEASED)) { | |||
| @@ -188,6 +193,9 @@ protected void doWriteTo(StreamOutput out) throws IOException { | |||
| out.writeBoolean(true); // lowercase_expanded_terms | |||
| } | |||
| out.writeBoolean(settings.lenient()); | |||
| if (out.getVersion().after(V_5_1_0_UNRELEASED)) { | |||
dakrone
force-pushed
the
fix-lenient-overriding
branch
2 times, most recently
from
67407e1
to
864f6d3
Compare
As part of elastic#20925 and elastic#21341 we added an "all-fields" mode to the `query_string` and `simple_query_string`. This would expand the query to all fields and automatically set `lenient` to true. However, we should still allow a user to override the `lenient` flag to whichever value they desire, should they add it in the request. This commit does that.
dakrone
force-pushed
the
fix-lenient-overriding
branch
from
864f6d3
to
11da09e
Compare
|
Thanks @jpountz! |
clintongormley
added
:Search/Search
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Feb 15, 2019
Looks like elastic#21504 introduced a serialization conditional for lenientSet, but the PR was never backported to 5.x hence whenever simple query string is serialized between 6.x and 5.6, it can't be read/written properly causing errors on the transport layer. This commit updates the conditional to only read/write the field against 6.0+ versions which are aware of it. Closes elastic#38889
javanna
added a commit
that referenced
this pull request
Feb 15, 2019
Looks like #21504 introduced a serialization conditional for lenientSet, but the PR was never backported to 5.x hence whenever simple query string is serialized between 6.x and 5.6, it can't be read/written properly causing errors on the transport layer. This commit updates the conditional to only read/write the field against 6.0+ versions which are aware of it. Closes #38889
javanna
added a commit
that referenced
this pull request
Feb 16, 2019
Looks like #21504 introduced a serialization conditional for lenientSet, but the PR was never backported to 5.x hence whenever simple query string is serialized between 6.x and 5.6, it can't be read/written properly causing errors on the transport layer. This commit updates the conditional to only read/write the field against 6.0+ versions which are aware of it. Closes #38889
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.
As part of #20925 and #21341 we added an "all-fields" mode to the
query_stringandsimple_query_string. This would expand the query toall fields and automatically set
lenientto true.However, we should still allow a user to override the
lenientflag towhichever value they desire, should they add it in the request. This
commit does that.