Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it possible to choose the index type #502

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Make it possible to choose the index type #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfe7578
WIP: Make it possible to choose the index type
jeltsch Dec 16, 2024
11fd52b
WIP: index types in the core library
jorisdral Dec 17, 2024
a997701
Undo accidentally committed changes to Cabal configuration
jeltsch Dec 18, 2024
4d0a005
Abandon separate class `NewIndexAcc`
jeltsch Dec 18, 2024
34ca53e
Move `Index` and `IndexAcc` type parameters to the end
jeltsch Dec 18, 2024
94ef5ad
Move other `Index` and `IndexAcc` things to the end
jeltsch Dec 18, 2024
bcdff27
Fix function invocation broken by type variable reordering
jeltsch Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/Database/LSMTree.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{-# LANGUAGE MagicHash #-}

-- | This module is experimental. It is mainly used for testing purposes.
--
-- See the 'Normal' and 'Monoidal' modules for documentation.
Expand Down Expand Up @@ -102,7 +104,6 @@ import Control.DeepSeq
import Control.Exception (throw)
import Control.Monad
import Data.Bifunctor (Bifunctor (..))
import Data.Coerce (coerce)
import Data.Kind (Type)
import Data.Typeable (Proxy (..), eqT, type (:~:) (Refl))
import qualified Data.Vector as V
Expand All @@ -113,6 +114,7 @@ import Database.LSMTree.Common (BlobRef (BlobRef), IOLike, Range (..),
import qualified Database.LSMTree.Common as Common
import qualified Database.LSMTree.Internal as Internal
import qualified Database.LSMTree.Internal.BlobRef as Internal
import qualified Database.LSMTree.Internal.Config as Internal
import qualified Database.LSMTree.Internal.Entry as Entry
import qualified Database.LSMTree.Internal.RawBytes as RB
import qualified Database.LSMTree.Internal.Serialise as Internal
Expand All @@ -121,6 +123,7 @@ import qualified Database.LSMTree.Internal.Vector as V
import Database.LSMTree.Monoidal (ResolveValue (..),
resolveDeserialised, resolveValueAssociativity,
resolveValueValidOutput)
import GHC.Exts

{-------------------------------------------------------------------------------
Tables
Expand All @@ -140,7 +143,9 @@ withTable ::
-> (Table m k v b -> m a)
-> m a
withTable (Internal.Session' sesh) conf action =
Internal.withTable sesh conf (action . Internal.Table')
case Internal.someFencePointerIndex (Internal.confFencePointerIndex conf) of
Internal.SomeFencePointerIndex (p :: Proxy# j) ->
Internal.withTable p sesh conf (action . Internal.Table')

{-# SPECIALISE new ::
Session IO
Expand All @@ -151,7 +156,10 @@ new ::
=> Session m
-> Common.TableConfig
-> m (Table m k v b)
new (Internal.Session' sesh) conf = Internal.Table' <$> Internal.new sesh conf
new (Internal.Session' sesh) conf =
case Internal.someFencePointerIndex (Internal.confFencePointerIndex conf) of
Internal.SomeFencePointerIndex (p :: Proxy# j) ->
Internal.Table' <$> Internal.new p sesh conf

{-# SPECIALISE close ::
Table IO k v b
Expand Down Expand Up @@ -481,23 +489,28 @@ createSnapshot label snap (Internal.Table' t) =
void $ Internal.createSnapshot (resolve (Proxy @v)) snap label Internal.SnapFullTable t

{-# SPECIALISE openSnapshot ::
ResolveValue v
=> Session IO
Session IO
-> Common.TableConfigOverride
-> Common.SnapshotLabel
-> SnapshotName
-> IO (Table IO k v b ) #-}
openSnapshot :: forall m k v b.
( IOLike m
, ResolveValue v
)
=> Session m
-> Common.TableConfigOverride -- ^ Optional config override
-> Common.SnapshotLabel
-> SnapshotName
-> m (Table m k v b)
openSnapshot (Internal.Session' sesh) override label snap =
Internal.Table' <$!> Internal.openSnapshot sesh label Internal.SnapFullTable override snap (resolve (Proxy @v))
Internal.openSnapshot
Internal.Table'
sesh
label
Internal.SnapFullTable
override
snap
const
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops! I accidentall changed the last argument, which I should not have

Suggested change
const
(resolve (Proxy @v))

This means the ResolveValue constraints also have to be reinstated


{-------------------------------------------------------------------------------
Mutiple writable tables
Expand Down
Loading