From: Ben Peart <benpeart@microsoft.com>
To: git@vger.kernel.org
Cc: chriscool@tuxfamily.org, t.gummerer@gmail.com, l.s.r@web.de,
jsorianopastor@gmail.com, peff@peff.net,
Ben Peart <benpeart@microsoft.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2] read_index_from(): Skip verification of the cache entry order to speed index loading
Date: Tue, 24 Oct 2017 10:45:44 -0400 [thread overview]
Message-ID: <20171024144544.7544-1-benpeart@microsoft.com> (raw)
In-Reply-To: <20171018142725.10948-1-benpeart@microsoft.com>
There is code in post_read_index_from() to detect out of order cache
entries when reading an index file. This order verification adds cost
to read_index_from() that grows with the size of the index.
Put this on-disk data-structure validation code behind an #ifdef DEBUG
so only debug builds have to pay the cost.
The effect can be seen using t/perf/p0002-read-cache.sh:
Test w/git repo HEAD HEAD~1
----------------------------------------------------------------------------
read_cache/discard_cache 1000 times 0.42(0.01+0.09) 0.48(0.01+0.09) +14.3%
read_cache/discard_cache 1000 times 0.41(0.03+0.04) 0.49(0.00+0.10) +19.5%
read_cache/discard_cache 1000 times 0.42(0.03+0.06) 0.49(0.06+0.04) +16.7%
Test w/10K files HEAD HEAD~1
---------------------------------------------------------------------------
read_cache/discard_cache 1000 times 1.58(0.04+0.00) 1.71(0.00+0.07) +8.2%
read_cache/discard_cache 1000 times 1.64(0.01+0.07) 1.76(0.01+0.09) +7.3%
read_cache/discard_cache 1000 times 1.62(0.03+0.04) 1.71(0.00+0.04) +5.6%
Test w/100K files HEAD HEAD~1
-----------------------------------------------------------------------------
read_cache/discard_cache 1000 times 25.85(0.00+0.06) 27.35(0.01+0.06) +5.8%
read_cache/discard_cache 1000 times 25.82(0.01+0.07) 27.25(0.01+0.07) +5.5%
read_cache/discard_cache 1000 times 26.00(0.01+0.07) 27.36(0.06+0.03) +5.2%
Test with 1,000K files HEAD HEAD~1
-------------------------------------------------------------------------------
read_cache/discard_cache 1000 times 200.61(0.01+0.07) 218.23(0.03+0.06) +8.8%
read_cache/discard_cache 1000 times 201.62(0.03+0.06) 217.86(0.03+0.06) +8.1%
read_cache/discard_cache 1000 times 201.64(0.01+0.09) 217.89(0.03+0.07) +8.1%
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Notes:
Base Ref: master
Web-Diff: https://github.com/benpeart/git/commit/95e20f17ff
Checkout: git fetch https://github.com/benpeart/git no_ce_order-v2 && git checkout 95e20f17ff
### Interdiff (v1..v2):
### Patches
read-cache.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 65f4fe8375..fc90ec0fce 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1664,6 +1664,7 @@ static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
return ce;
}
+#ifdef DEBUG
static void check_ce_order(struct index_state *istate)
{
unsigned int i;
@@ -1685,6 +1686,7 @@ static void check_ce_order(struct index_state *istate)
}
}
}
+#endif
static void tweak_untracked_cache(struct index_state *istate)
{
@@ -1720,7 +1722,9 @@ static void tweak_split_index(struct index_state *istate)
static void post_read_index_from(struct index_state *istate)
{
+#ifdef DEBUG
check_ce_order(istate);
+#endif
tweak_untracked_cache(istate);
tweak_split_index(istate);
}
base-commit: c52ca88430e6ec7c834af38720295070d8a1e330
--
2.14.1.windows.1.1034.g0776750557
next prev parent reply other threads:[~2017-10-24 14:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 14:27 [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading Ben Peart
2017-10-19 5:22 ` Junio C Hamano
2017-10-19 15:12 ` Ben Peart
2017-10-19 16:05 ` Jeff King
2017-10-20 1:14 ` Junio C Hamano
2017-10-19 22:14 ` Stefan Beller
2017-10-20 12:47 ` Johannes Schindelin
2017-10-20 18:53 ` Stefan Beller
2017-10-21 1:55 ` Junio C Hamano
2017-10-24 14:45 ` Ben Peart [this message]
2017-10-30 12:48 ` [PATCH v2] " Ben Peart
2017-10-30 18:03 ` Jeff King
2017-10-31 0:33 ` Alex Vandiver
2017-10-31 13:01 ` Ben Peart
2017-10-31 17:10 ` Jeff King
2017-11-01 6:09 ` Junio C Hamano
2017-10-31 1:49 ` Junio C Hamano
2017-10-31 12:51 ` Ben Peart
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=20171024144544.7544-1-benpeart@microsoft.com \
--to=benpeart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=jsorianopastor@gmail.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
--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).