Merge pull request #656 from IntersectMBO/wenkokke/internal-data-map-range

fix: move Data.Map.Range to Database.LSMTree.Internal.Map.Range

Author: wenkokke

bench/micro/Bench/Database/LSMTree/Internal/Index/Compact.hs

@@ -17,7 +17,6 @@ import qualified Data.Foldable as Fold
 import qualified Data.List as List
 import           Data.List.NonEmpty (NonEmpty (..))
 import qualified Data.List.NonEmpty as NE
-import           Data.Map.Range
 import qualified Data.Vector.Unboxed.Mutable as VUM
 import           Data.Word
 import           Database.LSMTree.Extras
@@ -27,6 +26,7 @@ import           Database.LSMTree.Extras.Random
 import           Database.LSMTree.Extras.UTxO
 import           Database.LSMTree.Internal.Index.Compact
 import           Database.LSMTree.Internal.Index.CompactAcc
+import           Database.LSMTree.Internal.Map.Range
 import           Database.LSMTree.Internal.Serialise (SerialisedKey,
                      serialiseKey)
 import           System.Random

lsm-tree.cabal

@@ -119,7 +119,6 @@ library
   hs-source-dirs:  src
   exposed-modules:
     Data.Arena
-    Data.Map.Range
     Database.LSMTree
     Database.LSMTree.Common
     Database.LSMTree.Internal
@@ -143,6 +142,7 @@ library
     Database.LSMTree.Internal.Index.Ordinary
     Database.LSMTree.Internal.Index.OrdinaryAcc
     Database.LSMTree.Internal.Lookup
+    Database.LSMTree.Internal.Map.Range
     Database.LSMTree.Internal.Merge
     Database.LSMTree.Internal.MergeSchedule
     Database.LSMTree.Internal.MergingRun

src/Database/LSMTree/Internal/Index/Compact.hs

@@ -33,7 +33,6 @@ import qualified Data.ByteString.Builder as BB
 import qualified Data.ByteString.Builder.Extra as BB
 import qualified Data.ByteString.Lazy as LBS
 import           Data.ByteString.Short (ShortByteString (..))
-import           Data.Map.Range (Bound (..))
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import           Data.Maybe (fromMaybe)
@@ -51,6 +50,7 @@ import           Database.LSMTree.Internal.ByteString (byteArrayFromTo)
 import           Database.LSMTree.Internal.Chunk (Chunk (Chunk))
 import qualified Database.LSMTree.Internal.Chunk as Chunk (toByteString)
 import           Database.LSMTree.Internal.Entry (NumEntries (..))
+import           Database.LSMTree.Internal.Map.Range (Bound (..))
 import           Database.LSMTree.Internal.Page
 import           Database.LSMTree.Internal.Serialise
 import           Database.LSMTree.Internal.Unsliced

src/Database/LSMTree/Internal/Index/CompactAcc.hs

@@ -35,7 +35,6 @@ import           Control.Monad.ST.Strict
 import           Data.Bit hiding (flipBit)
 import           Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as NE
-import           Data.Map.Range (Bound (..))
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import           Data.Primitive.ByteArray (newPinnedByteArray, setByteArray)
@@ -48,6 +47,7 @@ import           Data.Word
 import           Database.LSMTree.Internal.BitMath
 import           Database.LSMTree.Internal.Chunk (Chunk)
 import           Database.LSMTree.Internal.Index.Compact
+import           Database.LSMTree.Internal.Map.Range (Bound (..))
 import           Database.LSMTree.Internal.Page
 import           Database.LSMTree.Internal.Serialise
 import           Database.LSMTree.Internal.Unsliced

src/Data/Map/Range.hs …c/Database/LSMTree/Internal/Map/Range.hssrc/Data/Map/Range.hs renamed to src/Database/LSMTree/Internal/Map/Range.hs src/Data/Map/Range.hs renamed to src/Database/LSMTree/Internal/Map/Range.hs

@@ -1,7 +1,8 @@
 {-# LANGUAGE BangPatterns        #-}
 {-# LANGUAGE PatternSynonyms     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-module Data.Map.Range (
+{-# OPTIONS_HADDOCK not-home     #-}
+module Database.LSMTree.Internal.Map.Range (
     Bound (.., BoundExclusive, BoundInclusive)
   , Clusive (..)
   , rangeLookup

src/Database/LSMTree/Internal/WriteBuffer.hs

@@ -20,12 +20,12 @@ module Database.LSMTree.Internal.WriteBuffer (
 ) where
 
 import           Control.DeepSeq (NFData (..))
-import qualified Data.Map.Range as Map.R
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import qualified Data.Vector as V
 import           Database.LSMTree.Internal.BlobRef (BlobSpan)
 import           Database.LSMTree.Internal.Entry
+import qualified Database.LSMTree.Internal.Map.Range as Map.R
 import           Database.LSMTree.Internal.Range (Range (..))
 import           Database.LSMTree.Internal.Serialise
 import qualified Database.LSMTree.Internal.Vector as V

test/Database/LSMTree/Model/Table.hs

@@ -49,7 +49,6 @@ import qualified Data.ByteString as BS
 import           Data.Kind (Type)
 import           Data.List.NonEmpty (NonEmpty (..))
 import           Data.Map (Map)
-import qualified Data.Map.Range as Map.R
 import qualified Data.Map.Strict as Map
 import           Data.Proxy (Proxy (Proxy))
 import           Data.Semigroup (First (..))
@@ -58,6 +57,7 @@ import           Database.LSMTree (LookupResult (..), QueryResult (..),
                      ResolveValue (..), Update (..))
 import           Database.LSMTree.Common (Range (..), SerialiseKey (..),
                      SerialiseValue (..))
+import qualified Database.LSMTree.Internal.Map.Range as Map.R
 import           Database.LSMTree.Internal.RawBytes (RawBytes)
 import           GHC.Exts (IsList (..))
 

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

@@ -4,12 +4,12 @@ module Test.Database.LSMTree.Internal.Vector (tests) where
 
 import           Control.Monad (forM_)
 import           Control.Monad.ST
-import           Data.Map.Range
 import qualified Data.Vector.Unboxed as VU
 import qualified Data.Vector.Unboxed.Mutable as VUM
 import           Data.Word
 import           Database.LSMTree.Extras
 import           Database.LSMTree.Internal.Index.CompactAcc
+import           Database.LSMTree.Internal.Map.Range
 import           Test.QuickCheck
 import           Test.QuickCheck.Instances ()
 import           Test.QuickCheck.Monadic (PropertyM, monadicST, run)

test/map-range-test.hs

@@ -5,7 +5,8 @@ module Main (main) where
 import           Data.ByteString (ByteString)
 import           Data.Map (Map)
 import qualified Data.Map as Map
-import           Data.Map.Range (Bound (..), Clusive (..), rangeLookup)
+import           Database.LSMTree.Internal.Map.Range (Bound (..), Clusive (..),
+                     rangeLookup)
 import           Test.QuickCheck (Arbitrary (..), Property, elements, frequency,
                      (===))
 import           Test.Tasty (defaultMain, testGroup)