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

Rename SolverCache (#184)

Browse source 
Everywhere else, we use cache to refer to a filesystem cache, so this is
kind of confusing. It's really an in-memory index that we build up over
the course of the solve.
This commit is contained in:
Charlie Marsh 2023-10-25 16:53:31 -07:00 • committed by GitHub
parent 889f6173cc
commit 5ed913af50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/puffin-resolver/src/resolver.rs
View file

@ -44,7 +44,7 @@ pub struct Resolver<'a, Ctx: BuildContext> {
tags: &'a Tags, tags: &'a Tags,
client: &'a RegistryClient, client: &'a RegistryClient,
selector: CandidateSelector, selector: CandidateSelector,
cache: Arc<SolverCache>, index: Arc<Index>,
build_context: &'a Ctx, build_context: &'a Ctx,
} }
@ -61,7 +61,7 @@ impl<'a, Ctx: BuildContext> Resolver<'a, Ctx> {
) -> Self { ) -> Self {
Self { Self {
selector: CandidateSelector::from_mode(mode, &requirements), selector: CandidateSelector::from_mode(mode, &requirements),
cache: Arc::new(SolverCache::default()), index: Arc::new(Index::default()),
requirements, requirements,
constraints, constraints,
markers, markers,
@ -268,7 +268,7 @@ impl<'a, Ctx: BuildContext> Resolver<'a, Ctx> {
}; };
// If we don't have metadata for this package, we can't make an early decision. // If we don't have metadata for this package, we can't make an early decision.
let Some(entry) = self.cache.packages.get(package_name) else { let Some(entry) = self.index.packages.get(package_name) else {
continue; continue;
}; };
let simple_json = entry.value(); let simple_json = entry.value();
@ -334,7 +334,7 @@ impl<'a, Ctx: BuildContext> Resolver<'a, Ctx> {
PubGrubPackage::Root => Ok((package, Some(MIN_VERSION.clone()))), PubGrubPackage::Root => Ok((package, Some(MIN_VERSION.clone()))),
PubGrubPackage::Package(package_name, _) => { PubGrubPackage::Package(package_name, _) => {
// Wait for the metadata to be available. // Wait for the metadata to be available.
let entry = self.cache.packages.wait(package_name).await.unwrap(); let entry = self.index.packages.wait(package_name).await.unwrap();
let simple_json = entry.value(); let simple_json = entry.value();
debug!( debug!(
@ -484,7 +484,7 @@ impl<'a, Ctx: BuildContext> Resolver<'a, Ctx> {
// Wait for the metadata to be available. // Wait for the metadata to be available.
let versions = pins.get(package_name).unwrap(); let versions = pins.get(package_name).unwrap();
let file = versions.get(version.into()).unwrap(); let file = versions.get(version.into()).unwrap();
let entry = self.cache.versions.wait(&file.hashes.sha256).await.unwrap(); let entry = self.index.versions.wait(&file.hashes.sha256).await.unwrap();
let metadata = entry.value(); let metadata = entry.value();
let mut constraints = let mut constraints =
@ -555,17 +555,17 @@ impl<'a, Ctx: BuildContext> Resolver<'a, Ctx> {
match response? { match response? {
Response::Package(package_name, metadata) => { Response::Package(package_name, metadata) => {
trace!("Received package metadata for {}", package_name); trace!("Received package metadata for {}", package_name);
self.cache.packages.insert(package_name.clone(), metadata); self.index.packages.insert(package_name.clone(), metadata);
} }
Response::Wheel(file, metadata) => { Response::Wheel(file, metadata) => {
trace!("Received file metadata for {}", file.filename); trace!("Received file metadata for {}", file.filename);
self.cache self.index
.versions .versions
.insert(file.hashes.sha256.clone(), metadata); .insert(file.hashes.sha256.clone(), metadata);
} }
Response::Sdist(file, metadata) => { Response::Sdist(file, metadata) => {
trace!("Received sdist build metadata for {}", file.filename); trace!("Received sdist build metadata for {}", file.filename);
self.cache self.index
.versions .versions
.insert(file.hashes.sha256.clone(), metadata); .insert(file.hashes.sha256.clone(), metadata);
} }
@ -645,7 +645,8 @@ enum Response {
Sdist(File, Metadata21), Sdist(File, Metadata21),
} }
struct SolverCache { /// In-memory index of package metadata.
struct Index {
/// A map from package name to the metadata for that package. /// A map from package name to the metadata for that package.
packages: WaitMap<PackageName, SimpleJson>, packages: WaitMap<PackageName, SimpleJson>,
@ -653,7 +654,7 @@ struct SolverCache {
versions: WaitMap<String, Metadata21>, versions: WaitMap<String, Metadata21>,
} }
impl Default for SolverCache { impl Default for Index {
fn default() -> Self { fn default() -> Self {
Self { Self {
packages: WaitMap::new(), packages: WaitMap::new(),