diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +0.2.1 Enzo Haussecker Wed Jul 25 2018 + + * Fix bug related to temporary reference creation + 0.2.0 Enzo Haussecker Sat Jul 21 2018 * Remove config parameter from type class @@ -12,4 +16,4 @@ * Abstract database to type class * Implement radix tree construction via conduit - * Clean-up documentation + * Clean-up documentationtemporary references diff --git a/benchmark/dfinity-radix-tree-benchmarks.svg b/benchmark/dfinity-radix-tree-benchmarks.svg --- a/benchmark/dfinity-radix-tree-benchmarks.svg +++ b/benchmark/dfinity-radix-tree-benchmarks.svg @@ -6,139 +6,155 @@ -dfinity-radix-tree-benchmarks (Sat Jul 21 21:21 2018) +dfinity-radix-tree-benchmarks (Wed Jul 25 01:08 2018) bytes seconds 0 - -500k - -1M - -1.5M - -2M - -2.5M - -3M - -3.5M - -4M - + +500k + +1M + +1.5M + +2M + +2.5M + +3M + +3.5M + +4M + +4.5M + +5M + +5.5M + +6M + +6.5M + 0 - -5 - -10 - -15 - -20 - -25 - -30 - -35 - + +5 + +10 + +15 + +20 + +25 + +30 + +35 + - - - - - - - + + + + + - + + + + + - + - + - + - - - + + + - + - + + + - - - + - + ARR_WORDS - + -dfinity-radix-tree-0.1.1-InTbb43R1Ol8NlAW1if72l:Network.DFINITY.RadixTree.Types.RadixNode - +ghc-prim:GHC.Types.: + -bytestring-0.10.8.2:Data.ByteString.Internal.PS - +dfinity-radix-tree-0.2.1-QxVrET4yvI4uUA6Z1qOAx:Network.DFINITY.RadixTree.Types.RadixNode + -base:GHC.Base.Just - +bytestring-0.10.8.2:Data.ByteString.Short.Internal.SBS + -bytestring-0.10.8.2:Data.ByteString.Short.Internal.SBS - +base:GHC.Base.Just + -containers-0.5.11.0:Data.Map.Internal.Bin - +bytestring-0.10.8.2:Data.ByteString.Internal.PS + -psqueues-0.2.7.0-1aggzzwUfpWF78UDbYzHKl:Data.IntPSQ.Internal.Bin - +containers-0.5.11.0:Data.Map.Internal.Bin + -psqueues-0.2.7.0-1aggzzwUfpWF78UDbYzHKl:Data.HashPSQ.Internal.B - +psqueues-0.2.7.0-1aggzzwUfpWF78UDbYzHKl:Data.IntPSQ.Internal.Bin + -base:GHC.ForeignPtr.PlainPtr - +psqueues-0.2.7.0-1aggzzwUfpWF78UDbYzHKl:Data.HashPSQ.Internal.B + -dfinity-radix-tree-0.1.1-InTbb43R1Ol8NlAW1if72l:Network.DFINITY.RadixTree.Types.RadixPrefix - +base:GHC.ForeignPtr.PlainPtr + -base:GHC.Int.I64# - +THUNK_1_0 + -STACK - +base:GHC.Int.I64# + -psqueues-0.2.7.0-1aggzzwUfpWF78UDbYzHKl:Data.IntPSQ.Internal.Tip - +STACK + -THUNK_1_0 - +THUNK + -(trace elements) +psqueues-0.2.7.0-1aggzzwUfpWF78UDbYzHKl:Data.IntPSQ.Internal.Tip + + + +(trace elements) diff --git a/dfinity-radix-tree.cabal b/dfinity-radix-tree.cabal --- a/dfinity-radix-tree.cabal +++ b/dfinity-radix-tree.cabal @@ -1,5 +1,5 @@ Name: dfinity-radix-tree -Version: 0.2.0 +Version: 0.2.1 Synopsis: A generic data integrity layer. Description: This library allows you to construct a Merkle tree on top of any underlying diff --git a/src/Network/DFINITY/RadixTree.hs b/src/Network/DFINITY/RadixTree.hs --- a/src/Network/DFINITY/RadixTree.hs +++ b/src/Network/DFINITY/RadixTree.hs @@ -118,7 +118,7 @@ case snd <$> result of Nothing -> throw $ StateRootDoesNotExist root Just cache' -> pure (root, cache') - pure $ RadixTree bloom bloomSize Map.empty cache' cacheSize root database root + pure $ RadixTree bloom bloomSize Map.empty cache' cacheSize root database 0 root where bloom = emptyRadixBloom bloomSize cache = LRU.empty cacheSize @@ -138,7 +138,7 @@ result <- loadCold root cache _radixDatabase case result of Nothing -> throw $ StateRootDoesNotExist root - _ -> pure $ RadixTree bloom _radixBloomSize Map.empty cache _radixCacheSize root _radixDatabase root + _ -> pure $ RadixTree bloom _radixBloomSize Map.empty cache _radixCacheSize root _radixDatabase 0 root where bloom = emptyRadixBloom _radixBloomSize cache = LRU.empty _radixCacheSize @@ -280,12 +280,13 @@ -> RadixTree database {-# INLINABLE initializeRadixTree #-} initializeRadixTree key value tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setRoot root tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setNonce nonce $ setRoot root tree where prefix = createPrefix $ toBits key node = setPrefix prefix $ Just value `setLeaf` def - root = createRoot node + root = createRootFromNonce _radixNonce bloom = Bloom.insert root _radixBloom + nonce = _radixNonce + 1 buffer = storeHot root node _radixBuffer -- TODO (enzo): Documentation. @@ -296,13 +297,14 @@ -> RadixTree database {-# INLINABLE insertRadixTreeAt #-} insertRadixTreeAt (_:|roots, node:|nodes, prefix:|_, _, _, cache) value tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where node' = Just value `setLeaf` node - root' = createRoot node' + root' = createRootFromNonce _radixNonce parent = listToMaybe $ zip3 roots nodes prefix bloom = flip insertList _radixBloom $ root':roots buffer = merkleSpoof root' parent $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 1 state = bool _radixRoot root' $ isNothing parent -- TODO (enzo): Documentation. @@ -313,17 +315,18 @@ -> RadixTree database {-# INLINABLE insertRadixTreeAfter #-} insertRadixTreeAfter (_:|roots, node:|nodes, prefix:|_, _, keyOverflow, cache) value tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where prefix' = createPrefix $ drop 1 keyOverflow node' = setPrefix prefix' $ Just value `setLeaf` def - root' = createRoot node' + root' = createRootFromNonce _radixNonce node'' = test `setChild` Just root' $ node - root'' = createRoot node'' + root'' = createRootFromNonce $ _radixNonce + 1 test = head keyOverflow parent = listToMaybe $ zip3 roots nodes prefix bloom = flip insertList _radixBloom $ root'':root':roots buffer = merkleSpoof root'' parent $ storeHot root'' node'' $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 2 state = bool _radixRoot root'' $ isNothing parent -- TODO (enzo): Documentation. @@ -334,18 +337,19 @@ -> RadixTree database {-# INLINABLE insertRadixTreeBefore #-} insertRadixTreeBefore (_:|roots, node:|nodes, prefix:|_, prefixOverflow, _, cache) value tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where prefix' = createPrefix $ drop 1 prefixOverflow node' = setPrefix prefix' node - root' = createRoot node' + root' = createRootFromNonce _radixNonce prefix'' = createPrefix $ drop 1 prefix `bool` prefix $ isNothing parent node'' = setPrefix prefix'' $ test `setChild` Just root' $ Just value `setLeaf` def - root'' = createRoot node'' + root'' = createRootFromNonce $ _radixNonce + 1 test = head prefixOverflow parent = listToMaybe $ zip3 roots nodes prefix bloom = flip insertList _radixBloom $ root'':root':roots buffer = merkleSpoof root'' parent $ storeHot root'' node'' $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 2 state = bool _radixRoot root'' $ isNothing parent -- TODO (enzo): Documentation. @@ -356,22 +360,23 @@ -> RadixTree database {-# INLINABLE insertRadixTreeBetween #-} insertRadixTreeBetween (_:|roots, node:|nodes, prefix:|_, prefixOverflow, keyOverflow, cache) value tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where prefix' = createPrefix $ drop 1 keyOverflow node' = setPrefix prefix' $ Just value `setLeaf` def - root' = createRoot node' + root' = createRootFromNonce _radixNonce prefix'' = createPrefix $ drop 1 prefixOverflow node'' = setPrefix prefix'' node - root'' = createRoot node'' + root'' = createRootFromNonce $ _radixNonce + 1 prefix''' = createPrefix $ drop 1 prefix `bool` prefix $ isNothing parent node''' = setPrefix prefix''' $ setChildren children def - root''' = createRoot node''' + root''' = createRootFromNonce $ _radixNonce + 2 test = head keyOverflow children = bool id swap test (Just root', Just root'') parent = listToMaybe $ zip3 roots nodes prefix bloom = flip insertList _radixBloom $ root''':root'':root':roots buffer = merkleSpoof root''' parent $ storeHot root''' node''' $ storeHot root'' node'' $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 3 state = bool _radixRoot root''' $ isNothing parent -- | @@ -446,14 +451,15 @@ -> RadixTree database {-# INLINABLE deleteRadixTreeNoChildrenParentWithLeaf #-} deleteRadixTreeNoChildrenParentWithLeaf (_:|_:roots, _:|node:nodes, prefix:|prefixes, _, _, cache) tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where node' = setChild test Nothing node - root' = createRoot node' + root' = createRootFromNonce _radixNonce test = head prefix parent = listToMaybe $ zip3 roots nodes $ map head prefixes bloom = flip insertList _radixBloom $ root':roots buffer = merkleSpoof root' parent $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 1 state = bool _radixRoot root' $ isNothing parent deleteRadixTreeNoChildrenParentWithLeaf _ _ = throw $ InvalidArgument "unknown parent" @@ -468,15 +474,16 @@ -> RadixTree database {-# INLINABLE deleteRadixTreeNoChildrenParentWithoutLeaf #-} deleteRadixTreeNoChildrenParentWithoutLeaf (_:|_:roots, _:|_:nodes, _:|prefixes, _, _, _) node@RadixNode {..} cache test tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where prefix' = createPrefix $ drop 1 bits `bool` bits $ isNothing parent node' = setPrefix prefix' node - root' = createRoot node' + root' = createRootFromNonce _radixNonce bits = head prefixes ++ test:maybe [] toBits _radixPrefix parent = listToMaybe $ zip3 roots nodes $ map head prefixes bloom = flip insertList _radixBloom $ root':roots buffer = merkleSpoof root' parent $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 1 state = bool _radixRoot root' $ isNothing parent deleteRadixTreeNoChildrenParentWithoutLeaf _ _ _ _ _ = throw $ InvalidArgument "unknown parent" @@ -491,15 +498,16 @@ -> RadixTree database {-# INLINABLE deleteRadixTreeOneChild #-} deleteRadixTreeOneChild (_:|roots, _:|nodes, prefix:|_, _, _, _) node@RadixNode {..} cache test tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where prefix' = createPrefix $ drop 1 bits `bool` bits $ isNothing parent node' = setPrefix prefix' node - root' = createRoot node' + root' = createRootFromNonce _radixNonce bits = prefix ++ test:maybe [] toBits _radixPrefix parent = listToMaybe $ zip3 roots nodes prefix bloom = flip insertList _radixBloom $ root':roots buffer = merkleSpoof root' parent $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 1 state = bool _radixRoot root' $ isNothing parent -- TODO (enzo): Documentation. @@ -509,13 +517,14 @@ -> RadixTree database {-# INLINABLE deleteRadixTreeTwoChildren #-} deleteRadixTreeTwoChildren (_:|roots, node:|nodes, prefix:|_, _, _, cache) tree@RadixTree {..} = - seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setRoot state tree + seq bloom $ setBloom bloom $ setBuffer buffer $ setCache cache $ setNonce nonce $ setRoot state tree where node' = setLeaf Nothing node - root' = createRoot node' + root' = createRootFromNonce _radixNonce parent = listToMaybe $ zip3 roots nodes prefix bloom = flip insertList _radixBloom $ root':roots buffer = merkleSpoof root' parent $ storeHot root' node' _radixBuffer + nonce = _radixNonce + 1 state = bool _radixRoot root' $ isNothing parent -- | @@ -563,10 +572,7 @@ => ByteString -- ^ Key. -> RadixTree database -- ^ Radix tree. -> m (Maybe (ByteString, RadixTree database)) -{-# SPECIALISE lookupMerkleizedRadixTree - :: ByteString - -> RadixTree DB - -> ResourceT IO (Maybe (ByteString, RadixTree DB)) #-} +{-# DEPRECATED lookupMerkleizedRadixTree "The function is will be removed in the next release. Please use 'lookupRadixTree' instead." #-} lookupMerkleizedRadixTree = lookupRadixTree' searchMerkleizedRadixTree -- | @@ -606,7 +612,7 @@ -> ResourceT IO (RadixRoot, RadixTree DB) #-} merkleizeRadixTree RadixTree {..} = do (root, cache) <- loop _radixRoot _radixCache - let tree = RadixTree bloom _radixBloomSize Map.empty cache _radixCacheSize root _radixDatabase root + let tree = RadixTree bloom _radixBloomSize Map.empty cache _radixCacheSize root _radixDatabase 0 root pure (root, tree) where bloom = emptyRadixBloom _radixBloomSize diff --git a/src/Network/DFINITY/RadixTree/Lenses.hs b/src/Network/DFINITY/RadixTree/Lenses.hs --- a/src/Network/DFINITY/RadixTree/Lenses.hs +++ b/src/Network/DFINITY/RadixTree/Lenses.hs @@ -15,6 +15,7 @@ , getBuffer , getCache , getCheckpoint + , getNonce , getRoot , setPrefix , setLeft @@ -26,6 +27,7 @@ , setBuffer , setCache , setCheckpoint + , setNonce , setRoot ) where @@ -68,6 +70,9 @@ getCheckpoint :: RadixTree database -> RadixRoot getCheckpoint = view radixCheckpoint +getNonce :: RadixTree database -> Word +getNonce = view radixNonce + getRoot :: RadixTree database -> RadixRoot getRoot = view radixRoot @@ -100,6 +105,9 @@ setCheckpoint :: RadixRoot -> RadixTree database -> RadixTree database setCheckpoint = set radixCheckpoint + +setNonce :: Word -> RadixTree database -> RadixTree database +setNonce = set radixNonce setRoot :: RadixRoot -> RadixTree database -> RadixTree database setRoot = set radixRoot diff --git a/src/Network/DFINITY/RadixTree/Types.hs b/src/Network/DFINITY/RadixTree/Types.hs --- a/src/Network/DFINITY/RadixTree/Types.hs +++ b/src/Network/DFINITY/RadixTree/Types.hs @@ -115,17 +115,16 @@ instance Show RadixNode where show node@RadixNode {..} = - case color 7 . unpack <$> _radixLeaf of - Nothing -> printf "%s@[%s,%s,%s]" root prefix left right - Just leaf -> printf "%s@[%s,%s,%s,%s]" root prefix left right leaf + case unpack <$> _radixLeaf of + Nothing -> printf "\ESC[96m%s\ESC[0m@[\ESC[97m%s\ESC[0m,\ESC[96m%s\ESC[0m,\ESC[96m%s\ESC[0m]" root prefix left right + Just leaf -> printf "\ESC[96m%s\ESC[0m@[\ESC[97m%s\ESC[0m,\ESC[96m%s\ESC[0m,\ESC[96m%s\ESC[0m,\ESC[97m%s\ESC[0m]" root prefix left right leaf where - color :: Int -> String -> String - color = printf "\ESC[9%dm%s\ESC[0m" + root = format $ hash $ toStrict $ serialise node + prefix = guard show _radixPrefix + left = guard format $ fromShort <$> _radixLeft + right = guard format $ fromShort <$> _radixRight + guard = maybe "null" format = take 8 . unpack . Base16.encode - root = color 4 $ format $ hash $ toStrict $ serialise node - prefix = color 7 $ maybe "null" show _radixPrefix - left = color 4 $ maybe "null" format $ fromShort <$> _radixLeft - right = color 4 $ maybe "null" format $ fromShort <$> _radixRight data RadixPrefix = RadixPrefix @@ -174,5 +173,6 @@ , _radixCacheSize :: Int , _radixCheckpoint :: RadixRoot , _radixDatabase :: database + , _radixNonce :: Word , _radixRoot :: RadixRoot } diff --git a/src/Network/DFINITY/RadixTree/Utilities.hs b/src/Network/DFINITY/RadixTree/Utilities.hs --- a/src/Network/DFINITY/RadixTree/Utilities.hs +++ b/src/Network/DFINITY/RadixTree/Utilities.hs @@ -3,11 +3,13 @@ module Network.DFINITY.RadixTree.Utilities ( createPrefix , createRoot + , createRootFromNonce , defaultRoot ) where import Codec.Serialise (serialise) import Crypto.Hash.SHA256 (hashlazy) +import Data.ByteString.Builder (toLazyByteString, wordDec) import Data.ByteString.Char8 as Byte (take) import Data.ByteString.Short (toShort) import Data.Default.Class (def) @@ -23,6 +25,9 @@ createRoot :: RadixNode -> RadixRoot createRoot = toShort . Byte.take 20 . hashlazy . serialise + +createRootFromNonce :: Word -> RadixRoot +createRootFromNonce = toShort . Byte.take 20 . hashlazy . toLazyByteString . wordDec defaultRoot :: RadixRoot defaultRoot = createRoot def