Merge pull request #293 from input-output-hk/rvl/154/sqlite-indexes

Add indexes to certain SQLite table columns

lib/core/cardano-wallet-core.cabal

@@ -38,7 +38,6 @@ library
     , basement
     , bytestring
     , cardano-crypto
-    , conduit
     , containers
     , cryptonite
     , deepseq
@@ -54,6 +53,7 @@ library
     , persistent
     , persistent-sqlite
     , persistent-template
+    , resourcet
     , servant
     , servant-server
     , text

lib/core/src/Cardano/Wallet/DB/Sqlite.hs

@@ -30,14 +30,14 @@ import Cardano.Wallet.DB.Sqlite.Types
     ( AddressPoolXPub (..), TxId (..) )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( Depth (..), deserializeXPrv, serializeXPrv )
-import Conduit
+import Control.Monad.Trans.Resource
     ( runResourceT )
 import Control.Concurrent.MVar
     ( newMVar, withMVar )
 import Control.DeepSeq
     ( NFData )
 import Control.Monad
-    ( void )
+    ( void, mapM_ )
 import Control.Monad.Catch
     ( MonadCatch (..), handleJust )
 import Control.Monad.IO.Class
@@ -73,6 +73,7 @@ import Database.Persist.Sql
     , insertMany_
     , insert_
     , putMany
+    , rawExecute
     , runMigration
     , runSqlConn
     , selectFirst
@@ -160,6 +161,7 @@ newDBLayer fp = do
     lock <- newMVar ()
     conn <- createSqliteBackend fp (dbLogs [LevelError])
     runQuery conn $ runMigration migrateAll
+    runQuery conn addIndexes
     return $ DBLayer
 
         {-----------------------------------------------------------------------
@@ -269,6 +271,19 @@ newDBLayer fp = do
             ExceptT $ withMVar lock $ \() -> runExceptT action
         }
 
+----------------------------------------------------------------------------
+-- SQLite database setup
+
+addIndexes :: SqlPersistM ()
+addIndexes = mapM_ (`rawExecute` [])
+    [ createIndex "pending_tx_wallet_id" "pending_tx (wallet_id)"
+    , createIndex "tx_meta_wallet_id" "tx_meta (wallet_id)"
+    , createIndex "tx_in_tx_id" "tx_in (tx_id)"
+    , createIndex "tx_out_tx_id" "tx_out (tx_id)"
+    ]
+  where
+    createIndex name on = "CREATE INDEX IF NOT EXISTS " <> name <> " ON " <> on
+
 ----------------------------------------------------------------------------
 -- Conversion between Persistent table types and wallet types