Compare commits

...

2 Commits

Author SHA1 Message Date
joeylichang
1c8fb28c99 fix: change version db config 2024-10-15 10:25:10 +08:00
joeylichang
6d41ff8190 chore: delete debug info 2024-09-30 16:49:06 +08:00
2 changed files with 4 additions and 21 deletions

View File

@@ -23,7 +23,6 @@ import (
"runtime"
"sort"
"sync"
"sync/atomic"
"time"
"github.com/ethereum/go-ethereum/common"
@@ -1217,7 +1216,6 @@ func (s *StateDB) AccountsIntermediateRoot() {
}()
}
var calcStateObjectCount atomic.Int64
// Although naively it makes sense to retrieve the account trie and then do
// the contract storage and account updates sequentially, that short circuits
// the account prefetcher. Instead, let's process all the storage updates
@@ -1228,9 +1226,6 @@ func (s *StateDB) AccountsIntermediateRoot() {
wg.Add(1)
tasks <- func() {
obj.updateRoot()
if obj.trie != nil {
calcStateObjectCount.Add(1)
}
// Cache the data until commit. Note, this update mechanism is not symmetric
// to the deletion, because whereas it is enough to track account updates
// at commit time, deletions need tracking at transaction boundary level to
@@ -1244,7 +1239,6 @@ func (s *StateDB) AccountsIntermediateRoot() {
}
}
wg.Wait()
log.Info("versa calc root state object", "count", calcStateObjectCount.Load(), "version", s.db.GetVersion()+1)
}
func (s *StateDB) StateIntermediateRoot() common.Hash {
@@ -1625,7 +1619,6 @@ func (s *StateDB) Commit(block uint64, failPostCommitFunc func(), postCommitFunc
}()
}
var committedStateObjectNum atomic.Int64
for addr := range s.stateObjectsDirty {
if obj := s.stateObjects[addr]; !obj.deleted {
tasks <- func() {
@@ -1635,9 +1628,6 @@ func (s *StateDB) Commit(block uint64, failPostCommitFunc func(), postCommitFunc
taskResults <- taskResult{err, nil}
return
} else {
if obj.trie != nil {
committedStateObjectNum.Add(1)
}
taskResults <- taskResult{nil, set}
}
} else {
@@ -1720,7 +1710,6 @@ func (s *StateDB) Commit(block uint64, failPostCommitFunc func(), postCommitFunc
}
}
wg.Wait()
log.Info("versa commit state object", "count", committedStateObjectNum.Load(), "version", s.db.GetVersion()+1)
return nil
}()

View File

@@ -29,20 +29,14 @@ func New(config *Config) *VersionDB {
if config != nil {
path = config.Path
cfg = &versa.VersaDBConfig{
FlushInterval: 2000,
MaxStatesInMem: 128,
MemLowWaterMark: 40,
MemHighWaterMark: 60,
MemEvictInternal: 200,
FlushInterval: 6000,
MaxStatesInMem: 128,
}
_ = cfg
}
db, err := versa.NewVersaDB(path, &versa.VersaDBConfig{
FlushInterval: 2000,
MaxStatesInMem: 128,
MemLowWaterMark: 40,
MemHighWaterMark: 60,
MemEvictInternal: 200,
FlushInterval: 6000,
MaxStatesInMem: 128,
})
if err != nil {
log.Crit("failed to new version db", "error", err)