From: Jeff King <peff@peff.net>
To: Derrick Stolee <stolee@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: [PATCH 3/6] t3311: use test_commit_bulk
Date: Fri, 28 Jun 2019 05:41:35 -0400 [thread overview]
Message-ID: <20190628094135.GC27329@sigill.intra.peff.net> (raw)
In-Reply-To: <20190628093751.GA3569@sigill.intra.peff.net>
One of the tests in t3311 creates 300 commits by running "test_commit"
in a loop. This requires 900 processes. Instead, we can use
test_commit_bulk to do it with only four. This improves the runtime of
the script from:
Benchmark #1: ./t3311-notes-merge-fanout.sh --root=/var/ram/git-tests
Time (mean ± σ): 5.821 s ± 0.691 s [User: 3.146 s, System: 2.782 s]
Range (min … max): 4.783 s … 6.841 s 10 runs
to:
Benchmark #1: ./t3311-notes-merge-fanout.sh --root=/var/ram/git-tests
Time (mean ± σ): 1.743 s ± 0.116 s [User: 1.144 s, System: 0.691 s]
Range (min … max): 1.629 s … 1.994 s 10 runs
for an average speedup of over 70%.
Unfortunately we still have to run 300 instances of "git notes add",
since the point is to test the fanout that comes from adding notes one
by one.
Signed-off-by: Jeff King <peff@peff.net>
---
Re-reading the patch again, the notes numbering will be in reverse
order from the original. That's fine for the purposes of the test,
though I could probably fix it if we want to be pedantic.
t/t3311-notes-merge-fanout.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t3311-notes-merge-fanout.sh b/t/t3311-notes-merge-fanout.sh
index 93516ef67c..37151a3adc 100755
--- a/t/t3311-notes-merge-fanout.sh
+++ b/t/t3311-notes-merge-fanout.sh
@@ -114,12 +114,12 @@ cp expect_log_x expect_log_y
test_expect_success 'Add a few hundred commits w/notes to trigger fanout (x -> y)' '
git update-ref refs/notes/y refs/notes/x &&
git config core.notesRef refs/notes/y &&
- i=5 &&
- while test $i -lt $num
+ test_commit_bulk --start=6 --id=commit $((num - 5)) &&
+ i=0 &&
+ while test $i -lt $((num - 5))
do
- i=$(($i + 1)) &&
- test_commit "commit$i" >/dev/null &&
- git notes add -m "notes for commit$i" || return 1
+ git notes add -m "notes for commit$i" HEAD~$i || return 1
+ i=$((i + 1))
done &&
test "$(git rev-parse refs/notes/y)" != "$(git rev-parse refs/notes/x)" &&
# Expected number of commits and notes
--
2.22.0.768.gd89de1e449
next prev parent reply other threads:[~2019-06-28 9:41 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 17:05 Git Test Coverage Report (Thurs. June 27) Derrick Stolee
2019-06-27 17:35 ` Derrick Stolee
2019-06-28 6:41 ` Jeff King
2019-06-28 9:37 ` [PATCH 0/6] easy bulk commit creation in tests Jeff King
2019-06-28 9:39 ` [PATCH 1/6] test-lib: introduce test_commit_bulk Jeff King
2019-06-28 12:35 ` Derrick Stolee
2019-06-28 18:05 ` Junio C Hamano
2019-06-29 0:09 ` Jeff King
2019-06-28 17:53 ` Junio C Hamano
2019-06-29 0:14 ` Jeff King
2019-06-28 18:44 ` Ævar Arnfjörð Bjarmason
2019-06-29 0:19 ` Jeff King
2019-06-28 21:32 ` Eric Sunshine
2019-06-28 23:04 ` SZEDER Gábor
2019-06-28 23:46 ` Eric Sunshine
2019-06-29 0:26 ` Jeff King
2019-06-29 8:24 ` SZEDER Gábor
2019-07-01 17:42 ` Junio C Hamano
2019-06-29 0:25 ` Jeff King
2019-06-28 9:39 ` [PATCH 2/6] t5310: increase the number of bitmapped commits Jeff King
2019-06-28 9:41 ` Jeff King [this message]
2019-06-28 9:41 ` [PATCH 4/6] t5702: use test_commit_bulk Jeff King
2019-06-28 9:42 ` [PATCH 5/6] t5703: " Jeff King
2019-06-28 9:42 ` [PATCH 6/6] t6200: " Jeff King
2019-06-28 12:53 ` [PATCH 0/6] easy bulk commit creation in tests Johannes Schindelin
2019-06-29 0:30 ` Jeff King
2019-06-29 16:38 ` Elijah Newren
2019-06-30 6:34 ` Jeff King
2019-06-28 18:49 ` Ævar Arnfjörð Bjarmason
2019-06-29 0:45 ` Jeff King
2019-06-29 4:53 ` [PATCH v2 1/6] test-lib: introduce test_commit_bulk Jeff King
2019-07-01 22:24 ` Junio C Hamano
2019-07-02 5:16 ` Jeff King
2019-07-01 22:28 ` Junio C Hamano
2019-07-02 5:22 ` Jeff King
2019-06-28 6:45 ` Git Test Coverage Report (Thurs. June 27) Jeff King
2019-06-28 12:23 ` Derrick Stolee
2019-06-28 23:59 ` Jeff King
2019-06-29 1:36 ` Derrick Stolee
2019-06-29 5:15 ` Jeff King
2019-06-28 9:47 ` Duy Nguyen
2019-06-28 12:39 ` Derrick Stolee
2019-06-28 13:39 ` Christian Couder
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=20190628094135.GC27329@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=stolee@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).