feat(store/v2): add support for iavl/v2 #22424
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| package iavlv2 | ||
|
There was a problem hiding this comment. Could you please add the tree test like iavl v1? There was a problem hiding this comment. I implemented the tests, skipping snaphots for now. It needs to be filled out but that can be done in parallel with the performance tests I'm now doing. |
||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| "github.com/cosmos/iavl/v2" | ||
| ics23 "github.com/cosmos/ics23/go" | ||
|
|
||
| corestore "cosmossdk.io/core/store" | ||
| "cosmossdk.io/store/v2" | ||
| "cosmossdk.io/store/v2/commitment" | ||
| ) | ||
|
|
||
| var ( | ||
| _ commitment.Tree = (*Tree)(nil) | ||
| _ commitment.Reader = (*Tree)(nil) | ||
| _ store.PausablePruner = (*Tree)(nil) | ||
| ) | ||
|
|
||
| type Tree struct { | ||
| tree *iavl.Tree | ||
| } | ||
|
|
||
| func NewTree(treeOptions iavl.TreeOptions, dbOptions iavl.SqliteDbOptions, pool *iavl.NodePool) (*Tree, error) { | ||
| sql, err := iavl.NewSqliteDb(pool, dbOptions) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| tree := iavl.NewTree(sql, pool, treeOptions) | ||
| return &Tree{tree: tree}, nil | ||
| } | ||
|
|
||
| func (t *Tree) Set(key, value []byte) error { | ||
| _, err := t.tree.Set(key, value) | ||
| return err | ||
| } | ||
|
|
||
| func (t *Tree) Remove(key []byte) error { | ||
| _, _, err := t.tree.Remove(key) | ||
| return err | ||
| } | ||
|
|
||
| func (t *Tree) GetLatestVersion() (uint64, error) { | ||
| return uint64(t.tree.Version()), nil | ||
| } | ||
|
|
||
| func (t *Tree) Hash() []byte { | ||
| return t.tree.Hash() | ||
| } | ||
|
|
||
| func (t *Tree) Version() uint64 { | ||
| return uint64(t.tree.Version()) | ||
| } | ||
|
|
||
| func (t *Tree) LoadVersion(version uint64) error { | ||
| if err := isHighBitSet(version); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if version == 0 { | ||
| return nil | ||
| } | ||
| return t.tree.LoadVersion(int64(version)) | ||
| } | ||
|
|
||
| func (t *Tree) Commit() ([]byte, uint64, error) { | ||
| h, v, err := t.tree.SaveVersion() | ||
| return h, uint64(v), err | ||
| } | ||
|
|
||
| func (t *Tree) SetInitialVersion(version uint64) error { | ||
| if err := isHighBitSet(version); err != nil { | ||
| return err | ||
| } | ||
| t.tree.SetShouldCheckpoint() | ||
| return t.tree.SetInitialVersion(int64(version)) | ||
| } | ||
|
|
||
| func (t *Tree) GetProof(version uint64, key []byte) (*ics23.CommitmentProof, error) { | ||
| if err := isHighBitSet(version); err != nil { | ||
| return nil, err | ||
| } | ||
| return t.tree.GetProof(int64(version), key) | ||
| } | ||
|
|
||
| func (t *Tree) Get(version uint64, key []byte) ([]byte, error) { | ||
| if err := isHighBitSet(version); err != nil { | ||
| return nil, err | ||
| } | ||
| if int64(version) != t.tree.Version() { | ||
| cloned, err := t.tree.ReadonlyClone() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if err = cloned.LoadVersion(int64(version)); err != nil { | ||
| return nil, err | ||
| } | ||
| return cloned.Get(key) | ||
| } else { | ||
| return t.tree.Get(key) | ||
| } | ||
| } | ||
|
|
||
| func (t *Tree) Iterator(version uint64, start, end []byte, ascending bool) (corestore.Iterator, error) { | ||
| if err := isHighBitSet(version); err != nil { | ||
| return nil, err | ||
| } | ||
| if int64(version) != t.tree.Version() { | ||
| return nil, fmt.Errorf("loading past version not yet supported") | ||
| } | ||
| return t.tree.Iterator(start, end, ascending) | ||
| } | ||
|
|
||
| func (t *Tree) Export(version uint64) (commitment.Exporter, error) { | ||
| return nil, errors.New("snapshot import/export not yet supported") | ||
| } | ||
|
|
||
| func (t *Tree) Import(version uint64) (commitment.Importer, error) { | ||
| return nil, errors.New("snapshot import/export not yet supported") | ||
| } | ||
|
|
||
| func (t *Tree) Close() error { | ||
| return t.tree.Close() | ||
| } | ||
|
|
||
| func (t *Tree) Prune(version uint64) error { | ||
| if err := isHighBitSet(version); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return t.tree.DeleteVersionsTo(int64(version)) | ||
| } | ||
|
|
||
| // PausePruning is unnecessary in IAVL v2 due to the advanced pruning mechanism | ||
| func (t *Tree) PausePruning(bool) {} | ||
|
|
||
| func (t *Tree) WorkingHash() []byte { | ||
| return t.tree.Hash() | ||
| } | ||
|
|
||
| func isHighBitSet(version uint64) error { | ||
| if version&(1<<63) != 0 { | ||
| return fmt.Errorf("%d too large; uint64 with the highest bit set are not supported", version) | ||
| } | ||
| return nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Improve error handling in PebbleDB initialization
The current implementation discards potential initialization errors using a blank identifier (
_). Since this is a critical storage component, proper error handling is essential.Consider this improvement: