Skip to content

Commit

Permalink
commit ndb batch and remove lazy parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
yihuang committed Dec 1, 2022
1 parent 5bee6a9 commit d9f40d1
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions mutable_tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -615,17 +615,8 @@ func (tree *MutableTree) LoadVersion(targetVersion int64) (int64, error) {

// LoadVersionForOverwriting attempts to load a tree at a previously committed
// version, or the latest version below it. Any versions greater than targetVersion will be deleted.
// When lazy=true, call `LazyLoadVersion` instead of `LoadVersion`.
func (tree *MutableTree) LoadVersionForOverwriting(targetVersion int64, lazy bool) (int64, error) {
var (
latestVersion int64
err error
)
if lazy {
latestVersion, err = tree.LazyLoadVersion(targetVersion)
} else {
latestVersion, err = tree.LoadVersion(targetVersion)
}
func (tree *MutableTree) LoadVersionForOverwriting(targetVersion int64) (int64, error) {
latestVersion, err := tree.LoadVersion(targetVersion)
if err != nil {
return latestVersion, err
}
Expand All @@ -634,11 +625,15 @@ func (tree *MutableTree) LoadVersionForOverwriting(targetVersion int64, lazy boo
return latestVersion, err
}

tree.ndb.resetLatestVersion(latestVersion)
if err := tree.ndb.Commit(); err != nil {
return latestVersion, err
}

tree.mtx.Lock()
defer tree.mtx.Unlock()

tree.ndb.resetLatestVersion(latestVersion)

if !tree.skipFastStorageUpgrade {
// it'll repopulates the fast node index because of version mismatch.
if _, err := tree.enableFastStorageAndCommitIfNotEnabled(); err != nil {
Expand Down

0 comments on commit d9f40d1

Please sign in to comment.