mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #9710 from gyuho/mvcc-delete
mvcc: use latest revision to tombstone
This commit is contained in:
commit
fc9ca59ced
@ -239,17 +239,17 @@ func (tw *storeTxnWrite) deleteRange(key, end []byte) int64 {
|
|||||||
if len(tw.changes) > 0 {
|
if len(tw.changes) > 0 {
|
||||||
rrev += 1
|
rrev += 1
|
||||||
}
|
}
|
||||||
keys, revs := tw.s.kvindex.Range(key, end, rrev)
|
keys, _ := tw.s.kvindex.Range(key, end, rrev)
|
||||||
if len(keys) == 0 {
|
if len(keys) == 0 {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
for i, key := range keys {
|
for _, key := range keys {
|
||||||
tw.delete(key, revs[i])
|
tw.delete(key)
|
||||||
}
|
}
|
||||||
return int64(len(keys))
|
return int64(len(keys))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tw *storeTxnWrite) delete(key []byte, rev revision) {
|
func (tw *storeTxnWrite) delete(key []byte) {
|
||||||
ibytes := newRevBytes()
|
ibytes := newRevBytes()
|
||||||
idxRev := revision{main: tw.beginRev + 1, sub: int64(len(tw.changes))}
|
idxRev := revision{main: tw.beginRev + 1, sub: int64(len(tw.changes))}
|
||||||
revToBytes(idxRev, ibytes)
|
revToBytes(idxRev, ibytes)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user