Skip to content

Commit 504f43a

Browse files
jeltschjeltsch
committed
Introduce extra namespaces for index-type-specific modules
1 parent d11c709 commit 504f43a

File tree

23 files changed

+55
-55
lines changed

23 files changed

+55
-55
lines changed

‎bench/macro/lsm-tree-bench-lookups.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import Database.LSMTree.Extras.Orphans ()
2525
import Database.LSMTree.Extras.UTxO
2626
import Database.LSMTree.Internal.Entry (Entry (Insert),
2727
NumEntries (..))
28-
import Database.LSMTree.Internal.IndexCompact (IndexCompact)
28+
import Database.LSMTree.Internal.Index.Compact (IndexCompact)
2929
import Database.LSMTree.Internal.Lookup
3030
import Database.LSMTree.Internal.Paths (RunFsPaths (RunFsPaths))
3131
import Database.LSMTree.Internal.Run (Run)

bench/micro/Bench/Database/LSMTree/Internal/IndexCompact.hs renamed to bench/micro/Bench/Database/LSMTree/Internal/Index/Compact.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{-# LANGUAGE TypeApplications #-}
33
{- HLINT ignore "Eta reduce" -}
44

5-
module Bench.Database.LSMTree.Internal.IndexCompact (
5+
module Bench.Database.LSMTree.Internal.Index.Compact (
66
benchmarks
77
-- * Benchmarked functions
88
, searches
@@ -25,15 +25,15 @@ import Database.LSMTree.Extras.Generators
2525
import Database.LSMTree.Extras.Index
2626
import Database.LSMTree.Extras.Random
2727
import Database.LSMTree.Extras.UTxO
28-
import Database.LSMTree.Internal.IndexCompact
29-
import Database.LSMTree.Internal.IndexCompactAcc
28+
import Database.LSMTree.Internal.Index.Compact
29+
import Database.LSMTree.Internal.Index.CompactAcc
3030
import Database.LSMTree.Internal.Serialise (SerialisedKey,
3131
serialiseKey)
3232
import System.Random
3333
import Test.QuickCheck (generate)
3434

3535
benchmarks :: Benchmark
36-
benchmarks = bgroup "Bench.Database.LSMTree.Internal.IndexCompact" [
36+
benchmarks = bgroup "Bench.Database.LSMTree.Internal.Index.Compact" [
3737
env (searchEnv 10000 1000) $ \ ~(ic, ks) ->
3838
bench "searches-10-1k" $ whnf (searches ic) ks
3939
, bgroup "construction" [

‎bench/micro/Main.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
module Main (main) where
55

66
import qualified Bench.Database.LSMTree.Internal.BloomFilter
7-
import qualified Bench.Database.LSMTree.Internal.IndexCompact
7+
import qualified Bench.Database.LSMTree.Internal.Index.Compact
88
import qualified Bench.Database.LSMTree.Internal.Lookup
99
import qualified Bench.Database.LSMTree.Internal.Merge
1010
import qualified Bench.Database.LSMTree.Internal.RawPage
@@ -21,7 +21,7 @@ main = do
2121
#endif
2222
defaultMain [
2323
Bench.Database.LSMTree.Internal.BloomFilter.benchmarks
24-
, Bench.Database.LSMTree.Internal.IndexCompact.benchmarks
24+
, Bench.Database.LSMTree.Internal.Index.Compact.benchmarks
2525
, Bench.Database.LSMTree.Internal.Lookup.benchmarks
2626
, Bench.Database.LSMTree.Internal.Merge.benchmarks
2727
, Bench.Database.LSMTree.Internal.RawPage.benchmarks

‎lsm-tree.cabal‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ library
130130
Database.LSMTree.Internal.CRC32C
131131
Database.LSMTree.Internal.Cursor
132132
Database.LSMTree.Internal.Entry
133-
Database.LSMTree.Internal.IndexCompact
134-
Database.LSMTree.Internal.IndexCompactAcc
135-
Database.LSMTree.Internal.IndexOrdinary
136-
Database.LSMTree.Internal.IndexOrdinaryAcc
133+
Database.LSMTree.Internal.Index.Compact
134+
Database.LSMTree.Internal.Index.CompactAcc
135+
Database.LSMTree.Internal.Index.Ordinary
136+
Database.LSMTree.Internal.Index.OrdinaryAcc
137137
Database.LSMTree.Internal.Lookup
138138
Database.LSMTree.Internal.Merge
139139
Database.LSMTree.Internal.MergeSchedule
@@ -356,8 +356,8 @@ test-suite lsm-tree-test
356356
Test.Database.LSMTree.Internal.Chunk
357357
Test.Database.LSMTree.Internal.CRC32C
358358
Test.Database.LSMTree.Internal.Entry
359-
Test.Database.LSMTree.Internal.IndexCompact
360-
Test.Database.LSMTree.Internal.IndexOrdinary
359+
Test.Database.LSMTree.Internal.Index.Compact
360+
Test.Database.LSMTree.Internal.Index.Ordinary
361361
Test.Database.LSMTree.Internal.Lookup
362362
Test.Database.LSMTree.Internal.Merge
363363
Test.Database.LSMTree.Internal.Monkey
@@ -452,7 +452,7 @@ benchmark lsm-tree-micro-bench
452452
main-is: Main.hs
453453
other-modules:
454454
Bench.Database.LSMTree.Internal.BloomFilter
455-
Bench.Database.LSMTree.Internal.IndexCompact
455+
Bench.Database.LSMTree.Internal.Index.Compact
456456
Bench.Database.LSMTree.Internal.Lookup
457457
Bench.Database.LSMTree.Internal.Merge
458458
Bench.Database.LSMTree.Internal.RawPage

‎src-extras/Database/LSMTree/Extras/Index.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import Control.Monad.ST.Strict (ST)
1111
import Data.Foldable (toList)
1212
import Data.Word (Word32)
1313
import Database.LSMTree.Internal.Chunk (Chunk)
14-
import Database.LSMTree.Internal.IndexCompactAcc (IndexCompactAcc)
15-
import qualified Database.LSMTree.Internal.IndexCompactAcc as IndexCompact
14+
import Database.LSMTree.Internal.Index.CompactAcc (IndexCompactAcc)
15+
import qualified Database.LSMTree.Internal.Index.CompactAcc as IndexCompact
1616
(appendMulti, appendSingle)
17-
import Database.LSMTree.Internal.IndexOrdinaryAcc (IndexOrdinaryAcc)
18-
import qualified Database.LSMTree.Internal.IndexOrdinaryAcc as IndexOrdinary
17+
import Database.LSMTree.Internal.Index.OrdinaryAcc (IndexOrdinaryAcc)
18+
import qualified Database.LSMTree.Internal.Index.OrdinaryAcc as IndexOrdinary
1919
(appendMulti, appendSingle)
2020
import Database.LSMTree.Internal.Serialise (SerialisedKey)
2121

‎src-extras/Database/LSMTree/Extras/NoThunks.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import Database.LSMTree.Internal.ChecksumHandle
4040
import Database.LSMTree.Internal.Config
4141
import Database.LSMTree.Internal.CRC32C
4242
import Database.LSMTree.Internal.Entry
43-
import Database.LSMTree.Internal.IndexCompact
44-
import Database.LSMTree.Internal.IndexCompactAcc
43+
import Database.LSMTree.Internal.Index.Compact
44+
import Database.LSMTree.Internal.Index.CompactAcc
4545
import Database.LSMTree.Internal.Merge hiding (Level)
4646
import qualified Database.LSMTree.Internal.Merge as Merge
4747
import Database.LSMTree.Internal.MergeSchedule

‎src/Database/LSMTree/Internal/ChecksumHandle.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import qualified Database.LSMTree.Internal.Chunk as Chunk (toByteString)
3434
import Database.LSMTree.Internal.CRC32C (CRC32C)
3535
import qualified Database.LSMTree.Internal.CRC32C as CRC
3636
import Database.LSMTree.Internal.Entry
37-
import Database.LSMTree.Internal.IndexCompact (IndexCompact)
38-
import qualified Database.LSMTree.Internal.IndexCompact as Index
37+
import Database.LSMTree.Internal.Index.Compact (IndexCompact)
38+
import qualified Database.LSMTree.Internal.Index.Compact as Index
3939
import Database.LSMTree.Internal.Paths (ForBlob (..), ForFilter (..),
4040
ForIndex (..), ForKOps (..))
4141
import qualified Database.LSMTree.Internal.RawBytes as RB

src/Database/LSMTree/Internal/IndexCompact.hs renamed to src/Database/LSMTree/Internal/Index/Compact.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
--
33
-- TODO: add utility functions for clash probability calculations
44
--
5-
module Database.LSMTree.Internal.IndexCompact (
5+
module Database.LSMTree.Internal.Index.Compact (
66
-- $compact
77
IndexCompact (..)
88
-- * Queries
@@ -59,7 +59,7 @@ import Database.LSMTree.Internal.Vector
5959
@i@, to min-max information for keys on that page.
6060
6161
Fence-pointer indexes can be constructed and serialised incrementally, see
62-
module "Database.LSMTree.Internal.IndexCompactAcc".
62+
module "Database.LSMTree.Internal.Index.CompactAcc".
6363
6464
Given a serialised target key @k@, an index can be 'search'ed to find a disk
6565
page @i@ that /might/ contain @k@. Fence-pointer indices offer no guarantee of
@@ -468,7 +468,7 @@ toLBS numEntries index =
468468
by using 'headerLBS'. Each yielded chunk can then be written using
469469
'Chunk.toByteString'. Once construction is completed, 'finalLBS' will
470470
serialise the remaining parts of the compact index.
471-
Also see module "Database.LSMTree.Internal.IndexCompactAcc".
471+
Also see module "Database.LSMTree.Internal.Index.CompactAcc".
472472
-}
473473

474474
-- | By writing out the type–version indicator in host endianness, we also

src/Database/LSMTree/Internal/IndexCompactAcc.hs renamed to src/Database/LSMTree/Internal/Index/CompactAcc.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Incremental construction can be finalised with 'unsafeEnd', which yields both
1010
a 'Chunk' (possibly) and the `IndexCompact'.
1111
-}
12-
module Database.LSMTree.Internal.IndexCompactAcc (
12+
module Database.LSMTree.Internal.Index.CompactAcc (
1313
-- * Construction
1414
-- $construction-invariants
1515
IndexCompactAcc (..)
@@ -45,7 +45,7 @@ import qualified Data.Vector.Unboxed.Mutable as VUM
4545
import Data.Word
4646
import Database.LSMTree.Internal.BitMath
4747
import Database.LSMTree.Internal.Chunk (Chunk)
48-
import Database.LSMTree.Internal.IndexCompact
48+
import Database.LSMTree.Internal.Index.Compact
4949
import Database.LSMTree.Internal.Page
5050
import Database.LSMTree.Internal.Serialise
5151
import Database.LSMTree.Internal.Unsliced

src/Database/LSMTree/Internal/IndexOrdinary.hs renamed to src/Database/LSMTree/Internal/Index/Ordinary.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{- HLINT ignore "Avoid restricted alias" -}
22

33
-- | A general-purpose fence pointer index.
4-
module Database.LSMTree.Internal.IndexOrdinary
4+
module Database.LSMTree.Internal.Index.Ordinary
55
(
66
IndexOrdinary (IndexOrdinary),
77
toLastKeys,

0 commit comments

Comments
 (0)