repofs: use underlying fs.download to download files #6401
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
efiop
commented
Aug 9, 2021
| @@ -253,3 +255,9 @@ def info(self, path_info): | |||
| ret[obj.hash_info.name] = obj.hash_info.value | |||
|
|
|||
| return ret | |||
|
|
|||
| def _download(self, from_info, to_file, **kwargs): | |||
There was a problem hiding this comment.
For the record: this is a bit ugly, but it will turn into a cleaner and more proper fs.get_file when migrating dvcfs to fsspec.
efiop
commented
Aug 9, 2021
| def open( # type: ignore | ||
| self, path: PathInfo, mode="r", encoding=None, remote=None, **kwargs | ||
| ): # pylint: disable=arguments-differ | ||
| def _get_fs_path(self, path: PathInfo, remote=None): |
There was a problem hiding this comment.
This didn't handle chained imports before and neither does it handle them now. We'll need to generalize resolving logic we use in dvc/dependency/repo.py to use it here. Will prob look into it in a followup.
efiop
added
optimize
efiop
commented
Aug 9, 2021
|
|
||
| def _download(self, from_info, to_file, **kwargs): | ||
| fs, path = self._get_fs_path(from_info) | ||
| fs._download( # pylint: disable=protected-access |
There was a problem hiding this comment.
This again is temporary, it will be replaced by just get_file in the future.
efiop
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes
dvc getwork just as fast asimport/pull. The reason is thatopen()is harder to make fast (e.g. we need to know what block size to use, etc, for which we don't yet have a very good internal infrastructure), and it is much easier to just use nativefs.downloadmethod that has been already tuned for maximum performance.Related to #5546
Fixes #6019
❗ I have followed the Contributing to DVC checklist.
📖 If this PR requires documentation updates, I have created a separate PR (or issue, at least) in dvc.org and linked it here.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