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

[Enhancement] Support Generated Column rewrite in complex Query (backport #50398) #50829

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 9, 2024

In this pr:

  1. Refactor Generated Column rewrite code:
    a. Collect generated column expr mapping From QueryAnalyzer.
    b. Introduce ReplaceScalarOperatorRule to replace the ScalarOperator match the generated column expression.
  2. Supprot View, JOIN with Subquery and CTE for Generated Column rewriting.
  3. Support simple equivalent expression rewrite for generated column.

Note: All query structure support Generated Column rewriting obey a simple rule: the Generated Column and its ref columns output directly into the outer scope.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #50398 done by [Mergify](https://mergify.com). In this pr: 1. Refactor Generated Column rewrite code: a. Collect generated column expr mapping From QueryAnalyzer. b. Introduce ReplaceScalarOperatorRule to replace the ScalarOperator match the generated column expression. 2. Supprot View, JOIN with Subquery and CTE for Generated Column rewriting. 3. Support simple equivalent expression rewrite for generated column.

Note: All query structure support Generated Column rewriting obey a simple rule: the Generated Column and its ref columns output directly into the outer scope.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: srlch <[email protected]>
(cherry picked from commit 96b97a7)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/sql/analyzer/QueryAnalyzer.java
@mergify mergify bot added the conflicts label Sep 9, 2024
Copy link
Contributor Author

mergify bot commented Sep 9, 2024

Cherry-pick of 96b97a7 has failed:

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

You are currently cherry-picking commit 96b97a70e4.
  (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:
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AnalyzeState.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/ast/Relation.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/ast/SelectRelation.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorRewriter.java
	new file:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/scalar/ReplaceScalarOperatorRule.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/transformer/ExpressionMapping.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/transformer/OptExprBuilder.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/transformer/QueryTransformer.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/transformer/SqlToScalarOperatorTranslator.java
	modified:   fe/fe-core/src/test/java/com/starrocks/sql/plan/GeneratedColumnTest.java
	modified:   test/sql/test_materialized_column/R/test_generated_column_rewrite
	modified:   test/sql/test_materialized_column/T/test_generated_column_rewrite

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/analyzer/QueryAnalyzer.java

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

Copy link
Contributor Author

mergify bot commented Sep 9, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-3.3/pr-50398 branch September 9, 2024 03:26
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.

1 participant