feat: switch to new solver backend implementation (#178)

* feat: switch to new solver backend implementation * fix: fmt * fix: missing snapshot * fix: actually all missing snapshots
prefix-dev · Jul 6, 2023 · 477a4fa · 477a4fa
1 parent 26febab
commit 477a4fa
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 144 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ rattler_conda_types = { default-features = false, git = "https://github.com/mamb
 rattler_networking = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
 rattler_repodata_gateway = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["sparse"] }
 rattler_shell = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["sysinfo"] }
-rattler_solve = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_solve = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["libsolv-sys"] }
 rattler_virtual_packages = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
 #rattler = { default-features = false, path="../rattler/crates/rattler" }
 #rattler_conda_types = { default-features = false, path="../rattler/crates/rattler_conda_types" }

diff --git a/src/cli/add.rs b/src/cli/add.rs
@@ -11,7 +11,7 @@ use rattler_conda_types::{
     version_spec::VersionOperator, MatchSpec, NamelessMatchSpec, Platform, Version, VersionSpec,
 };
 use rattler_repodata_gateway::sparse::SparseRepoData;
-use rattler_solve::{LibsolvRepoData, SolverBackend};
+use rattler_solve::{libsolv_sys, SolverImpl};
 use std::collections::HashMap;
 use std::path::PathBuf;
 
@@ -212,9 +212,7 @@ pub fn determine_best_version(
             .map(|(name, spec)| MatchSpec::from_nameless(spec.clone(), Some(name.clone())))
             .collect(),
 
-        available_packages: available_packages
-            .iter()
-            .map(|records| LibsolvRepoData::from_records(records)),
+        available_packages: &available_packages,
 
         virtual_packages: get_minimal_virtual_packages(platform)
             .into_iter()
@@ -227,12 +225,17 @@ pub fn determine_best_version(
         pinned_packages: vec![],
     };
 
-    let records = rattler_solve::LibsolvBackend.solve(task)?;
+    let records = libsolv_sys::Solver.solve(task)?;
 
     // Determine the versions of the new packages
     Ok(records
         .into_iter()
         .filter(|record| new_specs.contains_key(&record.package_record.name))
-        .map(|record| (record.package_record.name, record.package_record.version))
+        .map(|record| {
+            (
+                record.package_record.name,
+                record.package_record.version.into(),
+            )
+        })
         .collect())
 }
diff --git a/src/cli/global/install.rs b/src/cli/global/install.rs
@@ -15,7 +15,7 @@ use rattler_shell::{
     shell::Shell,
     shell::ShellEnum,
 };
