blockchain: Generalize and optimize chain reorg. #997
Merged
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
davecgh
force-pushed
the
blockchain_reorganizechain_cleanup
branch
from
5130733 to
1a42300
Compare
alexlyp
requested changes
Jan 31, 2018
blockchain/chain.go
Outdated
| @@ -1286,8 +1346,11 @@ func (b *BlockChain) reorganizeChain(detachNodes, attachNodes *list.List, flags | |||
| // at least a couple of ways accomplish that rollback, but both involve | |||
| // tweaking the chain and/or database. This approach catches these | |||
| // issues before ever modifying the chain. | |||
| var topBlock *blockNode | |||
| for e := attachNodes.Front(); e != nil; e = e.Next() { | |||
| for i, e := 0, attachNodes.Front(); e != nil; i, e = i+1, e.Next() { | |||
There was a problem hiding this comment.
Nice catch. It's actually used in the next PR. I originally wrote the whole series together, but then split them up for easier review. I'll move it to the proper commit that uses it.
There was a problem hiding this comment.
Gotcha, thanks for the clarification.
alexlyp
approved these changes
Jan 31, 2018
davecgh
force-pushed
the
blockchain_reorganizechain_cleanup
branch
3 times, most recently
from
69a8ee1 to
0d12de8
Compare
This generalizes and optimizes the reorganize chain function to take advantage of the linear structure of the nodes being attached and detached in order to avoid reloading the parent blocks as well as allow it to rewind the chain in the case no attach nodes are provided or extend the chain in the case no detach nodes are provided. It also adds several assertions to ensure the assumptions about the state hold and generally cleans up the function for code consistency.
davecgh
force-pushed
the
blockchain_reorganizechain_cleanup
branch
from
0d12de8 to
31caca1
Compare
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 generalizes and optimizes the reorganize chain function to take advantage of the linear structure of the nodes being attached and detached in order to avoid reloading the parent blocks as well as allow it to rewind the chain in the case no attach nodes are provided or extend the chain in the case no detach nodes are provided.
It also adds several assertions to ensure the assumptions about the state hold and generally cleans up the function for code consistency.