revert close order change

yuchen-db · yuchen-db · commit 865c60c182f9 · 2025-04-19T22:20:15.000-07:00
diff --git a/pkg/store/proxy_merge.go b/pkg/store/proxy_merge.go
@@ -558,13 +558,13 @@ func newAsyncRespSet(
 func (l *lazyRespSet) Close() {
 	l.bufferedResponsesMtx.Lock()
 	defer l.bufferedResponsesMtx.Unlock()
-	_ = l.cl.CloseSend()
 
 	l.closeSeries()
 	l.noMoreData = true
 	l.dataOrFinishEvent.Signal()
 
 	l.shardMatcher.Close()
+	_ = l.cl.CloseSend()
 }
 
 // eagerRespSet is a SeriesSet that blocks until all data is retrieved from
@@ -750,11 +750,11 @@ func sortWithoutLabels(set []*storepb.SeriesResponse, labelsToRemove map[string]
 }
 
 func (l *eagerRespSet) Close() {
-	_ = l.cl.CloseSend()
 	if l.closeSeries != nil {
 		l.closeSeries()
 	}
 	l.shardMatcher.Close()
+	_ = l.cl.CloseSend()
 }
 
 func (l *eagerRespSet) At() *storepb.SeriesResponse {

Original file line number	Diff line number	Diff line change
`@@ -558,13 +558,13 @@ func newAsyncRespSet(`
`558`	`558`	`func (l *lazyRespSet) Close() {`
`559`	`559`	`l.bufferedResponsesMtx.Lock()`
`560`	`560`	`defer l.bufferedResponsesMtx.Unlock()`
`561`		`- _ = l.cl.CloseSend()`
`562`	`561`
`563`	`562`	`l.closeSeries()`
`564`	`563`	`l.noMoreData = true`
`565`	`564`	`l.dataOrFinishEvent.Signal()`
`566`	`565`
`567`	`566`	`l.shardMatcher.Close()`
	`567`	`+ _ = l.cl.CloseSend()`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`// eagerRespSet is a SeriesSet that blocks until all data is retrieved from`
`@@ -750,11 +750,11 @@ func sortWithoutLabels(set []*storepb.SeriesResponse, labelsToRemove map[string]`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`func (l *eagerRespSet) Close() {`
`753`		`- _ = l.cl.CloseSend()`
`754`	`753`	`if l.closeSeries != nil {`
`755`	`754`	`l.closeSeries()`
`756`	`755`	`}`
`757`	`756`	`l.shardMatcher.Close()`
	`757`	`+ _ = l.cl.CloseSend()`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`func (l eagerRespSet) At() storepb.SeriesResponse {`