2fd294d06f
Rather than go through the location log to see which files are present on the remote, it simply looks at the disk contents directly. I benchmarked this speeding up scanning 834 files, from an annex on my phone's SSD, from 11.39 seconds to 1.31 seconds. (No files actually moved.) Also benchmarked 8139 files, from an annex on spinning storage, speeding up from 103.17 to 13.39 seconds. Note that benchmarking with an encrypted annex on flash actually showed a minor slowdown with this optimisation -- from 13.93 to 14.50 seconds. Seems the overhead of doing the crypto needed to get the filenames to directly check can be higher than the overhead of looking up data in the location log. (Which says good things about how well the location log and git have been optimised!) It *may* make sense to make encrypted local remotes not have hasKeyCheap set; further benchmarking is called for.
152 lines
4.6 KiB
Haskell
152 lines
4.6 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2010-2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Move where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import qualified Command.Drop
|
|
import qualified Annex
|
|
import Annex.Content
|
|
import qualified Remote
|
|
import Annex.UUID
|
|
import qualified Option
|
|
import Logs.Presence
|
|
|
|
def :: [Command]
|
|
def = [withOptions options $ command "move" paramPaths seek
|
|
"move content of files to/from another repository"]
|
|
|
|
fromOption :: Option
|
|
fromOption = Option.field ['f'] "from" paramRemote "source remote"
|
|
|
|
toOption :: Option
|
|
toOption = Option.field ['t'] "to" paramRemote "destination remote"
|
|
|
|
options :: [Option]
|
|
options = [fromOption, toOption]
|
|
|
|
seek :: [CommandSeek]
|
|
seek = [withField toOption Remote.byName $ \to ->
|
|
withField fromOption Remote.byName $ \from ->
|
|
withFilesInGit $ whenAnnexed $ start to from True]
|
|
|
|
start :: Maybe Remote -> Maybe Remote -> Bool -> FilePath -> (Key, Backend) -> CommandStart
|
|
start to from move file (key, _) = do
|
|
noAuto
|
|
case (from, to) of
|
|
(Nothing, Nothing) -> error "specify either --from or --to"
|
|
(Nothing, Just dest) -> toStart dest move file key
|
|
(Just src, Nothing) -> fromStart src move file key
|
|
(_ , _) -> error "only one of --from or --to can be specified"
|
|
where
|
|
noAuto = when move $ whenM (Annex.getState Annex.auto) $ error
|
|
"--auto is not supported for move"
|
|
|
|
showMoveAction :: Bool -> FilePath -> Annex ()
|
|
showMoveAction True file = showStart "move" file
|
|
showMoveAction False file = showStart "copy" file
|
|
|
|
{- Moves (or copies) the content of an annexed file to a remote.
|
|
-
|
|
- If the remote already has the content, it is still removed from
|
|
- the current repository.
|
|
-
|
|
- Note that unlike drop, this does not honor annex.numcopies.
|
|
- A file's content can be moved even if there are insufficient copies to
|
|
- allow it to be dropped.
|
|
-}
|
|
toStart :: Remote -> Bool -> FilePath -> Key -> CommandStart
|
|
toStart dest move file key = do
|
|
u <- getUUID
|
|
ishere <- inAnnex key
|
|
if not ishere || u == Remote.uuid dest
|
|
then stop -- not here, so nothing to do
|
|
else do
|
|
showMoveAction move file
|
|
next $ toPerform dest move key
|
|
toPerform :: Remote -> Bool -> Key -> CommandPerform
|
|
toPerform dest move key = moveLock move key $ do
|
|
-- Checking the remote is expensive, so not done in the start step.
|
|
-- In fast mode, location tracking is assumed to be correct,
|
|
-- and an explicit check is not done, when copying. When moving,
|
|
-- it has to be done, to avoid inaverdent data loss.
|
|
fast <- Annex.getState Annex.fast
|
|
let fastcheck = fast && not move && not (Remote.hasKeyCheap dest)
|
|
isthere <- if fastcheck
|
|
then do
|
|
remotes <- Remote.keyPossibilities key
|
|
return $ Right $ dest `elem` remotes
|
|
else Remote.hasKey dest key
|
|
case isthere of
|
|
Left err -> do
|
|
showNote err
|
|
stop
|
|
Right False -> do
|
|
showAction $ "to " ++ Remote.name dest
|
|
ok <- Remote.storeKey dest key
|
|
if ok
|
|
then finish
|
|
else do
|
|
when fastcheck $
|
|
warning "This could have failed because --fast is enabled."
|
|
stop
|
|
Right True -> finish
|
|
where
|
|
finish = do
|
|
Remote.logStatus dest key InfoPresent
|
|
if move
|
|
then do
|
|
whenM (inAnnex key) $ removeAnnex key
|
|
next $ Command.Drop.cleanupLocal key
|
|
else next $ return True
|
|
|
|
{- Moves (or copies) the content of an annexed file from a remote
|
|
- to the current repository.
|
|
-
|
|
- If the current repository already has the content, it is still removed
|
|
- from the remote.
|
|
-}
|
|
fromStart :: Remote -> Bool -> FilePath -> Key -> CommandStart
|
|
fromStart src move file key
|
|
| move = go
|
|
| otherwise = stopUnless (not <$> inAnnex key) go
|
|
where
|
|
go = stopUnless (fromOk src key) $ do
|
|
showMoveAction move file
|
|
next $ fromPerform src move key
|
|
fromOk :: Remote -> Key -> Annex Bool
|
|
fromOk src key
|
|
| Remote.hasKeyCheap src =
|
|
either (const expensive) return =<< Remote.hasKey src key
|
|
| otherwise = expensive
|
|
where
|
|
expensive = do
|
|
u <- getUUID
|
|
remotes <- Remote.keyPossibilities key
|
|
return $ u /= Remote.uuid src && any (== src) remotes
|
|
fromPerform :: Remote -> Bool -> Key -> CommandPerform
|
|
fromPerform src move key = moveLock move key $ do
|
|
ishere <- inAnnex key
|
|
if ishere
|
|
then handle move True
|
|
else do
|
|
showAction $ "from " ++ Remote.name src
|
|
ok <- getViaTmp key $ Remote.retrieveKeyFile src key
|
|
handle move ok
|
|
where
|
|
handle _ False = stop -- failed
|
|
handle False True = next $ return True -- copy complete
|
|
handle True True = do -- finish moving
|
|
ok <- Remote.removeKey src key
|
|
next $ Command.Drop.cleanupRemote key src ok
|
|
|
|
{- Locks a key in order for it to be moved.
|
|
- No lock is needed when a key is being copied. -}
|
|
moveLock :: Bool -> Key -> Annex a -> Annex a
|
|
moveLock True key a = lockContent key a
|
|
moveLock False _ a = a
|