From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: tytso@mit.edu, Avery Pennarun <apenwarr@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH 2/4] limit "contains" traversals based on commit timestamp
Date: Wed, 13 Oct 2010 18:21:53 -0500 [thread overview]
Message-ID: <20101013232153.GC11793@burratino> (raw)
In-Reply-To: <20100705123419.GB25699@sigill.intra.peff.net>
Jeff King wrote:
> Name-rev already implements a similar optimization, using a
> "slop" of one day to allow for a certain amount of clock
> skew in commit timestamps. This patch introduces a
> "core.clockskew" variable, which allows specifying the
> allowable amount of clock skew in seconds. For safety, it
> defaults to "none", causing a full traversal (i.e., no
> change in behavior from previous versions).
Tests?
Actually just a short example script to try would be helpful,
if anyone has one handy (yes, I am terribly lazy). Such a script
would be useful for figuring out which commands ought to be
updated to respect core_clock_skew. rev-list is one.
> --- a/commit.c
> +++ b/commit.c
[...]
> @@ -872,9 +874,13 @@ static int contains_recurse(struct commit *candidate,
> if (parse_commit(candidate) < 0)
> return 0;
>
> + /* stop searching if we go too far back in time */
> + if (candidate->date < cutoff)
> + return 0;
> +
Nice idea.
> @@ -885,5 +891,20 @@ static int contains_recurse(struct commit *candidate,
>
> int contains(struct commit *candidate, const struct commit_list *want)
> {
> - return contains_recurse(candidate, want);
> + unsigned long cutoff = 0;
> +
> + if (core_clock_skew >= 0) {
> + const struct commit_list *c;
> + unsigned long min_date = ULONG_MAX;
> + for (c = want; c; c = c->next) {
> + if (parse_commit(c->item) < 0)
> + continue;
Why ignore these errors? Will they be noticed later?
The rest of the patch looks good to me. I am not thrilled with
making the user figure out an acceptable "[core] clockskew" value
(and am not sure it makes much sense as a tunable setting), but
it is better than the status quo, so...
next prev parent reply other threads:[~2010-10-13 23:25 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 0:54 Why is "git tag --contains" so slow? Theodore Ts'o
2010-07-01 0:58 ` Shawn O. Pearce
2010-07-03 23:27 ` Sam Vilain
2010-07-01 1:00 ` Avery Pennarun
2010-07-01 12:17 ` tytso
2010-07-01 15:03 ` Jeff King
2010-07-01 15:38 ` Jeff King
2010-07-02 19:26 ` tytso
2010-07-03 8:06 ` Jeff King
2010-07-04 0:55 ` tytso
2010-07-05 12:27 ` Jeff King
2010-07-05 12:33 ` [RFC/PATCH 1/4] tag: speed up --contains calculation Jeff King
2010-10-13 22:07 ` Jonathan Nieder
2010-10-13 22:56 ` Clemens Buchacher
2011-02-23 15:51 ` Ævar Arnfjörð Bjarmason
2011-02-23 16:39 ` Jeff King
2010-07-05 12:34 ` [RFC/PATCH 2/4] limit "contains" traversals based on commit timestamp Jeff King
2010-10-13 23:21 ` Jonathan Nieder [this message]
2010-07-05 12:35 ` [RFC/PATCH 3/4] default core.clockskew variable to one day Jeff King
2010-07-05 12:36 ` [RFC/PATCH 4/4] name-rev: respect core.clockskew Jeff King
2010-07-05 12:39 ` Why is "git tag --contains" so slow? Jeff King
2010-10-14 18:59 ` Jonathan Nieder
2010-10-16 14:32 ` Clemens Buchacher
2010-10-27 17:11 ` Jeff King
2010-10-28 8:07 ` Clemens Buchacher
2010-07-05 14:10 ` tytso
2010-07-06 11:58 ` Jeff King
2010-07-06 15:31 ` Will Palmer
2010-07-06 16:53 ` tytso
2010-07-08 11:28 ` Jeff King
2010-07-08 13:21 ` Will Palmer
2010-07-08 13:54 ` tytso
2010-07-07 17:45 ` Jeff King
2010-07-08 10:29 ` Theodore Tso
2010-07-08 11:12 ` Jakub Narebski
2010-07-08 19:29 ` Nicolas Pitre
2010-07-08 19:39 ` Avery Pennarun
2010-07-08 20:13 ` Nicolas Pitre
2010-07-08 21:20 ` Jakub Narebski
2010-07-08 21:30 ` Sverre Rabbelier
2010-07-08 23:10 ` Nicolas Pitre
2010-07-08 23:15 ` Nicolas Pitre
2010-07-08 11:31 ` Jeff King
2010-07-08 14:35 ` Johan Herland
2010-07-08 19:06 ` Nicolas Pitre
2010-07-07 17:50 ` 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=20101013232153.GC11793@burratino \
--to=jrnieder@gmail.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=tytso@mit.edu \
/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).