internal/keyspan: obey Seek invariants in filteringIter #3046
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
|
This change is |
|
This needs a test. I'll write one within the next hour. |
Previously if filteringIter's FilterFunc mutated the passed-in span to no longer be a valid return value for a SeekLT or SeekGE call, we would still return that span even though it could be >= the seek key (for SeekLT), or less than it (for SeekGE). This change updates filteringIter to guard for this case before returning from a seek call. Found with cockroachdb#3044. Informs cockroachdb/cockroach#113973, cockroachdb/cockroach#114056.
itsbilal
force-pushed
the
filtering-iter-fix
branch
from
1c6b496 to
d7ebd8f
Compare
|
Tests added. |
jbowens
approved these changes
Nov 9, 2023
There was a problem hiding this comment.
Nice find.
Do you mind filing an issue about refactoring keyspan.Truncate? If we don't use keyspan.Filter and implement keyspan.FragmentIterator we can avoid the key comparison when we don't truncate.
Reviewed 6 of 6 files at r1, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @erikgrinaker)
|
TFTR! Filed #3048. I should backport this too right? |
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.
Previously if filteringIter's FilterFunc mutated the passed-in span to no longer be a valid return value for a SeekLT or SeekGE call, we would still return that span even though it could be >= the seek key (for SeekLT), or less than it (for SeekGE).
This change updates filteringIter to guard for this case before returning from a seek call.
Found with #3044.
Informs cockroachdb/cockroach#113973, cockroachdb/cockroach#114056.