Add support for label matchers in LabelNames and LabelValues call to store. #4107
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pstibrany
force-pushed
the
label-matchers
branch
from
e988ef2
to
a8d7380
Compare
pstibrany
commented
Apr 26, 2021
| indexr *bucketIndexReader, | ||
| chunkr *bucketChunkReader, | ||
| matchers []*labels.Matcher, | ||
| req *storepb.SeriesRequest, |
There was a problem hiding this comment.
Instead of req we now pass all used parameters explicitly.
pstibrany
commented
Apr 26, 2021
|
|
||
| s.mtx.RLock() |
There was a problem hiding this comment.
Note that s.mtx.RLock() is now only called after checking hints. Previously wrong hints would return error without unlocking this lock.
yeya24
previously approved these changes
Apr 26, 2021
yeya24
previously approved these changes
Apr 27, 2021
pracucci
previously approved these changes
Apr 27, 2021
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
…n use that. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
pracucci
force-pushed
the
label-matchers
branch
from
5838ceb
to
84c4e5a
Compare
|
I've just rebased master. Let's see if CI passes now. |
yeya24
reviewed
Apr 27, 2021
| @@ -1261,7 +1302,25 @@ func (s *BucketStore) LabelValues(ctx context.Context, req *storepb.LabelValuesR | |||
| } | |||
| } | |||
|
|
|||
| // If we have series matchers, add <labelName> != "" matcher, to only select series that have given label name. | |||
| if len(reqSeriesMatchers) > 0 { | |||
There was a problem hiding this comment.
What if reqSeriesMatchers already contains this unequal matcher? @pstibrany @pracucci
There was a problem hiding this comment.
End result will be correct, but there is an optimization we can do (preferably in blockSeries to be more general).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
This PR implements support for label matches in
LabelNamesandLabelValuesAPI calls to bucket store. It reuses existingblockSeriesimplementation, but without fetching of chunks.Verification
Unit tests.
This is a partial fix for issue #3637