core: refine code

bnb-chain · Apr 15, 2024 · 5640825 · 5640825
1 parent b76e390
commit 5640825
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
@@ -1197,7 +1197,7 @@ func showMetaData(ctx *cli.Context) error {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error accessing ancients: %v", err)
 	}
-	data := rawdb.ReadChainMetadataCmd(db)
+	data := rawdb.ReadChainMetadataFromMultiDatabase(db)
 	data = append(data, []string{"frozen", fmt.Sprintf("%d items", ancients)})
 	data = append(data, []string{"snapshotGenerator", snapshot.ParseGeneratorStatus(rawdb.ReadSnapshotGenerator(db))})
 	if b := rawdb.ReadHeadBlock(db); b != nil {

diff --git a/core/rawdb/database.go b/core/rawdb/database.go
@@ -1148,7 +1148,7 @@ func ReadChainMetadata(db ethdb.KeyValueStore) [][]string {
 	return data
 }
 
-func ReadChainMetadataCmd(db ethdb.Database) [][]string {
+func ReadChainMetadataFromMultiDatabase(db ethdb.Database) [][]string {
 	pp := func(val *uint64) string {
 		if val == nil {
 			return "<nil>"

diff --git a/node/node.go b/node/node.go
@@ -820,12 +820,12 @@ func (n *Node) OpenAndMergeDatabase(name string, namespace string, readonly bool
 		disableChainDbFreeze = true
 
 		// 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, false, config.PruneAncientData)
+		stateDiskDb, err = n.OpenDatabaseWithFreezer(name+"/state", stateDbCache, stateDbHandles, "", "eth/db/state/", readonly, true, false, config.PruneAncientData)
 		if err != nil {
 			return nil, err
 		}
 
-		blockDb, err = n.OpenDatabaseWithFreezer(name+"/block", blockDbCacheSize, blockDbHandlesSize, "", "eth/db/blockdata/", readonly, false, false, config.PruneAncientData)
+		blockDb, err = n.OpenDatabaseWithFreezer(name+"/block", blockDbCacheSize, blockDbHandlesSize, "", "eth/db/block/", readonly, false, false, config.PruneAncientData)
 		if err != nil {
 			return nil, err
 		}
@@ -913,7 +913,7 @@ func (n *Node) CheckIfMultiDataBase() bool {
 	} else if !stateExist && !blockExist {
 		return false
 	} else {
-		panic("block datadir is missing")
+		panic("data corruption! missing block or state dir.")
 	}
 }