Skip to content

Commit

Permalink
return error when loading version from an empty tree (#317)
Browse files Browse the repository at this point in the history
  • Loading branch information
erikgrinaker authored Sep 25, 2020
1 parent df0fe07 commit a7d2e7b
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## Unreleased

### Breaking Changes

- [\#317](https://github.com/cosmos/iavl/pull/317) `LoadVersion()` and `LazyLoadVersion()` now error
if called with a positive version number on an empty tree.

## 0.15.0-rc3 (August 27, 2020)

### Improvements
Expand Down
10 changes: 8 additions & 2 deletions mutable_tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,10 @@ func (tree *MutableTree) LazyLoadVersion(targetVersion int64) (int64, error) {

// no versions have been saved if the latest version is non-positive
if latestVersion <= 0 {
return 0, nil
if targetVersion <= 0 {
return 0, nil
}
return 0, fmt.Errorf("no versions found while trying to load %v", targetVersion)
}

// default to the latest version if the targeted version is non-positive
Expand Down Expand Up @@ -323,7 +326,10 @@ func (tree *MutableTree) LoadVersion(targetVersion int64) (int64, error) {
}

if len(roots) == 0 {
return 0, nil
if targetVersion <= 0 {
return 0, nil
}
return 0, fmt.Errorf("no versions found while trying to load %v", targetVersion)
}

firstVersion := int64(0)
Expand Down
34 changes: 34 additions & 0 deletions mutable_tree_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,40 @@ func TestMutableTree_DeleteVersions(t *testing.T) {
}
}

func TestMutableTree_LoadVersion_Empty(t *testing.T) {
memDB := db.NewMemDB()
tree, err := NewMutableTree(memDB, 0)
require.NoError(t, err)

version, err := tree.LoadVersion(0)
require.NoError(t, err)
assert.EqualValues(t, 0, version)

version, err = tree.LoadVersion(-1)
require.NoError(t, err)
assert.EqualValues(t, 0, version)

_, err = tree.LoadVersion(3)
require.Error(t, err)
}

func TestMutableTree_LazyLoadVersion_Empty(t *testing.T) {
memDB := db.NewMemDB()
tree, err := NewMutableTree(memDB, 0)
require.NoError(t, err)

version, err := tree.LazyLoadVersion(0)
require.NoError(t, err)
assert.EqualValues(t, 0, version)

version, err = tree.LazyLoadVersion(-1)
require.NoError(t, err)
assert.EqualValues(t, 0, version)

_, err = tree.LazyLoadVersion(3)
require.Error(t, err)
}

func TestMutableTree_InitialVersion(t *testing.T) {
memDB := db.NewMemDB()
tree, err := NewMutableTreeWithOpts(memDB, 0, &Options{InitialVersion: 9})
Expand Down

0 comments on commit a7d2e7b

Please sign in to comment.