Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid allocations for default cache keys (#12063)

This commit is contained in:
Charlie Marsh 2025-03-17 16:59:32 -07:00 committed by GitHub
parent 029b9e1fcd
commit e0f81f0d4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/uv-cache-info/src/cache_info.rs
View File

@ -1,3 +1,4 @@
use std::borrow::Cow;
use std::cmp::max; use std::cmp::max;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
@ -35,7 +36,7 @@ pub struct CacheInfo {
env: BTreeMap<String, Option<String>>, env: BTreeMap<String, Option<String>>,
/// The timestamp or inode of any directories that should be considered in the cache key. /// The timestamp or inode of any directories that should be considered in the cache key.
#[serde(default)] #[serde(default)]
directories: BTreeMap<String, Option<DirectoryTimestamp>>, directories: BTreeMap<Cow<'static, str>, Option<DirectoryTimestamp>>,
} }
impl CacheInfo { impl CacheInfo {
@ -83,11 +84,11 @@ impl CacheInfo {
// If no cache keys were defined, use the defaults. // If no cache keys were defined, use the defaults.
let cache_keys = cache_keys.unwrap_or_else(|| { let cache_keys = cache_keys.unwrap_or_else(|| {
vec![ vec![
CacheKey::Path("pyproject.toml".to_string()), CacheKey::Path(Cow::Borrowed("pyproject.toml")),
CacheKey::Path("setup.py".to_string()), CacheKey::Path(Cow::Borrowed("setup.py")),
CacheKey::Path("setup.cfg".to_string()), CacheKey::Path(Cow::Borrowed("setup.cfg")),
CacheKey::Directory { CacheKey::Directory {
dir: "src".to_string(), dir: Cow::Borrowed("src"),
}, },
] ]
}); });
@ -97,14 +98,18 @@ impl CacheInfo {
for cache_key in cache_keys { for cache_key in cache_keys {
match cache_key { match cache_key {
CacheKey::Path(file) | CacheKey::File { file } => { CacheKey::Path(file) | CacheKey::File { file } => {
if file.chars().any(|c| matches!(c, '*' | '?' | '[' | '{')) { if file
.as_ref()
.chars()
.any(|c| matches!(c, '*' | '?' | '[' | '{'))
{
// Defer globs to a separate pass. // Defer globs to a separate pass.
globs.push(file); globs.push(file);
continue; continue;
} }
// Treat the path as a file. // Treat the path as a file.
let path = directory.join(&file); let path = directory.join(file.as_ref());
let metadata = match path.metadata() { let metadata = match path.metadata() {
Ok(metadata) => metadata, Ok(metadata) => metadata,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => { Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
@ -126,7 +131,7 @@ impl CacheInfo {
} }
CacheKey::Directory { dir } => { CacheKey::Directory { dir } => {
// Treat the path as a directory. // Treat the path as a directory.
let path = directory.join(&dir); let path = directory.join(dir.as_ref());
let metadata = match path.metadata() { let metadata = match path.metadata() {
Ok(metadata) => metadata, Ok(metadata) => metadata,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => { Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
@ -296,11 +301,11 @@ struct ToolUv {
#[serde(untagged, rename_all = "kebab-case", deny_unknown_fields)] #[serde(untagged, rename_all = "kebab-case", deny_unknown_fields)]
pub enum CacheKey { pub enum CacheKey {
/// Ex) `"Cargo.lock"` or `"**/*.toml"` /// Ex) `"Cargo.lock"` or `"**/*.toml"`
Path(String), Path(Cow<'static, str>),
/// Ex) `{ file = "Cargo.lock" }` or `{ file = "**/*.toml" }` /// Ex) `{ file = "Cargo.lock" }` or `{ file = "**/*.toml" }`
File { file: String }, File { file: Cow<'static, str> },
/// Ex) `{ dir = "src" }` /// Ex) `{ dir = "src" }`
Directory { dir: String }, Directory { dir: Cow<'static, str> },
/// Ex) `{ git = true }` or `{ git = { commit = true, tags = false } }` /// Ex) `{ git = true }` or `{ git = { commit = true, tags = false } }`
Git { git: GitPattern }, Git { git: GitPattern },
/// Ex) `{ env = "UV_CACHE_INFO" }` /// Ex) `{ env = "UV_CACHE_INFO" }`