Refactor PhraseSuggestionBuilder.DirectCandidateGenerator #16185
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
cbuescher
force-pushed
the
ref-DirectCandidateGenerator
branch
from
f9c3602 to
8428028
Compare
cbuescher
added
:Search Refactoring
:Search Relevance/Suggesters
cbuescher
force-pushed
the
ref-DirectCandidateGenerator
branch
from
8428028 to
0735e24
Compare
| @@ -98,18 +98,10 @@ public PhraseSuggestParser(PhraseSuggester suggester) { | |||
| } | |||
| } | |||
| } else if (token == Token.START_ARRAY) { | |||
| if ("direct_generator".equals(fieldName) || "directGenerator".equals(fieldName)) { | |||
| if (parseFieldMatcher.match(fieldName, org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder.DirectCandidateGenerator.DIRECT_GENERATOR_FIELD)) { | |||
There was a problem hiding this comment.
Can we make this either PhraseSuggestionBuilder.DirectCandidateGenerator or DirectCandidateGenerator?
There was a problem hiding this comment.
I would have really liked to pull this to its own class, but there is already org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator which is the same thing but with shard-dependent properties (Analyzers etc...), so I will rename this thing to DirectCandidateGeneratorBuilder.
There was a problem hiding this comment.
Or just reference it as PhraseSuggestionBuilder.DirectCandidateGenerator instead of its FQCN
There was a problem hiding this comment.
I prefer pulling this out, PhraseSuggestionBuilder is large enough already.
|
left a couple of minor comments but it LGTM |
As a prerequisite for refactoring the whole PhraseSuggestionBuilder to be able to be parsed and streamed from the coordinating node, the DirectCandidateGenerator must implement Writeable, be able to parse a new instance (fromXContent()) and later when transported to the shard to generate a PhraseSuggestionContext.DirectCandidateGenerator. Also adding equals/hashCode and tests and moving DirectCandidateGenerator to its own DirectCandidateGeneratorBuilder class.
cbuescher
force-pushed
the
ref-DirectCandidateGenerator
branch
from
0735e24 to
61c435e
Compare
cbuescher
added a commit
that referenced
this pull request
Feb 1, 2016
As a prerequisite for refactoring the whole PhraseSuggestionBuilder to be able to be parsed and streamed from the coordinating node, the DirectCandidateGenerator must implement Writeable, be able to parse a new instance (fromXContent()) and later when transported to the shard to generate a PhraseSuggestionContext.DirectCandidateGenerator. Also adding equals/hashCode and tests and moving DirectCandidateGenerator to its own DirectCandidateGeneratorBuilder class.
|
@colings86 thanks for the review. |
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.
As a prerequisite for refactoring the whole PhraseSuggestionBuilder to be able to be parsed and streamed from the coordinating node, the DirectCandidateGenerator must implement Writeable, be able to parse a new instance (fromXContent()) and later when transported to the shard to generate a PhraseSuggestionContext.DirectCandidateGenerator. Also adding equals/hashCode and tests and moving DirectCandidateGenerator to its own DirectCandidateGeneratorBuilder class.
Relates to #10217