diff --git a/core/rawdb/ancient_scheme.go b/core/rawdb/ancient_scheme.go index 217f5c32e4..baf9c78074 100644 --- a/core/rawdb/ancient_scheme.go +++ b/core/rawdb/ancient_scheme.go @@ -37,13 +37,13 @@ const ( ChainFreezerReceiptTable = "receipts" ) -// chainFreezerNoSnappy configures whether compression is disabled for the ancient-tables. +// chainFreezerTableConfigs configures whether compression is disabled for the ancient-tables. // Hashes and difficulties don't compress well. -var chainFreezerNoSnappy = map[string]freezerTableConfig{ - ChainFreezerHeaderTable: freezerTableConfig{snappy: false, prunable: false}, - ChainFreezerHashTable: freezerTableConfig{snappy: true, prunable: false}, - ChainFreezerBodiesTable: freezerTableConfig{snappy: false, prunable: true}, - ChainFreezerReceiptTable: freezerTableConfig{snappy: false, prunable: true}, +var chainFreezerTableConfigs = map[string]freezerTableConfig{ + ChainFreezerHeaderTable: {snappy: false, prunable: false}, + ChainFreezerHashTable: {snappy: true, prunable: false}, + ChainFreezerBodiesTable: {snappy: false, prunable: true}, + ChainFreezerReceiptTable: {snappy: false, prunable: true}, } type freezerTableConfig struct { @@ -63,13 +63,13 @@ const ( stateHistoryStorageData = "storage.data" ) -// stateFreezerNoSnappy configures whether compression is disabled for the state freezer. -var stateFreezerNoSnappy = map[string]freezerTableConfig{ - stateHistoryMeta: freezerTableConfig{snappy: true, prunable: false}, - stateHistoryAccountIndex: freezerTableConfig{snappy: false, prunable: false}, - stateHistoryStorageIndex: freezerTableConfig{snappy: false, prunable: false}, - stateHistoryAccountData: freezerTableConfig{snappy: false, prunable: false}, - stateHistoryStorageData: freezerTableConfig{snappy: false, prunable: false}, +// stateFreezerTableConfigs configures whether compression is disabled for the state freezer. +var stateFreezerTableConfigs = map[string]freezerTableConfig{ + stateHistoryMeta: {snappy: true, prunable: false}, + stateHistoryAccountIndex: {snappy: false, prunable: false}, + stateHistoryStorageIndex: {snappy: false, prunable: false}, + stateHistoryAccountData: {snappy: false, prunable: false}, + stateHistoryStorageData: {snappy: false, prunable: false}, } // The list of identifiers of ancient stores. @@ -90,7 +90,7 @@ var freezers = []string{ChainFreezerName, MerkleStateFreezerName, VerkleStateFre // state freezer. func NewStateFreezer(ancientDir string, verkle bool, readOnly bool) (ethdb.ResettableAncientStore, error) { if ancientDir == "" { - return NewMemoryFreezer(readOnly, stateFreezerNoSnappy), nil + return NewMemoryFreezer(readOnly, stateFreezerTableConfigs), nil } var name string if verkle { @@ -98,5 +98,5 @@ func NewStateFreezer(ancientDir string, verkle bool, readOnly bool) (ethdb.Reset } else { name = filepath.Join(ancientDir, MerkleStateFreezerName) } - return newResettableFreezer(name, "eth/db/state", readOnly, stateHistoryTableSize, stateFreezerNoSnappy) + return newResettableFreezer(name, "eth/db/state", readOnly, stateHistoryTableSize, stateFreezerTableConfigs) } diff --git a/core/rawdb/ancient_utils.go b/core/rawdb/ancient_utils.go index ab171309c5..f4909d86e7 100644 --- a/core/rawdb/ancient_utils.go +++ b/core/rawdb/ancient_utils.go @@ -82,7 +82,7 @@ func inspectFreezers(db ethdb.Database) ([]freezerInfo, error) { for _, freezer := range freezers { switch freezer { case ChainFreezerName: - info, err := inspect(ChainFreezerName, chainFreezerNoSnappy, db) + info, err := inspect(ChainFreezerName, chainFreezerTableConfigs, db) if err != nil { return nil, err } @@ -99,7 +99,7 @@ func inspectFreezers(db ethdb.Database) ([]freezerInfo, error) { } defer f.Close() - info, err := inspect(freezer, stateFreezerNoSnappy, f) + info, err := inspect(freezer, stateFreezerTableConfigs, f) if err != nil { return nil, err } @@ -123,9 +123,9 @@ func InspectFreezerTable(ancient string, freezerName string, tableName string, s ) switch freezerName { case ChainFreezerName: - path, tables = resolveChainFreezerDir(ancient), chainFreezerNoSnappy + path, tables = resolveChainFreezerDir(ancient), chainFreezerTableConfigs case MerkleStateFreezerName, VerkleStateFreezerName: - path, tables = filepath.Join(ancient, freezerName), stateFreezerNoSnappy + path, tables = filepath.Join(ancient, freezerName), stateFreezerTableConfigs default: return fmt.Errorf("unknown freezer, supported ones: %v", freezers) } diff --git a/core/rawdb/chain_freezer.go b/core/rawdb/chain_freezer.go index 0627aca34c..f3c671f45a 100644 --- a/core/rawdb/chain_freezer.go +++ b/core/rawdb/chain_freezer.go @@ -62,9 +62,9 @@ func newChainFreezer(datadir string, namespace string, readonly bool) (*chainFre freezer ethdb.AncientStore ) if datadir == "" { - freezer = NewMemoryFreezer(readonly, chainFreezerNoSnappy) + freezer = NewMemoryFreezer(readonly, chainFreezerTableConfigs) } else { - freezer, err = NewFreezer(datadir, namespace, readonly, freezerTableSize, chainFreezerNoSnappy) + freezer, err = NewFreezer(datadir, namespace, readonly, freezerTableSize, chainFreezerTableConfigs) } if err != nil { return nil, err