Skip to content

Store engine together with Module to mitigate memory increase issue (backport #1982) #1987

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

Merged
merged 2 commits into from
Jan 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2024

This is an automatic backport of pull request #1982 done by Mergify.
Cherry-pick of a344468 has failed:

On branch mergify/bp/release/1.5/pr-1982
Your branch is up to date with 'origin/release/1.5'.

You are currently cherry-picking commit a34446891.
  (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:   packages/vm/src/modules/cached_module.rs
	modified:   packages/vm/src/modules/file_system_cache.rs
	modified:   packages/vm/src/modules/mod.rs
	modified:   packages/vm/src/modules/pinned_memory_cache.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/vm/src/cache.rs
	both modified:   packages/vm/src/modules/in_memory_cache.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit a344468)

# Conflicts:
#	packages/vm/src/cache.rs
#	packages/vm/src/modules/in_memory_cache.rs
(cherry picked from commit 1b110c6)
@chipshort chipshort force-pushed the mergify/bp/release/1.5/pr-1982 branch from 40eb5ac to 61c5e53 Compare January 12, 2024 10:39
Copy link
Member

@webmaster128 webmaster128 left a comment

Choose a reason for hiding this comment

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

LGTM

@chipshort chipshort merged commit 0e61a0c into release/1.5 Jan 15, 2024
@chipshort chipshort deleted the mergify/bp/release/1.5/pr-1982 branch January 15, 2024 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants