-
Notifications
You must be signed in to change notification settings - Fork 784
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.
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
Handle symlinks in LocalFileSystem (#2206) #2269
Conversation
pub(crate) fn filesystem_path_to_url( | ||
path: impl AsRef<std::path::Path>, | ||
) -> Result<Url, Error> { | ||
let path = path.as_ref().canonicalize().context(CanonicalizeSnafu { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the change that makes this possible, we no longer canonicalize the paths
let walkdir = WalkDir::new(&resolved_prefix) | ||
.min_depth(1) | ||
.max_depth(1) | ||
.follow_links(true); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amusingly the lack of follow_links
previously meant that symlinks would be reported as objects
even if they were actually directories 😅
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks awesome -- thank you @tustvold
@@ -170,6 +170,17 @@ impl From<Error> for super::Error { | |||
/// | |||
/// If not called from a tokio context, this will perform IO on the current thread with | |||
/// no additional complexity or overheads | |||
/// | |||
/// # Symlinks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
.await | ||
.unwrap(); | ||
|
||
// Follow out of tree symlink |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
love the comments in this test
Co-authored-by: Andrew Lamb <[email protected]>
Benchmark runs are scheduled for baseline = 4222f5a and contender = ad65e88. ad65e88 is a master commit associated with this PR. Results will be available as each benchmark for each run completes. |
Which issue does this PR close?
Closes #2206
Rationale for this change
What changes are included in this PR?
This attempts to handle symlinks consistently
Are there any user-facing changes?
Yes, symlinks will behave as expected