Skip to content

Commit be74e03

Browse files
committed
feat: add Database.LSMTree.Simple
1 parent 8bd37e4 commit be74e03

File tree

8 files changed

+1114
-17
lines changed

8 files changed

+1114
-17
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c -
142142
xz -d < cabal-docspec.xz > ./cabal-docspec
143143
chmod a+x ./cabal-docspec
144-
./cabal-docspec --extra-package lsm-tree:prototypes -XOverloadedStrings -XNumericUnderscores -XTypeApplications
144+
./cabal-docspec --extra-package directory --extra-package lsm-tree:prototypes -XOverloadedStrings -XNumericUnderscores -XTypeApplications -XScopedTypeVariables
145145
146146
# Check formatting for Haskell files
147147
stylish-haskell:

lsm-tree.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ library
286286
Database.LSMTree.Internal.WriteBufferWriter
287287
Database.LSMTree.Monoidal
288288
Database.LSMTree.Normal
289+
Database.LSMTree.Simple
289290

290291
build-depends:
291292
, base >=4.14 && <4.22

src/Database/LSMTree/Internal/Snapshot.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,16 @@ newtype SnapshotLabel = SnapshotLabel Text
9797
-- TODO: revisit if we need three table types.
9898
data SnapshotTableType
9999
= SnapSimpleTable
100+
| SnapFullTable
100101
| SnapNormalTable
101102
| SnapMonoidalTable
102-
| SnapFullTable
103103
deriving stock (Eq, Show)
104104

105105
instance NFData SnapshotTableType where
106106
rnf SnapSimpleTable = ()
107+
rnf SnapFullTable = ()
107108
rnf SnapNormalTable = ()
108109
rnf SnapMonoidalTable = ()
109-
rnf SnapFullTable = ()
110110

111111
data SnapshotMetaData = SnapshotMetaData {
112112
-- | See 'SnapshotLabel'.

src/Database/LSMTree/Internal/Snapshot/Codec.hs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -247,19 +247,19 @@ instance DecodeVersioned SnapshotLabel where
247247
-- TableType
248248

249249
instance Encode SnapshotTableType where
250-
encode SnapNormalTable = encodeWord 0
251-
encode SnapMonoidalTable = encodeWord 1
252-
encode SnapFullTable = encodeWord 2
253-
encode SnapSimpleTable = encodeWord 3
250+
encode SnapSimpleTable = encodeWord 0
251+
encode SnapFullTable = encodeWord 1
252+
encode SnapNormalTable = encodeWord 2
253+
encode SnapMonoidalTable = encodeWord 3
254254

255255
instance DecodeVersioned SnapshotTableType where
256256
decodeVersioned V0 = do
257257
tag <- decodeWord
258258
case tag of
259-
0 -> pure SnapNormalTable
260-
1 -> pure SnapMonoidalTable
261-
2 -> pure SnapFullTable
262-
3 -> pure SnapSimpleTable
259+
0 -> pure SnapSimpleTable
260+
1 -> pure SnapFullTable
261+
2 -> pure SnapNormalTable
262+
3 -> pure SnapMonoidalTable
263263
_ -> fail ("[SnapshotTableType] Unexpected tag: " <> show tag)
264264

265265
instance Encode SnapshotRun where

0 commit comments

Comments
 (0)