update vendored cortex and add new replace overrides #3256
Merged
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
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
|
|
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
jtlisi
force-pushed
the
20210128_update_vendored_cortex
branch
from
fd5ee1f
to
9c87416
Compare
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
owen-d
approved these changes
Jan 28, 2021
owen-d
reviewed
Jan 28, 2021
| @@ -90,7 +91,7 @@ func (t *table) compact() error { | |||
|
|
|||
| errChan := make(chan error) | |||
| readObjectChan := make(chan string) | |||
| n := util.Min(len(objects), readDBsParallelism) | |||
| n := math.Min(len(objects), readDBsParallelism) | |||
There was a problem hiding this comment.
Would you mind making these consistently util_math?
owen-d
approved these changes
Jan 28, 2021
| @@ -11,6 +11,7 @@ import ( | |||
| "github.com/cortexproject/cortex/pkg/chunk" | |||
| chunk_util "github.com/cortexproject/cortex/pkg/chunk/util" | |||
| "github.com/cortexproject/cortex/pkg/util" | |||
| "github.com/cortexproject/cortex/pkg/util/math" | |||
There was a problem hiding this comment.
Suggested change
| "github.com/cortexproject/cortex/pkg/util/math" | |
| util_math "github.com/cortexproject/cortex/pkg/util/math" |
| @@ -90,7 +91,7 @@ func (t *table) compact() error { | |||
|
|
|||
| errChan := make(chan error) | |||
| readObjectChan := make(chan string) | |||
| n := util.Min(len(objects), readDBsParallelism) | |||
| n := math.Min(len(objects), readDBsParallelism) | |||
There was a problem hiding this comment.
Suggested change
| n := math.Min(len(objects), readDBsParallelism) | |
| n := util_math.Min(len(objects), readDBsParallelism) |
| @@ -7,7 +7,7 @@ import ( | |||
|
|
|||
| "github.com/cortexproject/cortex/pkg/chunk" | |||
| chunk_util "github.com/cortexproject/cortex/pkg/chunk/util" | |||
| "github.com/cortexproject/cortex/pkg/util" | |||
| "github.com/cortexproject/cortex/pkg/util/math" | |||
There was a problem hiding this comment.
Suggested change
| "github.com/cortexproject/cortex/pkg/util/math" | |
| util_math "github.com/cortexproject/cortex/pkg/util/math" |
| @@ -34,7 +34,7 @@ func DoParallelQueries(ctx context.Context, tableQuerier TableQuerier, queries [ | |||
| errs := make(chan error) | |||
|
|
|||
| for i := 0; i < len(queries); i += maxQueriesPerGoroutine { | |||
| q := queries[i:util.Min(i+maxQueriesPerGoroutine, len(queries))] | |||
| q := queries[i:math.Min(i+maxQueriesPerGoroutine, len(queries))] | |||
There was a problem hiding this comment.
Suggested change
| q := queries[i:math.Min(i+maxQueriesPerGoroutine, len(queries))] | |
| q := queries[i:util_math.Min(i+maxQueriesPerGoroutine, len(queries))] |
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
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.
What this PR does / why we need it: