Filter empty series client side too.

Signed-off-by: Goutham Veeramachaneni <[email protected]>

Author: gouthamve

pkg/querier/ingester_streaming_queryable.go

@@ -54,6 +54,11 @@ func (i ingesterQueryable) Get(ctx context.Context, from, through model.Time, ma
 
 	chunks := make([]chunk.Chunk, 0, len(results))
 	for _, result := range results {
+		// Sometimes the ingester can send series that have no data.
+		if len(result.Chunks) == 0 {
+			continue
+		}
+
 		metric := client.FromLabelAdaptersToMetric(result.Labels)
 		cs, err := chunkcompat.FromChunks(userID, metric, result.Chunks)
 		if err != nil {
@@ -89,6 +94,11 @@ func (q *ingesterStreamingQuerier) Select(sp *storage.SelectParams, matchers ...
 
 	serieses := make([]storage.Series, 0, len(results))
 	for _, result := range results {
+		// Sometimes the ingester can send series that have no data.
+		if len(result.Chunks) == 0 {
+			continue
+		}
+
 		chunks, err := chunkcompat.FromChunks(userID, nil, result.Chunks)
 		if err != nil {
 			return nil, nil, promql.ErrStorage{Err: err}

pkg/querier/ingester_streaming_queryable_test.go

@@ -4,25 +4,41 @@ import (
 	"context"
 	"testing"
 
+	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/stretchr/testify/require"
 
+	"github.com/cortexproject/cortex/pkg/chunk"
+	"github.com/cortexproject/cortex/pkg/chunk/encoding"
 	"github.com/cortexproject/cortex/pkg/ingester/client"
+	"github.com/cortexproject/cortex/pkg/util/chunkcompat"
 	"github.com/weaveworks/common/user"
 )
 
 func TestIngesterStreaming(t *testing.T) {
+	// We need to make sure that there is atleast one chunk present,
+	// else no series will be selected.
+	promChunk, err := encoding.NewForEncoding(encoding.Bigchunk)
+	require.NoError(t, err)
+
+	clientChunks, err := chunkcompat.ToChunks([]chunk.Chunk{
+		chunk.NewChunk("", 0, nil, promChunk, model.Earliest, model.Earliest),
+	})
+	require.NoError(t, err)
+
 	d := &mockDistributor{
 		r: []client.TimeSeriesChunk{
 			{
 				Labels: []client.LabelAdapter{
 					{Name: "bar", Value: "baz"},
 				},
+				Chunks: clientChunks,
 			},
 			{
 				Labels: []client.LabelAdapter{
 					{Name: "foo", Value: "bar"},
 				},
+				Chunks: clientChunks,
 			},
 		},
 	}