Merge pull request #617 from IntersectMBO/wenkokke/remove-AllocMonkey

fix: remove AllocMonkey

Author: wenkokke

.github/workflows/haskell.yml

@@ -313,5 +313,5 @@ jobs:
     - name: 'Run HLint'
       uses: haskell-actions/hlint-run@v2
       with:
-        path: '[ "src/", "test/", "src-extras/", "src-fcntl-nocache/", "src-kmerge/", "src-mcg/", "src-monkey/", "src-rocksdb/" ]'
+        path: '[ "src/", "test/", "src-extras/", "src-fcntl-nocache/", "src-kmerge/", "src-mcg/", "src-rocksdb/" ]'
         fail-on: suggestion

bench/macro/lsm-tree-bench-bloomfilter.hs

@@ -28,9 +28,9 @@ import           Text.Printf (printf)
 import           Database.LSMTree.Extras.Orphans ()
 import           Database.LSMTree.Internal.Assertions (fromIntegralChecked)
 import qualified Database.LSMTree.Internal.BloomFilterQuery1 as Bloom1
+import           Database.LSMTree.Internal.RunAcc (numHashFunctions)
 import           Database.LSMTree.Internal.Serialise (SerialisedKey,
                      serialiseKey)
-import qualified Monkey
 
 #ifdef BLOOM_QUERY_FAST
 import qualified Database.LSMTree.Internal.BloomFilterQuery2 as Bloom2
@@ -201,7 +201,7 @@ lsmStyleBloomFilters l1 requestedBitsPerEntry =
         ++ replicate 8 (2^(l1+4),16)   -- 8 runs at level 3 (tiering)
         ++            [(2^(l1+8),256)] -- 1 run  at level 4 (leveling)
     , let nbits   = numEntries * requestedBitsPerEntry
-          nhashes = Monkey.numHashFunctions nbits numEntries
+          nhashes = numHashFunctions nbits numEntries
     ]
 
 totalNumEntries, totalNumBytes :: [BloomFilterSizeInfo] -> Integer

bench/macro/lsm-tree-bench-wp8.hs

@@ -226,7 +226,7 @@ cmdP = O.subparser $ mconcat
 
 setupOptsP :: O.Parser SetupOpts
 setupOptsP = pure SetupOpts
-    <*> O.option O.auto (O.long "bloom-filter-alloc" <> O.value LSM.defaultBloomFilterAlloc <> O.showDefault <> O.help "Bloom filter allocation method [AllocFixed n | AllocRequestFPR d | AllocMonkey m (NumEntries n)]")
+    <*> O.option O.auto (O.long "bloom-filter-alloc" <> O.value LSM.defaultBloomFilterAlloc <> O.showDefault <> O.help "Bloom filter allocation method [AllocFixed n | AllocRequestFPR d]")
 
 runOptsP :: O.Parser RunOpts
 runOptsP = pure RunOpts

lsm-tree.cabal

@@ -190,7 +190,6 @@ library
     , lsm-tree:bloomfilter
     , lsm-tree:control
     , lsm-tree:kmerge
-    , lsm-tree:monkey
     , primitive               ^>=0.9
     , text                    ^>=2.1.1
     , vector                  ^>=0.13
@@ -438,7 +437,6 @@ test-suite lsm-tree-test
     , lsm-tree:bloomfilter
     , lsm-tree:control
     , lsm-tree:extras
-    , lsm-tree:monkey
     , lsm-tree:prototypes
     , mtl
     , nothunks
@@ -518,7 +516,6 @@ benchmark lsm-tree-bench-bloomfilter
     , lsm-tree
     , lsm-tree:bloomfilter
     , lsm-tree:extras
-    , lsm-tree:monkey
     , random
     , time
     , vector
@@ -641,14 +638,6 @@ library rocksdb
     , bytestring
     , indexed-traversable
 
-library monkey
-  import:          language, warnings, wno-x-partial
-  hs-source-dirs:  src-monkey
-  exposed-modules: Monkey
-  build-depends:
-    , ad    ^>=4.5.6
-    , base
-
 library kmerge
   import:          language, warnings, wno-x-partial
   hs-source-dirs:  src-kmerge