memoize some cut properties in the cut record #2086
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
larskuhtz
force-pushed
the
lars/cut-properties
branch
from
44bdf37 to
b09d965
Compare
edmundnoble
reviewed
Dec 25, 2024
| @@ -357,6 +391,12 @@ projectChains m = HM.intersection m | |||
| $ chainIdsAt (cutHeadersChainwebVersion m) (cutHeadersMinHeight m) | |||
| {-# INLINE projectChains #-} | |||
|
|
|||
| cutProjectChains :: Cut -> Cut | |||
| cutProjectChains c = unsafeMkCut v $! projectChains $ _cutHeaders c | |||
There was a problem hiding this comment.
This $! is unnecessary. unsafeMkCut is strict in its second input, because _cutHeaders' is a strict field.
Comment on lines
711
to
+715
| True -> return $ Just | ||
| $! over unsafeCutHeaders extendChains | ||
| $ set (unsafeCutHeaders . ix' (_chainId h)) h c | ||
| $! unsafeMkCut v | ||
| $! extendChains | ||
| $ set (ix' (_chainId h)) h | ||
| $ _cutHeaders c |
There was a problem hiding this comment.
To make the result strict, we have to do this:
return $! Just
$! unsafeMkCut v
$ extendChains
$ set (ix' (_chainId h)) h
$ _cutHeaders cBecause return is lazy, Just is lazy, and extendChains and set (ix' ...) ... are both dealing with HashMaps, which cannot have laziness anywhere but their elements.
| -> Cut | ||
| -> IO Cut | ||
| limitCut wdb h c | ||
| | all (\bh -> h >= view blockHeight bh) (view cutHeaders c) = | ||
| return c | ||
| | otherwise = do | ||
| hdrs <- itraverse go $ view cutHeaders c | ||
| return $! set unsafeCutHeaders (projectChains $ HM.mapMaybe id hdrs) c | ||
| return $! unsafeMkCut v $! projectChains $ HM.mapMaybe id hdrs |
There was a problem hiding this comment.
Suggested change
| return $! unsafeMkCut v $! projectChains $ HM.mapMaybe id hdrs | |
| return $! unsafeMkCut v $ projectChains $ HM.mapMaybe id hdrs |
There was a problem hiding this comment.
Because unsafeMkCut is strict already.
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.
No description provided.