Skip to content

Commit 450cb37

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 3c5faf2 commit 450cb37

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
@@ -423,7 +423,29 @@ static int update_one(struct cache_tree *it,
423423
continue;
424424

425425
strbuf_grow(&buffer, entlen + 100);
426-
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
426+
427+
switch (mode) {
428+
case 0100644:
429+
strbuf_add(&buffer, "100644 ", 7);
430+
break;
431+
case 0100664:
432+
strbuf_add(&buffer, "100664 ", 7);
433+
break;
434+
case 0100755:
435+
strbuf_add(&buffer, "100755 ", 7);
436+
break;
437+
case 0120000:
438+
strbuf_add(&buffer, "120000 ", 7);
439+
break;
440+
case 0160000:
441+
strbuf_add(&buffer, "160000 ", 7);
442+
break;
443+
default:
444+
strbuf_addf(&buffer, "%o ", mode);
445+
break;
446+
}
447+
strbuf_add(&buffer, path + baselen, entlen);
448+
strbuf_addch(&buffer, '\0');
427449
strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
428450

429451
#if DEBUG_CACHE_TREE

0 commit comments

Comments
 (0)