lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-10 09:11:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #679 from zenixls2/fix/close_rows

Browse Source 
fix: close / rollback queries/transactions on error
This commit is contained in:
Yo-An Lin 2022-06-06 18:10:12 +08:00 committed by GitHub
commit 6c6d5a27a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/service/backtest.go
View File

@ -125,6 +125,7 @@ func (s *BacktestService) QueryKLine(ex types.ExchangeName, symbol string, inter
"interval": interval, "interval": interval,
"symbol": symbol, "symbol": symbol,
}) })
defer rows.Close()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "query kline error") return nil, errors.Wrap(err, "query kline error")
@ -134,8 +135,6 @@ func (s *BacktestService) QueryKLine(ex types.ExchangeName, symbol string, inter
return nil, rows.Err() return nil, rows.Err()
} }
defer rows.Close()
if rows.Next() { if rows.Next() {
var kline types.KLine var kline types.KLine
err = rows.StructScan(&kline) err = rows.StructScan(&kline)
@ -263,6 +262,7 @@ func (s *BacktestService) scanRowsCh(rows *sqlx.Rows) (chan types.KLine, chan er
} }
func (s *BacktestService) scanRows(rows *sqlx.Rows) (klines []types.KLine, err error) { func (s *BacktestService) scanRows(rows *sqlx.Rows) (klines []types.KLine, err error) {
defer rows.Close()
for rows.Next() { for rows.Next() {
var kline types.KLine var kline types.KLine
if err := rows.StructScan(&kline); err != nil { if err := rows.StructScan(&kline); err != nil {
@ -308,6 +308,9 @@ func (s *BacktestService) BatchInsert(kline []types.KLine) error {
tx := s.DB.MustBegin() tx := s.DB.MustBegin()
if _, err := tx.NamedExec(sql, kline); err != nil { if _, err := tx.NamedExec(sql, kline); err != nil {
if e := tx.Rollback(); e != nil {
log.WithError(e).Fatalf("cannot rollback insertion %v", err)
}
return err return err
} }
return tx.Commit() return tx.Commit()
@ -389,6 +392,7 @@ func (s *BacktestService) FindMissingTimeRanges(ctx context.Context, ex types.Ex
} }
rows, err := s.DB.QueryContext(ctx, sql, args...) rows, err := s.DB.QueryContext(ctx, sql, args...)
defer rows.Close()
if err != nil { if err != nil {
return nil, err return nil, err
} }