Use inheritance instead of composition to simplify search phase transitions #119272
Conversation
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
…itions We only need the extensibility for testing and it's a lot easier to reason about the code if we have explicit methods instead of overly complicated composition with lots of redundant references being retained all over the place. -> lets simplify to inheritance and get shorter code that performs more predictably (especially when it comes to memory) as a first step. This also opens up the possibility of further simplifications and removing more retained state/memory as we go through the search phases.
original-brownbear
added
>non-issue
:Search Foundations/Search
elasticsearchmachine
added
v9.0.0
Team:Search Foundations
|
Pinging @elastic/es-search-foundations (Team:Search Foundations) |
| @@ -180,4 +179,95 @@ ShardSearchRequest rewriteShardSearchRequest(ShardSearchRequest request) { | |||
|
|
|||
| return request; | |||
| } | |||
|
|
|||
| private static List<DfsKnnResults> mergeKnnResults(SearchRequest request, List<DfsSearchResult> dfsSearchResults) { | |||
There was a problem hiding this comment.
The two static methods move without changes, they are now only used from this class.
|
This change makes the code more readable. The classes' sequence is discrete and easy to follow. It reminds me of the Similar logic can also be applied in the RankFeaturePhase, not updated in this pr. |
drempapis
approved these changes
Feb 19, 2025
There was a problem hiding this comment.
LGTM! This is a refactoring task, which makes the code easier to follow. Thank you @original-brownbear
original-brownbear
added
auto-backport
|
Thanks Dimitris! |
💔 Backport failed
You can use sqren/backport to manually backport by running |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Apr 9, 2025
…itions (elastic#119272) We only need the extensibility for testing and it's a lot easier to reason about the code if we have explicit methods instead of overly complicated composition with lots of redundant references being retained all over the place. -> lets simplify to inheritance and get shorter code that performs more predictably (especially when it comes to memory) as a first step. This also opens up the possibility of further simplifications and removing more retained state/memory as we go through the search phases.
original-brownbear
added a commit
that referenced
this pull request
Apr 9, 2025
…120079) (#126511) * Remove unnecessary interfaces/abstractions from search phases (#120079) A couple obvious cleanups where declared general interfaces aren't actually used + we shouldn't escape potentially heavy-weight search phases just to get their name in a call so adjusted the failure API. * Use inheritance instead of composition to simplify search phase transitions (#119272) We only need the extensibility for testing and it's a lot easier to reason about the code if we have explicit methods instead of overly complicated composition with lots of redundant references being retained all over the place. -> lets simplify to inheritance and get shorter code that performs more predictably (especially when it comes to memory) as a first step. This also opens up the possibility of further simplifications and removing more retained state/memory as we go through the search phases.
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.
We only need the extensibility for testing and it's a lot easier to reason about the code if we have explicit methods instead of overly complicated composition with lots of redundant references being retained all over the place.
-> lets simplify to inheritance and get shorter code that performs more predictably (especially when it comes to memory) as a first step. This also opens up the possibility of further simplifications and removing more retained state/memory as we go through the search phases.