mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-29 07:07:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

erigon22: recent history read (#605)

Browse Source
This commit is contained in:
Alex Sharov 2022-08-28 11:25:53 +07:00 committed by GitHub
parent cfd14d0297
commit 588519a33b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
state/aggregator22.go
View File

@ -742,10 +742,25 @@ func (ac *Aggregator22Context) IsMaxCodeTxNum(addr []byte, txNum uint64) bool {
return ac.code.IsMaxTxNum(addr, txNum) return ac.code.IsMaxTxNum(addr, txNum)
} }
func (ac *Aggregator22Context) ReadAccountDataNoStateWithRecent(addr []byte, txNum uint64) ([]byte, bool, error) {
return ac.accounts.GetNoStateWithRecent(addr, txNum, ac.tx)
}
func (ac *Aggregator22Context) ReadAccountDataNoState(addr []byte, txNum uint64) ([]byte, bool, error) { func (ac *Aggregator22Context) ReadAccountDataNoState(addr []byte, txNum uint64) ([]byte, bool, error) {
return ac.accounts.GetNoState(addr, txNum) return ac.accounts.GetNoState(addr, txNum)
} }
func (ac *Aggregator22Context) ReadAccountStorageNoStateWithRecent(addr []byte, loc []byte, txNum uint64) ([]byte, bool, error) {
if cap(ac.keyBuf) < len(addr)+len(loc) {
ac.keyBuf = make([]byte, len(addr)+len(loc))
} else if len(ac.keyBuf) != len(addr)+len(loc) {
ac.keyBuf = ac.keyBuf[:len(addr)+len(loc)]
}
copy(ac.keyBuf, addr)
copy(ac.keyBuf[len(addr):], loc)
return ac.storage.GetNoStateWithRecent(ac.keyBuf, txNum, ac.tx)
}
func (ac *Aggregator22Context) ReadAccountStorageNoState(addr []byte, loc []byte, txNum uint64) ([]byte, bool, error) { func (ac *Aggregator22Context) ReadAccountStorageNoState(addr []byte, loc []byte, txNum uint64) ([]byte, bool, error) {
if cap(ac.keyBuf) < len(addr)+len(loc) { if cap(ac.keyBuf) < len(addr)+len(loc) {
ac.keyBuf = make([]byte, len(addr)+len(loc)) ac.keyBuf = make([]byte, len(addr)+len(loc))
@ -757,10 +772,20 @@ func (ac *Aggregator22Context) ReadAccountStorageNoState(addr []byte, loc []byte
return ac.storage.GetNoState(ac.keyBuf, txNum) return ac.storage.GetNoState(ac.keyBuf, txNum)
} }
func (ac *Aggregator22Context) ReadAccountCodeNoStateWithRecent(addr []byte, txNum uint64) ([]byte, bool, error) {
return ac.code.GetNoStateWithRecent(addr, txNum, ac.tx)
}
func (ac *Aggregator22Context) ReadAccountCodeNoState(addr []byte, txNum uint64) ([]byte, bool, error) { func (ac *Aggregator22Context) ReadAccountCodeNoState(addr []byte, txNum uint64) ([]byte, bool, error) {
return ac.code.GetNoState(addr, txNum) return ac.code.GetNoState(addr, txNum)
} }
func (ac *Aggregator22Context) ReadAccountCodeSizeNoStateWithRecent(addr []byte, txNum uint64) (int, bool, error) {
code, noState, err := ac.code.GetNoStateWithRecent(addr, txNum, ac.tx)
if err != nil {
return 0, false, err
}
return len(code), noState, nil
}
func (ac *Aggregator22Context) ReadAccountCodeSizeNoState(addr []byte, txNum uint64) (int, bool, error) { func (ac *Aggregator22Context) ReadAccountCodeSizeNoState(addr []byte, txNum uint64) (int, bool, error) {
code, noState, err := ac.code.GetNoState(addr, txNum) code, noState, err := ac.code.GetNoState(addr, txNum)
if err != nil { if err != nil {
@ -815,6 +840,8 @@ type Aggregator22Context struct {
logTopics *InvertedIndexContext logTopics *InvertedIndexContext
tracesFrom *InvertedIndexContext tracesFrom *InvertedIndexContext
tracesTo *InvertedIndexContext tracesTo *InvertedIndexContext
tx kv.Tx
} }
func (a *Aggregator22) MakeContext() *Aggregator22Context { func (a *Aggregator22) MakeContext() *Aggregator22Context {
@ -829,3 +856,4 @@ func (a *Aggregator22) MakeContext() *Aggregator22Context {
tracesTo: a.tracesTo.MakeContext(), tracesTo: a.tracesTo.MakeContext(),
} }
} }
func (ac *Aggregator22Context) SetTx(tx kv.Tx) { ac.tx = tx }

43
state/history.go
View File

@ -597,6 +597,8 @@ func (h *History) pruneF(txFrom, txTo uint64, f func(txNum uint64, k, v []byte)
type HistoryContext struct { type HistoryContext struct {
h *History h *History
indexFiles, historyFiles *btree.BTreeG[*ctxItem] indexFiles, historyFiles *btree.BTreeG[*ctxItem]
tx kv.Tx
} }
func (h *History) MakeContext() *HistoryContext { func (h *History) MakeContext() *HistoryContext {
@ -623,6 +625,47 @@ func (h *History) MakeContext() *HistoryContext {
}) })
return &hc return &hc
} }
func (hc *HistoryContext) SetTx(tx kv.Tx) { hc.tx = tx }
func (hc *HistoryContext) getNoStateFromDB(key []byte, txNum uint64, tx kv.Tx) ([]byte, bool, error) {
var txKey [8]byte
binary.BigEndian.PutUint64(txKey[:], txNum)
historyKeysCursor, err := tx.CursorDupSort(hc.h.indexKeysTable)
if err != nil {
return nil, false, fmt.Errorf("create %s history cursor: %w", hc.h.filenameBase, err)
}
defer historyKeysCursor.Close()
valsC, err := tx.Cursor(hc.h.historyValsTable)
if err != nil {
return nil, false, err
}
defer valsC.Close()
v, err := historyKeysCursor.SeekBothRange(txKey[:], key)
if err != nil {
return nil, false, err
}
if len(v) > 0 {
key2, txnNumBytes := v[:len(v)-8], v[len(v)-8:]
_ = key2
_, vv, err := valsC.SeekExact(txnNumBytes)
if err != nil {
return nil, false, err
}
return vv, vv != nil, nil
}
return nil, false, nil
}
func (hc *HistoryContext) GetNoStateWithRecent(key []byte, txNum uint64, tx kv.Tx) ([]byte, bool, error) {
enc, ok, err := hc.getNoStateFromDB(key, txNum, tx)
if err != nil {
return nil, false, err
}
if ok {
return enc, true, nil
}
return hc.GetNoState(key, txNum)
}
func (hc *HistoryContext) GetNoState(key []byte, txNum uint64) ([]byte, bool, error) { func (hc *HistoryContext) GetNoState(key []byte, txNum uint64) ([]byte, bool, error) {
//fmt.Printf("GetNoState [%x] %d\n", key, txNum) //fmt.Printf("GetNoState [%x] %d\n", key, txNum)