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: add config iavl-lazy-loading to enable lazy loading of iavl store (backport #14189) #14862

Merged
merged 4 commits into from
Feb 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2023

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

On branch mergify/bp/release/v0.46.x/pr-14189
Your branch is up to date with 'origin/release/v0.46.x'.

You are currently cherry-picking commit b266522c8.
  (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:   baseapp/options.go
	modified:   server/config/config.go
	modified:   server/config/toml.go
	modified:   server/mock/store.go
	modified:   server/start.go
	modified:   store/iavl/store.go
	modified:   store/iavl/tree.go
	modified:   store/rootmulti/store.go
	modified:   store/types/store.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   cosmovisor/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   server/util.go
	deleted by us:   simapp/go.mod
	deleted by us:   simapp/go.sum
	deleted by us:   store/go.mod
	deleted by us:   store/go.sum
	deleted by us:   tests/go.mod
	deleted by us:   tests/go.sum
	deleted by us:   x/nft/go.mod
	deleted by us:   x/upgrade/go.mod
	deleted by us:   x/upgrade/go.sum

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

@mergify mergify bot requested a review from a team as a code owner February 1, 2023 09:36
@mergify mergify bot added the conflicts label Feb 1, 2023
@github-actions github-actions bot added C:Cosmovisor Issues and PR related to Cosmovisor C:Store C:x/nft C:x/upgrade labels Feb 1, 2023
…tore (#14189)

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit b266522)

# Conflicts:
#	CHANGELOG.md
#	cosmovisor/go.sum
#	go.mod
#	go.sum
#	server/util.go
#	simapp/go.mod
#	simapp/go.sum
#	store/go.mod
#	store/go.sum
#	tests/go.mod
#	tests/go.sum
#	x/nft/go.mod
#	x/upgrade/go.mod
#	x/upgrade/go.sum
@yihuang yihuang force-pushed the mergify/bp/release/v0.46.x/pr-14189 branch from 3999b87 to 74bd79b Compare February 1, 2023 09:47
go.mod Outdated Show resolved Hide resolved
@yihuang yihuang removed the conflicts label Feb 1, 2023
@github-actions github-actions bot removed C:Cosmovisor Issues and PR related to Cosmovisor C:x/upgrade C:x/nft labels Feb 1, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

utACK. About the explanation, maybe it is something to mention in the release notes at release.

@tac0turtle tac0turtle enabled auto-merge (squash) February 2, 2023 10:48
@tac0turtle tac0turtle merged commit 70589eb into release/v0.46.x Feb 2, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.46.x/pr-14189 branch February 2, 2023 12:00
yihuang added a commit to yihuang/cosmos-sdk that referenced this pull request Feb 7, 2023
…tore (backport cosmos#14189) (cosmos#14862)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
SpicyLemon added a commit to provenance-io/cosmos-sdk that referenced this pull request Feb 16, 2023
…518)

* fix: Fix Evidence CLI query flag parsing (backport cosmos#13458) (cosmos#14799)

Co-authored-by: Likhita Polavarapu <78951027+likhita-809@users.noreply.github.com>
Co-authored-by: HuangYi <huang@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: nested iterator on cache store (cosmos#14798)

* chore: update IAVL  (backport cosmos#14830) (cosmos#14835)

Co-authored-by: Marko <marbar3778@yahoo.com>

* Mark v0.46.8-pio-2 in the changelog and release notes.

* feat: add config `iavl-lazy-loading` to enable lazy loading of iavl store (backport cosmos#14189) (cosmos#14862)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>

* chore: bump IAVL to v0.19.5 (backport cosmos#14889) (cosmos#14892)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* build(deps): bump tendermint to v0.34.25 (cosmos#14903)

* build(deps): bump tendermint to v0.34.26 (cosmos#14911)

* fix: return named error for write validators (backport cosmos#14919) (cosmos#14921)

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* Bump Tendermint to v0.34.25 (from v0.34.24). (#498)

* Fix a few listener proto comments. (#499)

* build(deps): bump btcd in v0.46 (cosmos#14846)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>

* ci: update release slack channel and algolia api key (backport cosmos#14942) (cosmos#14945)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* feat: support profiling block replay during abci handshake (backport cosmos#14953) (cosmos#14964)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* Revert "Revert cosmos#14349 - cache iterator optimizations (#444)"

This reverts commit cd9d192.

* Mark v0.46.8-pio-3 in the changelog and release notes.

* fix: avoid broadcasting tx through query (backport cosmos#15044) (cosmos#15047)

Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* Add CLI commands for sanction Tx gov props (#510)

* Fix the changelog.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Likhita Polavarapu <78951027+likhita-809@users.noreply.github.com>
Co-authored-by: HuangYi <huang@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com>
Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com>
ankurdotb pushed a commit to cheqd/cosmos-sdk that referenced this pull request Feb 28, 2023
…tore (backport cosmos#14189) (cosmos#14862)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
jiujiteiro pushed a commit to realiotech/cosmos-sdk that referenced this pull request Mar 7, 2023
…tore (backport cosmos#14189) (cosmos#14862)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…tore (backport cosmos#14189) (cosmos#14862)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants