Skip to content

Commit

Permalink
core, trie: cleanup trie database (#28062)
Browse files Browse the repository at this point in the history
  • Loading branch information
rjl493456442 authored Sep 7, 2023
1 parent a8d7201 commit a7842c9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 26 deletions.
9 changes: 8 additions & 1 deletion core/state/statedb.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ type StateDB struct {
StorageUpdated int
AccountDeleted int
StorageDeleted int

// Testing hooks
onCommit func(states *triestate.Set) // Hook invoked when commit is performed
}

// New creates a new state from a given trie.
Expand Down Expand Up @@ -1276,13 +1279,17 @@ func (s *StateDB) Commit(block uint64, deleteEmptyObjects bool) (common.Hash, er
}
if root != origin {
start := time.Now()
if err := s.db.TrieDB().Update(root, origin, block, nodes, triestate.New(s.accountsOrigin, s.storagesOrigin, incomplete)); err != nil {
set := triestate.New(s.accountsOrigin, s.storagesOrigin, incomplete)
if err := s.db.TrieDB().Update(root, origin, block, nodes, set); err != nil {
return common.Hash{}, err
}
s.originalRoot = root
if metrics.EnabledExpensive {
s.TrieDBCommits += time.Since(start)
}
if s.onCommit != nil {
s.onCommit(set)
}
}
// Clear all internal flags at the end of commit operation.
s.accounts = make(map[common.Hash][]byte)
Expand Down
4 changes: 3 additions & 1 deletion core/state/statedb_fuzz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func (test *stateTest) run() bool {
storageList = append(storageList, copy2DSet(states.Storages))
}
disk = rawdb.NewMemoryDatabase()
tdb = trie.NewDatabase(disk, &trie.Config{OnCommit: onCommit, PathDB: pathdb.Defaults})
tdb = trie.NewDatabase(disk, &trie.Config{PathDB: pathdb.Defaults})
sdb = NewDatabaseWithNodeDB(disk, tdb)
byzantium = rand.Intn(2) == 0
)
Expand All @@ -206,6 +206,8 @@ func (test *stateTest) run() bool {
if err != nil {
panic(err)
}
state.onCommit = onCommit

for i, action := range actions {
if i%test.chunk == 0 && i != 0 {
if byzantium {
Expand Down
20 changes: 0 additions & 20 deletions trie/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ type Config struct {
Preimages bool // Flag whether the preimage of node key is recorded
HashDB *hashdb.Config // Configs for hash-based scheme
PathDB *pathdb.Config // Configs for experimental path-based scheme

// Testing hooks
OnCommit func(states *triestate.Set) // Hook invoked when commit is performed
}

// HashDefaults represents a config for using hash-based scheme with
Expand Down Expand Up @@ -88,20 +85,6 @@ type Database struct {
backend backend // The backend for managing trie nodes
}

// prepare initializes the database with provided configs, but the
// database backend is still left as nil.
func prepare(diskdb ethdb.Database, config *Config) *Database {
var preimages *preimageStore
if config != nil && config.Preimages {
preimages = newPreimageStore(diskdb)
}
return &Database{
config: config,
diskdb: diskdb,
preimages: preimages,
}
}

// NewDatabase initializes the trie database with default settings, note
// the legacy hash-based scheme is used by default.
func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
Expand Down Expand Up @@ -149,9 +132,6 @@ func (db *Database) Reader(blockRoot common.Hash) (Reader, error) {
// The passed in maps(nodes, states) will be retained to avoid copying everything.
// Therefore, these maps must not be changed afterwards.
func (db *Database) Update(root common.Hash, parent common.Hash, block uint64, nodes *trienode.MergedNodeSet, states *triestate.Set) error {
if db.config != nil && db.config.OnCommit != nil {
db.config.OnCommit(states)
}
if db.preimages != nil {
db.preimages.commit(false)
}
Expand Down
13 changes: 9 additions & 4 deletions trie/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,16 @@ import (

// newTestDatabase initializes the trie database with specified scheme.
func newTestDatabase(diskdb ethdb.Database, scheme string) *Database {
db := prepare(diskdb, nil)
config := &Config{Preimages: false}
if scheme == rawdb.HashScheme {
db.backend = hashdb.New(diskdb, &hashdb.Config{}, mptResolver{})
config.HashDB = &hashdb.Config{
CleanCacheSize: 0,
} // disable clean cache
} else {
db.backend = pathdb.New(diskdb, &pathdb.Config{}) // disable clean/dirty cache
config.PathDB = &pathdb.Config{
CleanCacheSize: 0,
DirtyCacheSize: 0,
} // disable clean/dirty cache
}
return db
return NewDatabase(diskdb, config)
}

0 comments on commit a7842c9

Please sign in to comment.