cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

remove db2 to dbNext

Browse Source
This commit is contained in:
vyzo 2021-07-27 12:06:40 +03:00
parent bb2d99908c
commit c21c413695
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
blockstore/badger/blockstore.go
View File

@ -112,9 +112,9 @@ type Blockstore struct {
moveState bsMoveState moveState bsMoveState
rlock int rlock int
db *badger.DB db *badger.DB
db2 *badger.DB // when moving dbNext *badger.DB // when moving
opts Options opts Options
prefixing bool prefixing bool
prefix []byte prefix []byte
@ -263,8 +263,8 @@ func (b *Blockstore) movingGC() error {
defer func() { defer func() {
b.lockMove() b.lockMove()
db2 := b.db2 db2 := b.dbNext
b.db2 = nil b.dbNext = nil
var state bsMoveState var state bsMoveState
if db2 != nil { if db2 != nil {
@ -316,19 +316,19 @@ func (b *Blockstore) movingGC() error {
} }
b.lockMove() b.lockMove()
b.db2 = db2 b.dbNext = db2
b.unlockMove(moveStateMoving) b.unlockMove(moveStateMoving)
log.Info("copying blockstore") log.Info("copying blockstore")
err = b.doCopy(b.db, b.db2) err = b.doCopy(b.db, b.dbNext)
if err != nil { if err != nil {
return fmt.Errorf("error moving badger blockstore to %s: %w", path, err) return fmt.Errorf("error moving badger blockstore to %s: %w", path, err)
} }
b.lockMove() b.lockMove()
db1 := b.db db1 := b.db
b.db = b.db2 b.db = b.dbNext
b.db2 = nil b.dbNext = nil
b.unlockMove(moveStateCleanup) b.unlockMove(moveStateCleanup)
err = db1.Close() err = db1.Close()
@ -652,8 +652,8 @@ func (b *Blockstore) Put(block blocks.Block) error {
return err return err
} }
if b.db2 != nil { if b.dbNext != nil {
if err := put(b.db2); err != nil { if err := put(b.dbNext); err != nil {
return err return err
} }
} }
@ -716,8 +716,8 @@ func (b *Blockstore) PutMany(blocks []blocks.Block) error {
return err return err
} }
if b.db2 != nil { if b.dbNext != nil {
if err := put(b.db2); err != nil { if err := put(b.dbNext); err != nil {
return err return err
} }
} }