Skip to content

Commit

Permalink
unionstore: make lock earlier (#484)
Browse files Browse the repository at this point in the history
Signed-off-by: xiongjiwei <xiongjiwei1996@outlook.com>
  • Loading branch information
xiongjiwei authored Apr 29, 2022
1 parent 577843f commit 3984ffe
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions internal/unionstore/memdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,15 @@ func (db *MemDB) Staging() int {

// Release publish all modifications in the latest staging buffer to upper level.
func (db *MemDB) Release(h int) {
db.Lock()
defer db.Unlock()

if h != len(db.stages) {
// This should never happens in production environment.
// Use panic to make debug easier.
panic("cannot release staging buffer")
}

db.Lock()
defer db.Unlock()
if h == 1 {
tail := db.vlog.checkpoint()
if !db.stages[0].isSamePosition(&tail) {
Expand All @@ -131,6 +132,9 @@ func (db *MemDB) Release(h int) {
// Cleanup cleanup the resources referenced by the StagingHandle.
// If the changes are not published by `Release`, they will be discarded.
func (db *MemDB) Cleanup(h int) {
db.Lock()
defer db.Unlock()

if h > len(db.stages) {
return
}
Expand All @@ -140,8 +144,6 @@ func (db *MemDB) Cleanup(h int) {
panic("cannot cleanup staging buffer")
}

db.Lock()
defer db.Unlock()
cp := &db.stages[h-1]
if !db.vlogInvalid {
curr := db.vlog.checkpoint()
Expand Down Expand Up @@ -294,6 +296,9 @@ func (db *MemDB) Dirty() bool {
}

func (db *MemDB) set(key []byte, value []byte, ops ...kv.FlagsOp) error {
db.Lock()
defer db.Unlock()

if db.vlogInvalid {
// panic for easier debugging.
panic("vlog is resetted")
Expand All @@ -308,9 +313,6 @@ func (db *MemDB) set(key []byte, value []byte, ops ...kv.FlagsOp) error {
}
}

db.Lock()
defer db.Unlock()

if len(db.stages) == 0 {
db.dirty = true
}
Expand Down

0 comments on commit 3984ffe

Please sign in to comment.