*: pull in fixes #65
Merged
*: pull in fixes #65
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
The matchers slice is now sorted in each call but that introduces a data race because the slice is shared between all calls. Do the sorting once on the outermost function. Signed-off-by: Giedrius Statkevičius <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
krisleipus
approved these changes
Aug 2, 2023
pjarmalavicius
approved these changes
Aug 2, 2023
Titasp
approved these changes
Aug 2, 2023
Comment on lines
+968
to
+978
| sort.Slice(matchers, func(i, j int) bool { | ||
| if matchers[i].Type == matchers[j].Type { | ||
| if matchers[i].Name == matchers[j].Name { | ||
| return matchers[i].Value < matchers[j].Value | ||
| } | ||
| return matchers[i].Name < matchers[j].Name | ||
| } | ||
| return matchers[i].Type < matchers[j].Type | ||
| }) | ||
|
|
||
| return matchers |
There was a problem hiding this comment.
nit: could reduce nesting by:
sort.Slice(matchers, func(i, j int) bool {
if matchers[i].Type != matchers[j].Type {
return matchers[i].Type < matchers[j].Type
}
if matchers[i].Name == matchers[j].Name {
return matchers[i].Value < matchers[j].Value
}
return matchers[i].Name < matchers[j].Name
})There was a problem hiding this comment.
In the original PR I copied/pasted the same logic thanos-io#6575 so I'd prefer to keep the same to reduce discrepancy 😄
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.
Pull in data race fixes while I work on repro tests.