From 363cfabf956193a8e42544f517a5afadd54cb4f2 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 2 Dec 2013 17:25:31 +0200 Subject: [PATCH] Re: [PATCH] perf-test: bump version to 0.4, use manifest files --- 09/d56cb7fedaecafe46585fd44d37ed7db1552ec | 218 ++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 09/d56cb7fedaecafe46585fd44d37ed7db1552ec diff --git a/09/d56cb7fedaecafe46585fd44d37ed7db1552ec b/09/d56cb7fedaecafe46585fd44d37ed7db1552ec new file mode 100644 index 000000000..2e79cd01a --- /dev/null +++ b/09/d56cb7fedaecafe46585fd44d37ed7db1552ec @@ -0,0 +1,218 @@ +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 3113C429E35 + for ; Mon, 2 Dec 2013 07:25:46 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 gYSfA737m5vD for ; + Mon, 2 Dec 2013 07:25:41 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 937D7429E2F + for ; Mon, 2 Dec 2013 07:25:41 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id D870A100086; + Mon, 2 Dec 2013 17:25:31 +0200 (EET) +From: Tomi Ollila +To: David Bremner , notmuch@notmuchmail.org +Subject: Re: [PATCH] perf-test: bump version to 0.4, use manifest files +In-Reply-To: <1385866803-17847-1-git-send-email-david@tethera.net> +References: <1385866803-17847-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.17~rc1+17~ga2e1a2f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Mon, 02 Dec 2013 15:25:46 -0000 + +On Sun, Dec 01 2013, David Bremner wrote: + +> The new revision of the performance test includes manifests for each corpus, +> so update the support library to use these manifests at the same time. +> --- + +This is consistent with what is currently in repository so +1 + +Tomi + + +> +> Jani's message +> +> id:d74499f1e462755676edf9aa6ab689ba47fa2471.1385825425.git.jani@nikula.org +> +> reminded me I had an update of the performance test suite in the +> works. The new suite is available from +> +> http://tesseract.cs.unb.ca/notmuch/notmuch-email-corpus-0.4.tar.xz +> http://tesseract.cs.unb.ca/notmuch/notmuch-email-corpus-0.4.tar.xz.asc +> +> I haven't yet uploaded it to notmuchmail.org because of disk space concerns. +> +> .../download/notmuch-email-corpus-0.4.tar.xz.asc | 14 +++++ +> performance-test/perf-test-lib.sh | 72 ++++++++++++++-------- +> performance-test/version.sh | 2 +- +> 3 files changed, 60 insertions(+), 28 deletions(-) +> create mode 100644 performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc +> +> diff --git a/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc b/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc +> new file mode 100644 +> index 0000000..72dedd8 +> --- /dev/null +> +++ b/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc +> @@ -0,0 +1,14 @@ +> +-----BEGIN PGP SIGNATURE----- +> +Version: GnuPG v1.4.15 (GNU/Linux) +> + +> +iQGcBAABCAAGBQJSdaDkAAoJEPIClx2kp54sQ54L/ikkvF1fy88hjLitN59v6g2J +> +vw85YNRifNHyp/UXI6nt2eXFzyWJiRHuvHFoBgmEsJVxauOKw61Gs2zd53x9Ear4 +> +MGcQWyiM1cnwX/nD7GvxRQNh33f+FEamTjg+QhG47K0A2YdLWcDC7r9GMatGT11x +> +5KE24WQGOqtgQn/9qNtJvkiKIehpRiDTaW/QJ7mTCYeJFjIHJUY8dxyfiTtkJ0z7 +> +cJ6omehvWSw4STbEg65XJgqykxMdltNEavfvSbAT73FgmkkyXxul0s5hDZ/esd0n +> +re3dyDxGt085POiAgPti05a4tJI5EQC2wLBUFri0s2JdMtazcD6yVuHNbVzZ4Do3 +> +nL/sgwKGUq5wRrPqPWp6HXtZ9zG+/V7hFNrr/l42qGrLqsSh0bqvEnUiwczZLBGy +> +NEs4G8VjmfS2cMKePsWaekBAvFUtb47PSB6JIPwpCNvKXDrcCb28eOQVB2atgj1h +> +9SktOtWYJhWIQp2YW9iae30Z6lhCcdPRRHTFMQq2nQ== +> +=eSMY +> +-----END PGP SIGNATURE----- +> diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh +> index 9ee7661..44708cf 100644 +> --- a/performance-test/perf-test-lib.sh +> +++ b/performance-test/perf-test-lib.sh +> @@ -41,52 +41,70 @@ add_email_corpus () +> { +> rm -rf ${MAIL_DIR} +> +> - case "$corpus_size" in +> - small) +> - mail_subdir="mail/enron/bailey-s" +> - check_for="${TEST_DIRECTORY}/corpus/$mail_subdir" +> - ;; +> - medium) +> - mail_subdir="mail/notmuch-archive" +> - check_for="${TEST_DIRECTORY}/corpus/$mail_subdir" +> - ;; +> - *) +> - mail_subdir=mail +> - check_for="${TEST_DIRECTORY}/corpus/$mail_subdir/enron/wolfe-j" +> - esac +> + CORPUS_DIR=${TEST_DIRECTORY}/corpus +> + mkdir -p "${CORPUS_DIR}" +> +> - MAIL_CORPUS="${TEST_DIRECTORY}/corpus/$mail_subdir" +> - TAG_CORPUS="${TEST_DIRECTORY}/corpus/tags" +> + MAIL_CORPUS="${CORPUS_DIR}/mail.${corpus_size}" +> + TAG_CORPUS="${CORPUS_DIR}/tags" +> +> - args=() +> - if [ ! -d "$TAG_CORPUS" ] ; then +> - args+=("notmuch-email-corpus/tags") +> + if command -v pixz > /dev/null; then +> + XZ=pixz +> + else +> + XZ=xz +> fi +> +> - if [ ! -d "$check_for" ] ; then +> - args+=("notmuch-email-corpus/$mail_subdir") +> + if [ ! -d "${CORPUS_DIR}/manifest" ]; then +> + +> + printf "Unpacking manifests\n" +> + tar --extract --use-compress-program ${XZ} --strip-components=1 \ +> + --directory ${TEST_DIRECTORY}/corpus \ +> + --wildcards --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \ +> + 'notmuch-email-corpus/manifest/*' +> fi +> +> - if [[ ${#args[@]} > 0 ]]; then +> - if command -v pixz > /dev/null; then +> - XZ=pixz +> + file_list=$(mktemp file_listXXXXXX) +> + if [ ! -d "$TAG_CORPUS" ] ; then +> + echo "notmuch-email-corpus/tags" >> $file_list +> + fi +> + +> + if [ ! -d "$MAIL_CORPUS" ] ; then +> + if [[ "$corpus_size" != "large" ]]; then +> + sed s,^,notmuch-email-corpus/, < \ +> + ${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list +> else +> - XZ=xz +> + echo "notmuch-email-corpus/mail" >> $file_list +> fi +> + fi +> +> - printf "Unpacking corpus\n" +> - mkdir -p "${TEST_DIRECTORY}/corpus" +> + if [[ -s $file_list ]]; then +> +> + printf "Unpacking corpus\n" +> tar --checkpoint=.5000 --extract --strip-components=1 \ +> --directory ${TEST_DIRECTORY}/corpus \ +> --use-compress-program ${XZ} \ +> --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \ +> - "${args[@]}" +> + --anchored --recursion \ +> + --files-from $file_list +> +> printf "\n" +> +> + if [[ ! -d ${MAIL_CORPUS} ]]; then +> + printf "creating link farm\n" +> + +> + if [[ "$corpus_size" = large ]]; then +> + cp -rl ${TEST_DIRECTORY}/corpus/mail ${MAIL_CORPUS} +> + else +> + while read -r file; do +> + tdir=${MAIL_CORPUS}/$(dirname $file) +> + mkdir -p $tdir +> + ln ${TEST_DIRECTORY}/corpus/$file $tdir +> + done <${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} +> + fi +> + fi +> + +> fi +> +> + rm $file_list +> cp -lr $TAG_CORPUS $TMP_DIRECTORY/corpus.tags +> cp -lr $MAIL_CORPUS $MAIL_DIR +> } +> diff --git a/performance-test/version.sh b/performance-test/version.sh +> index afafc73..f02527a 100644 +> --- a/performance-test/version.sh +> +++ b/performance-test/version.sh +> @@ -1,3 +1,3 @@ +> # this should be both a valid Makefile fragment and valid POSIX(ish) shell. +> +> -PERFTEST_VERSION=0.3 +> +PERFTEST_VERSION=0.4 +> -- +> 1.8.4.2 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2