[Enhancement]Merge group fields for aggregate if having dependent group fields#4703
Merged
LantaoJin merged 3 commits intoopensearch-project:mainfrom Oct 31, 2025
Merged
[Enhancement]Merge group fields for aggregate if having dependent group fields#4703LantaoJin merged 3 commits intoopensearch-project:mainfrom
LantaoJin merged 3 commits intoopensearch-project:mainfrom
Conversation
…up fields Signed-off-by: Heng Qian <qianheng@amazon.com>
Signed-off-by: Heng Qian <qianheng@amazon.com>
yuancu
reviewed
Oct 30, 2025
Comment on lines
+57
to
+62
| } else { | ||
| throw new AssertionError( | ||
| String.format( | ||
| "The length of rels should be %s but got %s", | ||
| this.operands.size(), call.rels.length)); | ||
| } |
Collaborator
There was a problem hiding this comment.
I'm curious when will there be more than 2 rels. With the given rule config, I assume it should match only the given pattern.
Collaborator
Author
There was a problem hiding this comment.
Agree. Just defensive check as other rules.
yuancu
approved these changes
Oct 31, 2025
LantaoJin
approved these changes
Oct 31, 2025
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.19-dev 2.19-dev
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.19-dev
# Create a new branch
git switch --create backport/backport-4703-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5517c1ea7cd11df8fffa1642c77b3dccc51c5e1e
# Push it to GitHub
git push --set-upstream origin backport/backport-4703-to-2.19-dev
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.19-devThen, create a pull request where the |
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.19-dev 2.19-dev
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.19-dev
# Create a new branch
git switch --create backport/backport-4703-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5517c1ea7cd11df8fffa1642c77b3dccc51c5e1e
# Push it to GitHub
git push --set-upstream origin backport/backport-4703-to-2.19-dev
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.19-devThen, create a pull request where the |
qianheng-aws
added a commit
to qianheng-aws/sql
that referenced
this pull request
Oct 31, 2025
…ensearch-project#4703) * [Enhancement]Merge group fields for aggregate if having dependent group fields Signed-off-by: Heng Qian <qianheng@amazon.com> * fix CI Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix windows UT Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com> (cherry picked from commit 5517c1e) Signed-off-by: Heng Qian <qianheng@amazon.com>
LantaoJin
pushed a commit
that referenced
this pull request
Oct 31, 2025
…ent group fields #4703 (#4711) * Merge group fields for aggregate if having dependent group fields (#4703) * [Enhancement]Merge group fields for aggregate if having dependent group fields Signed-off-by: Heng Qian <qianheng@amazon.com> * fix CI Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix windows UT Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com> (cherry picked from commit 5517c1e) Signed-off-by: Heng Qian <qianheng@amazon.com> * fix compiling Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com>
8 tasks
expani
pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
…ensearch-project#4703) * [Enhancement]Merge group fields for aggregate if having dependent group fields Signed-off-by: Heng Qian <qianheng@amazon.com> * fix CI Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix windows UT Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Description
Merge group fields for aggregate if having dependent group fields. e.g. it will transform
to
which will both simplify aggregation complexity and also avoid agg-script push down.
Currently, we only support single base group fields and all other group fields must have dependency on the base one.
Related Issues
Resolves #4681
Check List
--signoffor-s.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.