[PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case
- From
Jeff King <peff@peff.net>
- Date
- Oct 9, 2017, 17:48 UTC
- Message-ID
- <20171009174852.32dpy5xh3w3bfn6t@sigill.intra.peff.net>
- In-Reply-To
- <20171009174715.a6wziu6w535u6rd2@sigill.intra.peff.net>
When retrying a delayed filter-process request, we don't need to send the blob to the filter a second time. However, we read it unconditionally into a buffer, only to later throw away that buffer. We can make this more efficient by skipping the read in the first place when it isn't necessary.
Signed-off-by: Jeff King <peff@peff.net> --- entry.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/entry.c b/entry.c index 637c5958b0..bec51e37a2 100644 --- a/entry.c +++ b/entry.c @@ -240,6 +240,7 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout *state, int to_tempfile) { unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT; + struct delayed_checkout *dco = state->delayed_checkout; int fd, ret, fstat_done = 0; char *new; struct strbuf buf = STRBUF_INIT; @@ -261,10 +262,19 @@ static int write_entry(struct cache_entry *ce, switch (ce_mode_s_ifmt) { case S_IFREG: case S_IFLNK: - new = read_blob_entry(ce, &size); - if (!new) - return error("unable to read sha1 file of %s (%s)", - path, oid_to_hex(&ce->oid)); + /* + * We do not send the blob in case of a retry, so do not + * bother reading it at all. + */ + if (ce_mode_s_ifmt == S_IFREG && dco && dco->state == CE_RETRY) { + new = NULL; + size = 0; + } else { + new = read_blob_entry(ce, &size); + if (!new) + return error("unable to read sha1 file of %s (%s)", + path, oid_to_hex(&ce->oid)); + } if (ce_mode_s_ifmt == S_IFLNK && has_symlinks && !to_tempfile) { ret = symlink(new, path); @@ -279,14 +289,7 @@ static int write_entry(struct cache_entry *ce, * Convert from git internal format to working tree format */ if (ce_mode_s_ifmt == S_IFREG) { - struct delayed_checkout *dco = state->delayed_checkout; if (dco && dco->state != CE_NO_DELAY) { - /* Do not send the blob in case of a retry. */ - if (dco->state == CE_RETRY) { - free(new); - new = NULL; - size = 0; - } ret = async_convert_to_working_tree( ce->name, new, size, &buf, dco); if (ret && string_list_has_string(&dco->paths, ce->name)) {
-- 2.15.0.rc0.421.gf5a676fd56