From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Jeff King" <peff@peff.net>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v4 15/22] read-cache: touch shared index files when used
Date: Mon, 27 Feb 2017 19:00:12 +0100 [thread overview]
Message-ID: <20170227180019.18666-16-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20170227180019.18666-1-chriscool@tuxfamily.org>
When a split-index file is created, let's update the mtime of the
shared index file that the split-index file is referencing.
In a following commit we will make shared index file expire
depending on their mtime, so updating the mtime makes sure that
the shared index file will not be deleted soon.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
read-cache.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index aeb413a508..5f295af4c6 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1674,6 +1674,19 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
die("index file corrupt");
}
+/*
+ * Signal that the shared index is used by updating its mtime.
+ *
+ * This way, shared index can be removed if they have not been used
+ * for some time.
+ */
+static void freshen_shared_index(char *base_sha1_hex, int warn)
+{
+ const char *shared_index = git_path("sharedindex.%s", base_sha1_hex);
+ if (!check_and_freshen_file(shared_index, 1) && warn)
+ warning("Could not freshen shared index '%s'", shared_index);
+}
+
int read_index_from(struct index_state *istate, const char *path)
{
struct split_index *split_index;
@@ -2245,6 +2258,7 @@ static int too_many_not_shared_entries(struct index_state *istate)
int write_locked_index(struct index_state *istate, struct lock_file *lock,
unsigned flags)
{
+ int new_shared_index, ret;
struct split_index *si = istate->split_index;
if (!si || alternate_index_output ||
@@ -2261,13 +2275,22 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
}
if (too_many_not_shared_entries(istate))
istate->cache_changed |= SPLIT_INDEX_ORDERED;
- if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
- int ret = write_shared_index(istate, lock, flags);
+
+ new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
+
+ if (new_shared_index) {
+ ret = write_shared_index(istate, lock, flags);
if (ret)
return ret;
}
- return write_split_index(istate, lock, flags);
+ ret = write_split_index(istate, lock, flags);
+
+ /* Freshen the shared index only if the split-index was written */
+ if (!ret && !new_shared_index)
+ freshen_shared_index(sha1_to_hex(si->base_sha1), 1);
+
+ return ret;
}
/*
--
2.12.0.22.g0672473d40
next prev parent reply other threads:[~2017-02-27 18:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 17:59 [PATCH v4 00/22] Add configuration options for split-index Christian Couder
2017-02-27 17:59 ` [PATCH v4 01/22] config: mark an error message up for translation Christian Couder
2017-02-27 17:59 ` [PATCH v4 02/22] t1700: change here document style Christian Couder
2017-02-27 18:00 ` [PATCH v4 03/22] config: add git_config_get_split_index() Christian Couder
2017-02-27 18:00 ` [PATCH v4 04/22] split-index: add {add,remove}_split_index() functions Christian Couder
2017-02-27 18:00 ` [PATCH v4 05/22] read-cache: add and then use tweak_split_index() Christian Couder
2017-02-27 18:00 ` [PATCH v4 06/22] update-index: warn in case of split-index incoherency Christian Couder
2017-02-27 18:00 ` [PATCH v4 07/22] t1700: add tests for core.splitIndex Christian Couder
2017-02-27 18:00 ` [PATCH v4 08/22] Documentation/config: add information " Christian Couder
2017-02-27 18:00 ` [PATCH v4 09/22] Documentation/git-update-index: talk about core.splitIndex config var Christian Couder
2017-02-27 18:00 ` [PATCH v4 10/22] config: add git_config_get_max_percent_split_change() Christian Couder
2017-02-27 18:00 ` [PATCH v4 11/22] read-cache: regenerate shared index if necessary Christian Couder
2017-02-27 18:00 ` [PATCH v4 12/22] t1700: add tests for splitIndex.maxPercentChange Christian Couder
2017-02-27 18:00 ` [PATCH v4 13/22] Documentation/config: add splitIndex.maxPercentChange Christian Couder
2017-02-27 18:00 ` [PATCH v4 14/22] sha1_file: make check_and_freshen_file() non static Christian Couder
2017-02-27 18:00 ` Christian Couder [this message]
2017-03-01 21:34 ` [PATCH v4 15/22] read-cache: touch shared index files when used Junio C Hamano
2017-02-27 18:00 ` [PATCH v4 16/22] config: add git_config_get_expiry() from gc.c Christian Couder
2017-02-27 18:00 ` [PATCH v4 17/22] read-cache: unlink old sharedindex files Christian Couder
2017-03-01 21:39 ` Junio C Hamano
2017-02-27 18:00 ` [PATCH v4 18/22] t1700: test shared index file expiration Christian Couder
2017-02-27 18:00 ` [PATCH v4 19/22] read-cache: refactor read_index_from() Christian Couder
2017-02-27 18:00 ` [PATCH v4 20/22] read-cache: use freshen_shared_index() in read_index_from() Christian Couder
2017-02-27 18:00 ` [PATCH v4 21/22] Documentation/config: add splitIndex.sharedIndexExpire Christian Couder
2017-02-27 18:00 ` [PATCH v4 22/22] Documentation/git-update-index: explain splitIndex.* Christian Couder
2017-03-01 21:29 ` [PATCH v4 00/22] Add configuration options for split-index 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170227180019.18666-16-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).