mirror of
https://github.com/astral-sh/uv.git
synced 2025-10-27 18:36:44 +00:00
f865406ab4
This commit is a pretty invasive change that implements the merging of resolutions created by each fork of the resolver. The main idea here is that each `SolveState` is converted into a `Resolution` (a new type) and stored on the heap after its fork completes. When all forks complete, they are all merged into a single `Resolution`. This `Resolution` is then used to build a `ResolutionGraph`. Construction of `ResolutionGraph` mostly stays the same (despite the gnarly diff due to an indent change) with one exception: the code to extract dependency edges out of PubGrub's state has been moved to `SolveState::into_resolution`. The idea here is that once a fork completes, we extract what we need from the PubGrub state and then throw it away. We store these edges in our own intermediate type which is then converted into petgraph edges in the `ResolutionGraph` constructor. One interesting change we make here is that our edge data is now a `Version` instead of a `Range<Version>`. I don't think `Range<Version>` was actually being used anywhere, so this seems okay? In any case, I think `Version` here is correct because a resolution corresponds to specific dependencies of each package. Moreover, I didn't see an easy way to make things work with `Range<Version>`. Notably, since we no longer have the guarantee that there is only one version of each package, we need to use `(PackageName, Version)` instead of just `PackageName` for inverted lookups in `ResolutionGraph::from_state`. Finally, the main resolver loop itself is changed a bit to track all forked resolutions and then merge them at the end. Note that we don't really have any dealings with markers in this commit. We'll get to that in a subsequent commit.
43 lines
1.5 KiB
Rust
43 lines
1.5 KiB
Rust
use rustc_hash::FxHashMap;
|
|
|
|
use distribution_types::{CompatibleDist, ResolvedDist};
|
|
use uv_normalize::PackageName;
|
|
|
|
use crate::candidate_selector::Candidate;
|
|
|
|
/// A set of package versions pinned to specific files.
|
|
///
|
|
/// For example, given `Flask==3.0.0`, the [`FilePins`] would contain a mapping from `Flask` to
|
|
/// `3.0.0` to the specific wheel or source distribution archive that was pinned for that version.
|
|
#[derive(Clone, Debug, Default)]
|
|
pub(crate) struct FilePins(FxHashMap<PackageName, FxHashMap<pep440_rs::Version, ResolvedDist>>);
|
|
|
|
impl FilePins {
|
|
/// Pin a candidate package.
|
|
pub(crate) fn insert(&mut self, candidate: &Candidate, dist: &CompatibleDist) {
|
|
self.0.entry(candidate.name().clone()).or_default().insert(
|
|
candidate.version().clone(),
|
|
dist.for_installation().to_owned(),
|
|
);
|
|
}
|
|
|
|
/// Return the pinned file for the given package name and version, if it exists.
|
|
pub(crate) fn get(
|
|
&self,
|
|
name: &PackageName,
|
|
version: &pep440_rs::Version,
|
|
) -> Option<&ResolvedDist> {
|
|
self.0.get(name)?.get(version)
|
|
}
|
|
|
|
/// Add the pins in `other` to `self`.
|
|
///
|
|
/// This assumes that if a version for a particular package exists in
|
|
/// both `self` and `other`, then they will both correspond to identical
|
|
/// distributions.
|
|
pub(crate) fn union(&mut self, other: FilePins) {
|
|
for (name, versions) in other.0 {
|
|
self.0.entry(name).or_default().extend(versions);
|
|
}
|
|
}
|
|
}
|