From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH v3 2/5] fetch-pack: load tip_oids eagerly iff needed
Date: Thu, 4 Oct 2018 18:07:11 -0400 [thread overview]
Message-ID: <20181004220711.GA28287@sigill.intra.peff.net> (raw)
In-Reply-To: <9f51ac28-73e9-2855-c650-7d695945e286@web.de>
On Thu, Oct 04, 2018 at 05:09:39PM +0200, René Scharfe wrote:
> tip_oids_contain() lazily loads refs into an oidset at its first call.
> It abuses the internal (sub)member .map.tablesize of that oidset to
> check if it has done that already.
>
> Determine if the oidset needs to be populated upfront and then do that
> instead. This duplicates a loop, but simplifies the existing one by
> separating concerns between the two.
I like this approach much better than what I showed earlier. But...
> diff --git a/fetch-pack.c b/fetch-pack.c
> index 3b317952f0..53914563b5 100644
> --- a/fetch-pack.c
> +++ b/fetch-pack.c
> @@ -526,23 +526,6 @@ static void add_refs_to_oidset(struct oidset *oids, struct ref *refs)
> oidset_insert(oids, &refs->old_oid);
> }
>
> -static int tip_oids_contain(struct oidset *tip_oids,
> - struct ref *unmatched, struct ref *newlist,
> - const struct object_id *id)
> -{
> - /*
> - * Note that this only looks at the ref lists the first time it's
> - * called. This works out in filter_refs() because even though it may
> - * add to "newlist" between calls, the additions will always be for
> - * oids that are already in the set.
> - */
I don't think the subtle point this comment is making goes away. We're
still growing the list in the loop that calls tip_oids_contain() (and
which now calls just oidset_contains). That's OK for the reasons given
here, but I think that would need to be moved down to this code:
> + if (strict) {
> + for (i = 0; i < nr_sought; i++) {
> + ref = sought[i];
> + if (!is_unmatched_ref(ref))
> + continue;
> +
> + add_refs_to_oidset(&tip_oids, unmatched);
> + add_refs_to_oidset(&tip_oids, newlist);
> + break;
> + }
> + }
I.e., we need to say here why it's OK to summarize newlist in the
oidset, even though we're adding to it later.
-Peff
next prev parent reply other threads:[~2018-10-04 22:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 13:11 [PATCH v2 0/2] oidset: use khash René Scharfe
2018-10-03 13:12 ` [PATCH v2 1/2] khash: factor out kh_release_* René Scharfe
2018-10-03 13:16 ` [PATCH v2 2/2] oidset: use khash René Scharfe
2018-10-03 19:40 ` Jeff King
2018-10-04 5:56 ` René Scharfe
2018-10-04 6:48 ` Jeff King
2018-10-04 6:50 ` Jeff King
2018-10-04 15:05 ` René Scharfe
2018-10-04 15:05 ` [PATCH v3 0/5] " René Scharfe
2018-10-04 15:09 ` [PATCH v3 1/5] fetch-pack: factor out is_unmatched_ref() René Scharfe
2018-10-04 15:09 ` [PATCH v3 2/5] fetch-pack: load tip_oids eagerly iff needed René Scharfe
2018-10-04 21:38 ` Jonathan Tan
2018-10-04 22:11 ` René Scharfe
2018-10-05 20:13 ` René Scharfe
2018-10-04 22:14 ` Jeff King
2018-10-04 22:52 ` Jonathan Tan
2018-10-04 23:18 ` Jeff King
2018-10-04 22:07 ` Jeff King [this message]
2018-10-05 20:13 ` René Scharfe
2018-10-05 20:27 ` Jeff King
2018-10-05 21:22 ` René Scharfe
2018-10-05 21:47 ` Jeff King
2018-10-04 15:10 ` [PATCH v3 3/5] khash: factor out kh_release_* René Scharfe
2018-10-04 15:13 ` [PATCH v3 4/5] oidset: use khash René Scharfe
2018-10-04 15:14 ` [PATCH 5/5] oidset: uninline oidset_init() René Scharfe
2018-10-04 22:15 ` [PATCH v3 0/5] oidset: use khash 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=20181004220711.GA28287@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=l.s.r@web.de \
/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).