aboutsummaryrefslogtreecommitdiff
path: root/Limit.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-24 15:16:56 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-24 15:16:56 -0400
commit2f868db90c7ba16eee901b9b1472b1e1a889dd93 (patch)
tree8a366a36cc50cf1c3899aeaddf10e02d9cffc847 /Limit.hs
parent13fb898fb2379a9ed9b7df2b645453059d296488 (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 'Limit.hs')
-rw-r--r--Limit.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Limit.hs b/Limit.hs
index 7b26f9e58..1485b4bce 100644
--- a/Limit.hs
+++ b/Limit.hs
@@ -19,6 +19,7 @@ import Annex.Action
import Annex.UUID
import Logs.Trust
import Annex.NumCopies
+import Types.Key
import Types.TrustLevel
import Types.Group
import Types.FileMatcher
@@ -251,7 +252,8 @@ addInBackend = addLimit . limitInBackend
limitInBackend :: MkLimit Annex
limitInBackend name = Right $ const $ checkKey check
where
- check key = pure $ keyBackendName key == name
+ check key = pure $ keyVariety key == variety
+ variety = parseKeyVariety name
{- Adds a limit to skip files that are too large or too small -}
addLargerThan :: String -> Annex ()