noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to fetch statement duration more than once

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2020-03-07 09:55:25 +00:00
parent 2ef562de06
commit f3ab0596f5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
db/executor.go
View file

@ -269,11 +269,11 @@ func (e *executor) operate(ctx context.Context, stm sql.Statement) (res []interf
// it runs no longer than specified.
if stm, ok := stm.(sql.KillableStatement); ok {
if stm.Duration() > 0 {
ctx, canc = context.WithTimeout(ctx, stm.Duration())
if dur := stm.Duration(); dur > 0 {
ctx, canc = context.WithTimeout(ctx, dur)
defer func() {
if tim := ctx.Err(); err == nil && tim != nil {
res, err = nil, &TimerError{timer: stm.Duration()}
res, err = nil, &TimerError{timer: dur}
}
canc()
}()