summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 706098a)
raw | patch | inline | side by side (parent: 706098a)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 29 Jun 2007 06:11:40 +0000 (23:11 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 1 Jul 2007 03:51:31 +0000 (20:51 -0700) |
The comment at the top of the file described an old algorithm
that was neutral to text/binary differences (it hashed sliding
window of N-byte sequences and counted overlaps), but long time
ago we switched to a new heuristics that are more suitable for
line oriented (read: text) files that are much faster.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
that was neutral to text/binary differences (it hashed sliding
window of N-byte sequences and counted overlaps), but long time
ago we switched to a new heuristics that are more suitable for
line oriented (read: text) files that are much faster.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-delta.c | patch | blob | history |
diff --git a/diffcore-delta.c b/diffcore-delta.c
index 0e1fae79de47029b212805170bb3e3b29bf6bf81..7116df0b83f68b9d31dc8e4c3a89ad365a138a37 100644 (file)
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
/*
* Idea here is very simple.
*
- * We have total of (sz-N+1) N-byte overlapping sequences in buf whose
- * size is sz. If the same N-byte sequence appears in both source and
- * destination, we say the byte that starts that sequence is shared
- * between them (i.e. copied from source to destination).
+ * Almost all data we are interested in are text, but sometimes we have
+ * to deal with binary data. So we cut them into chunks delimited by
+ * LF byte, or 64-byte sequence, whichever comes first, and hash them.
*
- * For each possible N-byte sequence, if the source buffer has more
- * instances of it than the destination buffer, that means the
- * difference are the number of bytes not copied from source to
- * destination. If the counts are the same, everything was copied
- * from source to destination. If the destination has more,
- * everything was copied, and destination added more.
+ * For those chunks, if the source buffer has more instances of it
+ * than the destination buffer, that means the difference are the
+ * number of bytes not copied from source to destination. If the
+ * counts are the same, everything was copied from source to
+ * destination. If the destination has more, everything was copied,
+ * and destination added more.
*
* We are doing an approximation so we do not really have to waste
* memory by actually storing the sequence. We just hash them into
* somewhere around 2^16 hashbuckets and count the occurrences.
- *
- * The length of the sequence is arbitrarily set to 8 for now.
*/
/* Wild guess at the initial hash size */