remove ContentIndentifiersCidRemoteIndex uniqueness constraint
For reasons explained in the bug report. Implemented using a persistent migration, which works fine. It may add a little startup overhead when a remote is enabled that uses this, but probably un-noticable. On the next major version, it would be fine to delete this database, and regenerate it from the git-annex branch information. Then this change could be reverted. Did nothing about adding back the data that got dropped from the db due to the bug. Only the borg special remote was probably affected, and it's not been released yet. rm -rf .git/annex/cidsdb does work.
This commit is contained in:
parent
b370e6b0ad
commit
c6e693b25d
2 changed files with 14 additions and 6 deletions
|
@ -52,7 +52,9 @@ import qualified Utility.RawFilePath as R
|
|||
|
||||
import Database.Persist.Sql hiding (Key)
|
||||
import Database.Persist.TH
|
||||
import Database.Persist.Sqlite (runSqlite)
|
||||
import qualified System.FilePath.ByteString as P
|
||||
import qualified Data.Text as T
|
||||
|
||||
data ContentIdentifierHandle = ContentIdentifierHandle H.DbQueue
|
||||
|
||||
|
@ -62,7 +64,6 @@ ContentIdentifiers
|
|||
cid ContentIdentifier
|
||||
key Key
|
||||
ContentIndentifiersKeyRemoteCidIndex key remote cid
|
||||
ContentIndentifiersCidRemoteIndex cid remote
|
||||
-- The last git-annex branch tree sha that was used to update
|
||||
-- ContentIdentifiers
|
||||
AnnexBranch
|
||||
|
@ -79,9 +80,15 @@ openDb :: Annex ContentIdentifierHandle
|
|||
openDb = do
|
||||
dbdir <- fromRepo gitAnnexContentIdentifierDbDir
|
||||
let db = dbdir P.</> "db"
|
||||
unlessM (liftIO $ R.doesPathExist db) $ do
|
||||
initDb db $ void $
|
||||
ifM (liftIO $ not <$> R.doesPathExist db)
|
||||
( initDb db $ void $
|
||||
runMigrationSilent migrateContentIdentifier
|
||||
-- Migrate from old version of database, which had
|
||||
-- an incorrect uniqueness constraint on the
|
||||
-- ContentIdentifiers table.
|
||||
, liftIO $ runSqlite (T.pack (fromRawFilePath db)) $ void $
|
||||
runMigrationSilent migrateContentIdentifier
|
||||
)
|
||||
h <- liftIO $ H.openDbQueue H.SingleWriter db "content_identifiers"
|
||||
return $ ContentIdentifierHandle h
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue