Merge pull request #8648 from gyuho/mu

mvcc: move 'keyi' define before holding locks
etcd-io · Oct 5, 2017 · 8b75689 · 8b75689
2 parents 75a51f7 + 9154b31
commit 8b75689
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mvcc/index.go b/mvcc/index.go
@@ -151,10 +151,11 @@ func (ti *treeIndex) Tombstone(key []byte, rev revision) error {
 // at or after the given rev. The returned slice is sorted in the order
 // of revision.
 func (ti *treeIndex) RangeSince(key, end []byte, rev int64) []revision {
+	keyi := &keyIndex{key: key}
+
 	ti.RLock()
 	defer ti.RUnlock()
 
-	keyi := &keyIndex{key: key}
 	if end == nil {
 		item := ti.tree.Get(keyi)
 		if item == nil {