Skip to content

Commit

Permalink
Add DB compaction following the deletion of a DB prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelsutton committed Apr 3, 2022
1 parent ab73def commit 46e7759
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ func (pm *pruningManager) PruningPointAndItsAnticone() ([]*externalapi.DomainHas
return nil, err
}

// By the Prunality proof, The pruning point anticone is a closed set (i.e., guaranteed not to change) ,
// By the Prunality proof, the pruning point anticone is a closed set (i.e., guaranteed not to change) ,
// so we can safely cache it.
if pm.cachedPruningPoint != nil && pm.cachedPruningPoint.Equal(pruningPoint) {
return append([]*externalapi.DomainHash{pruningPoint}, pm.cachedPruningPointAnticone...), nil
Expand Down
14 changes: 10 additions & 4 deletions domain/prefixmanager/prefix.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ func InactivePrefix(dataAccessor database.DataAccessor) (*prefix.Prefix, bool, e
}

// DeleteInactivePrefix deletes all data associated with the inactive database prefix, including itself.
func DeleteInactivePrefix(dataAccessor database.DataAccessor) error {
prefixBytes, err := dataAccessor.Get(inactivePrefixKey)
func DeleteInactivePrefix(db database.Database) error {
prefixBytes, err := db.Get(inactivePrefixKey)
if database.IsNotFoundError(err) {
return nil
}
Expand All @@ -62,12 +62,18 @@ func DeleteInactivePrefix(dataAccessor database.DataAccessor) error {
return err
}

err = deletePrefix(dataAccessor, prefix)
err = deletePrefix(db, prefix)
if err != nil {
return err
}

err = db.Delete(inactivePrefixKey)
if err != nil {
return err
}

return dataAccessor.Delete(inactivePrefixKey)
log.Infof("Compacting database after prefix delete")
return db.Compact()
}

func deletePrefix(dataAccessor database.DataAccessor, prefix *prefix.Prefix) error {
Expand Down
3 changes: 3 additions & 0 deletions infrastructure/db/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ type Database interface {
// Begin begins a new database transaction.
Begin() (Transaction, error)

// Compact compacts the database instance.
Compact() error

// Close closes the database.
Close() error
}
7 changes: 7 additions & 0 deletions infrastructure/db/database/ldb/leveldb.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/syndtr/goleveldb/leveldb"
ldbErrors "github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/opt"
"github.com/syndtr/goleveldb/leveldb/util"
)

// LevelDB defines a thin wrapper around leveldb.
Expand Down Expand Up @@ -47,6 +48,12 @@ func NewLevelDB(path string, cacheSizeMiB int) (*LevelDB, error) {
return db, nil
}

// Compact compacts the leveldb instance.
func (db *LevelDB) Compact() error {
err := db.ldb.CompactRange(util.Range{Start: nil, Limit: nil})
return errors.WithStack(err)
}

// Close closes the leveldb instance.
func (db *LevelDB) Close() error {
err := db.ldb.Close()
Expand Down

0 comments on commit 46e7759

Please sign in to comment.