PubGrub resolver #1453

maciektr · 2024-07-17T10:04:24Z

Stack:

⚠️ Part of a stack created by spr. Do not merge manually using the UI - doing so may have unexpected results.

commit-id:d55b5ecb

mkaput · 2024-11-25T14:53:00Z

Cargo.toml

@@ -142,6 +145,9 @@ xxhash-rust = { version = "0.8", features = ["xxh3"] }
 zip = { version = "0.6", default-features = false, features = ["deflate"] }
 zstd = "0.13"

+[patch.'https://github.com/pubgrub-rs/pubgrub.git']
+pubgrub = { git = 'https://github.com/software-mansion-labs/pubgrub.git', branch = 'dev' }


why are you doing this instead of just depending on our fork directly?

semver-pubgrub depends on pubgrub as well 🫤

can't you change this dependency in our semver-pubgrub fork?

mkaput · 2024-11-25T14:54:23Z

scarb/src/resolver/algorithm/in_memory_index.rs

+    packages: FxOnceMap<ManifestDependency, Arc<VersionsResponse>>,
+}
+
+pub(crate) type FxOnceMap<K, V> = OnceMap<K, V>;


mkaput · 2024-11-25T14:57:03Z

scarb/tests/git_source.rs

@@ -165,6 +165,7 @@ fn fetch_with_nested_paths() {
    Scarb::quick_snapbox()
        .arg("fetch")
        .current_dir(&t)
+        .timeout(std::time::Duration::from_secs(60))


mkaput · 2024-11-25T14:58:19Z

scarb/tests/http_registry.rs

@@ -71,6 +71,19 @@ fn usage() {

        ###

+        GET /index/3/b/bar.json


how did it happen that this request got repeated?

mkaput · 2024-11-25T15:04:54Z

scarb/src/resolver/algorithm/mod.rs

+    let cloned_lockfile = lockfile.clone();
+    thread::Builder::new()
+        .name("scarb-resolver".into())
+        .spawn(move || {


consider moving this to a separate named function to: reduce indentation, have something named in stack trace

mkaput · 2024-11-25T15:10:04Z

scarb/src/resolver/algorithm/state.rs

+            // Backpressure is provided by at a more granular level by `DistributionDatabase`
+            // and `SourceDispatch`, as well as the bounded request channel.


what do these two names refer to?

wawel37 · 2024-11-26T09:53:01Z

scarb/src/resolver/algorithm/mod.rs

+mod solution;
+mod state;
+
+pub async fn resolve<'c>(


This function is the core algorithm, so I think it would be good to have it commented (at least the above the signature, and even better describe the steps of the algorithm).

wawel37 · 2024-11-26T10:28:08Z

scarb/src/resolver/algorithm/mod.rs

+fn format_error(err: PubGrubError<PubGrubDependencyProvider>) -> anyhow::Error {
+    match err {
+        PubGrubError::NoSolution(derivation_tree) => {
+            anyhow::format_err!(


nit: import directly

This was referenced Jul 17, 2024

Add all root summaries to state #1454

Closed

Display formatted resolver errors #1455

Closed

Refactor -> move simple resolver to separate mod #1452

Open

maciektr force-pushed the spr/main/d55b5ecb branch from 6ac7666 to 3c2d40c Compare July 17, 2024 13:00

maciektr force-pushed the spr/main/3ba8d8f0 branch from 57c7fea to 5e3f300 Compare July 17, 2024 13:00

This was referenced Jul 17, 2024

Rewrite transient path deps in git deps #1458

Closed

Consider prerelease versions if version field of a dependency is unspecified (issue#600) #1459

Closed

maciektr changed the title ~~PubGrub resolver initial impl, blocking, no-graph~~ PubGrub resolver initial implementation Oct 14, 2024

maciektr force-pushed the spr/main/3ba8d8f0 branch from 5e3f300 to beead3d Compare October 14, 2024 22:35

maciektr force-pushed the spr/main/d55b5ecb branch 2 times, most recently from 57efb17 to 7bf873b Compare October 20, 2024 18:40

maciektr force-pushed the spr/main/3ba8d8f0 branch from beead3d to 8a59b68 Compare October 20, 2024 18:40

maciektr force-pushed the spr/main/d55b5ecb branch 2 times, most recently from 121762e to c33266d Compare October 22, 2024 09:32

maciektr changed the base branch from spr/main/3ba8d8f0 to main October 22, 2024 13:46

maciektr force-pushed the spr/main/d55b5ecb branch from c33266d to 93173f0 Compare October 22, 2024 13:46

maciektr changed the title ~~PubGrub resolver initial implementation~~ PubGrub resolver Oct 22, 2024

maciektr mentioned this pull request Oct 22, 2024

Add once_map package #1665

Open

maciektr changed the base branch from main to spr/main/293590d9 October 22, 2024 13:46

maciektr force-pushed the spr/main/293590d9 branch from 28db9a7 to a4d0ee0 Compare October 23, 2024 14:44

maciektr force-pushed the spr/main/d55b5ecb branch 2 times, most recently from 06a2207 to 73b73d5 Compare October 26, 2024 20:38

maciektr force-pushed the spr/main/d55b5ecb branch from 73b73d5 to ec64268 Compare October 30, 2024 22:38

maciektr force-pushed the spr/main/293590d9 branch from 3fc352c to 158859b Compare October 30, 2024 22:38

maciektr force-pushed the spr/main/d55b5ecb branch 3 times, most recently from ef18fc7 to 8aba988 Compare November 4, 2024 22:52

maciektr force-pushed the spr/main/293590d9 branch from 31cbe81 to 33a0dad Compare November 4, 2024 22:52

maciektr force-pushed the spr/main/d55b5ecb branch from 8aba988 to eaf5a76 Compare November 4, 2024 23:36

maciektr force-pushed the spr/main/d55b5ecb branch from eaf5a76 to 4805d2b Compare November 13, 2024 14:07

maciektr force-pushed the spr/main/d55b5ecb branch from 4805d2b to 45a11b8 Compare November 19, 2024 21:01

PubGrub resolver

e80c322

commit-id:d55b5ecb

maciektr force-pushed the spr/main/293590d9 branch from c117830 to a1502d4 Compare November 25, 2024 14:42

maciektr force-pushed the spr/main/d55b5ecb branch from 45a11b8 to e80c322 Compare November 25, 2024 14:42

maciektr requested a review from mkaput November 25, 2024 14:42

maciektr marked this pull request as ready for review November 25, 2024 14:42

maciektr requested a review from a team as a code owner November 25, 2024 14:42

mkaput requested changes Nov 25, 2024

View reviewed changes

wawel37 reviewed Nov 26, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PubGrub resolver #1453

PubGrub resolver #1453

maciektr commented Jul 17, 2024 •

edited

Loading

mkaput Nov 25, 2024

maciektr Nov 28, 2024

mkaput Nov 29, 2024

mkaput Nov 25, 2024

mkaput Nov 25, 2024

mkaput Nov 25, 2024

mkaput Nov 25, 2024

mkaput Nov 25, 2024

wawel37 Nov 26, 2024

wawel37 Nov 26, 2024

		// Backpressure is provided by at a more granular level by `DistributionDatabase`
		// and `SourceDispatch`, as well as the bounded request channel.

PubGrub resolver #1453

Are you sure you want to change the base?

PubGrub resolver #1453

Conversation

maciektr commented Jul 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maciektr commented Jul 17, 2024 •

edited

Loading