diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-02-16 16:48:19 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-02-16 17:05:42 -0400 |
commit | 78c590b161bd7c800a4dd3a9d02f5e25d917998a (patch) | |
tree | 0f72e487481bd7a2173e63ba18799c323f206c49 /Database/Fsck.hs | |
parent | e25ea03e118a76ef59169ec6fb5b195c80ff00f7 (diff) |
commit new transaction after 60 seconds
Database.Handle can now be given a CommitPolicy, making it easy to specify
transaction granularity.
Benchmarking the old git-annex incremental fsck that flips sticky bits
to the new that uses sqlite, running in a repo with 37000 annexed files,
both from cold cache:
old: 6m6.906s
new: 6m26.913s
This commit was sponsored by TasLUG.
Diffstat (limited to 'Database/Fsck.hs')
-rw-r--r-- | Database/Fsck.hs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Database/Fsck.hs b/Database/Fsck.hs index 2b622e844..e52603d9c 100644 --- a/Database/Fsck.hs +++ b/Database/Fsck.hs @@ -40,7 +40,6 @@ share [mkPersist sqlSettings, mkMigrate "migrateFsck"] [persistLowerCase| Fscked key SKey UniqueKey key - deriving Show |] {- The database is removed when starting a new incremental fsck pass. -} @@ -62,7 +61,7 @@ openDb = do liftIO $ H.openDb db addDb :: H.DbHandle -> Key -> IO () -addDb h = void . H.runDb h . insert . Fscked . toSKey +addDb h = void . H.runDb' h commitPolicy . insert . Fscked . toSKey inDb :: H.DbHandle -> Key -> IO Bool inDb h k = H.runDb h $ do @@ -70,3 +69,10 @@ inDb h k = H.runDb h $ do where_ (r ^. FsckedKey ==. val (toSKey k)) return (r ^. FsckedKey) return $ not $ null r + +{- Bundle up addDb transactions and commit after 60 seconds. + - This is a balance between resuming where the last incremental + - fsck left off, and making too many commits which slows down the fsck + - of lots of small or not present files. -} +commitPolicy :: H.CommitPolicy +commitPolicy = H.CommitAfterSeconds 60 |