diff options
| author | David Turner <dturner@twopensource.com> | 2016-01-22 19:58:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-22 21:03:10 (GMT) |
| commit | a6720955f19ea10bf9569d04480deed25b1bccf7 (patch) | |
| tree | a1278d3dd1d02f69605e3d123cca6929fa9462a5 /unpack-trees.c | |
| parent | d9c2bd560e1e7a3d4654fb6ef3f9037ad337eb01 (diff) | |
| download | git-a6720955f19ea10bf9569d04480deed25b1bccf7.zip git-a6720955f19ea10bf9569d04480deed25b1bccf7.tar.gz git-a6720955f19ea10bf9569d04480deed25b1bccf7.tar.bz2 | |
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 <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 5f541c2..9f55cc2 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) |