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 mv refresh with multi partition columns ref base tables (backport #52017) #52033

Merged
merged 2 commits into from
Oct 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2024

Why I'm doing:

When partitions p4 and p5 in the base table t1 change, cascading will cause the refresh of p1 and p5 in the materialized view mv1. However, p1 includes two partitions, 2020-07-01 and 2020-07-02, and the partition 2020-07-02 does not only come from the partition p4. Therefore, other partitions it depends on must also be taken into account.

image

Since p1 contains two partitions, 2020-07-01 and 2020-07-02, and the partition 2020-07-02 is not solely derived from the p4 partition, other partitions it depends on must also be considered when cascading the refresh. Therefore, during the cascaded refresh, it is necessary to include partitions p1, p2, and p3 that have not changed:

image

What I'm doing:

  • Fix mv refresh with multi partition columns ref base tables

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

When partitions p4 and p5 in the base table t1 change, cascading will cause the refresh of p1 and p5 in the materialized view mv1. However, p1 includes two partitions, 2020-07-01 and 2020-07-02, and the partition 2020-07-02 does not only come from the partition p4. Therefore, other partitions it depends on must also be taken into account.

image

Since p1 contains two partitions, 2020-07-01 and 2020-07-02, and the partition 2020-07-02 is not solely derived from the p4 partition, other partitions it depends on must also be considered when cascading the refresh. Therefore, during the cascaded refresh, it is necessary to include partitions p1, p2, and p3 that have not changed:

image

What I'm doing:

  • Fix mv refresh with multi partition columns ref base tables

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

…52017)

Signed-off-by: shuming.li <[email protected]>
(cherry picked from commit 3c896df)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/combinator/AggStateCombinator.java
#	fe/fe-core/src/main/java/com/starrocks/catalog/combinator/AggStateMergeCombinator.java
#	fe/fe-core/src/main/java/com/starrocks/catalog/combinator/AggStateUnionCombinator.java
@mergify mergify bot added the conflicts label Oct 17, 2024
Copy link
Contributor Author

mergify bot commented Oct 17, 2024

Cherry-pick of 3c896df has failed:

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

You are currently cherry-picking commit 3c896df731.
  (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/scheduler/mv/MVPCTRefreshListPartitioner.java
	modified:   fe/fe-core/src/main/java/com/starrocks/scheduler/mv/MVPCTRefreshPartitioner.java
	modified:   fe/fe-core/src/main/java/com/starrocks/scheduler/mv/MVPCTRefreshRangePartitioner.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/common/PCell.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/common/PListCell.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/common/PRangeCell.java
	modified:   fe/fe-core/src/test/java/com/starrocks/scheduler/PCTRefreshListPartitionOlapTest.java
	modified:   test/test_sql_cases.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/catalog/combinator/AggStateCombinator.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/catalog/combinator/AggStateMergeCombinator.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/catalog/combinator/AggStateUnionCombinator.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 Oct 17, 2024

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

@LiShuMing LiShuMing reopened this Oct 17, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 17, 2024 08:19
Signed-off-by: shuming.li <[email protected]>
Copy link

sonarcloud bot commented Oct 17, 2024

@wanpengfei-git wanpengfei-git merged commit 475743b into branch-3.3 Oct 17, 2024
30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-52017 branch October 17, 2024 09:06
@LiShuMing
Copy link
Contributor

@mergify backport branch-3.3.5

Copy link
Contributor Author

mergify bot commented Oct 17, 2024

backport branch-3.3.5

✅ Backports have been created

mergify bot added a commit that referenced this pull request Oct 17, 2024
…(backport #52017) (#52033)

Signed-off-by: shuming.li <[email protected]>
Co-authored-by: shuming.li <[email protected]>
(cherry picked from commit 475743b)
wanpengfei-git pushed a commit that referenced this pull request Oct 17, 2024
…(backport #52017) (backport #52033) (#52042)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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