haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve per-request-cache performance

Browse Source
This commit is contained in:
Gregor Kleen 2021-03-25 15:33:31 +01:00
parent 1f122a6eac
commit 85cbc00419
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yesod-core/src/Yesod/Core/Handler.hs
View File

@ -1149,9 +1149,9 @@ cached action = do
eres <- Cache.cached cache action eres <- Cache.cached cache action
case eres of case eres of
Right res -> return res Right res -> return res
Left (newCache, res) -> do Left (updateCache, res) -> do
gs <- get gs <- get
let merged = newCache `HM.union` ghsCache gs let merged = updateCache $ ghsCache gs
put $ gs { ghsCache = merged } put $ gs { ghsCache = merged }
return res return res
@ -1192,9 +1192,9 @@ cachedBy k action = do
eres <- Cache.cachedBy cache k action eres <- Cache.cachedBy cache k action
case eres of case eres of
Right res -> return res Right res -> return res
Left (newCache, res) -> do Left (updateCache, res) -> do
gs <- get gs <- get
let merged = newCache `HM.union` ghsCacheBy gs let merged = updateCache $ ghsCacheBy gs
put $ gs { ghsCacheBy = merged } put $ gs { ghsCacheBy = merged }
return res return res

10
yesod-core/src/Yesod/Core/TypeCache.hs
View File

@ -32,12 +32,12 @@ type KeyedTypeMap = HashMap (TypeRep, ByteString) Dynamic
cached :: (Monad m, Typeable a) cached :: (Monad m, Typeable a)
=> TypeMap => TypeMap
-> m a -- ^ cache the result of this action -> m a -- ^ cache the result of this action
-> m (Either (TypeMap, a) a) -- ^ Left is a cache miss, Right is a hit -> m (Either (TypeMap -> TypeMap, a) a) -- ^ Left is a cache miss, Right is a hit
cached cache action = case cacheGet cache of cached cache action = case cacheGet cache of
Just val -> return $ Right val Just val -> return $ Right val
Nothing -> do Nothing -> do
val <- action val <- action
return $ Left (cacheSet val cache, val) return $ Left (cacheSet val, val)
-- | Retrieves a value from the cache -- | Retrieves a value from the cache
-- --
@ -72,12 +72,12 @@ cachedBy :: (Monad m, Typeable a)
=> KeyedTypeMap => KeyedTypeMap
-> ByteString -- ^ a cache key -> ByteString -- ^ a cache key
-> m a -- ^ cache the result of this action -> m a -- ^ cache the result of this action
-> m (Either (KeyedTypeMap, a) a) -- ^ Left is a cache miss, Right is a hit -> m (Either (KeyedTypeMap -> KeyedTypeMap, a) a) -- ^ Left is a cache miss, Right is a hit
cachedBy cache k action = case cacheByGet k cache of cachedBy cache k action = case cacheByGet k cache of
Just val -> return $ Right val Just val -> return $ Right val
Nothing -> do Nothing -> do
val <- action val <- action
return $ Left (cacheBySet k val cache, val) return $ Left (cacheBySet k val, val)
-- | Retrieves a value from the keyed cache -- | Retrieves a value from the keyed cache
-- --
@ -93,4 +93,4 @@ cacheByGet key c = res
-- --
-- @since 1.6.10 -- @since 1.6.10
cacheBySet :: Typeable a => ByteString -> a -> KeyedTypeMap -> KeyedTypeMap cacheBySet :: Typeable a => ByteString -> a -> KeyedTypeMap -> KeyedTypeMap
cacheBySet key v cache = insert (typeOf v, key) (toDyn v) cache cacheBySet key v cache = insert (typeOf v, key) (toDyn v) cache