avoid always using fast iterator in mutable tree iterator

osmosis-labs · Mar 2, 2022 · 6eced7b · 6eced7b
1 parent fe90684
commit 6eced7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/immutable_tree.go b/immutable_tree.go
@@ -226,8 +226,10 @@ func (t *ImmutableTree) Iterate(fn func(key []byte, value []byte) bool) bool {
 // Iterator returns an iterator over the immutable tree.
 func (t *ImmutableTree) Iterator(start, end []byte, ascending bool) dbm.Iterator {
 	if t.IsFastCacheEnabled() {
+		fmt.Println("immutable tree - iterator - use fast")
 		return NewFastIterator(start, end, ascending, t.ndb)
 	} else {
+		fmt.Println("immutable tree - iterator - use regular")
 		return NewIterator(start, end, ascending, t)
 	}
 }

diff --git a/mutable_tree.go b/mutable_tree.go
@@ -182,7 +182,12 @@ func (t *MutableTree) Iterate(fn func(key []byte, value []byte) bool) (stopped b
 // Iterator returns an iterator over the mutable tree.
 // CONTRACT: no updates are made to the tree while an iterator is active.
 func (t *MutableTree) Iterator(start, end []byte, ascending bool) dbm.Iterator {
-	return NewUnsavedFastIterator(start, end, ascending, t.ndb, t.unsavedFastNodeAdditions, t.unsavedFastNodeRemovals)
+	if t.IsFastCacheEnabled() {
+		fmt.Println("mutable tree - iterator - use fast")
+		return NewUnsavedFastIterator(start, end, ascending, t.ndb, t.unsavedFastNodeAdditions, t.unsavedFastNodeRemovals)
+	}
+	fmt.Println("mutable tree - iterator - use immutable")
+	return t.ImmutableTree.Iterator(start, end, ascending)
 }
 
 func (tree *MutableTree) set(key []byte, value []byte) (orphans []*Node, updated bool) {