修复merge异常中断导致加载索引的问题#342
Open
To2hour wants to merge 1 commit into
Open
Conversation
…the merge exception was interrupted
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
在merge进行到loadMergeFiles的时候，如果发生断电，关机等异常。可能会出现data文件替换了一半，但hint和finish没动的情况。这个时候的hint文件是不准的。应该在loadMergeFiles的for之前删掉hint和finish，并在根据hint加载index索引的时候判断下finish的合法性