tikv
/
client-go
mirror of https://github.com/tikv/client-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: do not call onMemChange in alloc, since it will make the latest block empty, which breaks a precondition for some operations (e.g. revertToCheckpoint) (#632) 

Signed-off-by: ekexium <eke@fastmail.com>
This commit is contained in:
ekexium 2022-12-05 16:43:17 +08:00 committed by GitHub
parent 50651d6bb5
commit ad59ca833a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/unionstore/memdb_arena.go
View File

@ -129,7 +129,8 @@ func (a *memdbArena) enlarge(allocSize, blockSize int) {
buf: make([]byte, a.blockSize), buf: make([]byte, a.blockSize),
}) })
a.capacity += uint64(a.blockSize) a.capacity += uint64(a.blockSize)
a.onMemChange() // We shall not call a.onMemChange() here, since it will make the latest block empty, which breaks a precondition
// for some operations (e.g. revertToCheckpoint)
} }
func (a *memdbArena) onMemChange() { func (a *memdbArena) onMemChange() {
@ -250,11 +251,15 @@ func (a *nodeAllocator) getNode(addr memdbArenaAddr) *memdbNode {
func (a *nodeAllocator) allocNode(key []byte) (memdbArenaAddr, *memdbNode) { func (a *nodeAllocator) allocNode(key []byte) (memdbArenaAddr, *memdbNode) {
nodeSize := 8*4 + 2 + kv.FlagBytes + len(key) nodeSize := 8*4 + 2 + kv.FlagBytes + len(key)
prevBlocks := len(a.blocks)
addr, mem := a.alloc(nodeSize, true) addr, mem := a.alloc(nodeSize, true)
n := (*memdbNode)(unsafe.Pointer(&mem[0])) n := (*memdbNode)(unsafe.Pointer(&mem[0]))
n.vptr = nullAddr n.vptr = nullAddr
n.klen = uint16(len(key)) n.klen = uint16(len(key))
copy(n.getKey(), key) copy(n.getKey(), key)
if prevBlocks != len(a.blocks) {
a.onMemChange()
}
return addr, n return addr, n
} }
@ -313,6 +318,7 @@ func (hdr *memdbVlogHdr) load(src []byte) {
func (l *memdbVlog) appendValue(nodeAddr memdbArenaAddr, oldValue memdbArenaAddr, value []byte) memdbArenaAddr { func (l *memdbVlog) appendValue(nodeAddr memdbArenaAddr, oldValue memdbArenaAddr, value []byte) memdbArenaAddr {
size := memdbVlogHdrSize + len(value) size := memdbVlogHdrSize + len(value)
prevBlocks := len(l.blocks)
addr, mem := l.alloc(size, false) addr, mem := l.alloc(size, false)
copy(mem, value) copy(mem, value)
@ -320,6 +326,9 @@ func (l *memdbVlog) appendValue(nodeAddr memdbArenaAddr, oldValue memdbArenaAddr
hdr.store(mem[len(value):]) hdr.store(mem[len(value):])
addr.off += uint32(size) addr.off += uint32(size)
if prevBlocks != len(l.blocks) {
l.onMemChange()
}
return addr return addr
} }