Refactor RegistryData::load to handle management of the index cache #10482
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
rust-highfive
added
the
S-waiting-on-review
Eh2406
reviewed
Mar 16, 2022
Yes. I'll update the http registry PR after this is in. |
arlosi
commented
Mar 16, 2022
…tself. This enables registry implementations to signal if the cache is valid on a per-request basis. Fixes a bug introduced by rust-lang#10064 that caused Cargo not to update for several cases in a release build because it believed the index cache to be valid when it was not.
|
I confirmed that the |
|
Thank you! @bors r+ By the way, I don't know if this is an optimization, but a git index could return the sha of the last commit when that file was updated instead of the currently checked out sha. Calculating last modified sha may not be worth the trouble, but it would allow the reuse of cached files if all of the changes are related to other files. |
|
📌 Commit a4a882d has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 19, 2022
Update cargo 9 commits in 65c82664263feddc5fe2d424be0993c28d46377a..109bfbd055325ef87a6e7f63d67da7e838f8300b 2022-03-09 02:32:56 +0000 to 2022-03-17 21:43:09 +0000 - Refactor RegistryData::load to handle management of the index cache (rust-lang/cargo#10482) - Separate VCS command paths with "--" (rust-lang/cargo#10483) - Fix panic when artifact target is used for `[target.'cfg(<target>)'.dependencies` (rust-lang/cargo#10433) - Bump [email protected] and [email protected] (rust-lang/cargo#10479) - vendor: Don't allow multiple values for --sync (rust-lang/cargo#10448) - Use types to make clere (credential process || token) (rust-lang/cargo#10471) - Warning on conflicting keys (rust-lang/cargo#10316) - Registry functions return Poll to enable parallel fetching of index data (rust-lang/cargo#10064) - Refine the contributor guide (rust-lang/cargo#10468)
|
BTW, I wanted to say thanks for fixing this so quickly. Sorry, I'm really behind on things. These changes should be in the latest nightly now (2022-03-20). |
bors
added a commit
that referenced
this pull request
Apr 5, 2022
File Cache is valid if checkout or contents hasn't changed #10482 allow the registry to have cashe keys at a per file level. On master if the currently checked out commit changes all cached files are regenerated. After this commit we also check if GITs hash of the particular file has changed. To avoid thrashing cached files this PR only checks for the presence of both hashes, but does not write them both. This means that nightly after this branch will still be able to share file caches with older versions, specifically current stable. When sufficient versions of stable know how to read the new format, a one line change can be made to start writing the new format.
11 tasks
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.
Enables registry implementations to signal if the cache is valid on a per-request basis.
Fixes a bug introduced by #10064 that caused Cargo not to update for several cases in a release build because it believed the index cache to be valid when it was not. The issue only occurred in release builds because debug builds verify that the cache contents is correct (by refreshing it).
Previously
current_versionwas called by the index to determine whether the cache was valid. In the new model,RegistryData::loadis passed the current version of the cache and returns an enum to indicate the status of the cached data.r? @Eh2406
cc @ehuss