From: Junio C Hamano <gitster@pobox.com>
To: Takuto Ikuta <tikuta@chromium.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v5] fetch-pack.c: use oidset to check existence of loose object
Date: Tue, 13 Mar 2018 12:04:40 -0700 [thread overview]
Message-ID: <xmqq7eqf3ign.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180310124643.82666-1-tikuta@chromium.org> (Takuto Ikuta's message of "Sat, 10 Mar 2018 21:46:43 +0900")
Takuto Ikuta <tikuta@chromium.org> writes:
> +struct loose_object_iter {
> + struct oidset *loose_object_set;
> + struct ref *refs;
> +};
> +
> +/*
> + * If the number of refs is not larger than the number of loose objects,
> + * this function stops inserting and returns false.
> + */
> +static int add_loose_objects_to_set(const struct object_id *oid,
> + const char *path,
> + void *data)
> +{
> + struct loose_object_iter *iter = data;
> + oidset_insert(iter->loose_object_set, oid);
> + if (iter->refs == NULL)
> + return 1;
> +
> + iter->refs = iter->refs->next;
> + return 0;
> +}
That's clever. By traversing the refs list as you iterate over the
loose objects, you do not do any unnecessary work ;-)
Thanks for working on this.
> @@ -719,16 +741,31 @@ static int everything_local(struct fetch_pack_args *args,
> int retval;
> int old_save_commit_buffer = save_commit_buffer;
> timestamp_t cutoff = 0;
> + struct oidset loose_oid_set = OIDSET_INIT;
> + int use_oidset = 0;
> + struct loose_object_iter iter = {&loose_oid_set, *refs};
> +
> + /* Enumerate all loose objects or know refs are not so many. */
> + use_oidset = !for_each_loose_object(add_loose_objects_to_set,
> + &iter, 0);
>
> save_commit_buffer = 0;
>
> for (ref = *refs; ref; ref = ref->next) {
> struct object *o;
> + unsigned int flags = OBJECT_INFO_QUICK;
>
> - if (!has_object_file_with_flags(&ref->old_oid,
> - OBJECT_INFO_QUICK))
> - continue;
> + if (use_oidset &&
> + !oidset_contains(&loose_oid_set, &ref->old_oid)) {
> + /*
> + * I know this does not exist in the loose form,
> + * so check if it exists in a non-loose form.
> + */
> + flags |= OBJECT_INFO_IGNORE_LOOSE;
> + }
>
> + if (!has_object_file_with_flags(&ref->old_oid, flags))
> + continue;
> o = parse_object(&ref->old_oid);
> if (!o)
> continue;
next prev parent reply other threads:[~2018-03-13 19:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-08 12:06 [PATCH] fetch-pack.c: use oidset to check existence of loose object Takuto Ikuta
2018-03-08 17:19 ` René Scharfe
2018-03-09 13:42 ` Takuto Ikuta
2018-03-08 18:42 ` Junio C Hamano
2018-03-09 13:11 ` [PATCH v2 0/1] " Takuto Ikuta
2018-03-09 13:11 ` [PATCH v2 1/1] " Takuto Ikuta
2018-03-09 13:26 ` [PATCH v3] " Takuto Ikuta
2018-03-09 19:54 ` Junio C Hamano
2018-03-10 13:19 ` Takuto Ikuta
2018-03-13 17:53 ` Junio C Hamano
2018-03-14 6:26 ` Takuto Ikuta
2018-03-10 12:34 ` [PATCH v4] " Takuto Ikuta
2018-03-10 12:46 ` [PATCH v5] " Takuto Ikuta
2018-03-13 19:04 ` Junio C Hamano [this message]
2018-03-14 6:05 ` [PATCH v6] " Takuto Ikuta
2018-03-14 6:32 ` [PATCH v7] " Takuto Ikuta
2018-03-09 14:12 ` [PATCH] " Takuto Ikuta
2018-03-09 18:00 ` Junio C Hamano
2018-03-09 19:41 ` Junio C Hamano
2018-03-13 15:30 ` [PATCH] sha1_file: restore OBJECT_INFO_QUICK functionality Jonathan Tan
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=xmqq7eqf3ign.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=tikuta@chromium.org \
/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).