Make use of the new pkglist metadata in more places #1162
Closed
Conversation
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
|
Marking as WIP for now; I'd like to add some tests for this. |
|
☔ The latest upstream changes (presumably 97133bd) made this pull request unmergeable. Please resolve the merge conflicts. |
In order to make use the new pkglist metadata more consummable, let's add a function to create RpmOstreePackage arrays from it. Since some APIs need to keep working as before, we use a `allow_noent` parameter to distinguish between the two cases. This is prep trying our best to make use of this metadata when possible rather than checking out the rpmdb and initializing a `DnfSack`.
Add a function that can smartly perform diff operations on sorted RpmOstreePackage arrays and make the db API use that. This allows us to immediately take advantage of the benefits in a few places where diffs are performed, including post-deployment tree diffs, and the legacy db diff variant API. The upcoming `CachedUpdate` rework will also make use of this (but with the notable difference of setting `allow_noent` to `TRUE`). Note this introduces a new `rpm_ostree_db_diff_ext` public API which has the same interface as `rpm_ostree_db_diff` but also takes flags.
This is the first step towards unifying how we introspect packages from a specific commit. We currently do this in three ways: libdnf, librpm, and now `rpmostree.rpmdb.pkglist`. I'd like to get to a point where we only have `rpmostree.rpmdb.pkglist` and libdnf, the latter only when more complex queries are required. This patch teaches the `db diff` command to make use of the new db diff API so that it can work even on metadata-only commits. This is relevant for use cases mentioned in coreos#558. I didn't get rid of the `rpmhdrs_diff` functions right now because of the `--changelogs` option: libdnf currently does not expose this, so we fall back to the previous API in that case. OTOH, I wonder how much it's actually used in the wild; maybe we could just nix it?
jlebon
force-pushed
the
pr/use-libdnf-for-db-cmd
branch
from
a049ced to
9afa074
Compare
|
Rebased and with tests! ⬆️ |
|
Very nice! |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Dec 30, 2017
Add a function that can smartly perform diff operations on sorted RpmOstreePackage arrays and make the db API use that. This allows us to immediately take advantage of the benefits in a few places where diffs are performed, including post-deployment tree diffs, and the legacy db diff variant API. The upcoming `CachedUpdate` rework will also make use of this (but with the notable difference of setting `allow_noent` to `TRUE`). Note this introduces a new `rpm_ostree_db_diff_ext` public API which has the same interface as `rpm_ostree_db_diff` but also takes flags. Closes: #1162 Approved by: cgwalters
rh-atomic-bot
pushed a commit
that referenced
this pull request
Dec 30, 2017
This is the first step towards unifying how we introspect packages from a specific commit. We currently do this in three ways: libdnf, librpm, and now `rpmostree.rpmdb.pkglist`. I'd like to get to a point where we only have `rpmostree.rpmdb.pkglist` and libdnf, the latter only when more complex queries are required. This patch teaches the `db diff` command to make use of the new db diff API so that it can work even on metadata-only commits. This is relevant for use cases mentioned in #558. I didn't get rid of the `rpmhdrs_diff` functions right now because of the `--changelogs` option: libdnf currently does not expose this, so we fall back to the previous API in that case. OTOH, I wonder how much it's actually used in the wild; maybe we could just nix it? Closes: #1162 Approved by: cgwalters
|
☀️ Test successful - status-papr |
|
one question on this. does |
|
Not currently...why would you want that? |
|
I guess consistency checking (i.e. does the rpmdb match the commit metadata) and/or compatibility with trees that started without rpm data in the commit metadata (i.e. |
|
One can do consistency checking by doing manual checkouts, though we'd have to screw up pretty spectacularly for things to be different. As far as compat, this PR looks for the commit metadata first, and falls back automatically do reading the rpmdb if it isn't present. |
|
ok |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch series teaches
RpmOstreePackageabout the new pkglist metadata format, and then makes the db diff API use it. There are a lot of advantages to this, the major one being one can perform adb diffwith only the commit metadata present. See commit messages for more details.Requires #1158 and #1160. (Only the last three commits are new here.)