[store] Add Request Hints for Labels APIs

Signed-off-by: Goutham Veeramachaneni <[email protected]>
thanos-io · Nov 19, 2020 · 6b2d465 · 6b2d465
1 parent 7ff9ba1
commit 6b2d465
Show file tree

Hide file tree

Showing 6 changed files with 643 additions and 75 deletions.
diff --git a/pkg/store/bucket.go b/pkg/store/bucket.go
@@ -1074,11 +1074,28 @@ func (s *BucketStore) LabelNames(ctx context.Context, req *storepb.LabelNamesReq
 
 	var mtx sync.Mutex
 	var sets [][]string
+	var reqBlockMatchers []*labels.Matcher
+
+	if req.Hints != nil {
+		reqHints := &hintspb.LabelNamesRequestHints{}
+		err := types.UnmarshalAny(req.Hints, reqHints)
+		if err != nil {
+			return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "unmarshal label names request hints").Error())
+		}
+
+		reqBlockMatchers, err = storepb.TranslateFromPromMatchers(reqHints.BlockMatchers...)
+		if err != nil {
+			return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request hints labels matchers").Error())
+		}
+	}
 
 	for _, b := range s.blocks {
 		if !b.overlapsClosedInterval(req.Start, req.End) {
 			continue
 		}
+		if len(reqBlockMatchers) > 0 && !b.matchRelabelLabels(reqBlockMatchers) {
+			continue
+		}
 
 		resHints.AddQueriedBlock(b.meta.ULID)
 
@@ -1141,11 +1158,28 @@ func (s *BucketStore) LabelValues(ctx context.Context, req *storepb.LabelValuesR
 
 	var mtx sync.Mutex
 	var sets [][]string
+	var reqBlockMatchers []*labels.Matcher
+
+	if req.Hints != nil {
+		reqHints := &hintspb.LabelValuesRequestHints{}
+		err := types.UnmarshalAny(req.Hints, reqHints)
+		if err != nil {
+			return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "unmarshal label names request hints").Error())
+		}
+
+		reqBlockMatchers, err = storepb.TranslateFromPromMatchers(reqHints.BlockMatchers...)
+		if err != nil {
+			return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request hints labels matchers").Error())
+		}
+	}
 
 	for _, b := range s.blocks {
 		if !b.overlapsClosedInterval(req.Start, req.End) {
 			continue
 		}
+		if len(reqBlockMatchers) > 0 && !b.matchRelabelLabels(reqBlockMatchers) {
+			continue
+		}
 
 		resHints.AddQueriedBlock(b.meta.ULID)
 

diff --git a/pkg/store/bucket_test.go b/pkg/store/bucket_test.go
@@ -2136,6 +2136,41 @@ func TestLabelNamesAndValuesHints(t *testing.T) {
 					{Id: block2.String()},
 				},
 			},
+		}, {
+			name: "querying a range containing multiple blocks but filtering a specific block should query only the requested block",
+
+			labelNamesReq: &storepb.LabelNamesRequest{
+				Start: 0,
+				End:   3,
+				Hints: mustMarshalAny(&hintspb.LabelNamesRequestHints{
+					BlockMatchers: []storepb.LabelMatcher{
+						{Type: storepb.LabelMatcher_EQ, Name: block.BlockIDLabel, Value: block1.String()},
+					},
+				}),
+			},
+			expectedNames: labelNamesFromSeriesSet(seriesSet1),
+			expectedNamesHints: hintspb.LabelNamesResponseHints{
+				QueriedBlocks: []hintspb.Block{
+					{Id: block1.String()},
+				},
+			},
+
+			labelValuesReq: &storepb.LabelValuesRequest{
+				Label: "ext1",
+				Start: 0,
+				End:   3,
+				Hints: mustMarshalAny(&hintspb.LabelValuesRequestHints{
+					BlockMatchers: []storepb.LabelMatcher{
+						{Type: storepb.LabelMatcher_EQ, Name: block.BlockIDLabel, Value: block1.String()},
+					},
+				}),
+			},
+			expectedValues: []string{"1"},
+			expectedValuesHints: hintspb.LabelValuesResponseHints{
+				QueriedBlocks: []hintspb.Block{
+					{Id: block1.String()},
+				},
+			},
 		},
 	}