Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

mvcc: don't allocate keys when computing Revisions

Browse Source
This commit is contained in:
Anthony Romano 2017-08-31 13:21:04 -07:00
parent be7d488982
commit 9d79d5fe65
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mvcc/index.go
View File

@ -85,6 +85,21 @@ func (ti *treeIndex) keyIndex(keyi *keyIndex) *keyIndex {
return nil return nil
} }
func (ti *treeIndex) visit(key, end []byte, f func(ki *keyIndex)) {
keyi, endi := &keyIndex{key: key}, &keyIndex{key: end}
ti.RLock()
defer ti.RUnlock()
ti.tree.AscendGreaterOrEqual(keyi, func(item btree.Item) bool {
if len(endi.key) > 0 && !item.Less(endi) {
return false
}
f(item.(*keyIndex))
return true
})
}
func (ti *treeIndex) Revisions(key, end []byte, atRev int64) (revs []revision) { func (ti *treeIndex) Revisions(key, end []byte, atRev int64) (revs []revision) {
if end == nil { if end == nil {
rev, _, _, err := ti.Get(key, atRev) rev, _, _, err := ti.Get(key, atRev)
@ -93,8 +108,12 @@ func (ti *treeIndex) Revisions(key, end []byte, atRev int64) (revs []revision) {
} }
return []revision{rev} return []revision{rev}
} }
_, rev := ti.Range(key, end, atRev) ti.visit(key, end, func(ki *keyIndex) {
return rev if rev, _, _, err := ki.get(atRev); err == nil {
revs = append(revs, rev)
}
})
return revs
} }
func (ti *treeIndex) Range(key, end []byte, atRev int64) (keys [][]byte, revs []revision) { func (ti *treeIndex) Range(key, end []byte, atRev int64) (keys [][]byte, revs []revision) {
@ -105,27 +124,12 @@ func (ti *treeIndex) Range(key, end []byte, atRev int64) (keys [][]byte, revs []
} }
return [][]byte{key}, []revision{rev} return [][]byte{key}, []revision{rev}
} }
ti.visit(key, end, func(ki *keyIndex) {
keyi := &keyIndex{key: key} if rev, _, _, err := ki.get(atRev); err == nil {
endi := &keyIndex{key: end} revs = append(revs, rev)
keys = append(keys, ki.key)
ti.RLock()
defer ti.RUnlock()
ti.tree.AscendGreaterOrEqual(keyi, func(item btree.Item) bool {
if len(endi.key) > 0 && !item.Less(endi) {
return false
} }
curKeyi := item.(*keyIndex)
rev, _, _, err := curKeyi.get(atRev)
if err != nil {
return true
}
revs = append(revs, rev)
keys = append(keys, curKeyi.key)
return true
}) })
return keys, revs return keys, revs
} }