Skip to content

Commit f93b552

Browse files
committed
fix: remove the monkey sub-library
1 parent a3ac13a commit f93b552

File tree

5 files changed

+3
-363
lines changed

5 files changed

+3
-363
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,5 +313,5 @@ jobs:
313313
- name: 'Run HLint'
314314
uses: haskell-actions/hlint-run@v2
315315
with:
316-
path: '[ "src/", "test/", "src-extras/", "src-fcntl-nocache/", "src-kmerge/", "src-mcg/", "src-monkey/", "src-rocksdb/" ]'
316+
path: '[ "src/", "test/", "src-extras/", "src-fcntl-nocache/", "src-kmerge/", "src-mcg/", "src-rocksdb/" ]'
317317
fail-on: suggestion

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import Text.Printf (printf)
2828
import Database.LSMTree.Extras.Orphans ()
2929
import Database.LSMTree.Internal.Assertions (fromIntegralChecked)
3030
import qualified Database.LSMTree.Internal.BloomFilterQuery1 as Bloom1
31+
import Database.LSMTree.Internal.RunAcc (numHashFunctions)
3132
import Database.LSMTree.Internal.Serialise (SerialisedKey,
3233
serialiseKey)
33-
import qualified Monkey
3434

3535
#ifdef BLOOM_QUERY_FAST
3636
import qualified Database.LSMTree.Internal.BloomFilterQuery2 as Bloom2
@@ -201,7 +201,7 @@ lsmStyleBloomFilters l1 requestedBitsPerEntry =
201201
++ replicate 8 (2^(l1+4),16) -- 8 runs at level 3 (tiering)
202202
++ [(2^(l1+8),256)] -- 1 run at level 4 (leveling)
203203
, let nbits = numEntries * requestedBitsPerEntry
204-
nhashes = Monkey.numHashFunctions nbits numEntries
204+
nhashes = numHashFunctions nbits numEntries
205205
]
206206

207207
totalNumEntries, totalNumBytes :: [BloomFilterSizeInfo] -> Integer

lsm-tree.cabal

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,6 @@ test-suite lsm-tree-test
437437
, lsm-tree:bloomfilter
438438
, lsm-tree:control
439439
, lsm-tree:extras
440-
, lsm-tree:monkey
441440
, lsm-tree:prototypes
442441
, mtl
443442
, nothunks
@@ -517,7 +516,6 @@ benchmark lsm-tree-bench-bloomfilter
517516
, lsm-tree
518517
, lsm-tree:bloomfilter
519518
, lsm-tree:extras
520-
, lsm-tree:monkey
521519
, random
522520
, time
523521
, vector
@@ -640,14 +638,6 @@ library rocksdb
640638
, bytestring
641639
, indexed-traversable
642640

643-
library monkey
644-
import: language, warnings, wno-x-partial
645-
hs-source-dirs: src-monkey
646-
exposed-modules: Monkey
647-
build-depends:
648-
, ad ^>=4.5.6
649-
, base
650-
651641
library kmerge
652642
import: language, warnings, wno-x-partial
653643
hs-source-dirs: src-kmerge

src-monkey/Monkey.hs

Lines changed: 0 additions & 321 deletions
This file was deleted.

0 commit comments

Comments
 (0)