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] Rewrite repair (backport #50330) #50530

Merged
merged 2 commits into from
Sep 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 2, 2024

Why I'm doing:

#50329 cache data is confusion

What I'm doing:

Rewrite will read the unsubmitted update data, which will be overwritten during submission and should not be cached.
Although 'page_cache=true' was not configured during reading, segment_iterator's 'use_page_cache' did not take effect because scalar_column_iterator.cpp directly referenced 'config::disable_storage_page_cache'.
So add parameter 'temporary_data' to identify temporary data that has not been submitted.

Fixes #50329

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 #50330 done by [Mergify](https://mergify.com). ## Why I'm doing: #50329 cache data is confusion

What I'm doing:

Rewrite will read the unsubmitted update data, which will be overwritten during submission and should not be cached.
Although 'page_cache=true' was not configured during reading, segment_iterator's 'use_page_cache' did not take effect because scalar_column_iterator.cpp directly referenced 'config::disable_storage_page_cache'.
So add parameter 'temporary_data' to identify temporary data that has not been submitted.

Fixes #50329

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: motto1314 <[email protected]>
Signed-off-by: stdpain <[email protected]>
Co-authored-by: stdpain <[email protected]>
Co-authored-by: trueeyu <[email protected]>
(cherry picked from commit 1e10d20)

# Conflicts:
#	be/src/storage/rowset/column_iterator.h
#	be/src/storage/rowset/scalar_column_iterator.cpp
#	be/src/storage/rowset/segment_iterator.cpp
#	be/src/storage/rowset/segment_options.h
@mergify mergify bot added the conflicts label Sep 2, 2024
Copy link
Contributor Author

mergify bot commented Sep 2, 2024

Cherry-pick of 1e10d20 has failed:

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

You are currently cherry-picking commit 1e10d20cf9.
  (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:   be/src/storage/rowset/segment_options.cpp
	modified:   be/src/storage/rowset/segment_rewriter.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/storage/rowset/column_iterator.h
	both modified:   be/src/storage/rowset/scalar_column_iterator.cpp
	both modified:   be/src/storage/rowset/segment_iterator.cpp
	both modified:   be/src/storage/rowset/segment_options.h

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 mergify bot mentioned this pull request Sep 2, 2024
24 tasks
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 2, 2024 01:52
@mergify mergify bot closed this Sep 2, 2024
Copy link
Contributor Author

mergify bot commented Sep 2, 2024

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

auto-merge was automatically disabled September 2, 2024 01:52

Pull request was closed

@mergify mergify bot deleted the mergify/bp/branch-3.1/pr-50330 branch September 2, 2024 01:52
@trueeyu trueeyu restored the mergify/bp/branch-3.1/pr-50330 branch September 2, 2024 11:27
@trueeyu trueeyu reopened this Sep 2, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 2, 2024 11:27
@wanpengfei-git wanpengfei-git merged commit 5d0941e into branch-3.1 Sep 2, 2024
26 of 27 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.1/pr-50330 branch September 2, 2024 12:01
trueeyu pushed a commit that referenced this pull request Sep 5, 2024
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.

3 participants