log: clean-up log conflict search #155
Open
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