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] fix blacklist not prevent insert sql (backport #48998) #49278

Merged
merged 2 commits into from
Aug 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2024

Why I'm doing:

fix blacklist not prevent insert sql

What I'm doing:

prevent the sql before exectuing

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 #48998 done by [Mergify](https://mergify.com). ## Why I'm doing: fix blacklist not prevent insert sql

What I'm doing:

prevent the sql before exectuing

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 04019bc)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
@mergify mergify bot added the conflicts label Aug 1, 2024
Copy link
Contributor Author

mergify bot commented Aug 1, 2024

Cherry-pick of 04019bc has failed:

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

You are currently cherry-picking commit 04019bc59a.
  (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/test/java/com/starrocks/planner/QueryPlannerTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.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 Aug 1, 2024

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

@mergify mergify bot closed this Aug 1, 2024
@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-48998 branch August 1, 2024 06:26
@packy92 packy92 restored the mergify/bp/branch-3.2/pr-48998 branch August 6, 2024 05:31
@packy92 packy92 reopened this Aug 6, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) August 6, 2024 05:32
Signed-off-by: packy92 <[email protected]>
Copy link

sonarcloud bot commented Aug 6, 2024

@wanpengfei-git wanpengfei-git merged commit 83f4a70 into branch-3.2 Aug 6, 2024
29 of 30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-48998 branch August 6, 2024 07:08
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