Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

distsql: tiny refactor to make the code more robust #10557

Merged
merged 3 commits into from
May 21, 2019
Merged

distsql: tiny refactor to make the code more robust #10557

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a7a3ce
distsql: tiny refactor to make the code more robust
tiancaiamao May 21, 2019
b98cc52
fix CI
tiancaiamao May 21, 2019
1960d6d
Merge branch 'master' into leak
jackysp May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions distsql/select_result.go
View file
Open in desktop
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