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 optimize table fail with special characters (backport #51709) #51821

Merged
merged 5 commits into from
Oct 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 12, 2024

Why I'm doing:

What I'm doing:

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 #51709 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

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: meegoo <[email protected]>
(cherry picked from commit 2a1a68b)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java
#	fe/fe-core/src/main/java/com/starrocks/alter/OptimizeJobV2.java
#	test/sql/test_optimize_table/R/test_optimize_table
#	test/sql/test_optimize_table/T/test_optimize_table
Copy link
Contributor Author

mergify bot commented Oct 12, 2024

Cherry-pick of 2a1a68b has failed:

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

You are currently cherry-picking commit 2a1a68bf28.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/alter/OptimizeJobV2.java
	both modified:   test/sql/test_optimize_table/R/test_optimize_table
	both modified:   test/sql/test_optimize_table/T/test_optimize_table

no changes added to commit (use "git add" and/or "git commit -a")

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 Oct 12, 2024

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

@mergify mergify bot closed this Oct 12, 2024
@meegoo meegoo reopened this Oct 12, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 12, 2024 05:26
@meegoo meegoo disabled auto-merge October 12, 2024 05:30
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 12, 2024 05:30
Copy link

sonarcloud bot commented Oct 12, 2024

@wanpengfei-git wanpengfei-git merged commit 0d9e8a4 into branch-3.2 Oct 12, 2024
30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-51709 branch October 12, 2024 06:02
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