From: Junio C Hamano <gitster@pobox.com>
To: Phil Hord <phil.hord@gmail.com>
Cc: Git <git@vger.kernel.org>
Subject: Re: [PATCH] defer expensive load_ref_decorations until needed
Date: Wed, 22 Nov 2017 14:03:24 +0900 [thread overview]
Message-ID: <xmqqbmjuvrab.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171121234336.10209-1-phil.hord@gmail.com> (Phil Hord's message of "Tue, 21 Nov 2017 15:43:36 -0800")
Phil Hord <phil.hord@gmail.com> writes:
> With many thousands of references, a simple `git rev-parse HEAD` may take
> more than a second to return because it first loads all the refs into
> memory even though it will never use them.
>
> Defer loading any references until we actually need them.
>
> Signed-off-by: Phil Hord <phil.hord@gmail.com>
> ---
> log-tree.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/log-tree.c b/log-tree.c
> index 3b904f037..c1509f8b9 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -84,8 +84,10 @@ void add_name_decoration(enum decoration_type type, const char *name, struct obj
> res->next = add_decoration(&name_decoration, obj, res);
> }
>
> +static void maybe_load_ref_decorations();
I'll tweak that "()" and the other one we see below to "(void)"
while queuing.
I am not sure if "maybe_" is a good name here, though. If anything,
you are making the semantics of "load_ref_decorations()" to "maybe"
(but I do not suggest renaming that one).
How about calling it to load_ref_decorations_lazily() or something?
I also wonder if decoration_loaded should now become function-scope
static in this new helper, but that can be left outside of the
topic.
Other than that, I like what this patch attempts to do. A nicely
identified low-hanging fruit ;-).
Thanks.
> const struct name_decoration *get_name_decoration(const struct object *obj)
> {
> + maybe_load_ref_decorations();
> return lookup_decoration(&name_decoration, obj);
> }
>
> @@ -150,10 +152,13 @@ static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
>
> void load_ref_decorations(int flags)
> {
> - if (!decoration_loaded) {
> + decoration_flags = flags;
> +}
>
> +static void maybe_load_ref_decorations()
> +{
> + if (!decoration_loaded) {
> decoration_loaded = 1;
> - decoration_flags = flags;
> for_each_ref(add_ref_decoration, NULL);
> head_ref(add_ref_decoration, NULL);
> for_each_commit_graft(add_graft_decoration, NULL);
next prev parent reply other threads:[~2017-11-22 5:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 23:43 [PATCH] defer expensive load_ref_decorations until needed Phil Hord
2017-11-22 5:03 ` Junio C Hamano [this message]
2017-11-22 6:14 ` Junio C Hamano
2017-11-22 17:45 ` Phil Hord
2017-11-22 21:27 ` Jeff King
2017-11-22 23:21 ` Phil Hord
2017-11-22 23:48 ` Jeff King
2017-11-23 2:19 ` Junio C Hamano
2017-11-23 4:00 ` 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=xmqqbmjuvrab.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phil.hord@gmail.com \
/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).