From: "Zed A. Shaw" <zedshaw@zedshaw.com>
To: git@vger.kernel.org
Subject: suffix array/tree deltas (Was: The criss-cross merge case)
Date: Wed, 27 Apr 2005 23:41:40 -0400 [thread overview]
Message-ID: <1114659700.5910.10.camel@thamachine> (raw)
In-Reply-To: <Pine.LNX.4.21.0504271854240.30848-100000@iabervon.org>
On Wed, 2005-04-27 at 19:32 -0400, Daniel Barkalow wrote:
> On Wed, 27 Apr 2005, Bram Cohen wrote:
>
> My plan is to implement multi-file diff and merge with a suffix tree-based
> algorithm, and then revisit the history stuff once we have a merger that
> can do sensible things with this information.
Hey, that's neat. I've already implemented two versions of this very
thing with FastCST. The original used suffix trees, but I found that
there were plenty of pathological cases which chewed memory and
processor. Most of these cases were large (>1MB) PDF files. Don't ask
me why PDF drove suffix tree algorithms insane, but they just did.
I recently switched to a suffix array based algorithm which actually
ends up being faster than the suffix tree alternative. I'm not using
the most recent fastest algorithm and it still compares favorably with
xdelta.
There's tons of weird things about doing a delta based on suffix
arrays/trees, so feel free to pick my brain or the FastCST code if you
attempt it. The difficult parts turn out to be making the suffix array
and searching for the matching/non-matching regions. Once you do that
the actual delta algorithm is a simple while loop that keeps doing the
match/non-match detection.
Zed
next prev parent reply other threads:[~2005-04-28 3:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-27 20:25 The criss-cross merge case Bram Cohen
2005-04-27 23:32 ` Daniel Barkalow
2005-04-28 0:43 ` Tupshin Harper
2005-04-28 1:16 ` Daniel Barkalow
2005-04-28 2:15 ` Benedikt Schmidt
2005-04-28 2:19 ` Daniel Barkalow
2005-04-28 11:16 ` David Roundy
2005-04-28 3:41 ` Zed A. Shaw [this message]
2005-04-28 4:30 ` suffix array/tree deltas (Was: The criss-cross merge case) Daniel Barkalow
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=1114659700.5910.10.camel@thamachine \
--to=zedshaw@zedshaw.com \
--cc=git@vger.kernel.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.
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).