log: clean-up log conflict search #155
Open
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
pav-kv
force-pushed
the
cleanup-log-conflict-search
branch
from
5457d01
to
54925de
Compare
Signed-off-by: Pavel Kalinnikov <pavel@cockroachlabs.com>
Use the new entryID type. Move the preceding entry check into the conflict search method rather than do it outside. Signed-off-by: Pavel Kalinnikov <pavel@cockroachlabs.com>
pav-kv
force-pushed
the
cleanup-log-conflict-search
branch
from
54925de
to
b636292
Compare
The append function call right after this does the same check, we don't need to do this in two places. TestLogMaybeAppend exercises these panics, and confirms the behaviour is the same after the first panic is removed. Signed-off-by: Pavel Kalinnikov <pavel@cockroachlabs.com>
pav-kv
force-pushed
the
cleanup-log-conflict-search
branch
from
b636292
to
85f43e6
Compare
|
Specifically, consider the TODOs I've added in |
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 cleans up
raftLog.maybeAppendandraftLog.findConflictfunctions, now that they accept the newlogSlicetype as input. This replaces a bunch of ad-hoc arithmetics on the rawentriesslice with a more understandable "fast-forward" logic on alogSlice.This also removes a redundant
panicinmaybeAppend. An equivalent panic is present in theraftLog.appendmethod which is triggered under the same conditions. This panic behaviour is tested inTestLogMaybeAppend, and hasn't changed.Related to #144