mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-04 07:18:27 +01:00
* objects.status: use object IDs instead of naive objects * objects.transfer: use object IDs instead of naive objects * objects: add ReferenceHashFile * odb: add ReferenceObjectDB * repo: collect used object IDs instead of naive objs * support basic/naive fs serialization * objects.stage: stage file objects in addition to trees * objects: remove save(), update transfer() * output/dep: update for osave removal * path_info: support both url and path attributes * status/gc: use object IDs instead of naive objs * diff: update staging usage * commit: update staging usage * tests: clean staging when needed * tests: update for save/transfer/stage changes * dvcfs: don't allow config serialization (repofs should be used instead) * utils: return mtime as str, size as int * tests: update unit tests for save/stage/transfer changes * objects: use Repo.open when needed in ReferenceHashFile * fix ls test staging * objects.stage: don't skip hash check when loading from state - individual hashes will still be loaded from state if they are still valid * ReferenceHashFile: serialize repo fs paths relative to repo root * preserve state when staging * objects.tree: skip hash computation in digest() when we have already loaded hash from state * always check file existence in referencehashfile * update repofs test since stage no longer allows nonexistent files * odb: only protect on check() if hash was verified * staging: use unique memfs namespace for staging per dest ODB * tests: clean full staging namespace * refodb: preserve repofs cache dir * repodependency: stage imports to local ODB and strict check circular imports * fetch: fetch staging last * staging: make dest odb mandatory and preserve state * refodb: cache nonlocal fs's * fix rebase errors * repofs: support full instantiation from fs config * repofs: preserve subrepo factory for erepos * tests: clarify repofs dirty file behavior
136 lines
4.3 KiB
Python
136 lines
4.3 KiB
Python
import errno
|
|
import logging
|
|
import os
|
|
import pickle
|
|
from typing import TYPE_CHECKING, Optional, Tuple
|
|
|
|
from .errors import ObjectFormatError
|
|
from .file import HashFile
|
|
|
|
if TYPE_CHECKING:
|
|
from dvc.fs.base import BaseFileSystem
|
|
from dvc.hash_info import HashInfo
|
|
from dvc.types import AnyPath
|
|
|
|
from .db.base import ObjectDB
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class ReferenceHashFile(HashFile):
|
|
PARAM_PATH = "path"
|
|
PARAM_HASH = "hash"
|
|
PARAM_MTIME = "mtime"
|
|
PARAM_SIZE = "size"
|
|
PARAM_FS_CONFIG = "fs_config"
|
|
|
|
def __init__(
|
|
self,
|
|
path_info: "AnyPath",
|
|
fs: "BaseFileSystem",
|
|
hash_info: "HashInfo",
|
|
mtime: Optional[str] = None,
|
|
size: Optional[int] = None,
|
|
**kwargs,
|
|
):
|
|
super().__init__(path_info, fs, hash_info, **kwargs)
|
|
cur_mtime, cur_size = self._get_mtime_and_size()
|
|
self.mtime = cur_mtime if mtime is None else mtime
|
|
self.hash_info.size = cur_size if size is None else size
|
|
|
|
def __str__(self):
|
|
return f"ref object {self.hash_info} -> {self.path_info}"
|
|
|
|
def check(self, odb: "ObjectDB", check_hash: bool = True):
|
|
assert self.fs
|
|
if not self.fs.exists(self.path_info):
|
|
raise FileNotFoundError(
|
|
errno.ENOENT, os.strerror(errno.ENOENT), self.path_info
|
|
)
|
|
if not (self.mtime, self.size) == self._get_mtime_and_size():
|
|
raise ObjectFormatError(f"{self} is changed")
|
|
if check_hash:
|
|
self._check_hash(odb)
|
|
|
|
def _get_mtime_and_size(self) -> Tuple[Optional[str], int]:
|
|
from dvc.utils.fs import get_mtime_and_size
|
|
|
|
assert self.fs
|
|
if hasattr(self.fs, "stat"):
|
|
try:
|
|
return get_mtime_and_size(self.path_info, self.fs)
|
|
except FileNotFoundError:
|
|
pass
|
|
return None, self.fs.getsize(self.path_info)
|
|
|
|
def to_bytes(self):
|
|
from dvc.fs.repo import RepoFileSystem
|
|
from dvc.path_info import PathInfo
|
|
|
|
# NOTE: dumping reference FS's this way is insecure, as the
|
|
# fully parsed remote FS config will include credentials
|
|
#
|
|
# ReferenceHashFiles should currently only be serialized in
|
|
# memory and not to disk
|
|
path_info = self.path_info
|
|
if isinstance(self.fs, RepoFileSystem):
|
|
path_info = PathInfo(path_info).relative_to(self.fs.root_dir)
|
|
|
|
dict_ = {
|
|
self.PARAM_PATH: path_info,
|
|
self.PARAM_HASH: self.hash_info,
|
|
self.PARAM_MTIME: self.mtime,
|
|
self.PARAM_SIZE: self.size,
|
|
self.PARAM_FS_CONFIG: self.config_tuple(self.fs),
|
|
}
|
|
try:
|
|
return pickle.dumps(dict_)
|
|
except pickle.PickleError as exc:
|
|
raise ObjectFormatError(f"Could not pickle {self}") from exc
|
|
|
|
@classmethod
|
|
def from_bytes(cls, data: bytes, fs_cache: Optional[dict] = None):
|
|
from dvc.fs import get_fs_cls
|
|
from dvc.fs.repo import RepoFileSystem
|
|
|
|
try:
|
|
dict_ = pickle.loads(data)
|
|
except pickle.PickleError as exc:
|
|
raise ObjectFormatError("ReferenceHashFile is corrupted") from exc
|
|
|
|
try:
|
|
path_info = dict_[cls.PARAM_PATH]
|
|
hash_info = dict_[cls.PARAM_HASH]
|
|
except KeyError as exc:
|
|
raise ObjectFormatError("ReferenceHashFile is corrupted") from exc
|
|
|
|
scheme, config_pairs = dict_.get(cls.PARAM_FS_CONFIG)
|
|
fs = fs_cache.get((scheme, config_pairs)) if fs_cache else None
|
|
if not fs:
|
|
config = dict(config_pairs)
|
|
if RepoFileSystem.PARAM_REPO_URL in config:
|
|
fs = RepoFileSystem(**config)
|
|
path_info = fs.root_dir / path_info
|
|
else:
|
|
fs_cls = get_fs_cls(config, scheme=path_info.scheme)
|
|
fs = fs_cls(**config)
|
|
return ReferenceHashFile(
|
|
path_info,
|
|
fs,
|
|
hash_info,
|
|
mtime=dict_.get(cls.PARAM_MTIME),
|
|
size=dict_.get(cls.PARAM_SIZE),
|
|
)
|
|
|
|
@staticmethod
|
|
def config_tuple(fs: "BaseFileSystem"):
|
|
return (
|
|
fs.scheme,
|
|
tuple(
|
|
(key, value)
|
|
for key, value in sorted(
|
|
fs.config.items(), key=lambda item: item[0]
|
|
)
|
|
),
|
|
)
|