[BugFix] Only repair mv when table's version/version time are matched with mv's version map (backport #49240)

mergify[bot] commented 2 days ago

Why I'm doing:

48883 will repair mv's partition version no matter the base table's partition has already refreshed which will cause

wrong version mapping between mv and base table.
Stream Load will not trigger related mv since changed.

What I'm doing:

Only repair partition infos which version and version time are matched with base table's version map.
Fix stream load trigger related mvs bug.

Fixes #issue

What type of PR is this:

[x] 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.
[x] 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:

[x] 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
[x] This is a backport pr

Bugfix cherry-pick branch check:

[x] I have checked the version labels which the pr will be auto-backported to the target branch
- [x] 3.3
- [x] 3.2
- [ ] 3.1
- [ ] 3.0
- [ ] 2.5
  This is an automatic backport of pull request #49240 done by Mergify.
  Why I'm doing:

48883 will repair mv's partition version no matter the base table's partition has already refreshed which will cause

wrong version mapping between mv and base table.
Stream Load will not trigger related mv since changed.

What I'm doing:

Only repair partition infos which version and version time are matched with base table's version map.
Fix stream load trigger related mvs bug.

Fixes #issue

What type of PR is this:

[x] 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.
[x] 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:

[x] 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
[x] This is a backport pr

mergify[bot] commented 2 days ago

Cherry-pick of dca57fc0ed87780870046f6986a90673f02adeb7 has failed:

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

You are currently cherry-picking commit dca57fc0ed.
  (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/listener/LoadJobMVListener.java
    modified:   fe/fe-core/src/main/java/com/starrocks/mv/MVMetaVersionRepairer.java
    modified:   fe/fe-core/src/test/java/com/starrocks/planner/mv/MVMetaVersionRepairerTest.java
    modified:   fe/fe-core/src/test/java/com/starrocks/server/MVRepairHandlerTest.java
    new file:   test/sql/test_materialized_view_refresh/R/test_mv_event_trigger_with_stream_load
    new file:   test/sql/test_materialized_view_refresh/T/test_mv_event_trigger_with_stream_load

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

mergify[bot] commented 2 days ago

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