From 4345f74426f1ca521b0042dd18fc0ae4b27b56ff Mon Sep 17 00:00:00 2001 From: Jingyi Hu Date: Wed, 29 May 2019 17:41:33 -0700 Subject: [PATCH] mvcc: revert change made by 10526 Revert #10526 and its followup #10699. --- mvcc/index.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mvcc/index.go b/mvcc/index.go index e2964cf5b..f8cc6df88 100644 --- a/mvcc/index.go +++ b/mvcc/index.go @@ -91,11 +91,10 @@ func (ti *treeIndex) keyIndex(keyi *keyIndex) *keyIndex { func (ti *treeIndex) visit(key, end []byte, f func(ki *keyIndex)) { keyi, endi := &keyIndex{key: key}, &keyIndex{key: end} - ti.Lock() - clone := ti.tree.Clone() - ti.Unlock() + ti.RLock() + 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 }