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

[Enhancement] remove partition version check in plan validation (backport #46733) #46781

Merged
merged 3 commits into from
Jun 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2024

Why I'm doing:

In a large number of real-time import scenarios, if a complex query contains multiple tables, verifying the partitioned versions of multiple tables may still cause the plan to fail.
image

What I'm doing:

When the partition is shallow copied, the version number is copied while holding the lock, and the historical snapshot version can be used for query. So we can remove this partition version check.

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 #46733 done by [Mergify](https://mergify.com). ## Why I'm doing: In a large number of real-time import scenarios, if a complex query contains multiple tables, verifying the partitioned versions of multiple tables may still cause the plan to fail. ![image](https://github.com/StarRocks/starrocks/assets/110370499/12eb6762-137f-41dc-8735-895db91a10f2)

What I'm doing:

When the partition is shallow copied, the version number is copied while holding the lock, and the historical snapshot version can be used for query. So we can remove this partition version check.

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 8b91707)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
#	fe/fe-core/src/main/java/com/starrocks/sql/OptimisticVersion.java
#	fe/fe-core/src/main/java/com/starrocks/sql/StatementPlanner.java
#	fe/fe-core/src/test/java/com/starrocks/lake/LakeTableTest.java
#	fe/fe-core/src/test/java/com/starrocks/sql/OptimisticVersionTest.java
@mergify mergify bot added the conflicts label Jun 7, 2024
Copy link
Contributor Author

mergify bot commented Jun 7, 2024

Cherry-pick of 8b91707 has failed:

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

You are currently cherry-picking commit 8b9170718d.
  (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/transaction/OlapTableTxnLogApplier.java
	modified:   fe/fe-core/src/test/java/com/starrocks/planner/QueryPlanLockFreeTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/sql/OptimisticVersion.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/StatementPlanner.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/lake/LakeTableTest.java
	deleted by us:   fe/fe-core/src/test/java/com/starrocks/sql/OptimisticVersionTest.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 7, 2024

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

@mergify mergify bot closed this Jun 7, 2024
auto-merge was automatically disabled June 7, 2024 09:30

Pull request was closed

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-46733 branch June 7, 2024 09:31
@packy92 packy92 restored the mergify/bp/branch-2.5/pr-46733 branch June 11, 2024 02:06
@packy92 packy92 reopened this Jun 11, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 11, 2024 02:07
Signed-off-by: packy92 <[email protected]>
Signed-off-by: packy92 <[email protected]>
Copy link

sonarcloud bot commented Jun 11, 2024

@wanpengfei-git wanpengfei-git merged commit 0a25b1d into branch-2.5 Jun 11, 2024
31 of 32 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-46733 branch June 11, 2024 05:05
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