From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Antoine Pelisse <apelisse@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 3/4] fast-export: don't parse all the commits
Date: Fri, 3 May 2013 19:06:29 -0500 [thread overview]
Message-ID: <CAMP44s09KqFuXPf=3qG42jzChnNBoiXdStME6Ga7EzY7uwF88Q@mail.gmail.com> (raw)
In-Reply-To: <7vd2t7ybin.fsf@alter.siamese.dyndns.org>
On Fri, May 3, 2013 at 4:54 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> We don't need the parsed objects at this point, merely the information
>> that they have marks.
>>
>> Seems to be three times faster in my setup with lots of objects.
>>
>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>> builtin/fast-export.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
>> index a5b8da8..3c5a701 100644
>> --- a/builtin/fast-export.c
>> +++ b/builtin/fast-export.c
>> @@ -636,7 +636,7 @@ static void import_marks(char *input_file)
>> /* only commits */
>> continue;
>>
>> - object = parse_object(sha1);
>> + object = lookup_unknown_object(sha1);
>
> This updates the parse_object() moved by the previous patch. At this
> point in the codeflow, unlike the original, we already _know_ the
> object must be a commit; wouldn't an equivalent of:
>
> object = &(lookup_commit(sha1)->object)
>
> be more correct here?
Maybe, if we want to run some extra code we don't care about.
The only actual difference is that object->type will be OBJ_COMMIT,
but a) this is not going to be used anywhere, and b) we can set that
ourselves.
In fact, my original code was:
object = lookup_object(sha1);
if (!object)
object = create_object(sha1, OBJ_COMMIT, alloc_object_node());
But I figured there's no need for those extra lines of code.
--
Felipe Contreras
next prev parent reply other threads:[~2013-05-04 0:06 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-03 4:31 [PATCH 0/4] fast-export: speed improvements Felipe Contreras
2013-05-03 4:31 ` [PATCH 1/4] fast-{import,export}: use get_sha1_hex() directly Felipe Contreras
2013-05-03 21:50 ` Junio C Hamano
2013-05-03 4:31 ` [PATCH 2/4] fast-export: improve speed by skipping blobs Felipe Contreras
2013-05-03 21:51 ` Junio C Hamano
2013-05-03 4:31 ` [PATCH 3/4] fast-export: don't parse all the commits Felipe Contreras
2013-05-03 21:54 ` Junio C Hamano
2013-05-04 0:06 ` Felipe Contreras [this message]
2013-05-04 19:22 ` Junio C Hamano
2013-05-03 4:31 ` [PATCH 4/4] fast-import: only store commit objects Felipe Contreras
2013-05-03 17:56 ` Thomas Rast
2013-05-03 18:23 ` Felipe Contreras
2013-05-06 10:28 ` Michael Haggerty
2013-05-06 10:32 ` Thomas Rast
2013-05-06 10:45 ` Michael Haggerty
2013-05-06 15:18 ` Junio C Hamano
2013-05-06 21:19 ` Felipe Contreras
2013-05-06 21:36 ` Felipe Contreras
2013-05-07 3:14 ` Michael Haggerty
2013-05-07 4:32 ` Johannes Schindelin
2013-05-07 4:36 ` Felipe Contreras
2013-05-07 2:58 ` Michael Haggerty
2013-05-07 4:37 ` Felipe Contreras
2013-05-06 21:04 ` Felipe Contreras
2013-05-07 3:27 ` Michael Haggerty
2013-05-07 4:39 ` Johannes Schindelin
2013-05-07 4:49 ` Felipe Contreras
2013-05-07 4:47 ` Felipe Contreras
2013-05-07 6:47 ` Michael Haggerty
2013-05-07 7:07 ` Felipe Contreras
2013-05-07 7:12 ` Junio C Hamano
2013-05-07 7:34 ` Michael Haggerty
2013-05-06 12:20 ` Johannes Schindelin
2013-05-06 21:06 ` Felipe Contreras
2013-05-03 22:08 ` Junio C Hamano
2013-05-03 22:19 ` Felipe Contreras
2013-05-03 23:45 ` Junio C Hamano
2013-05-04 0:01 ` Felipe Contreras
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='CAMP44s09KqFuXPf=3qG42jzChnNBoiXdStME6Ga7EzY7uwF88Q@mail.gmail.com' \
--to=felipe.contreras@gmail.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.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).