core/bloombits: handle non 8-bit boundary section matches #15489
+41
−23
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.
In our bloombits matcher, we maintain matched blocks via a
[]byte
bitset. After filtering the blocks and generating the final bitset, we iterate over the block interval and check whether they match according to the bitset.Since the bitset contains bytes, if a bitset element is zero, we can skip ahead 8 blocks, since none of them will match. This has a subtlety that we got wrong. If we start filtering from a block number that's not a multiple of 8, then we can't skip ahead 8 blocks when finding a zero bitset element, only
8 - number % 8
elements, since skipping 8 would overlap with the next byte in the bitset.This PR fixes it by only skipping 8 blocks if we're at a bitset byte boundary, otherwise just increment blocks 1-by-1 until we do reach a byte boundary.
Fixes #15309.