Skip to content

Commit

Permalink
ChainDB.Iterator: read the switchover point from memory
Browse files Browse the repository at this point in the history 
When streaming from both the ImmutableDB and the VolatileDB, we need to know
the switchover point, i.e. the tip of the ImmutableDB.

Previously, we were reading that whole block from disk to figure out its hash,
while we already had the necessary information in memory: the anchor point of
the in-memory chain fragment refers to the tip of the ImmutableDB (see the
invariant of 'cdbChain'). We now take advantage of this information and avoid
one extra block read.
  • Loading branch information
@mrBliss
mrBliss committed Jul 22, 2019
1 parent 9aab180 commit bb0a91a
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 36 deletions.
84 changes: 49 additions & 35 deletions ouroboros-consensus/src/Ouroboros/Storage/ChainDB/Impl/Iterator.hs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}
Expand Down Expand Up @@ -28,8 +29,10 @@ import Control.Monad.Class.MonadThrow

import Control.Tracer

import Ouroboros.Network.Block (HasHeader, HeaderHash, blockHash,
blockPoint, pointSlot)
import qualified Ouroboros.Network.AnchoredFragment as AF
import Ouroboros.Network.Block (pattern BlockPoint,
pattern GenesisPoint, HasHeader, HeaderHash, Point,
blockHash, blockPoint, castPoint, pointSlot, withHash)

