Skip to content
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

Merged
merged 2 commits into from
Aug 2, 2022

Conversation

tustvold
Copy link
Contributor

@tustvold tustvold commented Aug 1, 2022

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

pub(crate) fn filesystem_path_to_url(
path: impl AsRef<std::path::Path>,
) -> Result<Url, Error> {
let path = path.as_ref().canonicalize().context(CanonicalizeSnafu {
Copy link
Contributor Author

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

@github-actions github-actions bot added the object-store Object Store Interface label Aug 1, 2022
let walkdir = WalkDir::new(&resolved_prefix)
.min_depth(1)
.max_depth(1)
.follow_links(true);
Copy link
Contributor Author

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 😅

Copy link
Contributor

@alamb alamb left a 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
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

object_store/src/local.rs Show resolved Hide resolved
.await
.unwrap();

// Follow out of tree symlink
Copy link
Contributor

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

@alamb alamb merged commit ad65e88 into apache:master Aug 2, 2022
@ursabot
Copy link

ursabot commented Aug 2, 2022

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.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
object-store Object Store Interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

object_store: Create explicit test for symlinks
3 participants