From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Cc: A Large Angry SCM <gitzilla@gmail.com>
Subject: Re: merge-base: update the clean-up postprocessing
Date: Tue, 11 Jul 2006 01:13:57 -0700 [thread overview]
Message-ID: <7vpsgc4kze.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vejx0cwwj.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Wed, 05 Jul 2006 00:51:08 -0700")
Junio C Hamano <junkio@cox.net> writes:
> A fixed up version of this patch, along with your updated test,
> is at the tip of "pu".
>
> It does affect the processing time for cases where there are
> more than one merge bases negatively. To compute all merge-base
> for the 23 merges in the kernel reporitory, the old code with
> the "contaminate the well a bit more" clean-up phase takes 2.5
> seconds, while the new code takes 3.9 seconds.
>
> Processing all 2215 merges in the kernel repository (the other
> 2192 merges have one merge-base between the parents) takes 160
> seconds either way. In other words, multi merge-base merges are
> relatively rare and a bit more time spent to clean-up with the
> new code is lost in the noise.
>
> The numbers are taken from /usr/bin/time on an Athron 64X2 3800.
I did a similar test on git.git repository. Numbers are
interesting.
* I have 941 two-head merges. 89 of them are multi-base
merges. This is unproportionally higher compared to the
kernel repository.
* Both the version in "master" (i.e. the one with the horizon
effect) and this version with updated clean-up code produces
identical set of merge bases for all 941 two-head merges.
* The difference in processing time for 941 two-head merges
with both versions is lost within margin of error.
next prev parent reply other threads:[~2006-07-11 8:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-05 0:35 [PATCH] Additional merge-base tests (revised) A Large Angry SCM
2006-07-05 2:07 ` merge-base: update the clean-up postprocessing Junio C Hamano
2006-07-05 7:50 ` Johannes Schindelin
2006-07-05 23:20 ` Junio C Hamano
2006-07-05 23:21 ` Junio C Hamano
2006-07-05 7:51 ` Junio C Hamano
2006-07-11 8:13 ` Junio C Hamano [this message]
2006-07-11 14:26 ` Johannes Schindelin
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=7vpsgc4kze.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=gitzilla@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