undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-pack-object: cache small deltas

Browse Source 
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Koegler 2007-05-28 23:20:59 +02:00 committed by Junio C Hamano
parent 074b2eea29
commit e3dfddb377
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@ -572,6 +572,10 @@ pack.deltaCacheSize::
gitlink:git-pack-objects[1]. gitlink:git-pack-objects[1].
A value of 0 means no limit. Defaults to 0. A value of 0 means no limit. Defaults to 0.
pack.deltaCacheLimit::
The maxium size of a delta, that is cached in
gitlink:git-pack-objects[1]. Defaults to 1000.
pull.octopus:: pull.octopus::
The default merge strategy to use when pulling multiple branches The default merge strategy to use when pulling multiple branches
at once. at once.

8
builtin-pack-objects.c
View File

@ -79,6 +79,7 @@ static int pack_compression_seen;
static unsigned long delta_cache_size = 0; static unsigned long delta_cache_size = 0;
static unsigned long max_delta_cache_size = 0; static unsigned long max_delta_cache_size = 0;
static unsigned long cache_max_small_delta_size = 1000;
/* /*
* The object names in objects array are hashed with this hashtable, * The object names in objects array are hashed with this hashtable,
@ -1403,6 +1404,9 @@ static int delta_cacheable(struct unpacked *trg, struct unpacked *src,
if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size) if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
return 0; return 0;
if (delta_size < cache_max_small_delta_size)
return 1;
/* cache delta, if objects are large enough compared to delta size */ /* cache delta, if objects are large enough compared to delta size */
if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10)) if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
return 1; return 1;
@ -1654,6 +1658,10 @@ static int git_pack_config(const char *k, const char *v)
max_delta_cache_size = git_config_int(k, v); max_delta_cache_size = git_config_int(k, v);
return 0; return 0;
} }
if (!strcmp(k, "pack.deltacachelimit")) {
cache_max_small_delta_size = git_config_int(k, v);
return 0;
}
return git_default_config(k, v); return git_default_config(k, v);
} }