Merge upstream at 140f4aa #782
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
* allow customizing TSDB postings decoder --------- Signed-off-by: Ben Ye <benye@amazon.com>
…-prometheus # Conflicts: # tsdb/block.go # tsdb/compact.go # tsdb/db.go # tsdb/index/index.go # tsdb/index/index_test.go # tsdb/querier_bench_test.go
|
|
krajorama
approved these changes
Dec 4, 2024
| @@ -697,7 +702,7 @@ func (db *DBReadOnly) Blocks() ([]BlockReader, error) { | |||
| return nil, ErrClosed | |||
| default: | |||
| } | |||
| loadable, corrupted, err := openBlocks(db.logger, db.dir, nil, nil, nil, DefaultPostingsForMatchersCacheTTL, DefaultPostingsForMatchersCacheMaxItems, DefaultPostingsForMatchersCacheMaxBytes, DefaultPostingsForMatchersCacheForce) | |||
| loadable, corrupted, err := openBlocks(db.logger, db.dir, nil, nil, DefaultPostingsDecoderFactory, nil, DefaultPostingsForMatchersCacheTTL, DefaultPostingsForMatchersCacheMaxItems, DefaultPostingsForMatchersCacheMaxBytes, DefaultPostingsForMatchersCacheForce) | |||
There was a problem hiding this comment.
note: this is weird in upstream as well, why would the default be able to decode all? why isn't this coming from options?
| func NewFileReader(path string) (*Reader, error) { | ||
| return NewFileReaderWithOptions(path, nil) | ||
| func NewFileReader(path string, decoder PostingsDecoder) (*Reader, error) { | ||
| return NewFileReaderWithOptions(path, decoder, nil) | ||
| } | ||
|
|
||
| // NewFileReaderWithOptions is like NewFileReader but allows to pass a cache provider and sharding function. |
There was a problem hiding this comment.
While we're here. The doc string wasn't true since #411
Suggested change
| // NewFileReaderWithOptions is like NewFileReader but allows to pass a cache provider and sharding function. | |
| // NewFileReaderWithOptions is like NewFileReader but allows to pass a cache provider. |
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.
This PR advances this fork closer to upstream Prometheus
main, bringing in the changes from prometheus/prometheus@140f4aa, which is the merge of prometheus/prometheus#13567.This merge had a number of conflicts. While I believe I've merged this correctly given there were minimal conflicts in the tests and all tests are passing, carefully checking these changes would be appreciated.
Conflicts were in:
tsdb/block.gotsdb/compact.gotsdb/db.gotsdb/index/index.gotsdb/index/index_test.gotsdb/querier_bench_test.go