8f/e06aa5f8c86235201174924a2e11cc4c85aa36

   1 Return-Path: <amdragon@mit.edu>\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 A8C95431FB6\r
   6         for <notmuch@notmuchmail.org>; Tue,  4 Dec 2012 21:23:30 -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.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 AxKSAX0kdBvg for <notmuch@notmuchmail.org>;\r
  16         Tue,  4 Dec 2012 21:23:26 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 0BCA6431FAE\r
  20         for <notmuch@notmuchmail.org>; Tue,  4 Dec 2012 21:23:26 -0800 (PST)\r
  21 X-AuditID: 1209190d-b7f266d00000092b-08-50beda4d9817\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 25.09.02347.D4ADEB05; Wed,  5 Dec 2012 00:23:25 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qB55NOE7023211; \r
  27         Wed, 5 Dec 2012 00:23:24 -0500\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB55NMmw022600\r
  32         (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
  33         Wed, 5 Dec 2012 00:23:23 -0500 (EST)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1Tg7S6-0004ne-7R; Wed, 05 Dec 2012 00:23:22 -0500\r
  37 From: Austin Clements <aclements@csail.mit.edu>\r
  38 To: david@tethera.net, notmuch@notmuchmail.org\r
  39 Subject: Re: [PATCH 3/4] perf-test: unpack tags.\r
  40 In-Reply-To: <1354594712-5179-3-git-send-email-david@tethera.net>\r
  41 References: <1354583824-10520-3-git-send-email-david@tethera.net>\r
  42         <1354594712-5179-1-git-send-email-david@tethera.net>\r
  43         <1354594712-5179-3-git-send-email-david@tethera.net>\r
  44 User-Agent: Notmuch/0.14+100~gcb9b0b0 (http://notmuchmail.org) Emacs/23.4.1\r
  45         (i486-pc-linux-gnu)\r
  46 Date: Wed, 05 Dec 2012 00:23:22 -0500\r
  47 Message-ID: <87pq2pcbsl.fsf@awakening.csail.mit.edu>\r
  48 MIME-Version: 1.0\r
  49 Content-Type: text/plain; charset=us-ascii\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IRYrdT1/W9tS/AoPuQgsXGZT+ZLW60djNa\r
  52         XL85k9mB2eNX21xmj2erbjF7bDn0njmAOYrLJiU1J7MstUjfLoEr48ifFtaCy8IVq768Zm9g\r
  53         3MPfxcjJISFgIrF75x92CFtM4sK99WxdjFwcQgL7GCVuzJjFAuGsZ5S4vqmHCcK5wCSxpG0p\r
  54         VNkSRonb6yczgvSzCehLrFg7ibWLkYNDREBPYuFWGZAws4CaxKQ1Z8BWCAsYSKy52MAEUsIp\r
  55         4CjRvdMCYsxqRon/PxaCxUUF4iUuL1UAMVkEVCWO/FUD6eQFOvT1smVMELagxMmZT1ggpmtJ\r
  56         3Pj3kmkCo+AsJKlZSFILGJlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrp5WaW6KWmlG5iBIUu\r
  57         pyTvDsZ3B5UOMQpwMCrx8Eoa7wsQYk0sK67MPcQoycGkJMqbdRMoxJeUn1KZkVicEV9UmpNa\r
  58         fIhRgoNZSYT3nx1QjjclsbIqtSgfJiXNwaIkznsl5aa/kEB6YklqdmpqQWoRTFaGg0NJgncS\r
  59         yFDBotT01Iq0zJwShDQTByfIcB6g4fNAaniLCxJzizPTIfKnGHU5ev91PWEUYsnLz0uVEuft\r
  60         ACkSACnKKM2DmwNLOa8YxYHeEubdDlLFA0xXcJNeAS1hAlryQmg3yJKSRISUVAOju0bV4tPs\r
  61         353lWAUXP600neGl+Ohdq07VhOupyx7NOa65VzCiO+2R5rpYPfmPjHELszSkRZX9Za7m7jbf\r
  62         3R1R/6LMLdI4/qvnByuHAy8deB/WSOo/lqrvft5uOt9d9mnYRdk5rgETaj4/frxodsP92kuK\r
  63         ZqKv5fkiUibX1k9dsK2S0VG9d6oSS3FGoqEWc1FxIgAJ0floFAMAAA==\r
  64 Cc: David Bremner <bremner@debian.org>\r
  65 X-BeenThere: notmuch@notmuchmail.org\r
  66 X-Mailman-Version: 2.1.13\r
  67 Precedence: list\r
  68 List-Id: "Use and development of the notmuch mail system."\r
  69         <notmuch.notmuchmail.org>\r
  70 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  72 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  73 List-Post: <mailto:notmuch@notmuchmail.org>\r
  74 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  75 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  76         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  77 X-List-Received-Date: Wed, 05 Dec 2012 05:23:30 -0000\r
  78 \r
  79 On Mon, 03 Dec 2012, david@tethera.net wrote:\r
  80 > From: David Bremner <bremner@debian.org>\r
  81 >\r
  82 > It's a bit annoying to call tar twice, but we cache the results so it\r
  83 > isn't as bad as it could be.\r
  84 > ---\r
  85 >  performance-test/Makefile.local   |    1 +\r
  86 >  performance-test/perf-test-lib.sh |   25 +++++++++++++++++++------\r
  87 >  2 files changed, 20 insertions(+), 6 deletions(-)\r
  88 >\r
  89 > diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
  90 > index b136a88..cdd7f19 100644\r
  91 > --- a/performance-test/Makefile.local\r
  92 > +++ b/performance-test/Makefile.local\r
  93 > @@ -30,3 +30,4 @@ download-corpus:\r
  94 >       wget -O ${TXZFILE} ${DEFAULT_URL}\r
  95 >  \r
  96 >  CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.* $(dir)/notmuch.cache.*\r
  97 > +CLEAN := $(CLEAN) $(dir)/corpus.tags\r
  98 > diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
  99 > index 08e2ebd..40c88c9 100644\r
 100 > --- a/performance-test/perf-test-lib.sh\r
 101 > +++ b/performance-test/perf-test-lib.sh\r
 102 > @@ -41,6 +41,13 @@ DB_CACHE_DIR=${TEST_DIRECTORY}/notmuch.cache.$corpus_size\r
 103 >  add_email_corpus ()\r
 104 >  {\r
 105 >      rm -rf ${MAIL_DIR}\r
 106 > +\r
 107 > +    if command -v pixz > /dev/null; then\r
 108 > +     XZ=pixz\r
 109 > +    else\r
 110 > +     XZ=xz\r
 111 > +    fi\r
 112 > +\r
 113 >      if [ ! -d $CORPUS_DIR ]; then\r
 114 >       case "$corpus_size" in\r
 115 >           small)\r
 116 > @@ -53,12 +60,6 @@ add_email_corpus ()\r
 117 >               arg=mail\r
 118 >       esac\r
 119 >  \r
 120 > -     if command -v pixz > /dev/null; then\r
 121 > -         XZ=pixz\r
 122 > -     else\r
 123 > -         XZ=xz\r
 124 > -     fi\r
 125 > -\r
 126 >       printf "Unpacking corpus\n"\r
 127 >       mkdir $CORPUS_DIR\r
 128 >  \r
 129 > @@ -72,6 +73,18 @@ add_email_corpus ()\r
 130 >  \r
 131 >      fi\r
 132 >  \r
 133 > +    if [ ! -d $TEST_DIRECTORY/corpus.tags ]; then\r
 134 > +\r
 135 > +     mkdir $TEST_DIRECTORY/corpus.tags\r
 136 > +\r
 137 > +     tar --extract --strip-components=2 \\r
 138 > +         --directory $TEST_DIRECTORY/corpus.tags \\r
 139 > +         --use-compress-program ${XZ} \\r
 140 > +         --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
 141 > +         notmuch-email-corpus/tags\r
 142 \r
 143 Why not --strip-components=1 and unpack both mail/ and tags/ into a\r
 144 single, shared corpus cache directory in one call to tar?  Since you're\r
 145 going to cp -lr things anyway, you can structure the corpus cache\r
 146 however is convenient.\r
 147 \r
 148 > +    fi\r
 149 > +\r
 150 > +    cp -lr $TEST_DIRECTORY/corpus.tags $TMP_DIRECTORY\r
 151 >      cp -lr $CORPUS_DIR $MAIL_DIR\r
 152 >  \r
 153 >      if [ -d $DB_CACHE_DIR ]; then\r
 154 > -- \r
 155 > 1.7.10.4\r
 156 >\r
 157 > _______________________________________________\r
 158 > notmuch mailing list\r
 159 > notmuch@notmuchmail.org\r
 160 > http://notmuchmail.org/mailman/listinfo/notmuch\r