Add expanding solvable provides for dependency matching #762

lukash · 2019-07-15T14:22:24Z

This is meant to fix a bug where rich dependencies would match a package even if the require specified a different version range than doesn't match the version of the provide.

Uses a new libsolv function pool_whatmatchessolvable(). Further description is with the commits, along with some shortcomings this currently has.

dnf PR:
rpm-software-management/dnf#1432

Tests are here:
rpm-software-management/ci-dnf-stack#577

https://bugzilla.redhat.com/show_bug.cgi?id=1534123
https://bugzilla.redhat.com/show_bug.cgi?id=1698034

dmach · 2019-08-21T13:14:10Z

@lukash could you check if you're able to build it locally using tito?
When I tried that, the build failed on unit tests.
Packit build also did not finish.

lukash · 2019-08-21T14:55:41Z

@dmach sorry, missed that. I've added a commit fixing the test, although it should probably be squashed with the one introducing the change, I can do that later.

packit-as-a-service · 2019-08-27T12:26:15Z

There was an error while running a copr build. You can re-trigger copr build by adding a comment (/packit copr-build) into this pull request.

rh-atomic-bot · 2019-11-05T09:17:14Z

☔ The latest upstream changes (presumably 6993c4b) made this pull request unmergeable. Please resolve the merge conflicts.

Conan-Kudo · 2019-11-07T12:28:07Z

@rh-atomic-bot r+

rh-atomic-bot · 2019-11-07T12:28:08Z

📌 Commit 13911cb has been approved by Conan-Kudo

lukash · 2019-11-07T14:34:57Z

@rh-atomic-bot r-

Conan-Kudo · 2019-11-07T14:35:49Z

@lukash the r- flag doesn't actually work, as far as I know.

Conan-Kudo · 2019-11-07T14:36:03Z

@rh-atomic-bot r-

lukash · 2019-11-07T14:36:25Z

