diff --git a/bench/macro/lsm-tree-bench-bloomfilter.hs b/bench/macro/lsm-tree-bench-bloomfilter.hs index 300a625e8..726ca462f 100644 --- a/bench/macro/lsm-tree-bench-bloomfilter.hs +++ b/bench/macro/lsm-tree-bench-bloomfilter.hs @@ -271,7 +271,7 @@ benchInBatches !b !rng0 !action = go !rng !n | n <= 0 = () | otherwise = - let (!rng'', !rng') = split rng + let (!rng'', !rng') = splitGen rng ks :: VP.Vector Word256 !ks = VP.unfoldrExactN b uniform rng' ks' :: V.Vector SerialisedKey diff --git a/bench/macro/lsm-tree-bench-lookups.hs b/bench/macro/lsm-tree-bench-lookups.hs index 5edebc588..2f2b7c9be 100644 --- a/bench/macro/lsm-tree-bench-lookups.hs +++ b/bench/macro/lsm-tree-bench-lookups.hs @@ -399,7 +399,7 @@ genLookupBatch !rng0 !n0 !res <- V.unsafeFreeze mres pure (res, rng) | otherwise = do - let (!k, !rng') = uniform @StdGen @UTxOKey rng + let (!k, !rng') = uniform @UTxOKey @StdGen rng !sk = serialiseKey k VM.write mres i $! sk go rng' (i+1) mres diff --git a/bench/micro/Bench/Database/LSMTree/Internal/Lookup.hs b/bench/micro/Bench/Database/LSMTree/Internal/Lookup.hs index 9228dbb84..87b47e81e 100644 --- a/bench/micro/Bench/Database/LSMTree/Internal/Lookup.hs +++ b/bench/micro/Bench/Database/LSMTree/Internal/Lookup.hs @@ -243,8 +243,8 @@ lookupsEnv :: , V.Vector SerialisedKey ) lookupsEnv g nentries npos nneg = do - let (g1, g') = R.split g - (g2, g3) = R.split g' + let (g1, g') = R.splitGen g + (g2, g3) = R.splitGen g' let (keys, negLookups) = splitAt nentries $ uniformWithoutReplacement @UTxOKey g1 (nentries + nneg) posLookups = sampleUniformWithReplacement g2 npos keys diff --git a/bench/micro/Bench/Database/LSMTree/Internal/Merge.hs b/bench/micro/Bench/Database/LSMTree/Internal/Merge.hs index 190871044..5bb90d260 100644 --- a/bench/micro/Bench/Database/LSMTree/Internal/Merge.hs +++ b/bench/micro/Bench/Database/LSMTree/Internal/Merge.hs @@ -340,22 +340,22 @@ defaultConfig = Config { configWord64 :: Config configWord64 = defaultConfig { - randomKey = first serialiseKey . uniform @_ @Word64 - , randomValue = first serialiseValue . uniform @_ @Word64 + randomKey = first serialiseKey . uniform @Word64 @_ + , randomValue = first serialiseValue . uniform @Word64 @_ , randomBlob = first serialiseBlob . R.randomByteStringR (0, 0x2000) -- up to 8 kB } configUTxO :: Config configUTxO = defaultConfig { - randomKey = first serialiseKey . uniform @_ @UTxOKey - , randomValue = first serialiseValue . uniform @_ @UTxOValue + randomKey = first serialiseKey . uniform @UTxOKey @_ + , randomValue = first serialiseValue . uniform @UTxOValue @_ } configUTxOStaking :: Config configUTxOStaking = defaultConfig { fmupserts = 1 - , randomKey = first serialiseKey . uniform @_ @UTxOKey - , randomValue = first serialiseValue . uniform @_ @Word64 + , randomKey = first serialiseKey . uniform @UTxOKey @_ + , randomValue = first serialiseValue . uniform @Word64 @_ , mergeResolve = Just (onDeserialisedValues ((+) @Word64)) } @@ -401,7 +401,7 @@ randomRuns hasFS hasBlockIO config@Config {..} rng0 = do zipWith (randomRunData config) nentries - (List.unfoldr (Just . R.split) rng0) + (List.unfoldr (Just . R.splitGen) rng0) -- | Generate keys and entries to insert into the write buffer. -- They are already serialised to exclude the cost from the benchmark. @@ -416,7 +416,7 @@ randomRunData Config {..} runentries g0 = (R.withoutReplacement g1 runentries randomKey) (R.withReplacement g2 runentries randomEntry) where - (g1, g2) = R.split g0 + (g1, g2) = R.splitGen g0 randomEntry :: Rnd (Entry SerialisedValue SerialisedBlob) randomEntry = R.frequency diff --git a/bench/micro/Bench/Database/LSMTree/Internal/WriteBuffer.hs b/bench/micro/Bench/Database/LSMTree/Internal/WriteBuffer.hs index b02894b2d..fb6b4dd16 100644 --- a/bench/micro/Bench/Database/LSMTree/Internal/WriteBuffer.hs +++ b/bench/micro/Bench/Database/LSMTree/Internal/WriteBuffer.hs @@ -168,14 +168,14 @@ defaultConfig = Config { configWord64 :: Config configWord64 = defaultConfig { - randomKey = first serialiseKey . uniform @_ @Word64 - , randomValue = first serialiseValue . uniform @_ @Word64 + randomKey = first serialiseKey . uniform @Word64 @_ + , randomValue = first serialiseValue . uniform @Word64 @_ } configUTxO :: Config configUTxO = defaultConfig { - randomKey = first serialiseKey . uniform @_ @UTxOKey - , randomValue = first serialiseValue . uniform @_ @UTxOValue + randomKey = first serialiseKey . uniform @UTxOKey @_ + , randomValue = first serialiseValue . uniform @UTxOValue @_ } envInputKOps :: Config -> InputKOps diff --git a/cabal.project.release b/cabal.project.release index d86178ae4..34de8e421 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -1,7 +1,6 @@ index-state: -- Bump this if you need newer packages from Hackage - -- current date: ghc-9.12 and data-elevator - , hackage.haskell.org 2025-03-10T07:49:31Z + , hackage.haskell.org 2025-05-01T00:00:00Z packages: . diff --git a/src-extras/Database/LSMTree/Extras/Random.hs b/src-extras/Database/LSMTree/Extras/Random.hs index 02a6460e4..b5ca2ec6d 100644 --- a/src-extras/Database/LSMTree/Extras/Random.hs +++ b/src-extras/Database/LSMTree/Extras/Random.hs @@ -102,4 +102,4 @@ frequency xs0 g randomByteStringR :: (Int, Int) -> StdGen -> (BS.ByteString, StdGen) randomByteStringR range g = let (!l, !g') = uniformR range g - in R.genByteString l g' + in R.uniformByteString l g' diff --git a/test/Test/Database/LSMTree/Internal/RunBloomFilterAlloc.hs b/test/Test/Database/LSMTree/Internal/RunBloomFilterAlloc.hs index 386ba548c..7f7ddace2 100644 --- a/test/Test/Database/LSMTree/Internal/RunBloomFilterAlloc.hs +++ b/test/Test/Database/LSMTree/Internal/RunBloomFilterAlloc.hs @@ -37,7 +37,7 @@ import Database.LSMTree.Extras.Random import qualified Database.LSMTree.Internal.Entry as LSMT import Database.LSMTree.Internal.RunAcc (RunBloomFilterAlloc (..), falsePositiveRate, newMBloom) -import System.Random +import System.Random hiding (Seed) import Test.QuickCheck import Test.QuickCheck.Gen import Test.Tasty (TestTree, testGroup)