on master help sign in
Drop rng-utils in test

It really doesn't help us much. We don't need the safe concurrent access and I don't want to thread the breaking API change through all past LTSes for one single bench.

commitb04d008b14d378b26ccf96ed8dad6ed19969c7a0 authorMichael Xavier <michael@michaelxavier.net> dateWed 25 Oct 2017, 09:40 (9 years ago) parenteca3d22
6 files changed+10−17
katip-elasticsearch/bench/Main.hs+9−12 katip-elasticsearch/katip-elasticsearch.cabal+1−1 stack-lts-2.yaml−1 stack-lts-3.yaml−1 stack-lts-4.yaml−1 stack-lts-5.yaml−1
katip-elasticsearch/bench/Main.hs+9−12
@@ -13,7 +13,7 @@ import Criterion.Main
1313import Data.Aeson
1414import qualified Data.HashMap.Strict as HM
1515import Data.Proxy (Proxy (..))
16−import Data.RNG
16+import System.Random
1717import qualified Data.Text as T
1818import Database.V1.Bloodhound.Types
1919import Numeric
@@ -24,19 +24,18 @@ import Katip.Scribes.ElasticSearch.Internal (ESV1)
2424
2525main :: IO ()
2626main = do
27− rng <- mkRNG
2827 defaultMain
2928 [
30− mkDocIdBenchmark rng
29+ mkDocIdBenchmark
3130 , deannotateValueBenchmark
3231 ]
3332
3433-------------------------------------------------------------------------------
35−mkDocIdBenchmark :: RNG -> Benchmark
36−mkDocIdBenchmark rng = bgroup "mkDocId"
34+mkDocIdBenchmark :: Benchmark
35+mkDocIdBenchmark = bgroup "mkDocId"
3736 [
3837 bench "mkDocId (randomIO)" $ nfIO (mkDocId (Proxy :: Proxy ESV1))
39− , bench "mkDocId' (shared )" $ nfIO $ mkDocId' rng
38+ , bench "mkDocId' (shared )" $ nfIO mkDocId'
4039 ]
4140
4241
@@ -58,13 +57,11 @@ annotatedValue = Object $ HM.fromList [ ("a::string", String "whatever")
5857 ]
5958
6059-------------------------------------------------------------------------------
61−mkDocId' :: RNG -> IO DocId
62−mkDocId' rng = do
63− is <- withRNG rng $ \gen -> replicateM len $ mk gen
64− return . DocId . T.pack . concatMap (`showHex` "") $ is
60+mkDocId' :: IO DocId
61+mkDocId' = do
62+ is <- replicateM len (randomRIO (0, 15))
63+ return (DocId (T.pack (concatMap (`showHex` "") (is :: [Int]))))
6564 where
6665 len = 32
67− mk :: GenIO -> IO Int
68− mk = uniformR (0,15)
6966
7067deriving instance NFData DocId
katip-elasticsearch/katip-elasticsearch.cabal+1−1
@@ -72,7 +72,7 @@ benchmark bench
7272 , bloodhound
7373 , deepseq
7474 , criterion >= 1.1.0.0
75− , rng-utils
75+ , random
7676 , uuid
7777 , text
7878 , unordered-containers
stack-lts-2.yaml−1
@@ -19,7 +19,6 @@ extra-deps:
1919 - microlens-th-0.4.1.0
2020 - time-1.5.0.1
2121 - memory-0.13
22− - rng-utils-0.2.1
2322 - lens-aeson-1.0.0.5
2423 - atomic-primops-0.8.0.4
2524 - safe-exceptions-0.1.5.0
stack-lts-3.yaml−1
@@ -13,7 +13,6 @@ extra-deps:
1313 - attoparsec-0.13.1.0
1414 - retry-0.7.4.2
1515 - tasty-0.11.0.4
16− - rng-utils-0.2.1
1716 - safe-exceptions-0.1.5.0
1817flags:
1918 katip:
stack-lts-4.yaml−1
@@ -10,7 +10,6 @@ extra-deps:
1010 - fail-4.9.0.0
1111 - tagged-0.8.3
1212 - uuid-1.3.12
13− - rng-utils-0.2.1
1413 - safe-exceptions-0.1.5.0
1514flags:
1615 katip:
stack-lts-5.yaml−1
@@ -7,7 +7,6 @@ extra-deps:
77 - string-conv-0.1.2
88 - aeson-0.11.1.0
99 - http-client-0.5.4
10− - rng-utils-0.2.1
1110 - safe-exceptions-0.1.5.0
1211flags:
1312 katip: