Skip to content

Commit 8a8b58e

Browse files
Kevin Willforddscho
authored andcommitted
cache-tree: remove use of strbuf_addf in update_one
String formatting can be a performance issue when there are hundreds of thousands of trees. Change to stop using the strbuf_addf and just add the strings or characters individually. There are a limited number of modes so added a switch for the known ones and a default case if something comes through that are not a known one for git. In one scenario regarding a huge worktree, this reduces the time required for a `git checkout <branch>` from 44 seconds to 38 seconds, i.e. it is a non-negligible performance improvement. Signed-off-by: Kevin Willford <kewillf@microsoft.com>
1 parent 9c4224b commit 8a8b58e

File tree

1 file changed

+23
-1
lines changed

1 file changed

+23
-1
lines changed

cache-tree.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,29 @@ static int update_one(struct cache_tree *it,
431431
continue;
432432

433433
strbuf_grow(&buffer, entlen + 100);
434-
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
434+
435+
switch (mode) {
436+
case 0100644:
437+
strbuf_add(&buffer, "100644 ", 7);
438+
break;
439+
case 0100664:
440+
strbuf_add(&buffer, "100664 ", 7);
441+
break;
442+
case 0100755:
443+
strbuf_add(&buffer, "100755 ", 7);
444+
break;
445+
case 0120000:
446+
strbuf_add(&buffer, "120000 ", 7);
447+
break;
448+
case 0160000:
449+
strbuf_add(&buffer, "160000 ", 7);
450+
break;
451+
default:
452+
strbuf_addf(&buffer, "%o ", mode);
453+
break;
454+
}
455+
strbuf_add(&buffer, path + baselen, entlen);
456+
strbuf_addch(&buffer, '\0');
435457
strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
436458

437459
#if DEBUG_CACHE_TREE

0 commit comments

Comments
 (0)