mvcc: revert change made by 10526

Revert etcd-io#10526 and its followup etcd-io#10699.
nolouch · Dec 22, 2019 · 86bb085 · 86bb085
1 parent 77d4b74
commit 86bb085
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -59,3 +59,5 @@ require (
 	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 	gopkg.in/yaml.v2 v2.2.2
 )
+
+go 1.13
diff --git a/mvcc/index.go b/mvcc/index.go
@@ -92,10 +92,9 @@ func (ti *treeIndex) visit(key, end []byte, f func(ki *keyIndex)) {
 	keyi, endi := &keyIndex{key: key}, &keyIndex{key: end}
 
 	ti.RLock()
-	clone := ti.tree.Clone()
-	ti.RUnlock()
+	defer ti.RUnlock()
 
-	clone.AscendGreaterOrEqual(keyi, func(item btree.Item) bool {
+	ti.tree.AscendGreaterOrEqual(keyi, func(item btree.Item) bool {
 		if len(endi.key) > 0 && !item.Less(endi) {
 			return false
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,3 +59,5 @@ require ( @@
     	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
     	gopkg.in/yaml.v2 v2.2.2
     )
+    go 1.13