import Ouroboros.Storage.ChainDB.API (ChainDbError (..),
Iterator (..), IteratorId (..), IteratorResult (..),
Expand Down Expand Up @@ -141,16 +144,19 @@ import qualified Ouroboros.Storage.ChainDB.Impl.VolDB as VolDB
-- read from disk.
--
-- * When blocks have to be streamed both from the ImmutableDB and the
-- VolatileDB, the blocks corresponding to the two bound will have to be
-- VolatileDB, the blocks corresponding to the two bounds will have to be
-- read upfront, as described in the previous bullet point. Since the tip of
-- the ImmutableDB must be the switchover point between the two, it will be
-- the upper bound.
-- the upper bound. However, we know the point at the tip of the
-- ImmutableDB: it is the anchor point of the current fragment (see the
-- invariant of 'cdbChain'), thus the upper bound does not have to be read
-- upfront.
--
-- In summary:
--
-- * Only streaming from the VolatileDB: 0 blocks read upfront.
-- * Only streaming from the ImmutableDB: 2 blocks read upfront.
-- * Streaming from both the ImmutableDB and the VolatileDB: 2 blocks read
-- * Streaming from both the ImmutableDB and the VolatileDB: 1 block read
-- upfront.
--
-- Additionally, when we notice during streaming that a block is no longer in
Expand Down Expand Up @@ -189,16 +195,22 @@ streamBlocks h from to = getEnv h $ \cdb ->
data IteratorEnv m blk = IteratorEnv
{ itImmDB :: ImmDB m blk
, itVolDB :: VolDB m blk
, itGetImmDBTip :: m (Point blk)
-- ^ This should preferably be cheap.
, itIterators :: TVar m (Map IteratorId (m ()))
, itNextIteratorId :: TVar m IteratorId
, itTracer :: Tracer m (TraceIteratorEvent blk)
}

-- | Obtain an 'IteratorEnv' from a 'ChainDbEnv'.
fromChainDbEnv :: ChainDbEnv m blk -> IteratorEnv m blk
fromChainDbEnv :: MonadSTM m
=> ChainDbEnv m blk -> IteratorEnv m blk
fromChainDbEnv CDB{..} = IteratorEnv
{ itImmDB = cdbImmDB
, itVolDB = cdbVolDB
-- See the invariant of 'cdbChain'.
, itGetImmDBTip = castPoint . AF.anchorPoint <$>
atomically (readTVar cdbChain)
, itIterators = cdbIterators
, itNextIteratorId = cdbNextIteratorId
, itTracer = contramap TraceIteratorEvent cdbTracer
Expand Down Expand Up @@ -289,37 +301,39 @@ newIterator itEnv@IteratorEnv{..} getItEnv from to = do
-> ExceptT (UnknownRange blk) m (Iterator m blk)
streamFromBoth predHash hashes = do
lift $ trace $ StreamFromBoth from to hashes
lift (ImmDB.getBlockAtTip itImmDB) >>= \case
lift itGetImmDBTip >>= \case
-- The ImmutableDB is empty
Nothing -> throwError $ ForkTooOld from
GenesisPoint -> throwError $ ForkTooOld from
-- The incomplete path fits onto the tip of the ImmutableDB.
Just blk | blockHash blk == predHash -> case NE.nonEmpty hashes of
Just hashes' -> stream (blockPoint blk) hashes'
-- The path is actually empty, but the exclusive upper bound was
-- in the VolatileDB. Just stream from the ImmutableDB without
-- checking the upper bound (which might not be in the
-- ImmutableDB)
Nothing -> streamFromImmDBHelper False
-- The incomplete path doesn't fit onto the tip of the ImmutableDB.
-- Note that since we have constructed the incomplete path through
-- the VolatileDB, blocks might have moved from the VolatileDB to
-- the ImmutableDB so that the tip of the ImmutableDB has changed.
-- Either the path used to fit onto the tip but the tip has changed,
-- or the path simply never fitted onto the tip.
Just blk -> case dropWhile (/= blockHash blk) hashes of
-- The current tip is not in the path, this means that the path
-- never fitted onto the tip of the ImmutableDB. We refuse this
-- stream.
[] -> throwError $ ForkTooOld from
-- The current tip is in the path, with some hashes after it, this
-- means that some blocks in our path have moved from the
-- VolatileDB to the ImmutableDB. We can shift the switchover
-- point to the current tip.
_tipHash:hash:hashes' -> stream (blockPoint blk) (hash NE.:| hashes')
-- The current tip is the end of the path, this means we can
-- actually stream everything from just the ImmutableDB. No need
-- to check the hash at the upper bound again.
[_tipHash] -> streamFromImmDBHelper False
pt@BlockPoint { withHash = tipHash }
| tipHash == predHash
-> case NE.nonEmpty hashes of
Just hashes' -> stream pt hashes'
-- The path is actually empty, but the exclusive upper bound was
-- in the VolatileDB. Just stream from the ImmutableDB without
-- checking the upper bound (which might not be in the
-- ImmutableDB)
Nothing -> streamFromImmDBHelper False
-- The incomplete path doesn't fit onto the tip of the ImmutableDB.
-- Note that since we have constructed the incomplete path through
-- the VolatileDB, blocks might have moved from the VolatileDB to
-- the ImmutableDB so that the tip of the ImmutableDB has changed.
-- Either the path used to fit onto the tip but the tip has changed,
-- or the path simply never fitted onto the tip.
| otherwise -> case dropWhile (/= tipHash) hashes of
-- The current tip is not in the path, this means that the path
-- never fitted onto the tip of the ImmutableDB. We refuse this
-- stream.
[] -> throwError $ ForkTooOld from
-- The current tip is in the path, with some hashes after it, this
-- means that some blocks in our path have moved from the
-- VolatileDB to the ImmutableDB. We can shift the switchover
-- point to the current tip.
_tipHash:hash:hashes' -> stream pt (hash NE.:| hashes')
-- The current tip is the end of the path, this means we can
-- actually stream everything from just the ImmutableDB. No need
-- to check the hash at the upper bound again.
[_tipHash] -> streamFromImmDBHelper False
where
stream pt hashes' = do
let immEnd = SwitchToVolDBFrom (StreamToInclusive pt) hashes'
Expand Down
4 changes: 3 additions & 1 deletion ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/Iterator.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import Ouroboros.Consensus.Util.Condense (condense)
import Ouroboros.Storage.ChainDB.API (Iterator (..), IteratorId (..),
IteratorResult (..), StreamFrom (..), StreamTo (..),
UnknownRange)
import Ouroboros.Storage.ChainDB.Impl.ImmDB (ImmDB, mkImmDB)
import Ouroboros.Storage.ChainDB.Impl.ImmDB (ImmDB, getPointAtTip,
mkImmDB)
import Ouroboros.Storage.ChainDB.Impl.Iterator (IteratorEnv (..),
newIterator)
import Ouroboros.Storage.ChainDB.Impl.Types (TraceIteratorEvent (..))
Expand Down Expand Up @@ -265,6 +266,7 @@ initIteratorEnv TestSetup { immutable, volatile } tracer = do
return IteratorEnv
{ itImmDB = immDB
, itVolDB = volDB
, itGetImmDBTip = getPointAtTip immDB
, itIterators = iters
, itNextIteratorId = nextIterId
, itTracer = tracer
Expand Down

0 comments on commit bb0a91a

Please sign in to comment.