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 when specify partition name (backport #34896) #35016

Merged
merged 2 commits into from
Nov 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 14, 2023

This is an automatic backport of pull request #34896 done by Mergify.
Cherry-pick of 04a0be7 has failed:

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

You are currently cherry-picking commit 04a0be7df1.
  (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/alter/OptimizeJobV2.java
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/OptimizeTask.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AlterTableClauseVisitor.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocks.g4
	modified:   fe/fe-core/src/test/java/com/starrocks/alter/OptimizeJobV2Test.java
	modified:   test/sql/test_optimize_table/T/test_optimize_table

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/sql/test_optimize_table/R/test_optimize_table

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

Signed-off-by: meegoo <meegoo.sr@gmail.com>
(cherry picked from commit 04a0be7)

# Conflicts:
#	test/sql/test_optimize_table/R/test_optimize_table
@mergify mergify bot requested a review from a team as a code owner November 14, 2023 21:32
@mergify mergify bot added the conflicts label Nov 14, 2023
@mergify mergify bot closed this Nov 14, 2023
Copy link
Contributor Author

mergify bot commented Nov 14, 2023

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

@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-34896 branch November 14, 2023 21:33
@meegoo meegoo restored the mergify/bp/branch-3.2/pr-34896 branch November 14, 2023 22:49
@meegoo meegoo reopened this Nov 14, 2023
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) November 14, 2023 22:50
@meegoo meegoo disabled auto-merge November 14, 2023 22:50
Copy link

[FE Incremental Coverage Report]

pass : 5 / 6 (83.33%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/sql/analyzer/AlterTableClauseVisitor.java 0 1 00.00% [388]
🔵 com/starrocks/alter/OptimizeTask.java 1 1 100.00% []
🔵 com/starrocks/alter/OptimizeJobV2.java 4 4 100.00% []

Copy link

[BE Incremental Coverage Report]

pass : 0 / 0 (0%)

@meegoo meegoo enabled auto-merge (squash) November 15, 2023 00:05
@meegoo meegoo self-assigned this Nov 17, 2023
@meegoo meegoo merged commit 84f46a8 into branch-3.2 Nov 17, 2023
@meegoo meegoo deleted the mergify/bp/branch-3.2/pr-34896 branch November 17, 2023 04:12
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.

3 participants