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

feat(memory): cherry-pick #19372 and #19059 to branch release-2.1 #19973

Merged
merged 3 commits into from
Jan 2, 2025

Conversation

Li0k
Copy link
Contributor

@Li0k Li0k commented Dec 31, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

cherry-pick

Checklist

  • I have written necessary rustdoc comments.
  • I have added necessary unit tests and integration tests.
  • I have added test labels as necessary.
  • I have added fuzzing tests or opened an issue to track them.
  • My PR contains breaking changes.
  • My PR changes performance-critical code, so I will run (micro) benchmarks and present the results.
  • My PR contains critical fixes that are necessary to be merged into the latest release.

Documentation

  • My PR needs documentation updates.
Release note

Copy link
Contributor

@lmatz lmatz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@Li0k Li0k enabled auto-merge December 31, 2024 17:54
@Li0k Li0k changed the title feat(memory): cherry-pick Separate total memory configurations for FE and Compactor (#19372) to branch release-2.1 feat(memory): cherry-pick #19372 and #19059 to branch release-2.1 Jan 2, 2025
Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Note that #19059 is also cherry picked in this PR. Please include that in the PR title and PR description as well.

@Li0k Li0k added this pull request to the merge queue Jan 2, 2025
Merged via the queue into release-2.1 with commit 3a91f87 Jan 2, 2025
20 of 31 checks passed
@Li0k Li0k deleted the li0k/cherry-pick-4085f56 branch January 2, 2025 06:17
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