Skip to content

GH-125413: pathlib: use scandir() to speed up copy() #126263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
barneygale wants to merge 10 commits into from
Closed

GH-125413: pathlib: use scandir() to speed up copy() #126263

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9b223ca
GH-125413: pathlib: use `scandir()` to speed up `copy()`
barneygale Nov 1, 2024
fc40a79
Fix tests
barneygale Nov 1, 2024
e688be8
Merge branch 'main' into gh-125413-copy
barneygale Nov 1, 2024
6f5ebb8
Speed up metadata handling
barneygale Nov 1, 2024
09aff17
Speed up ensure_different_files()
barneygale Nov 1, 2024
00abf8a
Speed up path construction when recursing
barneygale Nov 1, 2024
3db0e18
Fix missed Windows changes
barneygale Nov 1, 2024
c4bd4a8
Apply suggestions from code review
barneygale Nov 2, 2024
69eb3c8
Merge branch 'main' into gh-125413-copy
barneygale Nov 4, 2024
7dd35b4
Merge branch 'main' into gh-125413-copy
barneygale Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Speed up ensure_different_files()
  • Loading branch information
@barneygale
barneygale committed Nov 1, 2024
commit 09aff170d392a6f75dedbcded0fdf9b3d9aff111
15 changes: 11 additions & 4 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,20 @@ def __init__(self, follow_symlinks=True, dirs_exist_ok=False,
self.preserve_metadata = preserve_metadata

@classmethod
def ensure_different_files(cls, source, target):
def ensure_different_files(cls, source, target, dir_entry=None):
"""Raise OSError(EINVAL) if both paths refer to the same file."""
try:
if not target.samefile(source):
return
target_st = target.stat()
try:
source_st = dir_entry.stat()
except AttributeError:
source_st = source.stat()
Comment on lines +113 to +116

@AA-Turner AA-Turner Dec 8, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there valid non-None types for dir_entry that don't have stat? Otherwise a is None check is cheaper.

except (OSError, ValueError):
return
if source_st.st_ino != target_st.st_ino:
return # Different inode
if source_st.st_dev != target_st.st_dev:
return # Different device
err = OSError(EINVAL, "Source and target are the same file")
err.filename = str(source)
err.filename2 = str(target)
Expand Down Expand Up @@ -172,7 +179,7 @@ def copy_dir(self, source, target, metadata_keys, dir_entry=None):

def copy_file(self, source, target, metadata_keys, dir_entry=None):
"""Copy the given file to the given target."""
self.ensure_different_files(source, target)
self.ensure_different_files(source, target, dir_entry)
if metadata_keys:
metadata = source._read_metadata(metadata_keys, dir_entry=dir_entry)
else:
Expand Down