-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit-id:d55b5ecb
- Loading branch information
Showing
18 changed files
with
930 additions
and
87 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| use crate::core::{Package, PackageId, Summary}; | ||
| use crate::resolver::algorithm::provider::PubGrubPackage; | ||
| use once_map::OnceMap; | ||
| use std::sync::Arc; | ||
|
|
||
| /// In-memory index of package metadata. | ||
| #[derive(Default, Clone)] | ||
| pub struct InMemoryIndex(Arc<SharedInMemoryIndex>); | ||
|
|
||
| #[derive(Default)] | ||
| struct SharedInMemoryIndex { | ||
| /// A map from package name to the metadata for that package and the index where the metadata | ||
| /// came from. | ||
| packages: FxOnceMap<PubGrubPackage, Arc<VersionsResponse>>, | ||
|
|
||
| /// A map from package ID to metadata for that distribution. | ||
| #[allow(dead_code)] | ||
| distributions: FxOnceMap<PackageId, Arc<MetadataResponse>>, | ||
| } | ||
|
|
||
| pub(crate) type FxOnceMap<K, V> = OnceMap<K, V>; | ||
|
|
||
| impl InMemoryIndex { | ||
| /// Returns a reference to the package metadata map. | ||
| pub fn packages(&self) -> &FxOnceMap<PubGrubPackage, Arc<VersionsResponse>> { | ||
| &self.0.packages | ||
| } | ||
|
|
||
| /// Returns a reference to the distribution metadata map. | ||
| #[allow(dead_code)] | ||
| pub fn distributions(&self) -> &FxOnceMap<PackageId, Arc<MetadataResponse>> { | ||
| &self.0.distributions | ||
| } | ||
| } | ||
|
|
||
| // pub struct VersionsResponse; | ||
| #[derive(Debug)] | ||
| pub enum VersionsResponse { | ||
| Found(Vec<Summary>), | ||
| } | ||
|
|
||
| // pub struct MetadataResponse; | ||
| pub enum MetadataResponse { | ||
| #[allow(dead_code)] | ||
| Found(Package), | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,168 @@ | ||
| use crate::core::lockfile::Lockfile; | ||
| use crate::core::registry::Registry; | ||
| use crate::core::{PackageId, Resolve, Summary}; | ||
| use crate::resolver::algorithm::provider::{ | ||
| rewrite_dependency_source_id, rewrite_locked_dependency, DependencyProviderError, | ||
| PubGrubDependencyProvider, PubGrubPackage, | ||
| }; | ||
| use crate::resolver::algorithm::solution::{build_resolve, validate_solution}; | ||
| use crate::resolver::algorithm::state::{Request, ResolverState}; | ||
| use anyhow::bail; | ||
| use futures::{FutureExt, TryFutureExt}; | ||
| use itertools::Itertools; | ||
| use pubgrub::error::PubGrubError; | ||
| use pubgrub::report::{DefaultStringReporter, Reporter}; | ||
| use pubgrub::{Incompatibility, State}; | ||
| use std::collections::HashSet; | ||
| use std::sync::Arc; | ||
| use std::thread; | ||
| use tokio::sync::{mpsc, oneshot}; | ||
|
|
||
| mod in_memory_index; | ||
| mod provider; | ||
| mod solution; | ||
| mod state; | ||
|
|
||
| #[allow(clippy::dbg_macro)] | ||
| #[allow(dead_code)] | ||
| pub async fn resolve<'c>( | ||
| summaries: &[Summary], | ||
| registry: &dyn Registry, | ||
| lockfile: Lockfile, | ||
| ) -> anyhow::Result<Resolve> { | ||
| let state = Arc::new(ResolverState::default()); | ||
|
|
||
| let (request_sink, request_stream): (mpsc::Sender<Request>, mpsc::Receiver<Request>) = | ||
| mpsc::channel(300); | ||
|
|
||
| let requests_fut = state | ||
| .clone() | ||
| .fetch(registry, request_stream) | ||
| .map_err(|err| anyhow::format_err!(err)) | ||
| .fuse(); | ||
|
|
||
| for summary in summaries { | ||
| let package: PubGrubPackage = summary.package_id.into(); | ||
| if state.index.packages().register(package.clone()) { | ||
| request_sink.send(Request::Package(package)).await?; | ||
| } | ||
| for dep in summary.full_dependencies() { | ||
| let dep = rewrite_dependency_source_id(summary.package_id, dep)?; | ||
| let locked_package_id = lockfile.packages_matching(dep.clone()); | ||
| let dep = if let Some(locked_package_id) = locked_package_id { | ||
| rewrite_locked_dependency(dep.clone(), locked_package_id?) | ||
| } else { | ||
| dep.clone() | ||
| }; | ||
|
|
||
| let package: PubGrubPackage = (&dep).into(); | ||
| if state.index.packages().register(package.clone()) { | ||
| request_sink.send(Request::Package(package)).await?; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let main_package_ids: HashSet<PackageId> = | ||
| HashSet::from_iter(summaries.iter().map(|sum| sum.package_id)); | ||
|
|
||
| let (tx, rx) = oneshot::channel(); | ||
|
|
||
| let cloned_lockfile = lockfile.clone(); | ||
| thread::Builder::new() | ||
| .name("scarb-resolver".into()) | ||
| .spawn(move || { | ||
| let result = || { | ||
| let provider = PubGrubDependencyProvider::new( | ||
| main_package_ids, | ||
| state, | ||
| request_sink, | ||
| cloned_lockfile, | ||
| ); | ||
|
|
||
| // Init state | ||
| let main_package_ids = provider | ||
| .main_package_ids() | ||
| .clone() | ||
| .into_iter() | ||
| .collect_vec(); | ||
|
|
||
| let Some((first, rest)) = main_package_ids.split_first() else { | ||
| bail!("empty summaries"); | ||
| }; | ||
| let package: PubGrubPackage = (*first).into(); | ||
| let version = first.version.clone(); | ||
| let mut state = State::init(package.clone(), version); | ||
| state | ||
| .unit_propagation(package.clone()) | ||
| .map_err(|err| anyhow::format_err!("unit propagation failed: {:?}", err))?; | ||
| for package_id in rest { | ||
| let package: PubGrubPackage = (*package_id).into(); | ||
| let version = package_id.version.clone(); | ||
| state.add_incompatibility(Incompatibility::not_root( | ||
| package.clone(), | ||
| version.clone(), | ||
| )); | ||
| state | ||
| .unit_propagation(package) | ||
| .map_err(|err| anyhow::format_err!("unit propagation failed: {:?}", err))? | ||
| } | ||
|
|
||
| // Resolve requirements | ||
| let solution = pubgrub::solver::resolve_state(&provider, &mut state, package) | ||
| .map_err(format_error)?; | ||
|
|
||
| validate_solution(&solution)?; | ||
| build_resolve(&provider, solution) | ||
| }; | ||
| let result = result(); | ||
| tx.send(result).unwrap(); | ||
| })?; | ||
|
|
||
| let resolve_fut = async move { | ||
| rx.await | ||
| // .map_err(|_| (ResolveError::ChannelClosed, FxHashSet::default())) | ||
| // .map_err(|_| DependencyProviderError::ChannelClosed) | ||
| .map_err(|_err| anyhow::format_err!("channel closed")) | ||
| .and_then(|result| result) | ||
| }; | ||
|
|
||
| let (_, resolve) = tokio::try_join!(requests_fut, resolve_fut)?; | ||
| resolve.check_checksums(&lockfile)?; | ||
| Ok(resolve) | ||
| } | ||
|
|
||
| fn format_error(err: PubGrubError<PubGrubDependencyProvider>) -> anyhow::Error { | ||
| match err { | ||
| PubGrubError::NoSolution(derivation_tree) => { | ||
| anyhow::format_err!( | ||
| "version solving failed:\n{}\n", | ||
| DefaultStringReporter::report(&derivation_tree) | ||
| ) | ||
| } | ||
| PubGrubError::ErrorChoosingPackageVersion(DependencyProviderError::PackageNotFound { | ||
| name, | ||
| version, | ||
| }) => { | ||
| anyhow::format_err!("cannot find package `{name} {version}`") | ||
| } | ||
| PubGrubError::ErrorChoosingPackageVersion(DependencyProviderError::PackageQueryFailed( | ||
| err, | ||
| )) => anyhow::format_err!("{}", err).context("dependency query failed"), | ||
| PubGrubError::ErrorRetrievingDependencies { | ||
| package, | ||
| version, | ||
| source, | ||
| } => anyhow::Error::from(source) | ||
| .context(format!("cannot get dependencies of `{package}@{version}`")), | ||
| PubGrubError::SelfDependency { package, version } => { | ||
| anyhow::format_err!("self dependency found: `{}@{}`", package, version) | ||
| } | ||
| PubGrubError::ErrorInShouldCancel(err) => { | ||
| anyhow::format_err!("{}", err).context("should cancel failed") | ||
| } | ||
| PubGrubError::Failure(msg) => anyhow::format_err!("{}", msg).context("resolver failure"), | ||
| // PubGrubError::ErrorChoosingPackageVersion(DependencyProviderError::ChannelClosed) => { | ||
| // anyhow::format_err!("channel closed") | ||
| // } | ||
| } | ||
| } |
Oops, something went wrong.