Skip to content

Commit b929534

Browse files
committed
Rename blob and blobref type variables to b
It makes the code more succinct.
1 parent 6a0c425 commit b929534

File tree

22 files changed

+514
-514
lines changed

22 files changed

+514
-514
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ pureReference !initialSize !batchSize !batchCount !seed =
857857
Nothing -> (,) k LSM.NotFound
858858
Just u -> (,) k $! updateToLookupResult u
859859

860-
updateToLookupResult :: LSM.Update v blob -> LSM.LookupResult v ()
860+
updateToLookupResult :: LSM.Update v b -> LSM.LookupResult v ()
861861
updateToLookupResult (LSM.Insert v Nothing) = LSM.Found v
862862
updateToLookupResult (LSM.Insert v (Just _)) = LSM.FoundWithBlob v ()
863863
updateToLookupResult LSM.Delete = LSM.NotFound

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import Test.QuickCheck.Instances ()
7676
Common LSMTree types
7777
-------------------------------------------------------------------------------}
7878

79-
instance (Arbitrary v, Arbitrary blob) => Arbitrary (Unified.Update v blob) where
79+
instance (Arbitrary v, Arbitrary b) => Arbitrary (Unified.Update v b) where
8080
arbitrary = QC.arbitrary2
8181
shrink = QC.shrink2
8282

@@ -95,7 +95,7 @@ instance Arbitrary2 Unified.Update where
9595
Unified.Mupsert v -> Unified.Insert v Nothing : map Unified.Mupsert (shrinkVal v)
9696
Unified.Delete -> []
9797

98-
instance (Arbitrary v, Arbitrary blob) => Arbitrary (Normal.Update v blob) where
98+
instance (Arbitrary v, Arbitrary b) => Arbitrary (Normal.Update v b) where
9999
arbitrary = QC.arbitrary2
100100
shrink = QC.shrink2
101101

@@ -152,7 +152,7 @@ instance (Arbitrary k, Ord k) => Arbitrary (Range k) where
152152
Entry
153153
-------------------------------------------------------------------------------}
154154

155-
instance (Arbitrary v, Arbitrary blob) => Arbitrary (Entry v blob) where
155+
instance (Arbitrary v, Arbitrary b) => Arbitrary (Entry v b) where
156156
arbitrary = QC.arbitrary2
157157
shrink = QC.shrink2
158158

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ instance (NoThunksIOLike m, Typeable m, Typeable (PrimState m))
9999
-- | Does not check 'NoThunks' for the 'Common.Session' that this
100100
-- 'Normal.Table' belongs to.
101101
instance (NoThunksIOLike m, Typeable m, Typeable (PrimState m))
102-
=> NoThunks (NormalTable m k v blob) where
103-
showTypeOf (_ :: Proxy (NormalTable m k v blob)) = "NormalTable"
102+
=> NoThunks (NormalTable m k v b) where
103+
showTypeOf (_ :: Proxy (NormalTable m k v b)) = "NormalTable"
104104
wNoThunks ctx (NormalTable t) = wNoThunks ctx t
105105

106106
{-------------------------------------------------------------------------------

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,21 @@ instance ( Ord k, Arbitrary k, Arbitrary v, Arbitrary b
149149
shrink = shrinkRunData shrink shrink shrink
150150

151151
genRunData ::
152-
forall k v blob. Ord k
152+
forall k v b. Ord k
153153
=> Gen k
154154
-> Gen v
155-
-> Gen blob
156-
-> Gen (RunData k v blob)
155+
-> Gen b
156+
-> Gen (RunData k v b)
157157
genRunData genKey genVal genBlob =
158158
RunData <$> liftArbitrary2Map genKey (liftArbitrary2 genVal genBlob)
159159

160160
shrinkRunData ::
161161
Ord k
162162
=> (k -> [k])
163163
-> (v -> [v])
164-
-> (blob -> [blob])
165-
-> RunData k v blob
166-
-> [RunData k v blob]
164+
-> (b -> [b])
165+
-> RunData k v b
166+
-> [RunData k v b]
167167
shrinkRunData shrinkKey shrinkVal shrinkBlob =
168168
fmap RunData
169169
. liftShrink2Map shrinkKey (liftShrink2 shrinkVal shrinkBlob)

0 commit comments

Comments
 (0)