From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 4/4] get_oid(): when an object was not found, try harder
Date: Thu, 14 Mar 2019 10:29:49 +0900 [thread overview]
Message-ID: <xmqqa7hyckfm.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <994446236d05d9d014e12a5102bcf9be222e3b57.1552472189.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 13 Mar 2019 03:16:34 -0700 (PDT)")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> @@ -442,6 +442,18 @@ static enum get_oid_result get_short_oid(const char *name, int len,
> find_short_packed_object(&ds);
> status = finish_object_disambiguation(&ds, oid);
>
> + /*
> + * If we didn't find it, do the usual reprepare() slow-path,
> + * since the object may have recently been added to the repository
> + * or migrated from loose to packed.
> + */
> + if (status == MISSING_OBJECT) {
> + reprepare_packed_git(the_repository);
> + find_short_object_filename(&ds);
> + find_short_packed_object(&ds);
> + status = finish_object_disambiguation(&ds, oid);
> + }
> +
This looks obviously correct, but two things that made me wonder
briefly were:
1. is reprepare_packed_git() a bit too heavy-weight, if the only
thing we are addressing is the loose-object cache going stale?
2. is there a way to cleanly avoid the three-line duplicate?
My tentative answers are (1) even if it is, but get_short_oid() is
already heavy-weight enough; it won't be worth restructuring the
code to make it possible to clear only the loose-object cache, and
(2) a loop that runs twice when the first result is MISSING_OBJECT
and otherwise leaves after once would need an extra variable, its
iniialization, check and increment, which is more than what we might
save with such a restructuring, so it won't be worth pursuing.
But others may have better ideas, as always ;-)
next prev parent reply other threads:[~2019-03-14 1:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 10:16 [PATCH 0/4] get_oid: cope with a possibly stale loose object cache Johannes Schindelin via GitGitGadget
2019-03-13 10:16 ` [PATCH 1/4] rebase -i: demonstrate obscure loose object cache bug Johannes Schindelin via GitGitGadget
2019-03-13 16:11 ` Ævar Arnfjörð Bjarmason
2019-03-13 16:35 ` Jeff King
2019-03-13 16:53 ` Jeff King
2019-03-13 22:40 ` Johannes Schindelin
2019-03-14 0:07 ` Jeff King
2019-03-13 22:27 ` Johannes Schindelin
2019-03-14 0:05 ` Jeff King
2019-03-14 6:40 ` Johannes Sixt
2019-03-14 13:06 ` Johannes Schindelin
2019-03-14 1:12 ` Junio C Hamano
2019-03-14 12:44 ` Johannes Schindelin
2019-03-13 10:16 ` [PATCH 2/4] sequencer: improve error message when an OID could not be parsed Johannes Schindelin via GitGitGadget
2019-03-14 1:14 ` Junio C Hamano
2019-03-13 10:16 ` [PATCH 3/4] sequencer: move stale comment into correct location Johannes Schindelin via GitGitGadget
2019-03-13 10:16 ` [PATCH 4/4] get_oid(): when an object was not found, try harder Johannes Schindelin via GitGitGadget
2019-03-14 1:29 ` Junio C Hamano [this message]
2019-03-14 2:22 ` Jeff King
2019-03-14 2:40 ` Jeff King
2019-03-14 4:05 ` Junio C Hamano
2019-03-14 18:55 ` Jeff King
2019-03-14 3:49 ` Junio C Hamano
2019-03-14 13:17 ` Johannes Schindelin
2019-03-14 18:57 ` Jeff King
2019-03-14 19:55 ` Johannes Schindelin
2019-03-13 15:33 ` [PATCH 0/4] get_oid: cope with a possibly stale loose object cache Jeff King
2019-03-14 15:33 ` [PATCH v2 0/4] get_short_oid: " Johannes Schindelin via GitGitGadget
2019-03-14 15:33 ` [PATCH v2 1/4] rebase -i: demonstrate obscure loose object cache bug Johannes Schindelin via GitGitGadget
2019-03-14 15:33 ` [PATCH v2 2/4] sequencer: improve error message when an OID could not be parsed Johannes Schindelin via GitGitGadget
2019-03-14 15:33 ` [PATCH v2 3/4] sequencer: move stale comment into correct location Johannes Schindelin via GitGitGadget
2019-03-14 15:33 ` [PATCH v2 4/4] get_oid(): when an object was not found, try harder Johannes Schindelin via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa7hyckfm.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).