Skip to content

Commit 73f46a5

Browse files
author
Abdul Rabbani
committed
Remove the need to pass a transaction when upserting to known_gaps
Thanks Ian :D
1 parent bca12f9 commit 73f46a5

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

statediff/indexer/database/sql/indexer.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -562,18 +562,8 @@ func (sdi *StateDiffIndexer) PushKnownGaps(startingBlockNumber *big.Int, endingB
562562
CheckedOut: checkedOut,
563563
ProcessingKey: processingKey,
564564
}
565-
tx, err := sdi.dbWriter.db.Begin(sdi.ctx)
566-
if err != nil {
567-
return err
568-
}
569-
570-
if err := sdi.dbWriter.upsertKnownGaps(tx, knownGap); err != nil {
565+
if err := sdi.dbWriter.upsertKnownGaps(knownGap); err != nil {
571566
return err
572567
}
573-
574-
if err := tx.Commit(sdi.ctx); err != nil {
575-
return err
576-
}
577-
578568
return nil
579569
}

statediff/indexer/database/sql/writer.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package sql
1818

1919
import (
20+
"context"
2021
"fmt"
2122

2223
"github.com/ethereum/go-ethereum/common"
@@ -183,14 +184,12 @@ func (w *Writer) upsertStorageCID(tx Tx, storageCID models.StorageNodeModel) err
183184
return nil
184185
}
185186

186-
func (w *Writer) upsertKnownGaps(tx Tx, knownGaps models.KnownGapsModel) error {
187-
res, err := tx.Exec(w.db.Context(), w.db.InsertKnownGapsStm(),
187+
func (w *Writer) upsertKnownGaps(knownGaps models.KnownGapsModel) error {
188+
_, err := w.db.Exec(context.Background(), w.db.InsertKnownGapsStm(),
188189
knownGaps.StartingBlockNumber, knownGaps.EndingBlockNumber, knownGaps.CheckedOut, knownGaps.ProcessingKey)
189190
if err != nil {
190191
return fmt.Errorf("error upserting known_gaps entry: %v", err)
191192
}
192193

193-
ret, _ := res.RowsAffected()
194-
fmt.Println("Res:", ret)
195194
return nil
196195
}

0 commit comments

Comments
 (0)