ESQL: Remove AggregateMapper reflection, and delegate intermediate state to suppliers #122023
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
ivancea
added
>refactoring
Team:Analytics
ivancea
commented
Feb 7, 2025
|
|
||
| @Override | ||
| public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) { | ||
| if (inputChannels.size() != 2 && inputChannels.size() != 3) { |
There was a problem hiding this comment.
This assertion can't be done now, unless we manually change the autogenerated function suppliers.
I don't think it's "required" though
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
idegtiarenko
approved these changes
Feb 10, 2025
# Conflicts: # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AggregateMapper.java
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Feb 10, 2025
…ate to suppliers (elastic#122023) To avoid having AggregateMapper find aggregators based on their names with reflection, I'm doing some changes: - Make the suppliers have methods returning the intermediate states - To allow this, the suppliers constructor won't receive the chanells as params. Instead, its methods will ask for them - Most changes in this PR are because of this - After those changes, I'm leaving AggregateMapper still there, as it still converts AggregateFunctions to its NamedExpressions (cherry picked from commit 7bea3a5) # Conflicts: # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AggregateMapper.java
|
8.x backport waiting for backport of #119889 |
ivancea
added a commit
that referenced
this pull request
Feb 11, 2025
…ate to suppliers (#122023) (#122183) To avoid having AggregateMapper find aggregators based on their names with reflection, I'm doing some changes: - Make the suppliers have methods returning the intermediate states - To allow this, the suppliers constructor won't receive the chanells as params. Instead, its methods will ask for them - Most changes in this PR are because of this - After those changes, I'm leaving AggregateMapper still there, as it still converts AggregateFunctions to its NamedExpressions (cherry picked from commit 7bea3a5) # Conflicts: # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AggregateMapper.java
ivancea
added a commit
that referenced
this pull request
Feb 12, 2025
…ate to suppliers (#122023) (#122380) Manual 8.x backport of #122023 To avoid having AggregateMapper find aggregators based on their names with reflection, I'm doing some changes: - Make the suppliers have methods returning the intermediate states - To allow this, the suppliers constructor won't receive the chanells as params. Instead, its methods will ask for them - Most changes in this PR are because of this - After those changes, I'm leaving AggregateMapper still there, as it still converts AggregateFunctions to its NamedExpressions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Don't be afraid of the amount of files: Most changes are trivial refactors along all aggregators/functions/tests.
To avoid having AggregateMapper find aggregators based on their names with reflection, I'm doing some changes:
In general, I think the change fits very well:
Things in progress