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] add an id argument to mark non-deterministic functions (backport #46592) #46605

Merged
merged 4 commits into from
Jun 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Why I'm doing:

The old id field in callOperator may be erased in rewriting process.

What I'm doing:

Add an id parameters to mark non-deterministic functions. Ensure that no uniqueness markers are lost during any copy operations.
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 #46592 done by [Mergify](https://mergify.com). ## Why I'm doing: The old id field in callOperator may be erased in rewriting process.

What I'm doing:

Add an id parameters to mark non-deterministic functions. Ensure that no uniqueness markers are lost during any copy operations.
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: packy92 <[email protected]>
(cherry picked from commit 2f1c5da)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/scalar/CallOperator.java
#	fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/tree/lowcardinality/DecodeContext.java
#	fe/fe-core/src/main/java/com/starrocks/sql/plan/ScalarOperatorToExpr.java
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of 2f1c5da has failed:

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

You are currently cherry-picking commit 2f1c5dab61.
  (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/optimizer/rewrite/BaseScalarOperatorShuttle.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/tree/ScalarOperatorsReuse.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/optimizer/rewrite/ScalarOperatorsReuseRuleTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/scalar/CallOperator.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/tree/lowcardinality/DecodeContext.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/plan/ScalarOperatorToExpr.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 Jun 4, 2024

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

auto-merge was automatically disabled June 4, 2024 06:11

Pull request was closed

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-46592 branch June 4, 2024 06:12
@packy92 packy92 restored the mergify/bp/branch-2.5/pr-46592 branch June 4, 2024 11:20
@packy92 packy92 reopened this Jun 4, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 4, 2024 11:20
Signed-off-by: packy92 <[email protected]>
Signed-off-by: packy92 <[email protected]>
packy92
packy92 previously approved these changes Jun 4, 2024
Signed-off-by: packy92 <[email protected]>
Copy link

sonarcloud bot commented Jun 5, 2024

@wanpengfei-git wanpengfei-git merged commit ffc356a into branch-2.5 Jun 5, 2024
28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-46592 branch June 5, 2024 03:23
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