Merge pull request #480 from IntersectMBO/jdral/rename-blob-type-variable

Rename `blob` and `blobref` type variables to `b`

Author: jorisdral

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

@@ -857,7 +857,7 @@ pureReference !initialSize !batchSize !batchCount !seed =
         Nothing -> (,) k LSM.NotFound
         Just u  -> (,) k $! updateToLookupResult u
 
-updateToLookupResult :: LSM.Update v blob -> LSM.LookupResult v ()
+updateToLookupResult :: LSM.Update v b -> LSM.LookupResult v ()
 updateToLookupResult (LSM.Insert v Nothing)  = LSM.Found v
 updateToLookupResult (LSM.Insert v (Just _)) = LSM.FoundWithBlob v ()
 updateToLookupResult  LSM.Delete             = LSM.NotFound

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

@@ -74,7 +74,7 @@ import           Test.QuickCheck.Instances ()
   Common LSMTree types
 -------------------------------------------------------------------------------}
 
-instance (Arbitrary v, Arbitrary blob) => Arbitrary (Unified.Update v blob) where
+instance (Arbitrary v, Arbitrary b) => Arbitrary (Unified.Update v b) where
   arbitrary = QC.arbitrary2
   shrink = QC.shrink2
 
@@ -93,7 +93,7 @@ instance Arbitrary2 Unified.Update where
     Unified.Mupsert v -> Unified.Insert v Nothing : map Unified.Mupsert (shrinkVal v)
     Unified.Delete -> []
 
-instance (Arbitrary v, Arbitrary blob) => Arbitrary (Normal.Update v blob) where
+instance (Arbitrary v, Arbitrary b) => Arbitrary (Normal.Update v b) where
   arbitrary = QC.arbitrary2
   shrink = QC.shrink2
 
@@ -150,7 +150,7 @@ instance (Arbitrary k, Ord k) => Arbitrary (Range k) where
   Entry
 -------------------------------------------------------------------------------}
 
-instance (Arbitrary v, Arbitrary blob) => Arbitrary (Entry v blob) where
+instance (Arbitrary v, Arbitrary b) => Arbitrary (Entry v b) where
   arbitrary = QC.arbitrary2
   shrink = QC.shrink2
 

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

@@ -99,8 +99,8 @@ instance (NoThunksIOLike m, Typeable m, Typeable (PrimState m))
 -- | Does not check 'NoThunks' for the 'Common.Session' that this
 -- 'Normal.Table' belongs to.
 instance (NoThunksIOLike m, Typeable m, Typeable (PrimState m))
-      => NoThunks (NormalTable m k v blob) where
-  showTypeOf (_ :: Proxy (NormalTable m k v blob)) = "NormalTable"
+      => NoThunks (NormalTable m k v b) where
+  showTypeOf (_ :: Proxy (NormalTable m k v b)) = "NormalTable"
   wNoThunks ctx (NormalTable t) = wNoThunks ctx t
 
 {-------------------------------------------------------------------------------

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

@@ -149,21 +149,21 @@ instance ( Ord k, Arbitrary k, Arbitrary v, Arbitrary b
   shrink = shrinkRunData shrink shrink shrink
 
 genRunData ::
-     forall k v blob. Ord k
+     forall k v b. Ord k
   => Gen k
   -> Gen v
-  -> Gen blob
-  -> Gen (RunData k v blob)
+  -> Gen b
+  -> Gen (RunData k v b)
 genRunData genKey genVal genBlob =
     RunData <$> liftArbitrary2Map genKey (liftArbitrary2 genVal genBlob)
 
 shrinkRunData ::
      Ord k
   => (k -> [k])
   -> (v -> [v])
-  -> (blob -> [blob])
-  -> RunData k v blob
-  -> [RunData k v blob]
+  -> (b -> [b])
+  -> RunData k v b
+  -> [RunData k v b]
 shrinkRunData shrinkKey shrinkVal shrinkBlob =
       fmap RunData
     . liftShrink2Map shrinkKey (liftShrink2 shrinkVal shrinkBlob)