mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-12 08:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove Simple API cache files for alternative indexes in cache clean (#5353)

Browse source 
## Summary

The `simple-v9` directory was missing the `index` segment. See before:


![Screenshot 2024-07-23 at 1 29
18 PM](https://github.com/user-attachments/assets/3af9ccbf-ba45-4910-ad3b-4f52806dc8c9)

And after:

![Screenshot 2024-07-23 at 1 29
38 PM](https://github.com/user-attachments/assets/15535534-3304-4209-93e8-7f5e572929f0)

Every other bucket has this `index` segment for non-PyPI indexes, e.g.:

![Screenshot 2024-07-23 at 1 29
24 PM](https://github.com/user-attachments/assets/7354c9ad-7757-4a5f-a7b8-ff987a100e39)

Closes https://github.com/astral-sh/uv/issues/5352.
This commit is contained in:
Charlie Marsh 2024-07-23 13:42:51 -04:00 • committed by GitHub
parent 5f1f9c8293
commit 097acb628d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/uv-cache/src/lib.rs
View file

@ -676,7 +676,7 @@ impl CacheBucket {
Self::FlatIndex => "flat-index-v0", Self::FlatIndex => "flat-index-v0",
Self::Git => "git-v0", Self::Git => "git-v0",
Self::Interpreter => "interpreter-v2", Self::Interpreter => "interpreter-v2",
Self::Simple => "simple-v9", Self::Simple => "simple-v10",
Self::Wheels => "wheels-v1", Self::Wheels => "wheels-v1",
Self::Archive => "archive-v0", Self::Archive => "archive-v0",
Self::Builds => "builds-v0", Self::Builds => "builds-v0",
@ -706,8 +706,8 @@ impl CacheBucket {
let root = cache.bucket(self).join(WheelCacheKind::Pypi); let root = cache.bucket(self).join(WheelCacheKind::Pypi);
summary += rm_rf(root.join(name.to_string()))?; summary += rm_rf(root.join(name.to_string()))?;
// For alternate indices, we expect a directory for every index, followed by a // For alternate indices, we expect a directory for every index (under an `index`
// directory per package (indexed by name). // subdirectory), followed by a directory per package (indexed by name).
let root = cache.bucket(self).join(WheelCacheKind::Index); let root = cache.bucket(self).join(WheelCacheKind::Index);
for directory in directories(root) { for directory in directories(root) {
summary += rm_rf(directory.join(name.to_string()))?; summary += rm_rf(directory.join(name.to_string()))?;
@ -725,8 +725,8 @@ impl CacheBucket {
let root = cache.bucket(self).join(WheelCacheKind::Pypi); let root = cache.bucket(self).join(WheelCacheKind::Pypi);
summary += rm_rf(root.join(name.to_string()))?; summary += rm_rf(root.join(name.to_string()))?;
// For alternate indices, we expect a directory for every index, followed by a // For alternate indices, we expect a directory for every index (under an `index`
// directory per package (indexed by name). // subdirectory), followed by a directory per package (indexed by name).
let root = cache.bucket(self).join(WheelCacheKind::Index); let root = cache.bucket(self).join(WheelCacheKind::Index);
for directory in directories(root) { for directory in directories(root) {
summary += rm_rf(directory.join(name.to_string()))?; summary += rm_rf(directory.join(name.to_string()))?;
@ -769,9 +769,9 @@ impl CacheBucket {
let root = cache.bucket(self).join(WheelCacheKind::Pypi); let root = cache.bucket(self).join(WheelCacheKind::Pypi);
summary += rm_rf(root.join(format!("{name}.rkyv")))?; summary += rm_rf(root.join(format!("{name}.rkyv")))?;
// For alternate indices, we expect a directory for every index, followed by a // For alternate indices, we expect a directory for every index (under an `index`
// MsgPack file per package, indexed by name. // subdirectory), followed by a directory per package (indexed by name).
let root = cache.bucket(self).join(WheelCacheKind::Url); let root = cache.bucket(self).join(WheelCacheKind::Index);
for directory in directories(root) { for directory in directories(root) {
summary += rm_rf(directory.join(format!("{name}.rkyv")))?; summary += rm_rf(directory.join(format!("{name}.rkyv")))?;
} }

8
crates/uv-client/src/registry_client.rs
View file

@ -1,6 +1,6 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::fmt::Debug; use std::fmt::Debug;
use std::path::{Path, PathBuf}; use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
use async_http_range_reader::AsyncHttpRangeReader; use async_http_range_reader::AsyncHttpRangeReader;
@ -268,11 +268,7 @@ impl RegistryClient {
let cache_entry = self.cache.entry( let cache_entry = self.cache.entry(
CacheBucket::Simple, CacheBucket::Simple,
Path::new(&match index { WheelCache::Index(index).root(),
IndexUrl::Pypi(_) => "pypi".to_string(),
IndexUrl::Url(url) => cache_key::digest(&cache_key::CanonicalUrl::new(url)),
IndexUrl::Path(url) => cache_key::digest(&cache_key::CanonicalUrl::new(url)),
}),
format!("{package_name}.rkyv"), format!("{package_name}.rkyv"),
); );
let cache_control = match self.connectivity { let cache_control = match self.connectivity {