-use rattler_solve::{LibsolvRepoData, SolverBackend};
+use rattler_solve::{libsolv_sys, SolverImpl};
 use std::{
     path::{Path, PathBuf},
     str::FromStr,
@@ -219,9 +219,7 @@ pub async fn execute(args: Args) -> anyhow::Result<()> {
     // Construct a solver task that we can start solving.
     let task = rattler_solve::SolverTask {
         specs: vec![package_matchspec],
-        available_packages: available_packages
-            .iter()
-            .map(|records| LibsolvRepoData::from_records(records)),
+        available_packages: &available_packages,
 
         virtual_packages: rattler_virtual_packages::VirtualPackage::current()?
             .iter()
@@ -234,7 +232,7 @@ pub async fn execute(args: Args) -> anyhow::Result<()> {
     };
 
     // Solve it
-    let records = rattler_solve::LibsolvBackend.solve(task)?;
+    let records = libsolv_sys::Solver.solve(task)?;
 
     // Create the binary environment prefix where we install or update the package
     let bin_prefix = BinEnvDir::create(&package_name).await?;

diff --git a/src/environment.rs b/src/environment.rs
@@ -26,7 +26,7 @@ use rattler_conda_types::{
 };
 use rattler_networking::AuthenticatedClient;
 use rattler_repodata_gateway::sparse::SparseRepoData;
-use rattler_solve::{LibsolvRepoData, SolverBackend};
+use rattler_solve::{libsolv_sys, SolverImpl};
 use std::collections::HashMap;
 use std::{
     collections::{HashSet, VecDeque},
@@ -329,9 +329,7 @@ pub async fn update_lock_file(
         // Construct a solver task that we can start solving.
         let task = rattler_solve::SolverTask {
             specs: match_specs.clone(),
-            available_packages: available_packages
-                .iter()
-                .map(|records| LibsolvRepoData::from_records(records)),
+            available_packages: &available_packages,
 
             // TODO: All these things.
             locked_packages: existing_lock_file
@@ -343,7 +341,7 @@ pub async fn update_lock_file(
         };
 
         // Solve the task
-        let records = rattler_solve::LibsolvBackend.solve(task)?;
+        let records = libsolv_sys::Solver.solve(task)?;
 
         // Update lock file
         let mut locked_packages = LockedPackages::new(platform);
@@ -415,7 +413,7 @@ pub fn get_required_packages(
                     subdir: "".to_string(),
                     timestamp: None,
                     track_features: vec![],
-                    version: Version::from_str(&pkg.version)?,
+                    version: Version::from_str(&pkg.version)?.into(),
                 },
             })
         })

diff --git a/src/project/snapshots/pixi__project__manifest__test__dependency_types.snap b/src/project/snapshots/pixi__project__manifest__test__dependency_types.snap
@@ -7,11 +7,8 @@ ProjectManifest {
     project: ProjectMetadata {
         name: "foo",
         version: Version {
-            norm: Some(
-                "0.1.0",
-            ),
-            version: "[[0], [0], [1], [0]]",
-            local: "[]",
+            version: [[0], [0], [1], [0]],
+            local: [],
         },
         description: None,
         authors: [],
@@ -37,11 +34,8 @@ ProjectManifest {
                 Operator(
                     Equals,
                     Version {
-                        norm: Some(
-                            "1.0.0",
-                        ),
-                        version: "[[0], [1], [0], [0]]",
-                        local: "[]",
+                        version: [[0], [1], [0], [0]],
+                        local: [],
                     },
                 ),
             ),

diff --git a/src/project/snapshots/pixi__project__manifest__test__target_specific.snap b/src/project/snapshots/pixi__project__manifest__test__target_specific.snap
@@ -7,11 +7,8 @@ ProjectManifest {
     project: ProjectMetadata {
         name: "foo",
         version: Version {
-            norm: Some(
-                "0.1.0",
-            ),
-            version: "[[0], [0], [1], [0]]",
-            local: "[]",
+            version: [[0], [0], [1], [0]],
+            local: [],
         },
         description: None,
         authors: [],
@@ -47,11 +44,8 @@ ProjectManifest {
                         Operator(
                             Equals,
                             Version {
-                                norm: Some(
-                                    "3.4.5",
-                                ),
-                                version: "[[0], [3], [4], [5]]",
-                                local: "[]",
+                                version: [[0], [3], [4], [5]],
+                                local: [],
                             },
                         ),
                     ),
@@ -80,11 +74,8 @@ ProjectManifest {
                         Operator(
                             Equals,
                             Version {
-                                norm: Some(
-                                    "1.2.3",
-                                ),
-                                version: "[[0], [1], [2], [3]]",
-                                local: "[]",
+                                version: [[0], [1], [2], [3]],
+                                local: [],
                             },
                         ),
                     ),

diff --git a/src/project/snapshots/pixi__project__tests__dependency_sets.snap b/src/project/snapshots/pixi__project__tests__dependency_sets.snap
@@ -9,11 +9,8 @@ expression: "project.all_dependencies(Platform::Linux64).unwrap()"
             Operator(
                 Equals,
                 Version {
-                    norm: Some(
-                        "1.0",
-                    ),
-                    version: "[[0], [1], [0]]",
-                    local: "[]",
+                    version: [[0], [1], [0]],
+                    local: [],
                 },
             ),
         ),
@@ -31,11 +28,8 @@ expression: "project.all_dependencies(Platform::Linux64).unwrap()"
             Operator(
                 Equals,
                 Version {
-                    norm: Some(
-                        "2.12",
-                    ),
-                    version: "[[0], [2], [12]]",
-                    local: "[]",
+                    version: [[0], [2], [12]],
+                    local: [],
                 },
             ),
         ),
@@ -53,11 +47,8 @@ expression: "project.all_dependencies(Platform::Linux64).unwrap()"
             Operator(
                 Equals,
                 Version {
-                    norm: Some(
-                        "1.0",
-                    ),
-                    version: "[[0], [1], [0]]",
-                    local: "[]",
+                    version: [[0], [1], [0]],
+                    local: [],
                 },
             ),
         ),