Commit a3b9ef6 1 parent daea7cb commit a3b9ef6 Copy full SHA for a3b9ef6
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 @@ -94,21 +94,21 @@ func (r *selectResult) fetch(ctx context.Context) {
94
94
metrics .DistSQLQueryHistgram .WithLabelValues (r .label , r .sqlType ).Observe (duration .Seconds ())
95
95
}()
96
96
for {
97
+ var result resultWithErr
97
98
resultSubset , err := r .resp .Next (ctx )
98
99
if err != nil {
99
- r .results <- resultWithErr {err : errors .Trace (err )}
100
+ result .err = err
101
+ } else if resultSubset == nil {
100
102
return
101
- }
102
- if resultSubset == nil {
103
- return
104
- }
105
-
106
- if r .memTracker != nil {
107
- r .memTracker .Consume (int64 (resultSubset .MemSize ()))
103
+ } else {
104
+ result .result = resultSubset
105
+ if r .memTracker != nil {
106
+ r .memTracker .Consume (int64 (resultSubset .MemSize ()))
107
+ }
108
108
}
109
109
110
110
select {
111
- case r .results <- resultWithErr { result : resultSubset } :
111
+ case r .results <- result :
112
112
case <- r .closed :
113
113
// If selectResult called Close() already, make fetch goroutine exit.
114
114
return
You can’t perform that action at this time.
0 commit comments