Merge pull request #655 from IntersectMBO/wenkokke/internal-data-arena

fix: move Data.Arena to Database.LSMTree.Internal.Arena

Author: wenkokke

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

@@ -8,7 +8,6 @@ import           Control.Monad.Class.MonadST
 import           Control.Monad.Primitive
 import           Control.Monad.ST.Strict (ST, runST)
 import           Control.RefCount
-import           Data.Arena (ArenaManager, newArenaManager, withArena)
 import           Data.Bits ((.&.))
 import           Data.BloomFilter (Bloom)
 import qualified Data.BloomFilter as Bloom
@@ -23,6 +22,8 @@ import qualified Data.Vector.Unboxed.Mutable as VUM
 import           Data.Word (Word64)
 import           Database.LSMTree.Extras.Orphans ()
 import           Database.LSMTree.Extras.UTxO
+import           Database.LSMTree.Internal.Arena (ArenaManager, newArenaManager,
+                     withArena)
 import           Database.LSMTree.Internal.Entry (Entry (Insert),
                      NumEntries (..))
 import           Database.LSMTree.Internal.Index (Index)

bench/micro/Bench/Database/LSMTree/Internal/Lookup.hs

@@ -7,8 +7,6 @@ import           Control.Monad.ST.Strict (stToIO)
 import           Control.RefCount
 import           Criterion.Main (Benchmark, bench, bgroup, env, envWithCleanup,
                      perRunEnv, perRunEnvWithCleanup, whnf, whnfAppIO)
-import           Data.Arena (ArenaManager, closeArena, newArena,
-                     newArenaManager, withArena)
 import           Data.Bifunctor (Bifunctor (..))
 import           Data.ByteString (ByteString)
 import qualified Data.List as List
@@ -20,6 +18,8 @@ import           Database.LSMTree.Extras.Orphans ()
 import           Database.LSMTree.Extras.Random (frequency, randomByteStringR,
                      sampleUniformWithReplacement, uniformWithoutReplacement)
 import           Database.LSMTree.Extras.UTxO
