mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 06:54:55 +01:00
Code Activity

Merge branch 'jc/delta' into next

Browse source 
* jc/delta:
  diff-delta: cull collided hash bucket more aggressively.
This commit is contained in:
Junio C Hamano 2006-03-02 22:13:11 -08:00
commit 539d84fe0a
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
diff-delta.c
View file

@ -90,22 +90,35 @@ static struct index ** delta_index(const unsigned char *buf,
/* /*
* Now make sure none of the hash buckets has more entries than * Now make sure none of the hash buckets has more entries than
* we're willing to test. Otherwise we short-circuit the entry * we're willing to test. Otherwise we cull the entry list to
* list uniformly to still preserve a good repartition across * limit identical three byte prefixes to still preserve a good
* the reference buffer. * repartition across the reference buffer.
*/ */
for (i = 0; i < hsize; i++) { for (i = 0; i < hsize; i++) {
struct index **list, *bucket, *remaining;
int cnt;
if (hash_count[i] < hlimit) if (hash_count[i] < hlimit)
continue; continue;
entry = hash[i];
do { bucket = NULL;
struct index *keep = entry; list = &bucket;
int skip = hash_count[i] / hlimit / 2; remaining = hash[i];
do { cnt = 0;
entry = entry->next; while (cnt < hlimit && remaining) {
} while(--skip && entry); struct index *this = remaining, *that;
keep->next = entry; remaining = remaining->next;
} while(entry); for (that = bucket; that; that = that->next) {
if (!memcmp(that->ptr, this->ptr, 3))
break;
}
if (that)
continue; /* discard */
cnt++;
*list = this;
list = &(this->next);
this->next = NULL;
}
hash[i] = bucket;
} }
free(hash_count); free(hash_count);