Re: [PATCH 3/4] fast-export: don't parse all the commits
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- May 4, 2013, 00:06 UTC
- Message-ID
- <CAMP44s09KqFuXPf=3qG42jzChnNBoiXdStME6Ga7EzY7uwF88Q@mail.gmail.com>
- 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:
Show 30 quoted lines
> 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