From: Derrick Stolee <stolee@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org
Cc: "Thomas Gummerer" <t.gummerer@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH 5/6] tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
Date: Tue, 17 Aug 2021 14:26:23 -0400 [thread overview]
Message-ID: <6f900a58-19b4-753c-18f5-852eaebc1527@gmail.com> (raw)
In-Reply-To: <20210817174938.3009923-6-szeder.dev@gmail.com>
On 8/17/2021 1:49 PM, SZEDER Gábor wrote:
> The sparse index and split index features are said to be currently
> incompatible [1], and consequently GIT_TEST_SPLIT_INDEX=1 might
> interfere with the test cases exercising the sparse index feature.
> Therefore GIT_TEST_SPLIT_INDEX is already explicitly disabled for the
> whole of 't1092-sparse-checkout-compatibility.sh'. There are,
> however, two other test cases exercising sparse index, namely
> 'sparse-index enabled and disabled' in
> 't1091-sparse-checkout-builtin.sh' and 'status succeeds with sparse
> index' in 't7519-status-fsmonitor.sh', and these two could fail with
> GIT_TEST_SPLIT_INDEX=1 as well [2].
>
> Unset GIT_TEST_SPLIT_INDEX and disable the split index in these two
> test cases to avoid such interference.
>
> Note that this is the minimal change to merely avoid failures when
> these test cases are run with GIT_TEST_SPLIT_INDEX=1. Interestingly,
> though, without these changes the 'git sparse-checkout init --cone
> --sparse-index' commands still succeed even with split index, and set
> all the necessary configuration variables and create the initial
> '$GIT_DIR/info/sparse-checkout' file, but the test failures are caused
> by later sanity checks finding that the index is not in fact a sparse
> index. This indicates that 'git sparse-checkout init --sparse-index'
> lacks some error checking and its tests lack coverage related to split
> index, but fixing those issues (let alone making sparse index
> comparible with split index) is beyond the scope of this patch series.
s/comparible/compatible.
I agree that making these two things compatible is not something to
solve today. I'm not sure they should _ever_ be solved because of
the complexity involved (what if the base index is not sparse but
the tip wants to be, or vice-versa?, or if a directory must be
expanded because of a conflict?). They use very different approaches
to solve a similar problem: how to deal with large index files.
* The split index reduces index _write_ time by only editing a diff
of the base index.
* The sparse index reduces index _read and write_ time by writing a
smaller index, but only if the user is using cone mode sparse-
checkout.
> test_expect_success 'sparse-index enabled and disabled' '
> - git -C repo sparse-checkout init --cone --sparse-index &&
> - test_cmp_config -C repo true index.sparse &&
> - test-tool -C repo read-cache --table >cache &&
> - grep " tree " cache &&
> -
> - git -C repo sparse-checkout disable &&
> - test-tool -C repo read-cache --table >cache &&
> - ! grep " tree " cache &&
> - git -C repo config --list >config &&
> - ! grep index.sparse config
> + (
> + sane_unset GIT_TEST_SPLIT_INDEX &&
> + git -C repo update-index --no-split-index &&
> +
> + git -C repo sparse-checkout init --cone --sparse-index &&
> + test_cmp_config -C repo true index.sparse &&
> + test-tool -C repo read-cache --table >cache &&
> + grep " tree " cache &&
> +
> + git -C repo sparse-checkout disable &&
> + test-tool -C repo read-cache --table >cache &&
> + ! grep " tree " cache &&
> + git -C repo config --list >config &&
> + ! grep index.sparse config
> + )
> '
This test is safe for now.
> test_expect_success 'status succeeds with sparse index' '
This test is being edited in ds/sparse-index-ignored-files. v3
of the relevant patch was just sent today [1].
[1] https://lore.kernel.org/git/e66106f7a99d94145eec983ea5e72b7cf8a8a479.1629206603.git.gitgitgadget@gmail.com/
You might want to rebase on top of that topic. The edits to
the test are likely stable now.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-08-17 18:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 17:49 [PATCH 0/6] Fix GIT_TEST_SPLIT_INDEX SZEDER Gábor
2021-08-17 17:49 ` [PATCH 1/6] t1600-index: remove unnecessary redirection SZEDER Gábor
2021-08-17 18:12 ` Derrick Stolee
2021-08-17 18:39 ` SZEDER Gábor
2021-08-17 18:48 ` Derrick Stolee
2021-08-17 17:49 ` [PATCH 2/6] t1600-index: don't run git commands upstream of a pipe SZEDER Gábor
2021-08-17 17:49 ` [PATCH 3/6] t1600-index: disable GIT_TEST_SPLIT_INDEX SZEDER Gábor
2021-08-17 17:49 ` [PATCH 4/6] read-cache: look for shared index files next to the index, too SZEDER Gábor
2021-08-17 17:49 ` [PATCH 5/6] tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests SZEDER Gábor
2021-08-17 18:26 ` Derrick Stolee [this message]
2021-08-17 21:32 ` SZEDER Gábor
2021-08-18 18:51 ` Derrick Stolee
2021-08-17 17:49 ` [PATCH 6/6] read-cache: fix GIT_TEST_SPLIT_INDEX SZEDER Gábor
2021-08-17 18:29 ` Derrick Stolee
2021-08-26 20:59 ` [PATCH v2 0/6] Fix GIT_TEST_SPLIT_INDEX SZEDER Gábor
2021-08-26 20:59 ` [PATCH v2 1/6] t1600-index: remove unnecessary redirection SZEDER Gábor
2021-08-26 21:00 ` [PATCH v2 2/6] t1600-index: don't run git commands upstream of a pipe SZEDER Gábor
2021-08-26 21:00 ` [PATCH v2 3/6] t1600-index: disable GIT_TEST_SPLIT_INDEX SZEDER Gábor
2021-08-26 21:00 ` [PATCH v2 4/6] read-cache: look for shared index files next to the index, too SZEDER Gábor
2021-08-26 21:00 ` [PATCH v2 5/6] tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests SZEDER Gábor
2021-08-26 21:00 ` [PATCH v2 6/6] read-cache: fix GIT_TEST_SPLIT_INDEX SZEDER Gábor
2021-08-31 14:47 ` [PATCH v2 0/6] Fix GIT_TEST_SPLIT_INDEX Derrick Stolee
2021-08-31 17:38 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6f900a58-19b4-753c-18f5-852eaebc1527@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=szeder.dev@gmail.com \
--cc=t.gummerer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).