From: David Turner Date: Fri, 22 Jan 2016 19:58:43 +0000 (-0500) Subject: unpack-trees: fix accidentally quadratic behavior X-Git-Tag: v2.8.0-rc0~71^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6720955f19ea10bf9569d04480deed25b1bccf7?hp=--cc unpack-trees: fix accidentally quadratic behavior While unpacking trees (e.g. during git checkout), when we hit a cache entry that's past and outside our path, we cut off iteration. This provides about a 45% speedup on git checkout between master and master^20000 on Twitter's monorepo. Speedup in general will depend on repostitory structure, number of changes, and packfile packing decisions. Signed-off-by: David Turner Signed-off-by: Junio C Hamano --- a6720955f19ea10bf9569d04480deed25b1bccf7 diff --git a/unpack-trees.c b/unpack-trees.c index 5f541c28c6..9f55cc28b9 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -695,8 +695,19 @@ static int find_cache_pos(struct traverse_info *info, ++o->cache_bottom; continue; } - if (!ce_in_traverse_path(ce, info)) + if (!ce_in_traverse_path(ce, info)) { + /* + * Check if we can skip future cache checks + * (because we're already past all possible + * entries in the traverse path). + */ + if (info->traverse_path) { + if (strncmp(ce->name, info->traverse_path, + info->pathlen) > 0) + break; + } continue; + } ce_name = ce->name + pfxlen; ce_slash = strchr(ce_name, '/'); if (ce_slash)