dandri/simplexmq
1
0 Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-10-23 04:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

agent store: move SQLite Types -> Util (#30)

Browse Source
This commit is contained in:
Efim Poberezkin committed 2021-01-25 20:14:33 +04:00
1 parent d719b741dc
commit e09d3bae99
7 files changed
+19 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Simplex/Messaging/Agent.hs
+1 -1
View File
@@ -21,7 +21,7 @@ import Data.Text.Encoding
import Simplex.Messaging.Agent.Client
import Simplex.Messaging.Agent.Env.SQLite
import Simplex.Messaging.Agent.Store
import Simplex.Messaging.Agent.Store.SQLite.Types
import Simplex.Messaging.Agent.Store.SQLite.Util (SQLiteStore)
import Simplex.Messaging.Agent.Store.Types
import Simplex.Messaging.Agent.Transmission
import Simplex.Messaging.Client (SMPServerTransmission)
src/Simplex/Messaging/Agent/Env/SQLite.hs
+1 -1
View File
@@ -10,7 +10,7 @@ import Crypto.Random
import Network.Socket
import Numeric.Natural
import Simplex.Messaging.Agent.Store.SQLite
import Simplex.Messaging.Agent.Store.SQLite.Types
import Simplex.Messaging.Agent.Store.SQLite.Util (SQLiteStore)
import Simplex.Messaging.Client
import UnliftIO.STM
src/Simplex/Messaging/Agent/Store/SQLite.hs
-1
View File
@@ -21,7 +21,6 @@ import Data.Maybe
import qualified Database.SQLite.Simple as DB
import Simplex.Messaging.Agent.Store
import Simplex.Messaging.Agent.Store.SQLite.Schema
import Simplex.Messaging.Agent.Store.SQLite.Types
import Simplex.Messaging.Agent.Store.SQLite.Util
import Simplex.Messaging.Agent.Store.Types
import Simplex.Messaging.Agent.Transmission
src/Simplex/Messaging/Agent/Store/SQLite/Types.hs
-29
View File
@@ -1,29 +0,0 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE UndecidableInstances #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Simplex.Messaging.Agent.Store.SQLite.Types where
import Data.Int (Int64)
import qualified Database.SQLite.Simple as DB
import UnliftIO.STM
data SQLiteStore = SQLiteStore
{ dbFilename :: String,
conn :: DB.Connection,
serversLock :: TMVar (),
rcvQueuesLock :: TMVar (),
sndQueuesLock :: TMVar (),
connectionsLock :: TMVar (),
messagesLock :: TMVar ()
}
type QueueRowId = Int64
type ConnectionRowId = Int64
src/Simplex/Messaging/Agent/Store/SQLite/Util.hs
+14 -1
View File
@@ -31,7 +31,6 @@ import Database.SQLite.Simple.QQ (sql)
import Database.SQLite.Simple.ToField
import Network.Socket
import Simplex.Messaging.Agent.Store
import Simplex.Messaging.Agent.Store.SQLite.Types
import Simplex.Messaging.Agent.Store.Types
import Simplex.Messaging.Agent.Transmission
import Simplex.Messaging.Protocol as SMP
@@ -40,6 +39,20 @@ import Text.Read
import qualified UnliftIO.Exception as E
import UnliftIO.STM
data SQLiteStore = SQLiteStore
{ dbFilename :: String,
conn :: DB.Connection,
serversLock :: TMVar (),
rcvQueuesLock :: TMVar (),
sndQueuesLock :: TMVar (),
connectionsLock :: TMVar (),
messagesLock :: TMVar ()
}
type QueueRowId = Int64
type ConnectionRowId = Int64
addRcvQueueQuery :: Query
addRcvQueueQuery =
[sql|