cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Refactor database transaction defer to match pattern elsewhere

Browse Source
This commit is contained in:
nabarun 2022-03-10 18:37:10 +05:30
parent 53913e0cb9
commit 2d790cea03
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
statediff/indexer/indexer.go
View File

@ -558,11 +558,20 @@ func (sdi *StateDiffIndexer) PushCodeAndCodeHash(tx *BlockTx, codeAndCodeHash sd
// InsertWatchedAddresses inserts the given addresses in the database // InsertWatchedAddresses inserts the given addresses in the database
func (sdi *StateDiffIndexer) InsertWatchedAddresses(args []sdtypes.WatchAddressArg, currentBlockNumber *big.Int) error { func (sdi *StateDiffIndexer) InsertWatchedAddresses(args []sdtypes.WatchAddressArg, currentBlockNumber *big.Int) error {
tx, err := sdi.dbWriter.db.Begin() tx, err := sdi.dbWriter.db.Beginx()
if err != nil { if err != nil {
return err return err
} }
defer tx.Rollback() defer func() {
if p := recover(); p != nil {
shared.Rollback(tx)
panic(p)
} else if err != nil {
shared.Rollback(tx)
} else {
err = tx.Commit()
}
}()
for _, arg := range args { for _, arg := range args {
_, err = tx.Exec(`INSERT INTO eth_meta.watched_addresses (address, created_at, watched_at) VALUES ($1, $2, $3) ON CONFLICT (address) DO NOTHING`, _, err = tx.Exec(`INSERT INTO eth_meta.watched_addresses (address, created_at, watched_at) VALUES ($1, $2, $3) ON CONFLICT (address) DO NOTHING`,
@ -572,21 +581,25 @@ func (sdi *StateDiffIndexer) InsertWatchedAddresses(args []sdtypes.WatchAddressA
} }
} }
err = tx.Commit() return err
if err != nil {
return err
}
return nil
} }
// RemoveWatchedAddresses removes the given watched addresses from the database // RemoveWatchedAddresses removes the given watched addresses from the database
func (sdi *StateDiffIndexer) RemoveWatchedAddresses(args []sdtypes.WatchAddressArg) error { func (sdi *StateDiffIndexer) RemoveWatchedAddresses(args []sdtypes.WatchAddressArg) error {
tx, err := sdi.dbWriter.db.Begin() tx, err := sdi.dbWriter.db.Beginx()
if err != nil { if err != nil {
return err return err
} }
defer tx.Rollback() defer func() {
if p := recover(); p != nil {
shared.Rollback(tx)
panic(p)
} else if err != nil {
shared.Rollback(tx)
} else {
err = tx.Commit()
}
}()
for _, arg := range args { for _, arg := range args {
_, err = tx.Exec(`DELETE FROM eth_meta.watched_addresses WHERE address = $1`, arg.Address) _, err = tx.Exec(`DELETE FROM eth_meta.watched_addresses WHERE address = $1`, arg.Address)
@ -595,21 +608,25 @@ func (sdi *StateDiffIndexer) RemoveWatchedAddresses(args []sdtypes.WatchAddressA
} }
} }
err = tx.Commit() return err
if err != nil {
return err
}
return nil
} }
// SetWatchedAddresses clears and inserts the given addresses in the database // SetWatchedAddresses clears and inserts the given addresses in the database
func (sdi *StateDiffIndexer) SetWatchedAddresses(args []sdtypes.WatchAddressArg, currentBlockNumber *big.Int) error { func (sdi *StateDiffIndexer) SetWatchedAddresses(args []sdtypes.WatchAddressArg, currentBlockNumber *big.Int) error {
tx, err := sdi.dbWriter.db.Begin() tx, err := sdi.dbWriter.db.Beginx()
if err != nil { if err != nil {
return err return err
} }
defer tx.Rollback() defer func() {
if p := recover(); p != nil {
shared.Rollback(tx)
panic(p)
} else if err != nil {
shared.Rollback(tx)
} else {
err = tx.Commit()
}
}()
_, err = tx.Exec(`DELETE FROM eth_meta.watched_addresses`) _, err = tx.Exec(`DELETE FROM eth_meta.watched_addresses`)
if err != nil { if err != nil {
@ -624,12 +641,7 @@ func (sdi *StateDiffIndexer) SetWatchedAddresses(args []sdtypes.WatchAddressArg,
} }
} }
err = tx.Commit() return err
if err != nil {
return err
}
return nil
} }
// ClearWatchedAddresses clears all the watched addresses from the database // ClearWatchedAddresses clears all the watched addresses from the database