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 incorrect materialized view row count (backport #51944) #52018

Merged
merged 2 commits into from
Oct 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2024

Why I'm doing:

Fix incorrect mv row count which introduced in #50668

What I'm doing:

The MaterializedIndex object is different in every physicalPartition, but with the same index.getId(), so the indexRowCountMap.put(index.getId(), indexRowCount) will overwrite previous mv partition's row count with the later partition's row count

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.

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 #51944 done by [Mergify](https://mergify.com). ## Why I'm doing: Fix incorrect mv row count which introduced in #50668 ## What I'm doing:

The MaterializedIndex object is different in every physicalPartition, but with the same index.getId(), so the indexRowCountMap.put(index.getId(), indexRowCount) will overwrite previous mv partition's row count with the later partition's row count

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.

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: kaijian.ding <[email protected]>
(cherry picked from commit 1df36e4)

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

mergify bot commented Oct 17, 2024

Cherry-pick of 1df36e4 has failed:

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

You are currently cherry-picking commit 1df36e49d4.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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) October 17, 2024 06:07
@mergify mergify bot closed this Oct 17, 2024
auto-merge was automatically disabled October 17, 2024 06:07

Pull request was closed

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 18, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 18, 2024 09:00
Signed-off-by: shuming.li <[email protected]>
Copy link

sonarcloud bot commented Oct 18, 2024

@wanpengfei-git wanpengfei-git merged commit faff693 into branch-3.3 Oct 19, 2024
29 of 31 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-51944 branch October 19, 2024 02:32
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.

4 participants