Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

db: fix unpropagated error in Iterator.mergeForward #3201

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

jbowens
Copy link
Collaborator

@jbowens jbowens commented Jan 5, 2024

Previously, if the underlying internal iterator encountered an error while
merging MERGE keys in the forward direction, the iterator would stop merging
and return a key representing the partially merged state up until the error.
This commit fixes the bug and adds a regression test.

@jbowens jbowens requested review from a team and RaduBerinde January 5, 2024 21:39
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: 0 of 4 files reviewed, all discussions resolved

Previously, if the underlying internal iterator encountered an error while
merging MERGE keys in the forward direction, the iterator would stop merging
and return a key representing the partially merged state up until the error.
This commit fixes the bug and adds a regression test.
@jbowens
Copy link
Collaborator Author

jbowens commented Jan 8, 2024

TFTR!

@jbowens jbowens merged commit 85b60b5 into cockroachdb:master Jan 8, 2024
11 checks passed
@jbowens jbowens deleted the merge-err branch January 8, 2024 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants