Browse Source

libs/db: close batch (#3397)

ClevelDB requires closing when WriteBatch is no longer needed, https://godoc.org/github.com/jmhodges/levigo#WriteBatch.Close

Fixes the memory leak in https://github.com/cosmos/cosmos-sdk/issues/3842
pull/3398/head
Yumin Xia 6 years ago
committed by Anton Kaliaev
parent
commit
b021f1e505
10 changed files with 32 additions and 0 deletions
  1. +5
    -0
      libs/db/c_level_db.go
  2. +5
    -0
      libs/db/debug_db.go
  3. +4
    -0
      libs/db/go_level_db.go
  4. +4
    -0
      libs/db/mem_batch.go
  5. +4
    -0
      libs/db/prefix_db.go
  6. +1
    -0
      libs/db/remotedb/grpcdb/server.go
  7. +4
    -0
      libs/db/remotedb/remotedb.go
  8. +2
    -0
      libs/db/types.go
  9. +1
    -0
      lite/dbprovider.go
  10. +2
    -0
      state/txindex/kv/kv.go

+ 5
- 0
libs/db/c_level_db.go View File

@ -187,6 +187,11 @@ func (mBatch *cLevelDBBatch) WriteSync() {
} }
} }
// Implements Batch.
func (mBatch *cLevelDBBatch) Close() {
mBatch.batch.Close()
}
//---------------------------------------- //----------------------------------------
// Iterator // Iterator
// NOTE This is almost identical to db/go_level_db.Iterator // NOTE This is almost identical to db/go_level_db.Iterator


+ 5
- 0
libs/db/debug_db.go View File

@ -250,3 +250,8 @@ func (dbch debugBatch) WriteSync() {
fmt.Printf("%v.batch.WriteSync()\n", dbch.label) fmt.Printf("%v.batch.WriteSync()\n", dbch.label)
dbch.bch.WriteSync() dbch.bch.WriteSync()
} }
// Implements Batch.
func (dbch debugBatch) Close() {
dbch.bch.Close()
}

+ 4
- 0
libs/db/go_level_db.go View File

@ -184,6 +184,10 @@ func (mBatch *goLevelDBBatch) WriteSync() {
} }
} }
// Implements Batch.
// Close is no-op for goLevelDBBatch.
func (mBatch *goLevelDBBatch) Close() {}
//---------------------------------------- //----------------------------------------
// Iterator // Iterator
// NOTE This is almost identical to db/c_level_db.Iterator // NOTE This is almost identical to db/c_level_db.Iterator


+ 4
- 0
libs/db/mem_batch.go View File

@ -46,6 +46,10 @@ func (mBatch *memBatch) WriteSync() {
mBatch.write(true) mBatch.write(true)
} }
func (mBatch *memBatch) Close() {
mBatch.ops = nil
}
func (mBatch *memBatch) write(doSync bool) { func (mBatch *memBatch) write(doSync bool) {
if mtx := mBatch.db.Mutex(); mtx != nil { if mtx := mBatch.db.Mutex(); mtx != nil {
mtx.Lock() mtx.Lock()


+ 4
- 0
libs/db/prefix_db.go View File

@ -248,6 +248,10 @@ func (pb prefixBatch) WriteSync() {
pb.source.WriteSync() pb.source.WriteSync()
} }
func (pb prefixBatch) Close() {
pb.source.Close()
}
//---------------------------------------- //----------------------------------------
// prefixIterator // prefixIterator


+ 1
- 0
libs/db/remotedb/grpcdb/server.go View File

@ -180,6 +180,7 @@ func (s *server) BatchWriteSync(c context.Context, b *protodb.Batch) (*protodb.N
func (s *server) batchWrite(c context.Context, b *protodb.Batch, sync bool) (*protodb.Nothing, error) { func (s *server) batchWrite(c context.Context, b *protodb.Batch, sync bool) (*protodb.Nothing, error) {
bat := s.db.NewBatch() bat := s.db.NewBatch()
defer bat.Close()
for _, op := range b.Ops { for _, op := range b.Ops {
switch op.Type { switch op.Type {
case protodb.Operation_SET: case protodb.Operation_SET:


+ 4
- 0
libs/db/remotedb/remotedb.go View File

@ -260,3 +260,7 @@ func (bat *batch) WriteSync() {
panic(fmt.Sprintf("RemoteDB.BatchWriteSync: %v", err)) panic(fmt.Sprintf("RemoteDB.BatchWriteSync: %v", err))
} }
} }
func (bat *batch) Close() {
bat.ops = nil
}

+ 2
- 0
libs/db/types.go View File

@ -57,10 +57,12 @@ type DB interface {
//---------------------------------------- //----------------------------------------
// Batch // Batch
// Batch Close must be called when the program no longer needs the object.
type Batch interface { type Batch interface {
SetDeleter SetDeleter
Write() Write()
WriteSync() WriteSync()
Close()
} }
type SetDeleter interface { type SetDeleter interface {


+ 1
- 0
lite/dbprovider.go View File

@ -54,6 +54,7 @@ func (dbp *DBProvider) SaveFullCommit(fc FullCommit) error {
dbp.logger.Info("DBProvider.SaveFullCommit()...", "fc", fc) dbp.logger.Info("DBProvider.SaveFullCommit()...", "fc", fc)
batch := dbp.db.NewBatch() batch := dbp.db.NewBatch()
defer batch.Close()
// Save the fc.validators. // Save the fc.validators.
// We might be overwriting what we already have, but // We might be overwriting what we already have, but


+ 2
- 0
state/txindex/kv/kv.go View File

@ -78,6 +78,7 @@ func (txi *TxIndex) Get(hash []byte) (*types.TxResult, error) {
// AddBatch indexes a batch of transactions using the given list of tags. // AddBatch indexes a batch of transactions using the given list of tags.
func (txi *TxIndex) AddBatch(b *txindex.Batch) error { func (txi *TxIndex) AddBatch(b *txindex.Batch) error {
storeBatch := txi.store.NewBatch() storeBatch := txi.store.NewBatch()
defer storeBatch.Close()
for _, result := range b.Ops { for _, result := range b.Ops {
hash := result.Tx.Hash() hash := result.Tx.Hash()
@ -109,6 +110,7 @@ func (txi *TxIndex) AddBatch(b *txindex.Batch) error {
// Index indexes a single transaction using the given list of tags. // Index indexes a single transaction using the given list of tags.
func (txi *TxIndex) Index(result *types.TxResult) error { func (txi *TxIndex) Index(result *types.TxResult) error {
b := txi.store.NewBatch() b := txi.store.NewBatch()
defer b.Close()
hash := result.Tx.Hash() hash := result.Tx.Hash()


Loading…
Cancel
Save