Fix FuzzyQuery to properly handle Object, number, dates or String. #12020
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
Makes FuzzyQueryBuilder take a value as a number, date or String using exactly the same logic as TermQueryBuilder. Relates elastic#11865
|
I think we also wanted to change the parser to parse the value as an object instead of a string? |
|
Yep I wasn't sure of that, I'll fix this. |
| public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) { | ||
| long iValue = dateMathParser().parse(value, now()); | ||
| public Query fuzzyQuery(Object value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) { | ||
| long iValue = dateMathParser().parse(value.toString(), now()); |
There was a problem hiding this comment.
Can you use parseValue(value) instead? It should behave as similarly to termQuery() as possible.
|
I left some comments. |
|
LGTM |
| Query query = null; | ||
| MappedFieldType fieldType = parseContext.fieldMapper(fieldName); | ||
| if (fieldType != null) { | ||
| query = fieldType.fuzzyQuery(value, fuzziness, prefixLength, maxExpansions, transpositions); | ||
| } | ||
| if (query == null) { | ||
| query = new FuzzyQuery(new Term(fieldName, value), fuzziness.asDistance(value), prefixLength, maxExpansions, transpositions); | ||
| query = new FuzzyQuery(new Term(fieldName, value.toString()), fuzziness.asDistance(value.toString()), prefixLength, maxExpansions, transpositions); |
There was a problem hiding this comment.
shouldn't we use BytesRefs.toBytesRef(value) here instead?
There was a problem hiding this comment.
Yep I was just updating the PR as you wrote this.
|
LGTM |
alexksikes
changed the title
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.
This makes FuzzyQueryBuilder and Parser take an Object as a value using the
same logic as termQuery, so that numbers, dates or Strings would be properly
handled.
Relates #11865