vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-02 10:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix locking in PutMany implementations

Browse source
This commit is contained in:
Daniel 2020-10-12 13:54:27 +02:00
parent e5a72ffa37
commit 6a58ce5a7a
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
database/storage/bbolt/bbolt.go
View file

@ -115,26 +115,9 @@ func (b *BBolt) PutMany(shadowDelete bool) (chan<- record.Record, <-chan error)
err := b.db.Batch(func(tx *bbolt.Tx) error { err := b.db.Batch(func(tx *bbolt.Tx) error {
bucket := tx.Bucket(bucketName) bucket := tx.Bucket(bucketName)
for r := range batch { for r := range batch {
if !shadowDelete && r.Meta().IsDeleted() { txErr := b.batchPutOrDelete(bucket, shadowDelete, r)
// Immediate delete. if txErr != nil {
txErr := bucket.Delete([]byte(r.DatabaseKey())) return txErr
if txErr != nil {
return txErr
}
} else {
// Put or shadow delete.
// marshal
data, txErr := r.MarshalRecord(r)
if txErr != nil {
return txErr
}
// put
txErr = bucket.Put([]byte(r.DatabaseKey()), data)
if txErr != nil {
return txErr
}
} }
} }
return nil return nil
@ -145,6 +128,25 @@ func (b *BBolt) PutMany(shadowDelete bool) (chan<- record.Record, <-chan error)
return batch, errs return batch, errs
} }
func (b *BBolt) batchPutOrDelete(bucket *bbolt.Bucket, shadowDelete bool, r record.Record) (err error) {
r.Lock()
defer r.Unlock()
if !shadowDelete && r.Meta().IsDeleted() {
// Immediate delete.
err = bucket.Delete([]byte(r.DatabaseKey()))
} else {
// Put or shadow delete.
var data []byte
data, err = r.MarshalRecord(r)
if err == nil {
err = bucket.Put([]byte(r.DatabaseKey()), data)
}
}
return err
}
// Delete deletes a record from the database. // Delete deletes a record from the database.
func (b *BBolt) Delete(key string) error { func (b *BBolt) Delete(key string) error {
err := b.db.Update(func(tx *bbolt.Tx) error { err := b.db.Update(func(tx *bbolt.Tx) error {

7
database/storage/hashmap/map.go
View file

@ -66,7 +66,7 @@ func (hm *HashMap) PutMany(shadowDelete bool) (chan<- record.Record, <-chan erro
// start handler // start handler
go func() { go func() {
for r := range batch { for r := range batch {
hm.putOrDelete(shadowDelete, r) hm.batchPutOrDelete(shadowDelete, r)
} }
errs <- nil errs <- nil
}() }()
@ -74,7 +74,10 @@ func (hm *HashMap) PutMany(shadowDelete bool) (chan<- record.Record, <-chan erro
return batch, errs return batch, errs
} }
func (hm *HashMap) putOrDelete(shadowDelete bool, r record.Record) { func (hm *HashMap) batchPutOrDelete(shadowDelete bool, r record.Record) {
r.Lock()
defer r.Unlock()
hm.dbLock.Lock() hm.dbLock.Lock()
defer hm.dbLock.Unlock() defer hm.dbLock.Unlock()