From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH 5/5] packfile: inline custom read_object()
Date: Thu, 12 Jan 2023 10:01:28 +0100 [thread overview]
Message-ID: <230112.86o7r42k13.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <Y7l4vQwRZzGtxlBB@coredump.intra.peff.net>
On Sat, Jan 07 2023, Jeff King wrote:
> When the pack code was split into its own file[1], it got a copy of the
> static read_object() function. But there's only one caller here, so we
> could just inline it. And it's worth doing so, as the name read_object()
> invites comparisons to the public read_object_file(), but the two don't
> behave quite the same.
>
> [1] The move happened over several commits, but the relevant one here is
> f1d8130be0 (pack: move clear_delta_base_cache(), packed_object_info(),
> unpack_entry(), 2017-08-18).
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> packfile.c | 26 +++++++++-----------------
> 1 file changed, 9 insertions(+), 17 deletions(-)
>
> diff --git a/packfile.c b/packfile.c
> index c0d7dd93f4..79e21ab18e 100644
> --- a/packfile.c
> +++ b/packfile.c
> @@ -1650,22 +1650,6 @@ struct unpack_entry_stack_ent {
> unsigned long size;
> };
>
> -static void *read_object(struct repository *r,
> - const struct object_id *oid,
> - enum object_type *type,
> - unsigned long *size)
> -{
> - struct object_info oi = OBJECT_INFO_INIT;
> - void *content;
> - oi.typep = type;
> - oi.sizep = size;
> - oi.contentp = &content;
> -
> - if (oid_object_info_extended(r, oid, &oi, 0) < 0)
> - return NULL;
> - return content;
> -}
> -
> void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
> enum object_type *final_type, unsigned long *final_size)
> {
> @@ -1798,14 +1782,22 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
> uint32_t pos;
> struct object_id base_oid;
> if (!(offset_to_pack_pos(p, obj_offset, &pos))) {
> + struct object_info oi = OBJECT_INFO_INIT;
> +
> nth_packed_object_id(&base_oid, p,
> pack_pos_to_index(p, pos));
> error("failed to read delta base object %s"
> " at offset %"PRIuMAX" from %s",
> oid_to_hex(&base_oid), (uintmax_t)obj_offset,
> p->pack_name);
> mark_bad_packed_object(p, &base_oid);
> - base = read_object(r, &base_oid, &type, &base_size);
> +
> + oi.typep = &type;
> + oi.sizep = &base_size;
> + oi.contentp = &base;
> + if (oid_object_info_extended(r, &base_oid, &oi, 0) < 0)
> + base = NULL;
> +
> external_base = base;
> }
> }
This isn't introducing a behavior difference, in fact it's diligently
bending over backwards to preserve existing behavior, but I don't think
we need to do so, and shouldn't have this "base = NULL" line.
Here we're within an "if" block where we tested that "base == NULL"
(which is why we're trying to populate it)
Before when we had read_object() re-assigning to "base" here was the
obvious thing to do, but now this seems like undue an incomplete
paranoia.
If oid_object_info_extended() why can't we trust that it didn't touch
our "base"? And if we can't trust that, why are we trusting that it left
"type" and "base_size" untouched?
I think squashing this in would be much better:
diff --git a/packfile.c b/packfile.c
index 79e21ab18e7..f45017422a1 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1795,10 +1795,8 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
oi.typep = &type;
oi.sizep = &base_size;
oi.contentp = &base;
- if (oid_object_info_extended(r, &base_oid, &oi, 0) < 0)
- base = NULL;
-
- external_base = base;
+ if (!oid_object_info_extended(r, &base_oid, &oi, 0))
+ external_base = base;
}
}
Not only aren't we second-guessing that our "base" was left alone, we're
using the return value of oid_object_info_extended() to guard that
assignment to "external_base" instead (it's NULL at this point too).
next prev parent reply other threads:[~2023-01-12 9:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-07 13:48 [PATCH 0/5] cleaning up read_object() family of functions Jeff King
2023-01-07 13:48 ` [PATCH 1/5] object-file: inline calls to read_object() Jeff King
2023-01-12 9:13 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:06 ` [PATCH] object-file: fix indent-with-space Jeff King
2023-01-12 16:08 ` Ævar Arnfjörð Bjarmason
2023-01-13 17:40 ` Junio C Hamano
2023-01-07 13:49 ` [PATCH 2/5] streaming: inline call to read_object_file_extended() Jeff King
2023-01-07 13:50 ` [PATCH 3/5] read_object_file_extended(): drop lookup_replace option Jeff King
2023-01-07 13:50 ` [PATCH 4/5] repo_read_object_file(): stop wrapping read_object_file_extended() Jeff King
2023-01-07 13:50 ` [PATCH 5/5] packfile: inline custom read_object() Jeff King
2023-01-12 9:01 ` Ævar Arnfjörð Bjarmason [this message]
2023-01-12 16:29 ` Jeff King
2023-01-09 15:09 ` [PATCH 0/5] cleaning up read_object() family of functions Derrick Stolee
2023-01-11 18:26 ` Jeff King
2023-01-11 20:17 ` Derrick Stolee
2023-01-11 20:30 ` Jeff King
2023-01-12 9:21 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:16 ` Jeff King
2023-01-12 16:22 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:53 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=230112.86o7r42k13.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).