From: Austin Clements Date: Wed, 5 Dec 2012 05:23:22 +0000 (+1900) Subject: Re: [PATCH 3/4] perf-test: unpack tags. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=92b04f153d808fc234ccb473546d2a1bfcad491e;p=notmuch-archives.git Re: [PATCH 3/4] perf-test: unpack tags. --- diff --git a/8f/e06aa5f8c86235201174924a2e11cc4c85aa36 b/8f/e06aa5f8c86235201174924a2e11cc4c85aa36 new file mode 100644 index 000000000..03a785fa5 --- /dev/null +++ b/8f/e06aa5f8c86235201174924a2e11cc4c85aa36 @@ -0,0 +1,160 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id A8C95431FB6 + for ; Tue, 4 Dec 2012 21:23:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id AxKSAX0kdBvg for ; + Tue, 4 Dec 2012 21:23:26 -0800 (PST) +Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU + [18.9.25.13]) + by olra.theworths.org (Postfix) with ESMTP id 0BCA6431FAE + for ; Tue, 4 Dec 2012 21:23:26 -0800 (PST) +X-AuditID: 1209190d-b7f266d00000092b-08-50beda4d9817 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id 25.09.02347.D4ADEB05; Wed, 5 Dec 2012 00:23:25 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qB55NOE7023211; + Wed, 5 Dec 2012 00:23:24 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB55NMmw022600 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Wed, 5 Dec 2012 00:23:23 -0500 (EST) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1Tg7S6-0004ne-7R; Wed, 05 Dec 2012 00:23:22 -0500 +From: Austin Clements +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [PATCH 3/4] perf-test: unpack tags. +In-Reply-To: <1354594712-5179-3-git-send-email-david@tethera.net> +References: <1354583824-10520-3-git-send-email-david@tethera.net> + <1354594712-5179-1-git-send-email-david@tethera.net> + <1354594712-5179-3-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.14+100~gcb9b0b0 (http://notmuchmail.org) Emacs/23.4.1 + (i486-pc-linux-gnu) +Date: Wed, 05 Dec 2012 00:23:22 -0500 +Message-ID: <87pq2pcbsl.fsf@awakening.csail.mit.edu> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IRYrdT1/W9tS/AoPuQgsXGZT+ZLW60djNa + XL85k9mB2eNX21xmj2erbjF7bDn0njmAOYrLJiU1J7MstUjfLoEr48ifFtaCy8IVq768Zm9g + 3MPfxcjJISFgIrF75x92CFtM4sK99WxdjFwcQgL7GCVuzJjFAuGsZ5S4vqmHCcK5wCSxpG0p + VNkSRonb6yczgvSzCehLrFg7ibWLkYNDREBPYuFWGZAws4CaxKQ1Z8BWCAsYSKy52MAEUsIp + 4CjRvdMCYsxqRon/PxaCxUUF4iUuL1UAMVkEVCWO/FUD6eQFOvT1smVMELagxMmZT1ggpmtJ + 3Pj3kmkCo+AsJKlZSFILGJlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrp5WaW6KWmlG5iBIUu + pyTvDsZ3B5UOMQpwMCrx8Eoa7wsQYk0sK67MPcQoycGkJMqbdRMoxJeUn1KZkVicEV9UmpNa + fIhRgoNZSYT3nx1QjjclsbIqtSgfJiXNwaIkznsl5aa/kEB6YklqdmpqQWoRTFaGg0NJgncS + yFDBotT01Iq0zJwShDQTByfIcB6g4fNAaniLCxJzizPTIfKnGHU5ev91PWEUYsnLz0uVEuft + ACkSACnKKM2DmwNLOa8YxYHeEubdDlLFA0xXcJNeAS1hAlryQmg3yJKSRISUVAOju0bV4tPs + 353lWAUXP600neGl+Ohdq07VhOupyx7NOa65VzCiO+2R5rpYPfmPjHELszSkRZX9Za7m7jbf + 3R1R/6LMLdI4/qvnByuHAy8deB/WSOo/lqrvft5uOt9d9mnYRdk5rgETaj4/frxodsP92kuK + ZqKv5fkiUibX1k9dsK2S0VG9d6oSS3FGoqEWc1FxIgAJ0floFAMAAA== +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 05 Dec 2012 05:23:30 -0000 + +On Mon, 03 Dec 2012, david@tethera.net wrote: +> From: David Bremner +> +> It's a bit annoying to call tar twice, but we cache the results so it +> isn't as bad as it could be. +> --- +> performance-test/Makefile.local | 1 + +> performance-test/perf-test-lib.sh | 25 +++++++++++++++++++------ +> 2 files changed, 20 insertions(+), 6 deletions(-) +> +> diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local +> index b136a88..cdd7f19 100644 +> --- a/performance-test/Makefile.local +> +++ b/performance-test/Makefile.local +> @@ -30,3 +30,4 @@ download-corpus: +> wget -O ${TXZFILE} ${DEFAULT_URL} +> +> CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.* $(dir)/notmuch.cache.* +> +CLEAN := $(CLEAN) $(dir)/corpus.tags +> diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh +> index 08e2ebd..40c88c9 100644 +> --- a/performance-test/perf-test-lib.sh +> +++ b/performance-test/perf-test-lib.sh +> @@ -41,6 +41,13 @@ DB_CACHE_DIR=${TEST_DIRECTORY}/notmuch.cache.$corpus_size +> add_email_corpus () +> { +> rm -rf ${MAIL_DIR} +> + +> + if command -v pixz > /dev/null; then +> + XZ=pixz +> + else +> + XZ=xz +> + fi +> + +> if [ ! -d $CORPUS_DIR ]; then +> case "$corpus_size" in +> small) +> @@ -53,12 +60,6 @@ add_email_corpus () +> arg=mail +> esac +> +> - if command -v pixz > /dev/null; then +> - XZ=pixz +> - else +> - XZ=xz +> - fi +> - +> printf "Unpacking corpus\n" +> mkdir $CORPUS_DIR +> +> @@ -72,6 +73,18 @@ add_email_corpus () +> +> fi +> +> + if [ ! -d $TEST_DIRECTORY/corpus.tags ]; then +> + +> + mkdir $TEST_DIRECTORY/corpus.tags +> + +> + tar --extract --strip-components=2 \ +> + --directory $TEST_DIRECTORY/corpus.tags \ +> + --use-compress-program ${XZ} \ +> + --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \ +> + notmuch-email-corpus/tags + +Why not --strip-components=1 and unpack both mail/ and tags/ into a +single, shared corpus cache directory in one call to tar? Since you're +going to cp -lr things anyway, you can structure the corpus cache +however is convenient. + +> + fi +> + +> + cp -lr $TEST_DIRECTORY/corpus.tags $TMP_DIRECTORY +> cp -lr $CORPUS_DIR $MAIL_DIR +> +> if [ -d $DB_CACHE_DIR ]; then +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch