09/d56cb7fedaecafe46585fd44d37ed7db1552ec

   1 Return-Path: <tomi.ollila@iki.fi>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 3113C429E35\r
   6         for <notmuch@notmuchmail.org>; Mon,  2 Dec 2013 07:25:46 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id gYSfA737m5vD for <notmuch@notmuchmail.org>;\r
  16         Mon,  2 Dec 2013 07:25:41 -0800 (PST)\r
  17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
  18         by olra.theworths.org (Postfix) with ESMTP id 937D7429E2F\r
  19         for <notmuch@notmuchmail.org>; Mon,  2 Dec 2013 07:25:41 -0800 (PST)\r
  20 Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
  21         by guru.guru-group.fi (Postfix) with ESMTP id D870A100086;\r
  22         Mon,  2 Dec 2013 17:25:31 +0200 (EET)\r
  23 From: Tomi Ollila <tomi.ollila@iki.fi>\r
  24 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
  25 Subject: Re: [PATCH] perf-test: bump version to 0.4, use manifest files\r
  26 In-Reply-To: <1385866803-17847-1-git-send-email-david@tethera.net>\r
  27 References: <1385866803-17847-1-git-send-email-david@tethera.net>\r
  28 User-Agent: Notmuch/0.17~rc1+17~ga2e1a2f (http://notmuchmail.org) Emacs/24.3.1\r
  29         (x86_64-unknown-linux-gnu)\r
  30 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
  31         $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
  32         !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
  33 Date: Mon, 02 Dec 2013 17:25:31 +0200\r
  34 Message-ID: <m2ob4zuvf8.fsf@guru.guru-group.fi>\r
  35 MIME-Version: 1.0\r
  36 Content-Type: text/plain\r
  37 X-BeenThere: notmuch@notmuchmail.org\r
  38 X-Mailman-Version: 2.1.13\r
  39 Precedence: list\r
  40 List-Id: "Use and development of the notmuch mail system."\r
  41         <notmuch.notmuchmail.org>\r
  42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  43         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  45 List-Post: <mailto:notmuch@notmuchmail.org>\r
  46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  48         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  49 X-List-Received-Date: Mon, 02 Dec 2013 15:25:46 -0000\r
  50 \r
  51 On Sun, Dec 01 2013, David Bremner <david@tethera.net> wrote:\r
  52 \r
  53 > The new revision of the performance test includes manifests for each corpus,\r
  54 > so update the support library to use these manifests at the same time.\r
  55 > ---\r
  56 \r
  57 This is consistent with what is currently in repository so +1\r
  58 \r
  59 Tomi\r
  60 \r
  61 \r
  62 >\r
  63 > Jani's message\r
  64 >        \r
  65 >        id:d74499f1e462755676edf9aa6ab689ba47fa2471.1385825425.git.jani@nikula.org\r
  66 >\r
  67 > reminded me I had an update of the performance test suite in the\r
  68 > works.  The new suite is available from\r
  69 >\r
  70 >     http://tesseract.cs.unb.ca/notmuch/notmuch-email-corpus-0.4.tar.xz\r
  71 >     http://tesseract.cs.unb.ca/notmuch/notmuch-email-corpus-0.4.tar.xz.asc\r
  72 >\r
  73 > I haven't yet uploaded it to notmuchmail.org because of disk space concerns.\r
  74 >\r
  75 >  .../download/notmuch-email-corpus-0.4.tar.xz.asc   | 14 +++++\r
  76 >  performance-test/perf-test-lib.sh                  | 72 ++++++++++++++--------\r
  77 >  performance-test/version.sh                        |  2 +-\r
  78 >  3 files changed, 60 insertions(+), 28 deletions(-)\r
  79 >  create mode 100644 performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc\r
  80 >\r
  81 > 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\r
  82 > new file mode 100644\r
  83 > index 0000000..72dedd8\r
  84 > --- /dev/null\r
  85 > +++ b/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc\r
  86 > @@ -0,0 +1,14 @@\r
  87 > +-----BEGIN PGP SIGNATURE-----\r
  88 > +Version: GnuPG v1.4.15 (GNU/Linux)\r
  89 > +\r
  90 > +iQGcBAABCAAGBQJSdaDkAAoJEPIClx2kp54sQ54L/ikkvF1fy88hjLitN59v6g2J\r
  91 > +vw85YNRifNHyp/UXI6nt2eXFzyWJiRHuvHFoBgmEsJVxauOKw61Gs2zd53x9Ear4\r
  92 > +MGcQWyiM1cnwX/nD7GvxRQNh33f+FEamTjg+QhG47K0A2YdLWcDC7r9GMatGT11x\r
  93 > +5KE24WQGOqtgQn/9qNtJvkiKIehpRiDTaW/QJ7mTCYeJFjIHJUY8dxyfiTtkJ0z7\r
  94 > +cJ6omehvWSw4STbEg65XJgqykxMdltNEavfvSbAT73FgmkkyXxul0s5hDZ/esd0n\r
  95 > +re3dyDxGt085POiAgPti05a4tJI5EQC2wLBUFri0s2JdMtazcD6yVuHNbVzZ4Do3\r
  96 > +nL/sgwKGUq5wRrPqPWp6HXtZ9zG+/V7hFNrr/l42qGrLqsSh0bqvEnUiwczZLBGy\r
  97 > +NEs4G8VjmfS2cMKePsWaekBAvFUtb47PSB6JIPwpCNvKXDrcCb28eOQVB2atgj1h\r
  98 > +9SktOtWYJhWIQp2YW9iae30Z6lhCcdPRRHTFMQq2nQ==\r
  99 > +=eSMY\r
 100 > +-----END PGP SIGNATURE-----\r
 101 > diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
 102 > index 9ee7661..44708cf 100644\r
 103 > --- a/performance-test/perf-test-lib.sh\r
 104 > +++ b/performance-test/perf-test-lib.sh\r
 105 > @@ -41,52 +41,70 @@ add_email_corpus ()\r
 106 >  {\r
 107 >      rm -rf ${MAIL_DIR}\r
 108 >  \r
 109 > -    case "$corpus_size" in\r
 110 > -     small)\r
 111 > -         mail_subdir="mail/enron/bailey-s"\r
 112 > -         check_for="${TEST_DIRECTORY}/corpus/$mail_subdir"\r
 113 > -         ;;\r
 114 > -     medium)\r
 115 > -         mail_subdir="mail/notmuch-archive"\r
 116 > -         check_for="${TEST_DIRECTORY}/corpus/$mail_subdir"\r
 117 > -         ;;\r
 118 > -     *)\r
 119 > -         mail_subdir=mail\r
 120 > -         check_for="${TEST_DIRECTORY}/corpus/$mail_subdir/enron/wolfe-j"\r
 121 > -    esac\r
 122 > +    CORPUS_DIR=${TEST_DIRECTORY}/corpus\r
 123 > +    mkdir -p "${CORPUS_DIR}"\r
 124 >  \r
 125 > -    MAIL_CORPUS="${TEST_DIRECTORY}/corpus/$mail_subdir"\r
 126 > -    TAG_CORPUS="${TEST_DIRECTORY}/corpus/tags"\r
 127 > +    MAIL_CORPUS="${CORPUS_DIR}/mail.${corpus_size}"\r
 128 > +    TAG_CORPUS="${CORPUS_DIR}/tags"\r
 129 >  \r
 130 > -    args=()\r
 131 > -    if [ ! -d "$TAG_CORPUS" ] ; then\r
 132 > -     args+=("notmuch-email-corpus/tags")\r
 133 > +    if command -v pixz > /dev/null; then\r
 134 > +     XZ=pixz\r
 135 > +    else\r
 136 > +     XZ=xz\r
 137 >      fi\r
 138 >  \r
 139 > -    if [ ! -d "$check_for" ] ; then\r
 140 > -     args+=("notmuch-email-corpus/$mail_subdir")\r
 141 > +    if [ ! -d "${CORPUS_DIR}/manifest" ]; then\r
 142 > +\r
 143 > +     printf "Unpacking manifests\n"\r
 144 > +     tar --extract --use-compress-program ${XZ} --strip-components=1 \\r
 145 > +         --directory ${TEST_DIRECTORY}/corpus \\r
 146 > +         --wildcards --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
 147 > +         'notmuch-email-corpus/manifest/*'\r
 148 >      fi\r
 149 >  \r
 150 > -    if [[ ${#args[@]} > 0 ]]; then\r
 151 > -     if command -v pixz > /dev/null; then\r
 152 > -         XZ=pixz\r
 153 > +    file_list=$(mktemp file_listXXXXXX)\r
 154 > +    if [ ! -d "$TAG_CORPUS" ] ; then\r
 155 > +     echo "notmuch-email-corpus/tags" >> $file_list\r
 156 > +    fi\r
 157 > +\r
 158 > +    if [ ! -d "$MAIL_CORPUS" ] ; then\r
 159 > +     if [[ "$corpus_size" != "large" ]]; then\r
 160 > +         sed s,^,notmuch-email-corpus/, < \\r
 161 > +             ${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list\r
 162 >       else\r
 163 > -         XZ=xz\r
 164 > +         echo "notmuch-email-corpus/mail" >> $file_list\r
 165 >       fi\r
 166 > +    fi\r
 167 >  \r
 168 > -     printf "Unpacking corpus\n"\r
 169 > -     mkdir -p "${TEST_DIRECTORY}/corpus"\r
 170 > +    if [[ -s $file_list ]]; then\r
 171 >  \r
 172 > +     printf "Unpacking corpus\n"\r
 173 >       tar --checkpoint=.5000 --extract --strip-components=1 \\r
 174 >           --directory ${TEST_DIRECTORY}/corpus \\r
 175 >           --use-compress-program ${XZ} \\r
 176 >           --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
 177 > -         "${args[@]}"\r
 178 > +         --anchored --recursion \\r
 179 > +         --files-from $file_list\r
 180 >  \r
 181 >       printf "\n"\r
 182 >  \r
 183 > +     if [[ ! -d ${MAIL_CORPUS} ]]; then\r
 184 > +         printf "creating link farm\n"\r
 185 > +\r
 186 > +         if [[ "$corpus_size" = large ]]; then\r
 187 > +             cp -rl ${TEST_DIRECTORY}/corpus/mail ${MAIL_CORPUS}\r
 188 > +         else\r
 189 > +             while read -r file; do\r
 190 > +                 tdir=${MAIL_CORPUS}/$(dirname $file)\r
 191 > +                 mkdir -p $tdir\r
 192 > +                 ln ${TEST_DIRECTORY}/corpus/$file $tdir\r
 193 > +             done <${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size}\r
 194 > +         fi\r
 195 > +     fi\r
 196 > +\r
 197 >      fi\r
 198 >  \r
 199 > +    rm $file_list\r
 200 >      cp -lr $TAG_CORPUS $TMP_DIRECTORY/corpus.tags\r
 201 >      cp -lr $MAIL_CORPUS $MAIL_DIR\r
 202 >  }\r
 203 > diff --git a/performance-test/version.sh b/performance-test/version.sh\r
 204 > index afafc73..f02527a 100644\r
 205 > --- a/performance-test/version.sh\r
 206 > +++ b/performance-test/version.sh\r
 207 > @@ -1,3 +1,3 @@\r
 208 >  # this should be both a valid Makefile fragment and valid POSIX(ish) shell.\r
 209 >  \r
 210 > -PERFTEST_VERSION=0.3\r
 211 > +PERFTEST_VERSION=0.4\r
 212 > -- \r
 213 > 1.8.4.2\r
 214 >\r
 215 > _______________________________________________\r
 216 > notmuch mailing list\r
 217 > notmuch@notmuchmail.org\r
 218 > http://notmuchmail.org/mailman/listinfo/notmuch\r