[Storehouse] Optimize finalized reader to use block id index #5175
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
28959f5 to
e24c7d3
Compare
jordanschalm
approved these changes
Dec 21, 2023
| @@ -231,8 +231,8 @@ func (e *UnexecutedLoader) pendingUnexecutedBlocks(ctx context.Context, finalize | |||
| // if the EN is dynamically bootstrapped, the finalized blocks at height range: | |||
| // [ sealedRoot.Height, finalizedRoot.Height - 1] can not be retrieved from | |||
| // protocol state, but only from headers | |||
| func (e *UnexecutedLoader) getHeaderByHeight(height uint64) (*flow.Header, error) { | |||
| func (e *UnexecutedLoader) getHeaderByHeight(height uint64) (flow.Identifier, error) { | |||
There was a problem hiding this comment.
Suggested change
| func (e *UnexecutedLoader) getHeaderByHeight(height uint64) (flow.Identifier, error) { | |
| func (e *UnexecutedLoader) getBlockIDByHeight(height uint64) (flow.Identifier, error) { |
There was a problem hiding this comment.
same question here about not using e.headers.BlockIDByHeight(height) directly
| @@ -89,8 +89,8 @@ func (e *UnfinalizedLoader) LoadUnexecuted(ctx context.Context) ([]flow.Identifi | |||
| // if the EN is dynamically bootstrapped, the finalized blocks at height range: | |||
| // [ sealedRoot.Height, finalizedRoot.Height - 1] can not be retrieved from | |||
| // protocol state, but only from headers | |||
| func (e *UnfinalizedLoader) getHeaderByHeight(height uint64) (*flow.Header, error) { | |||
| func (e *UnfinalizedLoader) getHeaderByHeight(height uint64) (flow.Identifier, error) { | |||
There was a problem hiding this comment.
Suggested change
| func (e *UnfinalizedLoader) getHeaderByHeight(height uint64) (flow.Identifier, error) { | |
| func (e *UnfinalizedLoader) getBlockIDByHeight(height uint64) (flow.Identifier, error) { |
peterargue
reviewed
Dec 21, 2023
| @@ -60,12 +60,12 @@ func (e *UnfinalizedLoader) LoadUnexecuted(ctx context.Context) ([]flow.Identifi | |||
| // reload its block to execution queues | |||
| // loading finalized blocks | |||
| for height := lastExecuted + 1; height <= final.Height; height++ { | |||
| header, err := e.getHeaderByHeight(height) | |||
| finalizedID, err := e.getHeaderByHeight(height) | |||
There was a problem hiding this comment.
why not use e.headers.BlockIDByHeight directly?
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #5175 +/- ##
==========================================
+ Coverage 56.43% 56.49% +0.06%
==========================================
Files 981 979 -2
Lines 93113 93149 +36
==========================================
+ Hits 52551 52629 +78
+ Misses 36673 36618 -55
- Partials 3889 3902 +13
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
peterargue
approved these changes
Dec 22, 2023
| @@ -231,8 +231,8 @@ func (e *UnexecutedLoader) pendingUnexecutedBlocks(ctx context.Context, finalize | |||
| // if the EN is dynamically bootstrapped, the finalized blocks at height range: | |||
| // [ sealedRoot.Height, finalizedRoot.Height - 1] can not be retrieved from | |||
| // protocol state, but only from headers | |||
| func (e *UnexecutedLoader) getHeaderByHeight(height uint64) (*flow.Header, error) { | |||
| func (e *UnexecutedLoader) getHeaderByHeight(height uint64) (flow.Identifier, error) { | |||
There was a problem hiding this comment.
same question here about not using e.headers.BlockIDByHeight(height) directly
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 optimizes the FinalizedBlockIDAtHeight method of the FinalizedReader used by Storehouse