Move internal modules to an private sub-library

Author: jorisdral

lsm-tree/bench-unions/Bench/Unions.hs

@@ -113,7 +113,6 @@ import qualified Text.Read as Read
 
 import           Database.LSMTree.Extras (groupsOfN)
 import qualified Database.LSMTree.Extras.Random as Random
-import           Database.LSMTree.Internal.ByteString (byteArrayToSBS)
 
 import qualified Database.LSMTree.Simple as LSM
 
@@ -177,6 +176,14 @@ makeKey seed =
       of (P.PrimArray ba :: P.PrimArray Word64) ->
            byteArrayToSBS (P.ByteArray ba)
 
+-- | \( O(1) \) conversion.
+byteArrayToSBS :: P.ByteArray -> BS.ShortByteString
+#if MIN_VERSION_bytestring(0,12,0)
+byteArrayToSBS ba               = BS.ShortByteString ba
+#else
+byteArrayToSBS (P.ByteArray ba) = BS.SBS ba
+#endif
+
 -- We use constant value. This shouldn't affect anything.
 theValue :: V
 theValue = BS.replicate 60 120 -- 'x'

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

@@ -71,7 +71,6 @@ import           Text.Printf (printf)
 import           Text.Show.Pretty
 
 import           Database.LSMTree.Extras (groupsOfN)
-import           Database.LSMTree.Internal.ByteString (byteArrayToSBS)
 
 -- We should be able to write this benchmark
 -- using only use public lsm-tree interface
@@ -128,6 +127,14 @@ makeKey seed =
       of (P.PrimArray ba :: P.PrimArray Word64) ->
            byteArrayToSBS (P.ByteArray ba)
 
+-- | \( O(1) \) conversion.
+byteArrayToSBS :: P.ByteArray -> BS.ShortByteString
+#if MIN_VERSION_bytestring(0,12,0)
+byteArrayToSBS ba               = BS.ShortByteString ba
+#else
+byteArrayToSBS (P.ByteArray ba) = BS.SBS ba
+#endif
+
 -- We use constant value. This shouldn't affect anything.
 theValue :: V
 theValue = BS.replicate 60 120 -- 'x'

lsm-tree/lsm-tree.cabal

@@ -537,6 +537,28 @@ library
   hs-source-dirs:  src
   exposed-modules:
     Database.LSMTree
+    Database.LSMTree.Simple
+
+  build-depends:
+    , base                    >=4.16   && <4.22
+    , blockio                 ^>=0.1
+    , contra-tracer           ^>=0.1   || ^>=0.2
+    , deepseq                 ^>=1.4   || ^>=1.5
+    , fs-api                  ^>=0.4
+    , io-classes              ^>=1.6   || ^>=1.7 || ^>=1.8.0.1
+    , io-classes:strict-mvar
+    , lsm-tree:control
+    , lsm-tree:core
+    , primitive               ^>=0.9
+    , random                  ^>=1.0   || ^>=1.1 || ^>=1.2     || ^>=1.3
+    , text                    ^>=2.1.1
+    , vector                  ^>=0.13
+
+library core
+  import:          language, warnings, wno-x-partial
+  visibility:      private
+  hs-source-dirs:  src-core
+  exposed-modules:
     Database.LSMTree.Internal.Arena
     Database.LSMTree.Internal.Assertions
     Database.LSMTree.Internal.BitMath
@@ -593,27 +615,25 @@ library
     Database.LSMTree.Internal.WriteBufferBlobs
     Database.LSMTree.Internal.WriteBufferReader
     Database.LSMTree.Internal.WriteBufferWriter
-    Database.LSMTree.Simple
 
   build-depends:
     , base                    >=4.16      && <4.22
     , bitvec                  ^>=1.1
     , blockio                 ^>=0.1
-    , bloomfilter-blocked
+    , bloomfilter-blocked     ^>=0.1
     , bytestring              ^>=0.11.4.0 || ^>=0.12.1.0
     , cborg                   ^>=0.2.10.0
     , containers              ^>=0.6      || ^>=0.7
     , contra-tracer           ^>=0.1      || ^>=0.2
     , crc32c                  ^>=0.2.1
     , deepseq                 ^>=1.4      || ^>=1.5
-    , filepath
+    , filepath                ^>=1.5
     , fs-api                  ^>=0.4
     , io-classes              ^>=1.6      || ^>=1.7      || ^>=1.8.0.1
     , io-classes:strict-mvar
     , lsm-tree:control
     , lsm-tree:kmerge
     , primitive               ^>=0.9
-    , random                  ^>=1.0      || ^>=1.1      || ^>=1.2     || ^>=1.3
     , serialise               ^>=0.2
     , text                    ^>=2.1.1
     , utf8-string             ^>=1.0
@@ -656,6 +676,7 @@ library extras
     , io-classes:strict-stm
     , lsm-tree
     , lsm-tree:control
+    , lsm-tree:core
     , lsm-tree:kmerge
     , lsm-tree:prototypes
     , nonempty-containers
@@ -668,10 +689,10 @@ library extras
     , wide-word
 
 test-suite lsm-tree-test
-  import:         language, warnings, wno-x-partial
-  type:           exitcode-stdio-1.0
-  hs-source-dirs: test
-  main-is:        Main.hs
+  import:          language, warnings, wno-x-partial
+  type:            exitcode-stdio-1.0
+  hs-source-dirs:  test
+  main-is:         Main.hs
   other-modules:
     Database.LSMTree.Class
     Database.LSMTree.Class.Common
@@ -735,6 +756,7 @@ test-suite lsm-tree-test
     Test.Util.RawPage
     Test.Util.TypeFamilyWrappers
 
+  autogen-modules: Paths_lsm_tree
   build-depends:
     , ansi-terminal
     , barbies
@@ -761,6 +783,7 @@ test-suite lsm-tree-test
     , io-sim
     , lsm-tree
     , lsm-tree:control
+    , lsm-tree:core
     , lsm-tree:extras
     , lsm-tree:prototypes
     , mtl
@@ -787,7 +810,7 @@ test-suite lsm-tree-test
     , vector-algorithms
     , wide-word
 
-  ghc-options:    -threaded
+  ghc-options:     -threaded
 
 benchmark lsm-tree-micro-bench
   import:         language, warnings, wno-x-partial
@@ -818,6 +841,7 @@ benchmark lsm-tree-micro-bench
     , fs-api
     , lsm-tree
     , lsm-tree:control
+    , lsm-tree:core
     , lsm-tree:extras
     , QuickCheck
     , random
@@ -834,7 +858,7 @@ benchmark lsm-tree-bench-bloomfilter
   build-depends:
     , base                 <5
     , bloomfilter-blocked
-    , lsm-tree
+    , lsm-tree:core
     , lsm-tree:extras
     , random
     , time
@@ -855,8 +879,8 @@ benchmark lsm-tree-bench-lookups
     , deepseq
     , fs-api
     , io-classes
-    , lsm-tree
     , lsm-tree:control
+    , lsm-tree:core
     , lsm-tree:extras
     , primitive
     , random
@@ -993,8 +1017,8 @@ library kmerge
 
   build-depends:
     , base                 <5
-    , indexed-traversable
-    , primitive
+    , indexed-traversable  ^>=0.1
+    , primitive            ^>=0.9
 
 test-suite kmerge-test
   import:         language, warnings, wno-x-partial
@@ -1042,7 +1066,7 @@ test-suite map-range-test
     , base              >=4.16 && <4.22
     , bytestring
     , containers
-    , lsm-tree
+    , lsm-tree:core
     , QuickCheck
     , tasty
     , tasty-hunit