Skip to content

Commit

Permalink
distsql: tiny refactor to make the code more robust (pingcap#10557)
Browse files Browse the repository at this point in the history
  • Loading branch information
tiancaiamao authored May 21, 2019
1 parent 545afc5 commit 9b62c5a
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions distsql/select_result.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,21 @@ func (r *selectResult) fetch(ctx context.Context) {
metrics.DistSQLQueryHistgram.WithLabelValues(r.label, r.sqlType).Observe(duration.Seconds())
}()
for {
var result resultWithErr
resultSubset, err := r.resp.Next(ctx)
if err != nil {
r.results <- resultWithErr{err: err}
return
}
if resultSubset == nil {
result.err = err
} else if resultSubset == nil {
return
}

if r.memTracker != nil {
r.memTracker.Consume(int64(resultSubset.MemSize()))
} else {
result.result = resultSubset
if r.memTracker != nil {
r.memTracker.Consume(int64(resultSubset.MemSize()))
}
}

select {
case r.results <- resultWithErr{result: resultSubset}:
case r.results <- result:
case <-r.closed:
// If selectResult called Close() already, make fetch goroutine exit.
return
Expand Down

0 comments on commit 9b62c5a

Please sign in to comment.