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

index writer/deleter also read from cache

Browse source 
Signed-off-by: Delweng <delweng@gmail.com>
This commit is contained in:
Delweng 2025-07-24 15:43:12 +08:00 committed by jsvisa
parent 26a17bc410
commit da3abe3fe7
1 changed files with 49 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
triedb/pathdb/history_index.go
View file

@ -80,11 +80,11 @@ type indexReader struct {
} }
// loadIndexData loads the index data associated with the specified state. // loadIndexData loads the index data associated with the specified state.
func loadIndexData(db ethdb.KeyValueReader, state stateIdent, timings *readTimings, cacheRead bool, cacher *historyCacher) ([]*indexBlockDesc, error) { func loadIndexData(db ethdb.KeyValueReader, state stateIdent, timings *readTimings, cacher *historyCacher) ([]*indexBlockDesc, error) {
start := time.Now() start := time.Now()
key := state.String() key := state.String()
var blob []byte var blob []byte
if cacheRead && cacher != nil && cacher.index.Contains(key) { if cacher != nil && cacher.index.Contains(key) {
blob, _ = cacher.index.Get(key) blob, _ = cacher.index.Get(key)
} else { } else {
if state.account { if state.account {
@ -113,7 +113,7 @@ func newIndexReader(db ethdb.KeyValueReader, state stateIdent, cacher *historyCa
// Helper to allow passing timings // Helper to allow passing timings
func newIndexReaderWithTimings(db ethdb.KeyValueReader, state stateIdent, timings *readTimings, cacher *historyCacher) (*indexReader, error) { func newIndexReaderWithTimings(db ethdb.KeyValueReader, state stateIdent, timings *readTimings, cacher *historyCacher) (*indexReader, error) {
descList, err := loadIndexData(db, state, timings, true, cacher) descList, err := loadIndexData(db, state, timings, cacher)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -138,7 +138,7 @@ func (r *indexReader) refresh() error {
delete(r.readers, last.id) delete(r.readers, last.id)
} }
} }
descList, err := loadIndexData(r.db, r.state, r.timings, false, r.cacher) descList, err := loadIndexData(r.db, r.state, r.timings, nil)
if err != nil { if err != nil {
return err return err
} }
@ -211,10 +211,19 @@ type indexWriter struct {
// newIndexWriter constructs the index writer for the specified state. // newIndexWriter constructs the index writer for the specified state.
func newIndexWriter(db ethdb.KeyValueReader, state stateIdent, cacher *historyCacher) (*indexWriter, error) { func newIndexWriter(db ethdb.KeyValueReader, state stateIdent, cacher *historyCacher) (*indexWriter, error) {
var blob []byte var blob []byte
if state.account {
blob = rawdb.ReadAccountHistoryIndex(db, state.addressHash) key := state.String()
if cacher != nil && cacher.index.Contains(key) {
blob, _ = cacher.index.Get(key)
} else { } else {
blob = rawdb.ReadStorageHistoryIndex(db, state.addressHash, state.storageHash) if state.account {
blob = rawdb.ReadAccountHistoryIndex(db, state.addressHash)
} else {
blob = rawdb.ReadStorageHistoryIndex(db, state.addressHash, state.storageHash)
}
if cacher != nil {
cacher.index.Add(key, blob)
}
} }
if len(blob) == 0 { if len(blob) == 0 {
desc := newIndexBlockDesc(0) desc := newIndexBlockDesc(0)
@ -235,10 +244,18 @@ func newIndexWriter(db ethdb.KeyValueReader, state stateIdent, cacher *historyCa
indexBlock []byte indexBlock []byte
lastDesc = descList[len(descList)-1] lastDesc = descList[len(descList)-1]
) )
if state.account { key = fmt.Sprintf("%s:%d", state.String(), lastDesc.id)
indexBlock = rawdb.ReadAccountHistoryIndexBlock(db, state.addressHash, lastDesc.id) if cacher != nil && cacher.block.Contains(key) {
indexBlock, _ = cacher.block.Get(key)
} else { } else {
indexBlock = rawdb.ReadStorageHistoryIndexBlock(db, state.addressHash, state.storageHash, lastDesc.id) if state.account {
indexBlock = rawdb.ReadAccountHistoryIndexBlock(db, state.addressHash, lastDesc.id)
} else {
indexBlock = rawdb.ReadStorageHistoryIndexBlock(db, state.addressHash, state.storageHash, lastDesc.id)
}
if cacher != nil {
cacher.block.Add(key, indexBlock)
}
} }
bw, err := newBlockWriter(indexBlock, lastDesc) bw, err := newBlockWriter(indexBlock, lastDesc)
if err != nil { if err != nil {
@ -352,10 +369,18 @@ type indexDeleter struct {
// newIndexDeleter constructs the index deleter for the specified state. // newIndexDeleter constructs the index deleter for the specified state.
func newIndexDeleter(db ethdb.KeyValueReader, state stateIdent, cacher *historyCacher) (*indexDeleter, error) { func newIndexDeleter(db ethdb.KeyValueReader, state stateIdent, cacher *historyCacher) (*indexDeleter, error) {
var blob []byte var blob []byte
if state.account { key := state.String()
blob = rawdb.ReadAccountHistoryIndex(db, state.addressHash) if cacher != nil && cacher.index.Contains(key) {
blob, _ = cacher.index.Get(key)
} else { } else {
blob = rawdb.ReadStorageHistoryIndex(db, state.addressHash, state.storageHash) if state.account {
blob = rawdb.ReadAccountHistoryIndex(db, state.addressHash)
} else {
blob = rawdb.ReadStorageHistoryIndex(db, state.addressHash, state.storageHash)
}
if cacher != nil {
cacher.index.Add(key, blob)
}
} }
if len(blob) == 0 { if len(blob) == 0 {
// TODO(rjl493456442) we can probably return an error here, // TODO(rjl493456442) we can probably return an error here,
@ -378,10 +403,18 @@ func newIndexDeleter(db ethdb.KeyValueReader, state stateIdent, cacher *historyC
indexBlock []byte indexBlock []byte
lastDesc = descList[len(descList)-1] lastDesc = descList[len(descList)-1]
) )
if state.account { key = fmt.Sprintf("%s:%d", state.String(), lastDesc.id)
indexBlock = rawdb.ReadAccountHistoryIndexBlock(db, state.addressHash, lastDesc.id) if cacher != nil && cacher.block.Contains(key) {
indexBlock, _ = cacher.block.Get(key)
} else { } else {
indexBlock = rawdb.ReadStorageHistoryIndexBlock(db, state.addressHash, state.storageHash, lastDesc.id) if state.account {
indexBlock = rawdb.ReadAccountHistoryIndexBlock(db, state.addressHash, lastDesc.id)
} else {
indexBlock = rawdb.ReadStorageHistoryIndexBlock(db, state.addressHash, state.storageHash, lastDesc.id)
}
if cacher != nil {
cacher.block.Add(key, indexBlock)
}
} }
bw, err := newBlockWriter(indexBlock, lastDesc) bw, err := newBlockWriter(indexBlock, lastDesc)
if err != nil { if err != nil {