store: use old behaviour when nil has been passed

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
thanos-io · Aug 11, 2021 · 23c18e2 · 23c18e2
1 parent a459162
commit 23c18e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/pkg/store/proxy_test.go b/pkg/store/proxy_test.go
@@ -1547,17 +1547,13 @@ type storeSeriesServer struct {
 	SeriesSet []storepb.Series
 	Warnings  []string
 	HintsSet  []*types.Any
-
-	Size int64
 }
 
 func newStoreSeriesServer(ctx context.Context) *storeSeriesServer {
 	return &storeSeriesServer{ctx: ctx}
 }
 
 func (s *storeSeriesServer) Send(r *storepb.SeriesResponse) error {
-	s.Size += int64(r.Size())
-
 	if r.GetWarning() != "" {
 		s.Warnings = append(s.Warnings, r.GetWarning())
 		return nil

diff --git a/pkg/store/storepb/custom.go b/pkg/store/storepb/custom.go
@@ -35,11 +35,6 @@ func NewWarnSeriesResponse(err error) *SeriesResponse {
 }
 
 func NewSeriesResponse(series *Series, respBuf **[]byte, respPool *sync.Pool) *SeriesResponse {
-	if respPool == nil {
-		buf := []byte{}
-		bufPtr := &buf
-		respBuf = &bufPtr
-	}
 	return &SeriesResponse{
 		respPool: respPool,
 		respBuf:  respBuf,
@@ -481,14 +476,19 @@ type syncPool = sync.Pool
 func (m *SeriesResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 
-	if cap(**m.respBuf) < size {
-		if m.respPool != nil {
-			m.respPool.Put(*m.respBuf)
+	var respBuf []byte
+	if m.respBuf == nil {
+		respBuf = make([]byte, size)
+	} else {
+		if cap(**m.respBuf) < size {
+			if m.respPool != nil {
+				m.respPool.Put(*m.respBuf)
+			}
+			buf := make([]byte, size)
+			*m.respBuf = &buf
 		}
-		buf := make([]byte, size)
-		*m.respBuf = &buf
+		respBuf = **m.respBuf
 	}
-	respBuf := **m.respBuf
 
 	marshalBuf := respBuf[:size]
 	n, err := m.MarshalToSizedBuffer(marshalBuf)