Find runfiles in directories that are themselves runfiles #14335
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
|
@mai93 Would you be able to take a look? You reviewed and worked on the last fixes to the runfiles libraries. |
|
@meteorcloudy Could you review this PR in case @mai93 is busy? |
fmeum
commented
Feb 1, 2022
meteorcloudy
requested changes
Feb 3, 2022
fmeum
force-pushed
the
runfiles-manifest-dir-lookup
branch
from
b79a5f0
to
d18c4ee
Compare
meteorcloudy
reviewed
Feb 3, 2022
tools/cpp/runfiles/runfiles_src.cc
Outdated
| @@ -48,6 +49,12 @@ using std::vector; | |||
|
|
|||
| namespace { | |||
|
|
|||
| #ifdef _WIN32 | |||
There was a problem hiding this comment.
Do we still need this if we always use /?
There was a problem hiding this comment.
Yes, I got rid of it.
fmeum
force-pushed
the
runfiles-manifest-dir-lookup
branch
from
d18c4ee
to
7d6de06
Compare
|
@meteorcloudy I pushed the fixes, thanks for the comments. Would it be okay to leave bash for a follow-up PR? I'm not too familiar with shell scripts and would probably need more time to fix the lookup logic there. |
fmeum
force-pushed
the
runfiles-manifest-dir-lookup
branch
from
67a6c85
to
c6cea90
Compare
|
I gave the Bash implementation a try and it wasn't that bad. This PR now includes fixes for all runfiles libraries shipped with Bazel. Let me know if you would prefer me to squash the four commits in case you want to import them together. |
meteorcloudy
requested changes
Feb 4, 2022
tools/bash/runfiles/runfiles.bash
Outdated
| echo "$candidate" | ||
| return 0 | ||
| fi | ||
| # There is only ever one matching prefix in the runfiles manifest. |
There was a problem hiding this comment.
Shouldn't this break statement be inside the if statement?
There was a problem hiding this comment.
I actually think it's correct as is, but agree this is confusing and thus added an extensive comment. Let me know what you think.
There was a problem hiding this comment.
Thanks! I missed the continue statement in the middle and thought the while loop would never run a second time. Thanks for the explanation!
fmeum
force-pushed
the
runfiles-manifest-dir-lookup
branch
from
c6cea90
to
2c004f4
Compare
|
I squashed the commits and added a descriptive message. |
meteorcloudy
approved these changes
Feb 7, 2022
When a target has a runfile that is contained in a directory that is itself one of its runfiles, the runfile will be shadowed by the SymlinkEntry for the directory. While this still allows to resolve the file in the runfiles symlink tree, a manifest-based lookup will fail. Since the manifest is used to create the symlink tree for which it is important that no path is a prefix of another, this can only be fixed in the runfiles libraries. This commit extends the lookup logic of the Bash, C++, Java, and Python runfiles libraries to also find runfiles contained within directories that are themselves runfiles. It does so by searching the manifest not only for the exact provided rlocation path, but also for all path prefixes. If a prefix is looked up successfully, the corresponding suffix is resolved relative to the looked up path.
fmeum
force-pushed
the
runfiles-manifest-dir-lookup
branch
from
2c004f4
to
2b91de0
Compare
fmeum
added a commit
to fmeum/bazel
that referenced
this pull request
Feb 7, 2022
When a target has a runfile that is contained in a directory that is itself one of its runfiles, the runfile will be shadowed by the `SymlinkEntry` for the directory. While this still allows to resolve the file in the runfiles symlink tree, a manifest-based lookup will fail. Since the manifest is used to create the symlink tree for which it is important that no path is a prefix of another, this can only be fixed in the runfiles libraries. This PR extends the lookup logic of the Bash, C++, Java, and Python runfiles libraries to also find runfiles contained within directories that are themselves runfiles. It does so by searching the manifest not only for the exact provided rlocation path, but also for all path prefixes. If a prefix is looked up successfully, the corresponding suffix is resolved relative to the looked up path. Fixes bazelbuild#14336. Closes bazelbuild#14335. PiperOrigin-RevId: 426894517
Wyverald
pushed a commit
that referenced
this pull request
Feb 7, 2022
When a target has a runfile that is contained in a directory that is itself one of its runfiles, the runfile will be shadowed by the `SymlinkEntry` for the directory. While this still allows to resolve the file in the runfiles symlink tree, a manifest-based lookup will fail. Since the manifest is used to create the symlink tree for which it is important that no path is a prefix of another, this can only be fixed in the runfiles libraries. This PR extends the lookup logic of the Bash, C++, Java, and Python runfiles libraries to also find runfiles contained within directories that are themselves runfiles. It does so by searching the manifest not only for the exact provided rlocation path, but also for all path prefixes. If a prefix is looked up successfully, the corresponding suffix is resolved relative to the looked up path. Fixes #14336. Closes #14335. PiperOrigin-RevId: 426894517
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.
When a target has a runfile that is contained in a directory that is itself one of its runfiles, the runfile will be shadowed by the
SymlinkEntryfor the directory. While this still allows to resolve the file in the runfiles symlink tree, a manifest-based lookup will fail. Since the manifest is used to create the symlink tree for which it is important that no path is a prefix of another, this can only be fixed in the runfiles libraries.This PR extends the lookup logic of the Bash, C++, Java, and Python runfiles libraries to also find runfiles contained within directories that are themselves runfiles. It does so by searching the manifest not only for the exact provided rlocation path, but also for all path prefixes. If a prefix is looked up successfully, the corresponding suffix is resolved relative to the looked up path.
Fixes #14336.