Commit regfile prep #1257
Closed
Commit regfile prep #1257
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
|
☔ The latest upstream changes (presumably 1c9975c) made this pull request unmergeable. Please resolve the merge conflicts. |
cgwalters
force-pushed
the
commit-regfile-prep
branch
from
77ff186 to
b09e388
Compare
|
Rebased 🏄 |
jlebon
reviewed
Oct 11, 2017
src/libostree/ostree-core.c
Outdated
| * @xattrs: (allow-none): Optional extended attribute array | ||
| * | ||
| * Returns: (transfer full): A new #GVariant containing file header for an archive repository | ||
| /* Like _ostree_file_header_new(), but used for the comprssed format in archive |
src/libostree/ostree-core.c
Outdated
| const guchar padding_nuls[8] = {0, 0, 0, 0, 0, 0, 0, 0}; | ||
| guint bits; | ||
| if (alignment == 8) | ||
| bits = alignment_offset & 7; |
There was a problem hiding this comment.
Not new to this patch, though can we add a comment explaining these? This is essentially a more efficient way to do modulo 8 and 4, right?
src/libostree/ostree-core.c
Outdated
| return FALSE; | ||
| ret_bytes_written += bytes_written; | ||
| g_string_append_len (buf, (char*)&variant_size_u32_be, sizeof (variant_size_u32_be)); | ||
| const gsize alignment_offset = sizeof(variant_size_u32_be); |
Nothing was using the `bytes_written` data (we always discard partially written tmpfiles), so simplify everything by dropping it. Further, we always passed an offset of `0`, so drop that argument too. (I believe that this was previously used by the "pack files" code that we deleted long ago) Second, we had an unnecessary internal wrapper for this function; drop that too.
No functional changes, just prep for more work.
This simplifies a lot of code; the header function was structured
to write to an input stream, but many callers only wanted the checksum,
so it's simpler (and error-free) to simply allocate a whole buffer
and checksum that.
For the callers that want to write it, it's also still simpler to allocate the
buffer and write the whole thing rather than having this function do the
writing.
A lot of the complexity here again is a legacy of the packfile code, which is
dead.
This is prep for faster regfile commits where we can avoid `G{In,Out}putStream`.
It's no longer called directly by the pull code, so make it static. The goal here is to have the pull and local-fs commit paths use higher level more efficient APIs, and eventually make those APIs public.
cgwalters
force-pushed
the
commit-regfile-prep
branch
from
b09e388 to
d2c654f
Compare
|
Rebased 🏄 and fixups ⬆️ |
|
⚡ Test exempted: pull fully rebased and already tested. |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Oct 11, 2017
No functional changes, just prep for more work. Closes: #1257 Approved by: jlebon
rh-atomic-bot
pushed a commit
that referenced
this pull request
Oct 11, 2017
This simplifies a lot of code; the header function was structured
to write to an input stream, but many callers only wanted the checksum,
so it's simpler (and error-free) to simply allocate a whole buffer
and checksum that.
For the callers that want to write it, it's also still simpler to allocate the
buffer and write the whole thing rather than having this function do the
writing.
A lot of the complexity here again is a legacy of the packfile code, which is
dead.
This is prep for faster regfile commits where we can avoid `G{In,Out}putStream`.
Closes: #1257
Approved by: jlebon
rh-atomic-bot
pushed a commit
that referenced
this pull request
Oct 11, 2017
It's no longer called directly by the pull code, so make it static. The goal here is to have the pull and local-fs commit paths use higher level more efficient APIs, and eventually make those APIs public. Closes: #1257 Approved by: jlebon
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.
Depends: #1256