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

Fix for call traces (#1939)

Browse Source 
* Fix for call traces

* Bug to->from

Co-authored-by: Alexey Sharp <alexeysharp@Alexeys-iMac.local>
Co-authored-by: Alex Sharp <alexsharp@Alexs-MacBook-Pro.local>
This commit is contained in:
ledgerwatch 2021-05-15 23:44:29 +01:00 committed by GitHub
parent b47367eb8d
commit a92a449a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eth/stagedsync/stage_call_traces.go
View File

@ -9,7 +9,6 @@ import (
"runtime"
"time"
"github.com/RoaringBitmap/roaring"
"github.com/RoaringBitmap/roaring/roaring64"
"github.com/c2h5oh/datasize"
"github.com/ledgerwatch/turbo-geth/common"
@ -131,7 +130,7 @@ func promoteCallTraces(logPrefix string, tx ethdb.RwTx, startBlock, endBlock uin
m, ok := tos[mapKey]
if !ok {
m = roaring64.New()
froms[mapKey] = m
tos[mapKey] = m
}
m.Add(blockNum)
}
@ -184,9 +183,12 @@ func promoteCallTraces(logPrefix string, tx ethdb.RwTx, startBlock, endBlock uin
}
func finaliseCallTraces(froms, tos map[string]*roaring64.Bitmap, collectorFrom, collectorTo *etl.Collector, logPrefix string, tx ethdb.RwTx, quit <-chan struct{}) error {
var currentBitmap = roaring.New()
var currentBitmap = roaring64.New()
var buf = bytes.NewBuffer(nil)
var loaderFunc = func(k []byte, v []byte, table etl.CurrentTableReader, next etl.LoadNextFunc) error {
if _, err := currentBitmap.ReadFrom(bytes.NewReader(v)); err != nil {
return err
}
lastChunkKey := make([]byte, len(k)+4)
copy(lastChunkKey, k)
binary.BigEndian.PutUint32(lastChunkKey[len(k):], ^uint32(0))
@ -195,19 +197,16 @@ func finaliseCallTraces(froms, tos map[string]*roaring64.Bitmap, collectorFrom,
return fmt.Errorf("find last chunk failed: %w", err)
}
lastChunk := roaring.New()
lastChunk := roaring64.New()
if len(lastChunkBytes) > 0 {
_, err = lastChunk.FromBuffer(lastChunkBytes)
_, err = lastChunk.ReadFrom(bytes.NewReader(lastChunkBytes))
if err != nil {
return fmt.Errorf("couldn't read last log index chunk: %w, len(lastChunkBytes)=%d", err, len(lastChunkBytes))
}
}
if _, err := currentBitmap.FromBuffer(v); err != nil {
return err
}
currentBitmap.Or(lastChunk) // merge last existing chunk from db - next loop will overwrite it
if err := bitmapdb.WalkChunkWithKeys(k, currentBitmap, bitmapdb.ChunkLimit, func(chunkKey []byte, chunk *roaring.Bitmap) error {
if err := bitmapdb.WalkChunkWithKeys64(k, currentBitmap, bitmapdb.ChunkLimit, func(chunkKey []byte, chunk *roaring64.Bitmap) error {
buf.Reset()
if _, err := chunk.WriteTo(buf); err != nil {
return err