Skip to content

Commit 6231a93

Browse files
Caplin: Remove TmpDB from BlockCollector (#11215)
Co-authored-by: Alex Sharov <[email protected]>
1 parent 5521c78 commit 6231a93

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

cl/phase1/execution_client/block_collector/block_collector.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ import (
2323

2424
"github.com/ledgerwatch/erigon-lib/common"
2525
"github.com/ledgerwatch/erigon-lib/etl"
26-
"github.com/ledgerwatch/erigon-lib/kv"
2726
"github.com/ledgerwatch/erigon-lib/kv/dbutils"
28-
"github.com/ledgerwatch/erigon-lib/kv/memdb"
2927
"github.com/ledgerwatch/erigon-lib/log/v3"
3028
"github.com/ledgerwatch/erigon/cl/clparams"
3129
"github.com/ledgerwatch/erigon/cl/cltypes"
@@ -91,19 +89,11 @@ func (b *blockCollector) Flush(ctx context.Context) error {
9189
if b.size == 0 {
9290
return nil
9391
}
94-
tmpDB := memdb.New(b.tmpdir)
95-
defer tmpDB.Close()
96-
defer b.collector.Close()
97-
tmpTx, err := tmpDB.BeginRw(ctx)
98-
if err != nil {
99-
return err
100-
}
101-
defer tmpTx.Rollback()
10292
blocksBatch := []*types.Block{}
103-
93+
var err error
10494
inserted := uint64(0)
10595

106-
if err := b.collector.Load(tmpTx, kv.Headers, func(k, v []byte, table etl.CurrentTableReader, next etl.LoadNextFunc) error {
96+
if err := b.collector.Load(nil, "", func(k, v []byte, table etl.CurrentTableReader, next etl.LoadNextFunc) error {
10797
if len(v) == 0 {
10898
return nil
10999
}

erigon-lib/etl/collector.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,10 @@ func (c *Collector) Load(db kv.RwTx, toBucket string, loadFunc LoadFunc, args Tr
257257
return nil
258258
}
259259

260+
if bucket == "" {
261+
loadNextFunc = func(_, k, v []byte) error { return nil }
262+
}
263+
260264
currentTable := &currentTableReader{db, bucket}
261265
simpleLoad := func(k, v []byte) error {
262266
return loadFunc(k, v, currentTable, loadNextFunc)

0 commit comments

Comments
 (0)