@Conan-Kudo oops :( I wanted @j-mracek to look at this and the related PRs before it gets merged... I do think it's what we want but there's a chance it may not be.

Conan-Kudo · 2019-11-07T14:37:37Z

@lukash for what it's worth, your code changes made sense to me, and it didn't seem broken when I looked at it.

lukash · 2019-11-07T14:40:30Z

@Conan-Kudo ok. The changes here are most probably fine, the dnf part has probably more potential to be problematic... Hopefully this will prompt @j-mracek to do the review 🙂

libdnf/sack/query.cpp

rh-atomic-bot · 2019-11-14T15:10:50Z

☔ The latest upstream changes (presumably db4b61a) made this pull request unmergeable. Please resolve the merge conflicts.

j-mracek · 2019-12-13T10:49:48Z

@lukash Please could you also rebase it?

packit-as-a-service · 2019-12-13T12:18:24Z

Congratulations! The build has finished successfully. 🍾

You can install the built RPMs by following these steps:

sudo yum install -y dnf-plugins-core on RHEL 8
sudo dnf install -y dnf-plugins-core on Fedora
dnf copr enable packit/rpm-software-management-libdnf-762
And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

lukash · 2019-12-13T12:42:08Z

@j-mracek I've switched from Queue to IdQueue and rebased this as well as the other two PRs.

rh-atomic-bot · 2020-01-05T08:48:56Z

☔ The latest upstream changes (presumably d3eb5c9) made this pull request unmergeable. Please resolve the merge conflicts.

j-mracek · 2020-01-14T08:59:03Z

@lukash Please could you rebase it?

Join the HY_PKG_CONFLICTS switch branch with the rest of the dependencies and remove the matchtype assert. The assert is done in the filterRcoReldep() function and the rest is the same.

j-mracek · 2020-01-14T10:34:35Z

@lukash I would like to ask you to enhance python binging in query-py.cpp. The new code supports query but not list of packages.

j-mracek · 2020-01-14T11:00:47Z

libdnf/sack/query.cpp

+    assert(f.getMatches().size() == 1);
+
+    dnf_sack_make_provides_ready(sack);
+    Pool *pool = dnf_sack_get_pool(sack);


Please Pool * pool

Also in all other new line please use a middle position for *.

There were just a couple, I think I got them all.

j-mracek · 2020-01-14T11:49:09Z

python/hawkey/tests/tests/test_query.py


        o = hawkey.Query(self.sack).filter(obsoletes=q)
        self.assertLength(o, 1)
        self.assertEqual(str(o[0]), "fool-1-5.noarch")

+    def test_requires_with_package_list(self):
+        q = hawkey.Query(self.sack).filter(name="fool")
+        o = hawkey.Query(self.sack).filter(requires=q)


Please could you also add requires=q.run()

This allows to filter all dependencies (requires, conflicts, recommends, etc.) by a list of solvables that match the dependency. Can be used in the dnf repoquery command instead of a low-level piece of code which was expanding packages to their provides and then matching the dependencies as reldeps. https://bugzilla.redhat.com/show_bug.cgi?id=1534123 https://bugzilla.redhat.com/show_bug.cgi?id=1698034

Fixes tests after allowing to pass a query (or an iterable of packages) as an argument to dependency filters (requires, suggests, etc.) in "Query: add a dependency by solvable filter". Drops the exception check and adds a simple test for the new functionality.

In addition to supporting a query as an argument to the dependency filters (which then gets resolved to a list of packages), add support for passing a sequence of packages directly.

lukash · 2020-01-14T12:56:00Z

@lukash I would like to ask you to enhance python binging in query-py.cpp. The new code supports query but not list of packages.

I'd also welcome if you were more specific with these requests, especially since it's been some time since the details were fresh in my head. Anyway, I think I figured out what you're asking for in the end and I've added a commit which adds support for a sequence of packages and the corresponding test with query.run().

lukash added the work in progress label Jul 15, 2019

lukash requested a review from dmach July 15, 2019 14:22

lukash mentioned this pull request Jul 15, 2019

repoquery: fix rich deps matching by using provide expansion from libdnf rpm-software-management/dnf#1432

Closed

dmach self-assigned this Aug 21, 2019

dmach removed their assignment Sep 24, 2019

j-mracek self-assigned this Sep 24, 2019

lukash added ready for review and removed work in progress labels Nov 4, 2019

j-mracek reviewed Nov 8, 2019

View reviewed changes

libdnf/sack/query.cpp Outdated Show resolved Hide resolved

j-mracek added changes requested and removed ready for review labels Dec 13, 2019

lukash added ready for review and removed changes requested labels Dec 13, 2019

Query: use the common dep switch branch for CONFLICTS when applying

8ed343c

Join the HY_PKG_CONFLICTS switch branch with the rest of the dependencies and remove the matchtype assert. The assert is done in the filterRcoReldep() function and the rest is the same.

j-mracek reviewed Jan 14, 2020

View reviewed changes

Lukáš Hrázký added 3 commits January 14, 2020 13:49

Query: Add support for a sequence of packages to dependency queries

c594c47

In addition to supporting a query as an argument to the dependency filters (which then gets resolved to a list of packages), add support for passing a sequence of packages directly.

j-mracek merged commit 367cf8a into rpm-software-management:master Jan 27, 2020

lukash deleted the rich-deps branch October 22, 2020 11:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add expanding solvable provides for dependency matching #762

Add expanding solvable provides for dependency matching #762

lukash commented Jul 15, 2019 •

edited

dmach commented Aug 21, 2019

lukash commented Aug 21, 2019

packit-as-a-service bot commented Aug 27, 2019

rh-atomic-bot commented Nov 5, 2019

Conan-Kudo commented Nov 7, 2019

rh-atomic-bot commented Nov 7, 2019

lukash commented Nov 7, 2019

Conan-Kudo commented Nov 7, 2019

Conan-Kudo commented Nov 7, 2019

lukash commented Nov 7, 2019

Conan-Kudo commented Nov 7, 2019

lukash commented Nov 7, 2019

rh-atomic-bot commented Nov 14, 2019

j-mracek commented Dec 13, 2019

packit-as-a-service bot commented Dec 13, 2019

lukash commented Dec 13, 2019

rh-atomic-bot commented Jan 5, 2020

j-mracek commented Jan 14, 2020

j-mracek commented Jan 14, 2020

j-mracek Jan 14, 2020

j-mracek Jan 14, 2020

lukash Jan 14, 2020

j-mracek Jan 14, 2020

lukash commented Jan 14, 2020

Add expanding solvable provides for dependency matching #762

Add expanding solvable provides for dependency matching #762

Conversation

lukash commented Jul 15, 2019 • edited

dmach commented Aug 21, 2019

lukash commented Aug 21, 2019

packit-as-a-service bot commented Aug 27, 2019

rh-atomic-bot commented Nov 5, 2019

Conan-Kudo commented Nov 7, 2019

rh-atomic-bot commented Nov 7, 2019

lukash commented Nov 7, 2019

Conan-Kudo commented Nov 7, 2019

Conan-Kudo commented Nov 7, 2019

lukash commented Nov 7, 2019

Conan-Kudo commented Nov 7, 2019

lukash commented Nov 7, 2019

rh-atomic-bot commented Nov 14, 2019

j-mracek commented Dec 13, 2019

packit-as-a-service bot commented Dec 13, 2019

lukash commented Dec 13, 2019

rh-atomic-bot commented Jan 5, 2020

j-mracek commented Jan 14, 2020

j-mracek commented Jan 14, 2020

j-mracek Jan 14, 2020

Choose a reason for hiding this comment

j-mracek Jan 14, 2020

Choose a reason for hiding this comment

lukash Jan 14, 2020

Choose a reason for hiding this comment

j-mracek Jan 14, 2020

Choose a reason for hiding this comment

lukash commented Jan 14, 2020

lukash commented Jul 15, 2019 •

edited