Support aggregation push down with scripts #3916
Merged
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
Signed-off-by: Heng Qian <qianheng@amazon.com>
qianheng-aws
requested review from
GumpacG,
LantaoJin,
MaxKsyunz,
Swiddis,
YANG-DB,
Yury-Fridlyand,
acarbonetto,
anirudha,
dai-chen,
derek-ho,
forestmvey,
joshuali925,
kavithacm,
mengweieric,
noCharger,
penghuo,
ps48,
seankao-az and
ykmr1224
as code owners
qianheng-aws
added
enhancement
|
CI failed because of the sort push down after aggregation is implemented improperly. Per v2's implementation, we should push down sort's collation into the inner of AggregationBuilder instead of the outer For instance, when do push down for PPL In Calcite, it will build SearchRequest like below: And then cause exception: |
Signed-off-by: Heng Qian <qianheng@amazon.com>
Fixed by the lasted commit. The correct DSL should be: |
Signed-off-by: Heng Qian <qianheng@amazon.com>
|
Ignore q30 because of too many scripts push down, which will then trigger ResourceMonitor restriction. This query will produce 89 scripts if push down enabled. It should be addressed in a separate PR by merging multi-scripts or preventing such script push down. As said in this comments #3859 (comment), filter script push down may trigger similar issue if filter conditions produce too many scripts |
Could u explain more about restriction? I try a more complex one, it works |
penghuo
reviewed
Jul 24, 2025
|
|
||
| /** Ignore queries that are not supported by Calcite. */ | ||
| /** | ||
| * Ignore queries that are not supported by Calcite. Ignore q33 because of too much script push |
Single q30 query can run successfully as well on my local test. It won't always trigger that exception. As seen in the CI before ignoring q30, https://github.com/opensearch-project/sql/actions/runs/16497630130/job/46647212530, some tests can pass while others failed with exception. I think it depends on the tension of the node on the specific point, maybe impacted by JVM GC. |
Signed-off-by: Heng Qian <qianheng@amazon.com>
Script push down will trigger exception. We can track the solution in seperate PR. |
penghuo
approved these changes
Jul 25, 2025
LantaoJin
approved these changes
Jul 26, 2025
|
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-3916-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b0c07008f8e5a6401f350da142e65fce649c7e60
# Push it to GitHub
git push --set-upstream origin backport/backport-3916-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
Jul 28, 2025
* Support aggregation push down with scripts Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix IT Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix sort push down after aggregation Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix IT Signed-off-by: Heng Qian <qianheng@amazon.com> * Ignore q33 in clickbench because of ResourceMonitor restriction Signed-off-by: Heng Qian <qianheng@amazon.com> * Correct ignored query name in the comment - from q33 to q30 Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com> (cherry picked from commit b0c0700)
penghuo
pushed a commit
that referenced
this pull request
Jul 29, 2025
#3926) * Support aggregation push down with scripts (#3916) * Support aggregation push down with scripts Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix IT Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix sort push down after aggregation Signed-off-by: Heng Qian <qianheng@amazon.com> * Fix IT Signed-off-by: Heng Qian <qianheng@amazon.com> * Ignore q33 in clickbench because of ResourceMonitor restriction Signed-off-by: Heng Qian <qianheng@amazon.com> * Correct ignored query name in the comment - from q33 to q30 Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com> (cherry picked from commit b0c0700) * Change java style to 11 Signed-off-by: Heng Qian <qianheng@amazon.com> --------- Signed-off-by: Heng Qian <qianheng@amazon.com>
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
Related Issues
Resolves
#3386
#3385
Check List
--signoff.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.