mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-08 05:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove Cache argument from DistributionDatabase (#2749)

Browse source 
## Summary

We can access cache from `BuildContext`. This mirrors
`SourceDistCachedBuilder`, which doesn't accept `Cache` as an argument
and always accesses it through `BuildContext`.
This commit is contained in:
Charlie Marsh 2024-03-31 22:22:25 -04:00 • committed by GitHub
parent 0c13eaabe0
commit 8596ff3470
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/uv-distribution/src/distribution_database.rs
View file

@ -15,7 +15,7 @@ use distribution_types::{
}; };
use platform_tags::Tags; use platform_tags::Tags;
use pypi_types::Metadata23; use pypi_types::Metadata23;
use uv_cache::{ArchiveTarget, ArchiveTimestamp, Cache, CacheBucket, CacheEntry, WheelCache}; use uv_cache::{ArchiveTarget, ArchiveTimestamp, CacheBucket, CacheEntry, WheelCache};
use uv_client::{CacheControl, CachedClientError, Connectivity, RegistryClient}; use uv_client::{CacheControl, CachedClientError, Connectivity, RegistryClient};
use uv_types::{BuildContext, NoBinary, NoBuild}; use uv_types::{BuildContext, NoBinary, NoBuild};
@ -37,23 +37,21 @@ use crate::{DiskWheel, Error, LocalWheel, Reporter, SourceDistCachedBuilder};
/// This struct also has the task of acquiring locks around source dist builds in general and git /// This struct also has the task of acquiring locks around source dist builds in general and git
/// operation especially. /// operation especially.
pub struct DistributionDatabase<'a, Context: BuildContext + Send + Sync> { pub struct DistributionDatabase<'a, Context: BuildContext + Send + Sync> {
cache: &'a Cache,
reporter: Option<Arc<dyn Reporter>>,
locks: Arc<Locks>,
client: &'a RegistryClient, client: &'a RegistryClient,
build_context: &'a Context, build_context: &'a Context,
builder: SourceDistCachedBuilder<'a, Context>, builder: SourceDistCachedBuilder<'a, Context>,
locks: Arc<Locks>,
reporter: Option<Arc<dyn Reporter>>,
} }
impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context> { impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context> {
pub fn new(cache: &'a Cache, client: &'a RegistryClient, build_context: &'a Context) -> Self { pub fn new(client: &'a RegistryClient, build_context: &'a Context) -> Self {
Self { Self {
cache,
reporter: None,
locks: Arc::new(Locks::default()),
client, client,
build_context, build_context,
builder: SourceDistCachedBuilder::new(build_context, client), builder: SourceDistCachedBuilder::new(build_context, client),
locks: Arc::new(Locks::default()),
reporter: None,
} }
} }
@ -200,7 +198,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
} }
FileLocation::Path(path) => { FileLocation::Path(path) => {
let url = Url::from_file_path(path).expect("path is absolute"); let url = Url::from_file_path(path).expect("path is absolute");
let cache_entry = self.cache.entry( let cache_entry = self.build_context.cache().entry(
CacheBucket::Wheels, CacheBucket::Wheels,
WheelCache::Url(&url).wheel_dir(wheel.name().as_ref()), WheelCache::Url(&url).wheel_dir(wheel.name().as_ref()),
wheel.filename.stem(), wheel.filename.stem(),
@ -238,7 +236,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
}; };
// Create a cache entry for the wheel. // Create a cache entry for the wheel.
let wheel_entry = self.cache.entry( let wheel_entry = self.build_context.cache().entry(
CacheBucket::Wheels, CacheBucket::Wheels,
WheelCache::Index(&wheel.index).wheel_dir(wheel.name().as_ref()), WheelCache::Index(&wheel.index).wheel_dir(wheel.name().as_ref()),
wheel.filename.stem(), wheel.filename.stem(),
@ -276,7 +274,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
BuiltDist::DirectUrl(wheel) => { BuiltDist::DirectUrl(wheel) => {
// Create a cache entry for the wheel. // Create a cache entry for the wheel.
let wheel_entry = self.cache.entry( let wheel_entry = self.build_context.cache().entry(
CacheBucket::Wheels, CacheBucket::Wheels,
WheelCache::Url(&wheel.url).wheel_dir(wheel.name().as_ref()), WheelCache::Url(&wheel.url).wheel_dir(wheel.name().as_ref()),
wheel.filename.stem(), wheel.filename.stem(),
@ -318,7 +316,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
} }
BuiltDist::Path(wheel) => { BuiltDist::Path(wheel) => {
let cache_entry = self.cache.entry( let cache_entry = self.build_context.cache().entry(
CacheBucket::Wheels, CacheBucket::Wheels,
WheelCache::Url(&wheel.url).wheel_dir(wheel.name().as_ref()), WheelCache::Url(&wheel.url).wheel_dir(wheel.name().as_ref()),
wheel.filename.stem(), wheel.filename.stem(),
@ -406,13 +404,14 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
.into_async_read(); .into_async_read();
// Download and unzip the wheel to a temporary directory. // Download and unzip the wheel to a temporary directory.
let temp_dir = let temp_dir = tempfile::tempdir_in(self.build_context.cache().root())
tempfile::tempdir_in(self.cache.root()).map_err(Error::CacheWrite)?; .map_err(Error::CacheWrite)?;
uv_extract::stream::unzip(reader.compat(), temp_dir.path()).await?; uv_extract::stream::unzip(reader.compat(), temp_dir.path()).await?;
// Persist the temporary directory to the directory store. // Persist the temporary directory to the directory store.
let archive = self let archive = self
.cache .build_context
.cache()
.persist(temp_dir.into_path(), wheel_entry.path()) .persist(temp_dir.into_path(), wheel_entry.path())
.await .await
.map_err(Error::CacheRead)?; .map_err(Error::CacheRead)?;
@ -435,7 +434,8 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
.build()?; .build()?;
let cache_control = match self.client.connectivity() { let cache_control = match self.client.connectivity() {
Connectivity::Online => CacheControl::from( Connectivity::Online => CacheControl::from(
self.cache self.build_context
.cache()
.freshness(&http_entry, Some(&filename.name)) .freshness(&http_entry, Some(&filename.name))
.map_err(Error::CacheRead)?, .map_err(Error::CacheRead)?,
), ),
@ -474,16 +474,16 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
.into_async_read(); .into_async_read();
// Download the wheel to a temporary file. // Download the wheel to a temporary file.
let temp_file = let temp_file = tempfile::tempfile_in(self.build_context.cache().root())
tempfile::tempfile_in(self.cache.root()).map_err(Error::CacheWrite)?; .map_err(Error::CacheWrite)?;
let mut writer = tokio::io::BufWriter::new(tokio::fs::File::from_std(temp_file)); let mut writer = tokio::io::BufWriter::new(tokio::fs::File::from_std(temp_file));
tokio::io::copy(&mut reader.compat(), &mut writer) tokio::io::copy(&mut reader.compat(), &mut writer)
.await .await
.map_err(Error::CacheWrite)?; .map_err(Error::CacheWrite)?;
// Unzip the wheel to a temporary directory. // Unzip the wheel to a temporary directory.
let temp_dir = let temp_dir = tempfile::tempdir_in(self.build_context.cache().root())
tempfile::tempdir_in(self.cache.root()).map_err(Error::CacheWrite)?; .map_err(Error::CacheWrite)?;
let mut file = writer.into_inner(); let mut file = writer.into_inner();
file.seek(io::SeekFrom::Start(0)) file.seek(io::SeekFrom::Start(0))
.await .await
@ -493,7 +493,8 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
// Persist the temporary directory to the directory store. // Persist the temporary directory to the directory store.
let archive = self let archive = self
.cache .build_context
.cache()
.persist(temp_dir.into_path(), wheel_entry.path()) .persist(temp_dir.into_path(), wheel_entry.path())
.await .await
.map_err(Error::CacheRead)?; .map_err(Error::CacheRead)?;
@ -516,7 +517,8 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
.build()?; .build()?;
let cache_control = match self.client.connectivity() { let cache_control = match self.client.connectivity() {
Connectivity::Online => CacheControl::from( Connectivity::Online => CacheControl::from(
self.cache self.build_context
.cache()
.freshness(&http_entry, Some(&filename.name)) .freshness(&http_entry, Some(&filename.name))
.map_err(Error::CacheRead)?, .map_err(Error::CacheRead)?,
), ),

2
crates/uv-installer/src/downloader.rs
View file

@ -54,7 +54,7 @@ impl<'a, Context: BuildContext + Send + Sync> Downloader<'a, Context> {
Self { Self {
tags, tags,
cache, cache,
database: DistributionDatabase::new(cache, client, build_context), database: DistributionDatabase::new(client, build_context),
reporter: None, reporter: None,
} }
} }

2
crates/uv-resolver/src/resolver/mod.rs
View file

@ -140,7 +140,7 @@ impl<
) -> Result<Self, ResolveError> { ) -> Result<Self, ResolveError> {
let provider = DefaultResolverProvider::new( let provider = DefaultResolverProvider::new(
client, client,
DistributionDatabase::new(build_context.cache(), client, build_context), DistributionDatabase::new(client, build_context),
flat_index, flat_index,
tags, tags,
PythonRequirement::new(interpreter, markers), PythonRequirement::new(interpreter, markers),