forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 05:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

no log

Browse source 
Signed-off-by: Delweng <delweng@gmail.com>
This commit is contained in:
Delweng 2025-07-24 23:50:35 +08:00 committed by jsvisa
parent 1c693226b8
commit fcb657fff4
3 changed files with 16 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
triedb/pathdb/history_index.go
View file

@ -21,7 +21,6 @@ import (
"fmt"
"math"
"sort"
"time"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/ethdb"
@ -75,13 +74,11 @@ type indexReader struct {
descList []*indexBlockDesc
readers map[uint32]*blockReader
state stateIdent
timings *readTimings
cacher *historyCacher
}
// loadIndexData loads the index data associated with the specified state.
func loadIndexData(db ethdb.KeyValueReader, state stateIdent, timings *readTimings, cacher *historyCacher) ([]*indexBlockDesc, error) {
start := time.Now()
func loadIndexData(db ethdb.KeyValueReader, state stateIdent, cacher *historyCacher) ([]*indexBlockDesc, error) {
key := state.CacheKey()
var blob []byte
if cacher != nil && cacher.index.Contains(key) {
@ -93,9 +90,6 @@ func loadIndexData(db ethdb.KeyValueReader, state stateIdent, timings *readTimin
blob = rawdb.ReadStorageHistoryIndex(db, state.addressHash, state.storageHash)
}
}
if timings != nil {
timings.kvdbIndex = time.Since(start)
}
if len(blob) == 0 {
return nil, nil
}
@ -108,12 +102,7 @@ func loadIndexData(db ethdb.KeyValueReader, state stateIdent, timings *readTimin
// newIndexReader constructs a index reader for the specified state. Reader with
// empty data is allowed.
func newIndexReader(db ethdb.KeyValueReader, state stateIdent, cacher *historyCacher) (*indexReader, error) {
return newIndexReaderWithTimings(db, state, nil, cacher)
}
// Helper to allow passing timings
func newIndexReaderWithTimings(db ethdb.KeyValueReader, state stateIdent, timings *readTimings, cacher *historyCacher) (*indexReader, error) {
descList, err := loadIndexData(db, state, timings, cacher)
descList, err := loadIndexData(db, state, cacher)
if err != nil {
return nil, err
}
@ -122,7 +111,6 @@ func newIndexReaderWithTimings(db ethdb.KeyValueReader, state stateIdent, timing
readers: make(map[uint32]*blockReader),
db: db,
state: state,
timings: timings,
cacher: cacher,
}, nil
}
@ -138,7 +126,7 @@ func (r *indexReader) refresh() error {
delete(r.readers, last.id)
}
}
descList, err := loadIndexData(r.db, r.state, r.timings, nil)
descList, err := loadIndexData(r.db, r.state, nil)
if err != nil {
return err
}
@ -163,7 +151,6 @@ func (r *indexReader) readGreaterThan(id uint64) (uint64, error) {
err error
blob []byte
)
start := time.Now()
key := fmt.Sprintf("%s:%d", r.state.CacheKey(), desc.id)
if r.cacher != nil && r.cacher.block.Contains(key) {
blob, _ = r.cacher.block.Get(key)
@ -178,9 +165,6 @@ func (r *indexReader) readGreaterThan(id uint64) (uint64, error) {
r.cacher.block.Add(key, blob)
}
}
if r.timings != nil {
r.timings.kvdbBlock = time.Since(start)
}
br, err = newBlockReader(blob)
if err != nil {
return 0, err

7
triedb/pathdb/history_indexer.go
View file

@ -208,7 +208,6 @@ func (b *batchIndexer) finish(force bool) error {
if err := eg.Wait(); err != nil {
return err
}
mtime := time.Now()
// Update the position of last indexed state history
if !b.delete {
@ -220,14 +219,10 @@ func (b *batchIndexer) finish(force bool) error {
storeIndexMetadata(batch, b.lastID-1)
}
}
wtime := time.Now()
if err := batch.Write(); err != nil {
return err
}
log.Debug("Committed batch indexer", "accounts", len(b.accounts), "storages", storages, "records", b.counter, "elapsed", common.PrettyDuration(time.Since(start)),
"mtime", common.PrettyDuration(mtime.Sub(start)),
"utime", common.PrettyDuration(wtime.Sub(mtime)),
"wtime", common.PrettyDuration(time.Since(wtime)))
log.Debug("Committed batch indexer", "accounts", len(b.accounts), "storages", storages, "records", b.counter, "elapsed", common.PrettyDuration(time.Since(start)))
b.counter = 0
b.accounts = make(map[common.Hash][]uint64)
b.storages = make(map[common.Hash]map[common.Hash][]uint64)

69
triedb/pathdb/history_reader.go
View file

@ -23,14 +23,12 @@ import (
"fmt"
"math"
"sort"
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/lru"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/log"
)
// stateIdent represents the identifier of a state element, which can be
@ -134,9 +132,8 @@ type indexReaderWithLimitTag struct {
}
// newIndexReaderWithLimitTag constructs a index reader with indexing position.
// Add timings parameter to pass through
func newIndexReaderWithLimitTag(db ethdb.KeyValueReader, state stateIdent, limit uint64, timings *readTimings, cacher *historyCacher) (*indexReaderWithLimitTag, error) {
r, err := newIndexReaderWithTimings(db, state, timings, cacher)
func newIndexReaderWithLimitTag(db ethdb.KeyValueReader, state stateIdent, limit uint64, cacher *historyCacher) (*indexReaderWithLimitTag, error) {
r, err := newIndexReader(db, state, cacher)
if err != nil {
return nil, err
}
@ -226,24 +223,10 @@ func newHistoryReader(disk ethdb.KeyValueReader, freezer ethdb.AncientReader, ca
}
}
// Struct to collect timing info for account or storage read
type readTimings struct {
kvdbMeta time.Duration
kvdbIndex time.Duration
kvdbBlock time.Duration
frdbIndex time.Duration
frdbHistory time.Duration
frdbMeta time.Duration
}
// readAccountMetadata resolves the account metadata within the specified
// state history.
func (r *historyReader) readAccountMetadata(address common.Address, historyID uint64, timings *readTimings) ([]byte, error) {
start := time.Now()
func (r *historyReader) readAccountMetadata(address common.Address, historyID uint64) ([]byte, error) {
blob := rawdb.ReadStateAccountIndex(r.freezer, historyID)
if timings != nil {
timings.frdbIndex = time.Since(start)
}
if len(blob) == 0 {
return nil, fmt.Errorf("account index is truncated, historyID: %d", historyID)
}
@ -268,13 +251,9 @@ func (r *historyReader) readAccountMetadata(address common.Address, historyID ui
// readStorageMetadata resolves the storage slot metadata within the specified
// state history.
func (r *historyReader) readStorageMetadata(storageKey common.Hash, storageHash common.Hash, historyID uint64, slotOffset, slotNumber int, timings *readTimings) ([]byte, error) {
func (r *historyReader) readStorageMetadata(storageKey common.Hash, storageHash common.Hash, historyID uint64, slotOffset, slotNumber int) ([]byte, error) {
// TODO(rj493456442) optimize it with partial read
start := time.Now()
blob := rawdb.ReadStateStorageIndex(r.freezer, historyID)
if timings != nil {
timings.frdbIndex = time.Since(start)
}
if len(blob) == 0 {
return nil, fmt.Errorf("storage index is truncated, historyID: %d", historyID)
}
@ -291,11 +270,7 @@ func (r *historyReader) readStorageMetadata(storageKey common.Hash, storageHash
m meta
target common.Hash
)
startMeta := time.Now()
blob = rawdb.ReadStateHistoryMeta(r.freezer, historyID)
if timings != nil {
timings.frdbMeta = time.Since(startMeta)
}
if err := m.decode(blob); err != nil {
return nil, err
}
@ -319,8 +294,8 @@ func (r *historyReader) readStorageMetadata(storageKey common.Hash, storageHash
}
// readAccount retrieves the account data from the specified state history.
func (r *historyReader) readAccount(address common.Address, historyID uint64, timings *readTimings) ([]byte, error) {
metadata, err := r.readAccountMetadata(address, historyID, timings)
func (r *historyReader) readAccount(address common.Address, historyID uint64) ([]byte, error) {
metadata, err := r.readAccountMetadata(address, historyID)
if err != nil {
return nil, err
}
@ -328,11 +303,7 @@ func (r *historyReader) readAccount(address common.Address, historyID uint64, ti
offset := int(binary.BigEndian.Uint32(metadata[common.AddressLength+1 : common.AddressLength+5])) // four bytes for the account data offset
// TODO(rj493456442) optimize it with partial read
start := time.Now()
data := rawdb.ReadStateAccountHistory(r.freezer, historyID)
if timings != nil {
timings.frdbHistory = time.Since(start)
}
if len(data) < length+offset {
return nil, fmt.Errorf("account data is truncated, address: %#x, historyID: %d, size: %d, offset: %d, len: %d", address, historyID, len(data), offset, length)
}
@ -340,8 +311,8 @@ func (r *historyReader) readAccount(address common.Address, historyID uint64, ti
}
// readStorage retrieves the storage slot data from the specified state history.
func (r *historyReader) readStorage(address common.Address, storageKey common.Hash, storageHash common.Hash, historyID uint64, timings *readTimings) ([]byte, error) {
metadata, err := r.readAccountMetadata(address, historyID, nil) // No timings for account metadata in storage read
func (r *historyReader) readStorage(address common.Address, storageKey common.Hash, storageHash common.Hash, historyID uint64) ([]byte, error) {
metadata, err := r.readAccountMetadata(address, historyID)
if err != nil {
return nil, err
}
@ -352,7 +323,7 @@ func (r *historyReader) readStorage(address common.Address, storageKey common.Ha
slotIndexOffset := int(binary.BigEndian.Uint32(metadata[common.AddressLength+5 : common.AddressLength+9]))
slotIndexNumber := int(binary.BigEndian.Uint32(metadata[common.AddressLength+9 : common.AddressLength+13]))
slotMetadata, err := r.readStorageMetadata(storageKey, storageHash, historyID, slotIndexOffset, slotIndexNumber, timings)
slotMetadata, err := r.readStorageMetadata(storageKey, storageHash, historyID, slotIndexOffset, slotIndexNumber)
if err != nil {
return nil, err
}
@ -360,11 +331,7 @@ func (r *historyReader) readStorage(address common.Address, storageKey common.Ha
offset := int(binary.BigEndian.Uint32(slotMetadata[common.HashLength+1 : common.HashLength+5])) // four bytes for slot data offset
// TODO(rj493456442) optimize it with partial read
start := time.Now()
data := rawdb.ReadStateStorageHistory(r.freezer, historyID)
if timings != nil {
timings.frdbHistory = time.Since(start)
}
if len(data) < offset+length {
return nil, fmt.Errorf("storage data is truncated, address: %#x, key: %#x, historyID: %d, size: %d, offset: %d, len: %d", address, storageKey, historyID, len(data), offset, length)
}
@ -376,8 +343,6 @@ func (r *historyReader) readStorage(address common.Address, storageKey common.Ha
// lastID: represents the ID of the latest/newest state history;
// latestValue: represents the state value at the current disk layer with ID == lastID;
func (r *historyReader) read(state stateIdentQuery, stateID uint64, lastID uint64, latestValue []byte) ([]byte, error) {
origin := time.Now()
timings := &readTimings{}
tail, err := r.freezer.Tail()
if err != nil {
return nil, err
@ -391,9 +356,7 @@ func (r *historyReader) read(state stateIdentQuery, stateID uint64, lastID uint6
// To serve the request, all state histories from stateID+1 to lastID
// must be indexed. It's not supposed to happen unless system is very
// wrong.
start := time.Now()
metadata := loadIndexMetadata(r.disk)
timings.kvdbMeta = time.Since(start)
if metadata == nil || metadata.Last < lastID {
indexed := "null"
if metadata != nil {
@ -406,13 +369,12 @@ func (r *historyReader) read(state stateIdentQuery, stateID uint64, lastID uint6
// state retrieval
ir, ok := r.readers[state.String()]
if !ok {
ir, err = newIndexReaderWithLimitTag(r.disk, state.stateIdent, metadata.Last, timings, r.cacher)
ir, err = newIndexReaderWithLimitTag(r.disk, state.stateIdent, metadata.Last, r.cacher)
if err != nil {
return nil, err
}
r.readers[state.String()] = ir
}
ir.reader.timings = timings
historyID, err := ir.readGreaterThan(stateID, lastID)
if err != nil {
return nil, err
@ -428,17 +390,10 @@ func (r *historyReader) read(state stateIdentQuery, stateID uint64, lastID uint6
// Such truncation should be captured by the state resolver below, rather than returning
// invalid data.
var result []byte
var item string
if state.account {
item = "account"
result, err = r.readAccount(state.address, historyID, timings)
result, err = r.readAccount(state.address, historyID)
} else {
item = "storage"
result, err = r.readStorage(state.address, state.storageKey, state.storageHash, historyID, timings)
result, err = r.readStorage(state.address, state.storageKey, state.storageHash, historyID)
}
log.Info("HistoryRead", "item", item, "elapsed", time.Since(origin),
"kvdbMeta", timings.kvdbMeta, "kvdbIndex", timings.kvdbIndex, "kvdbBlock", timings.kvdbBlock,
"frdbIndex", timings.frdbIndex, "frdbHistory", timings.frdbHistory, "frdbMeta", timings.frdbMeta,
)
return result, err
}