LUCENE-10414: Add fn:fuzzyTerm interval function to flexible query parser #668
Conversation
| * <li>{@link #multiterm(CompiledAutomaton, String)} | ||
| * </ul> | ||
| */ | ||
| public static final int DEFAULT_MAX_EXPANSIONS = 128; | ||
|
|
There was a problem hiding this comment.
I've extracted this as a constant. It's functionally the same but it's good to have a reference to the defaults that you can rely on in external code (other than javadoc just mentioning it).
|
|
||
| public Wildcard(String wildcard) { | ||
| public Wildcard(String wildcard, int maxExpansions) { |
There was a problem hiding this comment.
This commit piggybacks an additional parameter maxExpansions to fn:wildcard function.
| @@ -144,7 +144,7 @@ public ScoreMode scoreMode() { | |||
| } | |||
|
|
|||
| /** | |||
| * Tests that a query matches the an expected set of documents using Hits. | |||
There was a problem hiding this comment.
This is just a test code cleanup. I changed the requested hits count to be twice the requested size (and not an arbitrary 1000) and used smaller iterators in the code.
|
|
||
| @Override | ||
| public IntervalsSource toIntervalSource(String field, Analyzer analyzer) { | ||
| var fuzzyQuery = new FuzzyQuery(new Term(field, term), maxEdits); |
There was a problem hiding this comment.
We could move this bit to Intervals... the problem is that I wanted to reuse the same logic FuzzyQuery does and it requires a field reference (internally it doesn't but the fuzzy automaton builder is package-private). So we'd have to open up something to be able to reference this machinery from within a method like Intervals.fuzzyTerm().
There was a problem hiding this comment.
Yep we do this all over the place in ES as well. Maybe we should just make FuzzyAutomatonBuilder public?
There was a problem hiding this comment.
Maybe we should just make FuzzyAutomatonBuilder public?
I'm +1 for this as it'd make the API more complete - we could move this logic to Intervals.fuzzyTerm(). I can make FuzzyAutomatonBuilder public or make a public static method exposing its result (an automaton for a term, maxEdits pair) on FuzzyQuery. Let me know which one works for you better and I'll reshape the code under this PR.
There was a problem hiding this comment.
A static method on FuzzyQuery fits with what we have elsewhere for PrefixQuery and WildcardQuery, let's do that
There was a problem hiding this comment.
I have already - see commit 86c9756
…tervals.fuzzyTerm method for completeness.
No description provided.