git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/4] diffcore-delta.c: update the comment on the algorithm.

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 29, 2007, 06:36 UTC
Message-ID
<11830989623983-git-send-email-gitster@pobox.com>
In-Reply-To
<7v3b0bi88r.fsf@assigned-by-dhcp.pobox.com>

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>
---
 diffcore-delta.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/diffcore-delta.c b/diffcore-delta.c
index 0e1fae7..7116df0 100644
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -5,23 +5,20 @@
 /*
  * 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 */
-- 
1.5.2.2.1414.g1e7d9
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 9 in “Applying patches in a directory that isn't a repository”
  1. Geoff RussellJun 29, 2007
  2. Junio C HamanoJun 29, 2007
  3. 1/4 diffcore_count_changes: pass diffcore_filespecJunio C Hamano, Jun 29, 2007
  4. 2/4 diffcore_filespec: add is_binaryJunio C Hamano, Jun 29, 2007
  5. 3/4 diffcore-delta.c: update the comment on the algorithm.Junio C Hamano, Jun 29, 2007
  6. 4/4 diffcore-delta.c: Ignore CR in CRLF for text filesJunio C Hamano, Jun 29, 2007
  7. しらいしななこJun 29, 2007
  8. Junio C HamanoJun 29, 2007
  9. Geoff RussellJun 30, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.