Fix cache invalidation for nested pyproject.toml files #12727
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
MichaReiser
commented
Aug 7, 2024
| // Insert a mapping that matches the directory itself (without a trailing slash). | ||
| // Inserting should always succeed because conflicts are resolved above and the above insertion guarantees | ||
| // that the path is correctly escaped. | ||
| self.router.insert(path, self.settings.len() - 1).unwrap(); |
There was a problem hiding this comment.
@ibraheemdev is there some wild card expression that we could use that I'm not aware of instead of inserting two routes (e.g. {path}(/{{#filepath}})?)
There was a problem hiding this comment.
No, this is the recommended way of doing it.
|
|
Thank you, Micha! I can confirm it fixes both the test script from #12721 as well as our own original case, where we discovered the bug. You folks are so fast! The issue is not even 12h old and you already have a fix :) |
ibraheemdev
approved these changes
Aug 7, 2024
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.
Summary
This PR fixes an issue with cache invalidation where changing a nested pyproject.toml didn't invalidate the cache for those files.
The root cause of the issue was that the
Resolverreturned the wrong configuration when querying the settings by the directory because it only registers a route fordirectory/{files}but a query by directory misses the trailing/.Fixes #12721
Fixes #12264
Test Plan
Played throught the example in #12721