Skip to content

ethdb: fix disable freezer when enable multidb #3233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzzckck merged 3 commits into from
Jul 18, 2025
Merged

ethdb: fix disable freezer when enable multidb #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
994c12c
ethdb: fix disable freezer when enable multidb
flywukong Jul 15, 2025
81071ea
ethdb: fix inspect freezer table of multidb
flywukong Jul 16, 2025
93705c1
ethdb: fix inspect history
flywukong Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/geth/dbcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ func inspectHistory(ctx *cli.Context) error {
if header == nil {
return 0, fmt.Errorf("block #%d is not existent", blockNumber)
}
id := rawdb.ReadStateID(db, header.Root)
id := rawdb.ReadStateID(db.GetStateStore(), header.Root)
if id == nil {
first, last, err := triedb.HistoryRange()
if err == nil {
Expand Down
6 changes: 1 addition & 5 deletions core/rawdb/ancient_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,7 @@ func InspectFreezerTable(ancient string, freezerName string, tableName string, s
)
switch freezerName {
case ChainFreezerName:
if multiDatabase {
path, tables = resolveChainFreezerDir(filepath.Dir(ancient)+"/block/ancient"), chainFreezerNoSnappy
} else {
path, tables = resolveChainFreezerDir(ancient), chainFreezerNoSnappy
}
path, tables = resolveChainFreezerDir(ancient), chainFreezerNoSnappy

case MerkleStateFreezerName, VerkleStateFreezerName:
if multiDatabase {
Expand Down
6 changes: 2 additions & 4 deletions node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@ func (n *Node) OpenAndMergeDatabase(name string, namespace string, readonly bool
var (
err error
stateDiskDb ethdb.Database
disableChainDbFreeze = false
chainDataHandles = config.DatabaseHandles
chainDbCache = config.DatabaseCache
stateDbCache, stateDbHandles int
Expand All @@ -791,17 +790,16 @@ func (n *Node) OpenAndMergeDatabase(name string, namespace string, readonly bool

stateDbCache = config.DatabaseCache - chainDbCache
stateDbHandles = config.DatabaseHandles - chainDataHandles
disableChainDbFreeze = true
}

chainDB, err := n.OpenDatabaseWithFreezer(name, chainDbCache, chainDataHandles, config.DatabaseFreezer, namespace, readonly, disableChainDbFreeze)
chainDB, err := n.OpenDatabaseWithFreezer(name, chainDbCache, chainDataHandles, config.DatabaseFreezer, namespace, readonly, false)
if err != nil {
return nil, err
}

if isMultiDatabase {
// Allocate half of the handles and chainDbCache to this separate state data database
stateDiskDb, err = n.OpenDatabaseWithFreezer(name+"/state", stateDbCache, stateDbHandles, "", "eth/db/statedata/", readonly, true)
stateDiskDb, err = n.OpenDatabaseWithFreezer(name+"/state", stateDbCache, stateDbHandles, "", "eth/db/statedata/", readonly, false)
if err != nil {
return nil, err
}
Expand Down