diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-24 15:16:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-24 15:16:56 -0400 |
| commit | 2f868db90c7ba16eee901b9b1472b1e1a889dd93 (patch) | |
| tree | 8a366a36cc50cf1c3899aeaddf10e02d9cffc847 /Assistant | |
| parent | 13fb898fb2379a9ed9b7df2b645453059d296488 (diff) | |
add KeyVariety type
Where before the "name" of a key and a backend was a string, this makes
it a concrete data type.
This is groundwork for allowing some varieties of keys to be disabled
in file2key, so git-annex won't use them at all.
Benchmarks ran in my big repo:
old git-annex info:
real 0m3.338s
user 0m3.124s
sys 0m0.244s
new git-annex info:
real 0m3.216s
user 0m3.024s
sys 0m0.220s
new git-annex find:
real 0m7.138s
user 0m6.924s
sys 0m0.252s
old git-annex find:
real 0m7.433s
user 0m7.240s
sys 0m0.232s
Surprising result; I'd have expected it to be slower since it now parses
all the key varieties. But, the parser is very simple and perhaps
sharing KeyVarieties uses less memory or something like that.
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/SanityChecker.hs | 3 | ||||
| -rw-r--r-- | Assistant/Upgrade.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs index 62ba8f0d0..0c79ef605 100644 --- a/Assistant/Threads/SanityChecker.hs +++ b/Assistant/Threads/SanityChecker.hs @@ -39,6 +39,7 @@ import Git.Index import Assistant.Unused import Logs.Unused import Types.Transfer +import Types.Key import Annex.Path import qualified Annex #ifdef WITH_WEBAPP @@ -308,7 +309,7 @@ cleanReallyOldTmp = do cleanjunk check f = case fileKey (takeFileName f) of Nothing -> cleanOld check f Just k - | "GPGHMAC" `isPrefixOf` keyBackendName k -> + | "GPGHMAC" `isPrefixOf` formatKeyVariety (keyVariety k) -> cleanOld check f | otherwise -> noop diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs index afbb61924..f91fde06c 100644 --- a/Assistant/Upgrade.hs +++ b/Assistant/Upgrade.hs @@ -115,7 +115,7 @@ distributionDownloadComplete d dest cleanup t | otherwise = cleanup where k = distributionKey d - fsckit f = case Backend.maybeLookupBackendName (Types.Key.keyBackendName k) of + fsckit f = case Backend.maybeLookupBackendVariety (Types.Key.keyVariety k) of Nothing -> return $ Just f Just b -> case Types.Backend.verifyKeyContent b of Nothing -> return $ Just f |