fix(blooms): dont break iterator conventions #12808
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
refactors skip logic for bloom pages that are too large s/Seek/LoadOffset/ for LazyBloomIter removes unused code Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
owen-d
force-pushed
the
blooms/better-skipping-large-pages
branch
from
adbbaf0
to
3ca36fa
Compare
salvacorts
reviewed
Apr 29, 2024
pkg/storage/bloom/v1/block.go
Outdated
| @@ -144,14 +144,12 @@ func (bq *BlockQuerier) Seek(fp model.Fingerprint) error { | |||
| func (bq *BlockQuerier) Next() bool { | |||
| for bq.series.Next() { | |||
| series := bq.series.At() | |||
| bq.blooms.Seek(series.Offset) | |||
| if ok := bq.blooms.LoadOffset(series.Offset); !ok { | |||
There was a problem hiding this comment.
I think LoadOffset should return an error. Then we should check here if the error is due to the page being too big in which case we can safely continue. Otherwise, we wont be able to error when there is. for example, an IO error.
| fq.bq.blooms.Seek(series.Offset) | ||
| ok := fq.bq.blooms.LoadOffset(series.Offset) | ||
| if !ok { | ||
| // could not seek to the desired bloom, |
There was a problem hiding this comment.
Same as previous comment
|
Good points @salvacorts -- I inverted the logic and now // LoadOffset returns whether the bloom page at the given offset should
// be skipped (due to being too large) _and_ there's no error
func (it *LazyBloomIter) LoadOffset(offset BloomOffset) (skip bool)It'll only return true when it's safe to skip so other times the error will surface immediately after. |
owen-d
force-pushed
the
blooms/better-skipping-large-pages
branch
from
638b3e5
to
5575682
Compare
Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
owen-d
force-pushed
the
blooms/better-skipping-large-pages
branch
from
5575682
to
fc6554b
Compare
salvacorts
approved these changes
Apr 30, 2024
|
This PR must be merged before a backport PR will be created. |
1 similar comment
|
This PR must be merged before a backport PR will be created. |
grafanabot
pushed a commit
that referenced
this pull request
Apr 30, 2024
shantanualsi
pushed a commit
that referenced
this pull request
May 6, 2024
Followup to #12806 which exposes skipped pages more explicitly than as an error. * refactors skip logic for bloom pages that are too large * s/Seek/LoadOffset/ for LazyBloomIter * removes unused code
This was referenced May 6, 2024
This was referenced May 27, 2024
This was referenced Jun 10, 2024
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.
Followup to #12806 which exposes skipped pages more explicitly than as an error.