Skip to content

Commit 35f873c

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 <[email protected]>
1 parent 25e8e94 commit 35f873c

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
@@ -438,7 +438,29 @@ static int update_one(struct cache_tree *it,
438438
continue;
439439

440440
strbuf_grow(&buffer, entlen + 100);
441-
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
441+
442+
switch (mode) {
443+
case 0100644:
444+
strbuf_add(&buffer, "100644 ", 7);
445+
break;
446+
case 0100664:
447+
strbuf_add(&buffer, "100664 ", 7);
448+
break;
449+
case 0100755:
450+
strbuf_add(&buffer, "100755 ", 7);
451+
break;
452+
case 0120000:
453+
strbuf_add(&buffer, "120000 ", 7);
454+
break;
455+
case 0160000:
456+
strbuf_add(&buffer, "160000 ", 7);
457+
break;
458+
default:
459+
strbuf_addf(&buffer, "%o ", mode);
460+
break;
461+
}
462+
strbuf_add(&buffer, path + baselen, entlen);
463+
strbuf_addch(&buffer, '\0');
442464
strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
443465

444466
#if DEBUG_CACHE_TREE

0 commit comments

Comments
 (0)