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 stale mem flush not reduce load memory usage (backport #52613) (backport #52713) #52730

Merged
merged 3 commits into from
Nov 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2024

Why I'm doing:

What I'm doing:

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

What I'm doing:

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

This is an automatic backport of pull request #52713 done by [Mergify](https://mergify.com).

…52613) (#52713)

Signed-off-by: meegoo <[email protected]>
Co-authored-by: meegoo <[email protected]>
(cherry picked from commit b57cc09)

# Conflicts:
#	test/sql/test_automatic_bucket/R/test_automatic_partition
#	test/sql/test_automatic_bucket/T/test_automatic_partition
Copy link
Contributor Author

mergify bot commented Nov 8, 2024

Cherry-pick of b57cc09 has failed:

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

You are currently cherry-picking commit b57cc09f6b.
  (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/async_delta_writer.cpp
	modified:   be/src/storage/delta_writer.cpp
	modified:   be/src/storage/delta_writer.h
	modified:   be/src/storage/lake/async_delta_writer.cpp
	modified:   be/src/storage/lake/delta_writer.cpp
	modified:   be/src/storage/lake/delta_writer.h
	modified:   be/test/storage/lake/async_delta_writer_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/sql/test_automatic_bucket/R/test_automatic_partition
	both modified:   test/sql/test_automatic_bucket/T/test_automatic_partition

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

@CLAassistant
Copy link

CLAassistant commented Nov 8, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ meegoo
❌ mergify[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 8, 2024 04:45
@mergify mergify bot closed this Nov 8, 2024
auto-merge was automatically disabled November 8, 2024 04:45

Pull request was closed

Copy link
Contributor Author

mergify bot commented Nov 8, 2024

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

@meegoo meegoo reopened this Nov 8, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 8, 2024 05:04
@meegoo meegoo disabled auto-merge November 8, 2024 05:05
@meegoo meegoo enabled auto-merge (squash) November 8, 2024 05:05
@meegoo meegoo merged commit 5dc0002 into branch-3.2 Nov 8, 2024
28 of 29 checks passed
@meegoo meegoo deleted the mergify/bp/branch-3.2/pr-52713 branch November 8, 2024 05:26
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