From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>
Subject: [RFC/PATCH 0/3] teach --histogram to diff
Date: Tue, 12 Jul 2011 14:10:24 +0800 [thread overview]
Message-ID: <1310451027-15148-1-git-send-email-rctay89@gmail.com> (raw)
(Shawn, I was held up with the patch messages, sorry for the delay.)
Port JGit's HistogramDiff(Index) over to C. This algorithm extends the
patience algorithm to "support low-occurrence common elements" [1].
Rough numbers show that it is a faster alternative to its --patience
cousin, as well as to the default Meyers algorithm:
$ time ./git log --histogram -p v1.0.0 >/dev/null
real 0m12.998s
user 0m11.506s
sys 0m1.487s
$ time ./git log -p v1.0.0 >/dev/null
real 0m13.575s
user 0m12.101s
sys 0m1.468s
$ time ./git log --patience -p v1.0.0 >/dev/null
real 0m14.978s
user 0m13.508s
sys 0m1.464s
The first patch implements JGit's HistogramDiff(Index) proper. The
second and third patches aren't essential but yield performance gains.
Note: these patches must be applied on top of rc/histogram-diff in pu.
Contents:
[RFC/PATCH 1/3] teach --histogram to diff
[RFC/PATCH 2/3] xdiff/xprepare: skip classification
[RFC/PATCH 3/3] xdiff/xprepare: use a smaller sample size for histogram
Makefile | 2 +-
diff.c | 2 +
merge-recursive.c | 2 +
t/t4048-diff-histogram.sh | 12 ++
xdiff/xdiff.h | 1 +
xdiff/xdiffi.c | 3 +
xdiff/xdiffi.h | 2 +
xdiff/xhistogram.c | 384 +++++++++++++++++++++++++++++++++++++++++++++
xdiff/xprepare.c | 41 ++++--
xdiff/xutils.c | 8 +-
xdiff/xutils.h | 2 +-
11 files changed, 440 insertions(+), 19 deletions(-)
create mode 100755 t/t4048-diff-histogram.sh
create mode 100644 xdiff/xhistogram.c
--
Footnotes:
[1] http://egit.eclipse.org/w/?p=jgit.git;a=blob;f=org.eclipse.jgit/src/org/eclipse/jgit/diff/HistogramDiff.java;hb=HEAD
--
1.7.3.4.681.gb718e
next reply other threads:[~2011-07-12 6:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 6:10 Tay Ray Chuan [this message]
2011-07-12 6:10 ` [RFC/PATCH 1/3] teach --histogram to diff Tay Ray Chuan
2011-07-12 6:10 ` [RFC/PATCH 2/3] xdiff/xprepare: skip classification Tay Ray Chuan
2011-07-12 6:10 ` [RFC/PATCH 3/3] xdiff/xprepare: use a smaller sample size for histogram diff Tay Ray Chuan
2011-07-12 19:56 ` [RFC/PATCH 1/3] teach --histogram to diff Junio C Hamano
2011-07-13 16:36 ` Tay Ray Chuan
2011-07-12 14:19 ` [RFC/PATCH 0/3] " Shawn Pearce
2011-07-12 17:43 ` Junio C Hamano
2011-07-13 16:35 ` Tay Ray Chuan
2011-07-13 16:34 ` Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 0/8] " Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 1/8] xdiff/xprepare: use memset() Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 2/8] do away with xdl_mmfile_next() Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 3/8] xdiff/xprepare: refactor abort cleanups Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 4/8] xdiff/xpatience: factor out fall-back-diff function Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 5/8] t4033-diff-patience: factor out tests Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 6/8] teach --histogram to diff Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 7/8] xdiff/xprepare: skip classification Tay Ray Chuan
2011-08-01 3:16 ` [PATCH v2 8/8] xdiff/xprepare: use a smaller sample size for histogram diff Tay Ray Chuan
2011-08-01 4:20 ` [PATCH 0/4] changes for rc/histogram-diff in 'next' Tay Ray Chuan
2011-08-01 4:20 ` [PATCH 1/4] xdiff: do away with xdl_mmfile_next() Tay Ray Chuan
2011-08-01 4:20 ` [PATCH 2/4] xdiff/xhistogram: rework handling of recursed results Tay Ray Chuan
2011-08-01 4:20 ` [PATCH 3/4] xdiff/xhistogram: rely on xdl_trim_ends() Tay Ray Chuan
2011-08-01 4:20 ` [PATCH 4/4] xdiff/xhistogram: drop need for additional variable Tay Ray Chuan
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=1310451027-15148-1-git-send-email-rctay89@gmail.com \
--to=rctay89@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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).