Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] Pushdown distinct agg across window not support complex expr (backport #36357) #36446

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2023

This is an automatic backport of pull request #36357 done by Mergify.
Cherry-pick of 7a0c140 has failed:

On branch mergify/bp/branch-2.5/pr-36357
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 7a0c140fe0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   fe/fe-core/src/test/resources/sql/query_dump/pushdown_distinct_agg_below_window2.json
	new file:   test/sql/test_push_down_distinct_agg_across_window/R/test_push_down_distinct_agg_across_window
	new file:   test/sql/test_push_down_distinct_agg_across_window/T/test_push_down_distinct_agg_across_window

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/LogicalPlanPrinter.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/tree/pdagg/PushDownDistinctAggregateRewriter.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/sql/plan/AggregatePushDownTest.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/sql/plan/ReplayFromDumpTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#36357)

Signed-off-by: satanson <[email protected]>
(cherry picked from commit 7a0c140)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/sql/optimizer/LogicalPlanPrinter.java
#	fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/tree/pdagg/PushDownDistinctAggregateRewriter.java
#	fe/fe-core/src/test/java/com/starrocks/sql/plan/AggregatePushDownTest.java
#	fe/fe-core/src/test/java/com/starrocks/sql/plan/ReplayFromDumpTest.java
Copy link
Contributor Author

mergify bot commented Dec 5, 2023

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-36357 branch December 5, 2023 07:24
Copy link

github-actions bot commented Dec 5, 2023

[FE Incremental Coverage Report]

pass : 205 / 221 (92.76%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/sql/optimizer/rule/tree/pdagg/PushDownDistinctAggregateRewriter.java 194 210 92.38% [134, 135, 154, 155, 165, 166, 317, 341, 387, 413, 414, 415, 416, 417, 418, 419]
🔵 com/starrocks/sql/optimizer/LogicalPlanPrinter.java 11 11 100.00% []

Copy link

github-actions bot commented Dec 5, 2023

[BE Incremental Coverage Report]

pass : 0 / 0 (0%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants