Commit 9b62c5a 1 parent 545afc5 commit 9b62c5a Copy full SHA for 9b62c5a
File tree 1 file changed +9
-9
lines changed
1 file changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -98,21 +98,21 @@ func (r *selectResult) fetch(ctx context.Context) {
98
98
metrics .DistSQLQueryHistgram .WithLabelValues (r .label , r .sqlType ).Observe (duration .Seconds ())
99
99
}()
100
100
for {
101
+ var result resultWithErr
101
102
resultSubset , err := r .resp .Next (ctx )
102
103
if err != nil {
103
- r .results <- resultWithErr {err : err }
104
- return
105
- }
106
- if resultSubset == nil {
104
+ result .err = err
105
+ } else if resultSubset == nil {
107
106
return
108
- }
109
-
110
- if r .memTracker != nil {
111
- r .memTracker .Consume (int64 (resultSubset .MemSize ()))
107
+ } else {
108
+ result .result = resultSubset
109
+ if r .memTracker != nil {
110
+ r .memTracker .Consume (int64 (resultSubset .MemSize ()))
111
+ }
112
112
}
113
113
114
114
select {
115
- case r .results <- resultWithErr { result : resultSubset } :
115
+ case r .results <- result :
116
116
case <- r .closed :
117
117
// If selectResult called Close() already, make fetch goroutine exit.
118
118
return
You can’t perform that action at this time.
0 commit comments