Re: [PATCH] diff: do not reuse worktree files that need "clean" conversion

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 22, 2016, 17:44 UTC
Message-ID: <xmqq60rxbmaf.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160722152753.GA6859@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 42 quoted lines

> Subject: diff: do not reuse worktree files that need "clean" conversion
>
> When accessing a blob for a diff, we may try to reuse file
> contents in the working tree, under the theory that it is
> faster to mmap those file contents than it would be to
> extract the content from the object database.
>
> When we have to filter those contents, though, that
> assumption does not hold. Even for our internal conversions
> like CRLF, we have to allocate and fill a new buffer anyway.
> But much worse, for external clean filters we have to exec
> an arbitrary script, and we have no idea how expensive it
> may be to run.
>
> So let's skip this optimization when conversion into git's
> "clean" form is required. This applies whenever the
> "want_file" flag is false. When it's true, the caller
> actually wants the smudged worktree contents, which the
> reused file by definition already has (in fact, this is a
> key optimization going the other direction, since reusing
> the worktree file there lets us skip smudge filters).
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
>  diff.c                |  7 +++++++
>  t/t0021-conversion.sh | 11 +++++++++++
>  2 files changed, 18 insertions(+)
>
> diff --git a/diff.c b/diff.c
> index 7d03419..b43d3dd 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -2683,6 +2683,13 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
>  	if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
>  		return 0;
>  
> +	/*
> +	 * Similarly, if we'd have to convert the file contents anyway, that
> +	 * makes the optimization not worthwhile.
> +	 */
> +	if (!want_file && would_convert_to_git(name))
> +		return 0;

The would_convert_to_git() function is not a free operation. It needs to prime the attribute stack, so it needs to open/read/parse a few files ($GIT_DIR/info/attributes and .gitattributes at least, and more if your directory hierarchy is deep) on the filesystem. The cost is amortized across paths, but we do not even enable the optimization if we have to pay the cost of reading the index ourselves.

I suspect that we may be better off disabling this optimization if we need to always call the helper.

Show 23 quoted lines

>  	len = strlen(name);
>  	pos = cache_name_pos(name, len);
>  	if (pos < 0)
> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
> index 7bac2bc..e799e59 100755
> --- a/t/t0021-conversion.sh
> +++ b/t/t0021-conversion.sh
> @@ -268,4 +268,15 @@ test_expect_success 'disable filter with empty override' '
>  	test_must_be_empty err
>  '
>  
> +test_expect_success 'diff does not reuse worktree files that need cleaning' '
> +	test_config filter.counter.clean "echo . >>count; sed s/^/clean:/" &&
> +	echo "file filter=counter" >.gitattributes &&
> +	test_commit one file &&
> +	test_commit two file &&
> +
> +	>count &&
> +	git diff-tree -p HEAD &&
> +	test_line_count = 0 count
> +'
> +
>  test_done