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 the race condition of addPartition operation (backport #48492) #48643

Merged
merged 1 commit into from
Jul 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2024

Why I'm doing:

  • analyzeAddPartitionProperties actually modify the state of ListPartitionInfo, but it's under ReadLock, so it would introduce a race condition on the ListPartitionInfo

What I'm doing:

  • Remove the modification by setBatchLiteralExprValues
    • it's totally unnecessary to change the LiteralValues since the idToValues is always consistent with idToLiteralExprValues
  • Simplify the code

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 #48492 done by [Mergify](https://mergify.com). ## Why I'm doing: - `analyzeAddPartitionProperties` actually modify the state of `ListPartitionInfo`, but it's under ReadLock, so it would introduce a race condition on the `ListPartitionInfo`

What I'm doing:

  • Remove the modification by setBatchLiteralExprValues
    • it's totally unnecessary to change the LiteralValues since the idToValues is always consistent with idToLiteralExprValues
  • Simplify the code

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

@mergify mergify bot added the conflicts label Jul 19, 2024
Copy link
Contributor Author

mergify bot commented Jul 19, 2024

Cherry-pick of 2a33dc9 has failed:

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

You are currently cherry-picking commit 2a33dc9ea5.
  (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/catalog/ListPartitionInfo.java

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

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 19, 2024 15:34
@mergify mergify bot closed this Jul 19, 2024
auto-merge was automatically disabled July 19, 2024 15:35

Pull request was closed

Copy link
Contributor Author

mergify bot commented Jul 19, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-48492 branch July 19, 2024 15:35
@murphyatwork murphyatwork restored the mergify/bp/branch-3.2/pr-48492 branch July 20, 2024 02:01
@murphyatwork murphyatwork reopened this Jul 20, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 20, 2024 02:02
Signed-off-by: Murphy <[email protected]>
(cherry picked from commit 2a33dc9)
Signed-off-by: Murphy <[email protected]>

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/CatalogUtils.java
@murphyatwork murphyatwork force-pushed the mergify/bp/branch-3.2/pr-48492 branch from 51acbba to c29ed45 Compare July 20, 2024 02:08
Copy link

sonarcloud bot commented Jul 20, 2024

@wanpengfei-git wanpengfei-git merged commit 59db541 into branch-3.2 Jul 20, 2024
28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-48492 branch July 20, 2024 03:20
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