Skip to content

Caplin: Remove TmpDB from BlockCollector #11215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 18, 2024
Merged

Caplin: Remove TmpDB from BlockCollector #11215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd3ac17
save
Giulio2002 Jul 17, 2024
cad961e
Update block_collector.go
AskAlexSharov Jul 18, 2024
39be1dd
Update block_collector.go
AskAlexSharov Jul 18, 2024
645c1b3
save
AskAlexSharov Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions cl/phase1/execution_client/block_collector/block_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ import (

"github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/etl"
"github.com/ledgerwatch/erigon-lib/kv"
"github.com/ledgerwatch/erigon-lib/kv/dbutils"
"github.com/ledgerwatch/erigon-lib/kv/memdb"
"github.com/ledgerwatch/erigon-lib/log/v3"
"github.com/ledgerwatch/erigon/cl/clparams"
"github.com/ledgerwatch/erigon/cl/cltypes"
Expand Down Expand Up @@ -91,19 +89,11 @@ func (b *blockCollector) Flush(ctx context.Context) error {
if b.size == 0 {
return nil
}
tmpDB := memdb.New(b.tmpdir)
defer tmpDB.Close()
defer b.collector.Close()
tmpTx, err := tmpDB.BeginRw(ctx)
if err != nil {
return err
}
defer tmpTx.Rollback()
blocksBatch := []*types.Block{}

var err error
inserted := uint64(0)

if err := b.collector.Load(tmpTx, kv.Headers, func(k, v []byte, table etl.CurrentTableReader, next etl.LoadNextFunc) error {
if err := b.collector.Load(nil, "", func(k, v []byte, table etl.CurrentTableReader, next etl.LoadNextFunc) error {
if len(v) == 0 {
return nil
}
Expand Down
4 changes: 4 additions & 0 deletions erigon-lib/etl/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ func (c *Collector) Load(db kv.RwTx, toBucket string, loadFunc LoadFunc, args Tr
return nil
}

if bucket == "" {
loadNextFunc = func(_, k, v []byte) error { return nil }
}

currentTable := &currentTableReader{db, bucket}
simpleLoad := func(k, v []byte) error {
return loadFunc(k, v, currentTable, loadNextFunc)
Expand Down