+import           Database.LSMTree.Internal.Arena (ArenaManager, closeArena,
+                     newArena, newArenaManager, withArena)
 import           Database.LSMTree.Internal.Entry (Entry (..), NumEntries (..))
 import           Database.LSMTree.Internal.Index as Index
 import           Database.LSMTree.Internal.Lookup (bloomQueries, indexSearches,

lsm-tree.cabal

@@ -118,10 +118,10 @@ library
   import:          language, warnings, wno-x-partial, bloom-query-fast
   hs-source-dirs:  src
   exposed-modules:
-    Data.Arena
     Database.LSMTree
     Database.LSMTree.Common
     Database.LSMTree.Internal
+    Database.LSMTree.Internal.Arena
     Database.LSMTree.Internal.Assertions
     Database.LSMTree.Internal.BitMath
     Database.LSMTree.Internal.BlobFile
@@ -362,10 +362,10 @@ test-suite lsm-tree-test
     Database.LSMTree.Model.IO
     Database.LSMTree.Model.Session
     Database.LSMTree.Model.Table
-    Test.Data.Arena
     Test.Database.LSMTree.Class
     Test.Database.LSMTree.Generators
     Test.Database.LSMTree.Internal
+    Test.Database.LSMTree.Internal.Arena
     Test.Database.LSMTree.Internal.BlobFile.FS
     Test.Database.LSMTree.Internal.BloomFilter
     Test.Database.LSMTree.Internal.Chunk

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

@@ -20,7 +20,6 @@ import           Control.Monad.Primitive
 import           Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
 import           Control.RefCount
 import           Control.Tracer
-import           Data.Arena
 import           Data.Bit
 import           Data.BloomFilter
 import           Data.Map.Strict
@@ -34,6 +33,7 @@ import qualified Data.Vector.Primitive as VP
 import qualified Data.Vector.Unboxed.Mutable as VUM
 import           Data.Word
 import           Database.LSMTree.Internal as Internal
+import           Database.LSMTree.Internal.Arena
 import           Database.LSMTree.Internal.BlobFile
 import           Database.LSMTree.Internal.BlobRef
 import           Database.LSMTree.Internal.ChecksumHandle

src/Database/LSMTree/Internal.hs

@@ -104,7 +104,6 @@ import           Control.Monad.Class.MonadThrow
 import           Control.Monad.Primitive
 import           Control.RefCount
 import           Control.Tracer
-import           Data.Arena (ArenaManager, newArenaManager)
 import           Data.Either (fromRight)
 import           Data.Foldable
 import           Data.Kind
@@ -117,6 +116,7 @@ import           Data.Monoid (First (..))
 import qualified Data.Set as Set
 import           Data.Typeable
 import qualified Data.Vector as V
+import           Database.LSMTree.Internal.Arena (ArenaManager, newArenaManager)
 import           Database.LSMTree.Internal.BlobRef (WeakBlobRef (..))
 import qualified Database.LSMTree.Internal.BlobRef as BlobRef
 import           Database.LSMTree.Internal.Config

src/Data/Arena.hs renamed to src/Database/LSMTree/Internal/Arena.hs

@@ -1,7 +1,8 @@
 {-# LANGUAGE CPP             #-}
 {-# LANGUAGE LambdaCase      #-}
 {-# LANGUAGE RecordWildCards #-}
-module Data.Arena (
+{-# OPTIONS_HADDOCK not-home #-}
+module Database.LSMTree.Internal.Arena (
     ArenaManager,
     newArenaManager,
     Arena,

src/Database/LSMTree/Internal/Lookup.hs

@@ -19,14 +19,15 @@ module Database.LSMTree.Internal.Lookup (
   , intraPageLookupsOn
   ) where
 
-import           Data.Arena (Arena, ArenaManager, allocateFromArena, withArena)
 import           Data.Bifunctor
 import           Data.BloomFilter (Bloom)
 import           Data.Primitive.ByteArray
 import qualified Data.Vector as V
 import qualified Data.Vector.Mutable as VM
 import qualified Data.Vector.Primitive as VP
 import qualified Data.Vector.Unboxed as VU
+import           Database.LSMTree.Internal.Arena (Arena, ArenaManager,
+                     allocateFromArena, withArena)
 
 import           Control.Exception (assert)
 import           Control.Monad

test/Main.hs

@@ -4,10 +4,10 @@ module Main (main) where
 
 import qualified Control.RefCount
 
-import qualified Test.Data.Arena
 import qualified Test.Database.LSMTree.Class
 import qualified Test.Database.LSMTree.Generators
 import qualified Test.Database.LSMTree.Internal
+import qualified Test.Database.LSMTree.Internal.Arena
 import qualified Test.Database.LSMTree.Internal.BlobFile.FS
 import qualified Test.Database.LSMTree.Internal.BloomFilter
 import qualified Test.Database.LSMTree.Internal.Chunk
@@ -51,7 +51,7 @@ import           Test.Tasty
 main :: IO ()
 main = do
   defaultMain $ testGroup "lsm-tree"
-    [ Test.Data.Arena.tests
+    [ Test.Database.LSMTree.Internal.Arena.tests
     , Test.Database.LSMTree.Class.tests
     , Test.Database.LSMTree.Generators.tests
     , Test.Database.LSMTree.Internal.tests

test/Test/Data/Arena.hs renamed to test/Test/Database/LSMTree/Internal/Arena.hs

@@ -1,18 +1,18 @@
 {-# LANGUAGE CPP #-}
-module Test.Data.Arena (
+module Test.Database.LSMTree.Internal.Arena (
     tests,
 ) where
 
 import           Control.Monad.ST (runST)
-import           Data.Arena
 import           Data.Primitive.ByteArray
 import           Data.Word (Word8)
+import           Database.LSMTree.Internal.Arena
 import           GHC.Exts (toList)
 import           Test.Tasty (TestTree, testGroup)
 import           Test.Tasty.HUnit (testCaseSteps, (@?=))
 
 tests :: TestTree
-tests = testGroup "Test.Data.Arena"
+tests = testGroup "Test.Database.LSMTree.Internal.Arena"
     [ testCaseSteps "safe" $ \_info -> do
         let !ba = runST $ withUnmanagedArena $ \arena -> do
                 (off', mba) <- allocateFromArena arena 32 8

test/Test/Database/LSMTree/Internal/Lookup.hs

@@ -23,7 +23,6 @@ import           Control.DeepSeq
 import           Control.Exception
 import           Control.Monad.ST.Strict
 import           Control.RefCount
-import           Data.Arena (newArenaManager, withUnmanagedArena)
 import           Data.Bifunctor
 import           Data.BloomFilter (Bloom)
 import qualified Data.BloomFilter as Bloom
@@ -44,6 +43,8 @@ import           Database.LSMTree.Extras
 import           Database.LSMTree.Extras.Generators
 import           Database.LSMTree.Extras.RunData (RunData (..),
                      liftArbitrary2Map, liftShrink2Map, withRuns)
+import           Database.LSMTree.Internal.Arena (newArenaManager,
+                     withUnmanagedArena)
 import           Database.LSMTree.Internal.BlobRef
 import           Database.LSMTree.Internal.Entry as Entry
 import           Database.LSMTree.Internal.Index (Index, IndexType)