1f/48988b722c70d03ac65ad1d5ef740f3d881d29

   1 Return-Path: <aclements@csail.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 E5D24431FDD\r
   6         for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:31:08 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] 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 nU-Bdx7Rh0a9 for <notmuch@notmuchmail.org>;\r
  16         Thu, 23 Oct 2014 05:31:01 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
  18         [18.9.25.14])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 0088E431FDE\r
  22         for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:30:52 -0700 (PDT)\r
  23 X-AuditID: 1209190e-f79d46d000003643-71-5448f4fc4b93\r
  24 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 7A.79.13891.CF4F8445; Thu, 23 Oct 2014 08:30:52 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s9NCUppt027184; \r
  31         Thu, 23 Oct 2014 08:30:51 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s9NCUmDP008963\r
  37         (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
  38         Thu, 23 Oct 2014 08:30:51 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
  40         (envelope-from <aclements@csail.mit.edu>)\r
  41         id 1XhHXP-0007c0-Co; Thu, 23 Oct 2014 08:30:43 -0400\r
  42 From: Austin Clements <aclements@csail.mit.edu>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH v3 6/9] lib: Implement upgrade to ghost messages feature\r
  45 Date: Thu, 23 Oct 2014 08:30:38 -0400\r
  46 Message-Id: <1414067441-29054-7-git-send-email-aclements@csail.mit.edu>\r
  47 X-Mailer: git-send-email 2.1.0\r
  48 In-Reply-To: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
  49 References: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6novvni0eIwc5HPBar5/JYXL85k9mB\r
  52         yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyjj44ARzwQbZikV75jE3ME4V72Lk5JAQMJFo\r
  53         Wb+XBcIWk7hwbz1bFyMXh5DAbCaJrhd3WSCcjYwSe/b3QmXuMEmsa3nFDuEsYZQ4/HwzE0g/\r
  54         m4C+xIq1k1hBbBEBaYmdd2eD2cwCjhKf9y9iA7GFBTwktn7bzQ5iswioSkx/+BrM5hVwl5g9\r
  55         8zATxB1yEht2/2cEsTmB6vfsuAPWKwRUs/35QdYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm\r
  56         5aUW6Rrr5WaW6KWmlG5iBIUSpyTfDsavB5UOMQpwMCrx8FYke4QIsSaWFVfmHmKU5GBSEuWN\r
  57         eQAU4kvKT6nMSCzOiC8qzUktPsQowcGsJMIbfwEox5uSWFmVWpQPk5LmYFES5930gy9ESCA9\r
  58         sSQ1OzW1ILUIJivDwaEkwcsIjBkhwaLU9NSKtMycEoQ0EwcnyHAeoOEiIDW8xQWJucWZ6RD5\r
  59         U4yKUuK8yZ+BEgIgiYzSPLheWKy/YhQHekWYVw2knQeYJuC6XwENZgK5egPY4JJEhJRUA6OQ\r
  60         yr2Yihu6K30F3i+zVvjTcdDCKXH5ippb/TrdYrP+ce62+24vcG/RwjUBy/7F5aTrn+oTqXt8\r
  61         58rOqTknLj31mum5bE5IEVvGzR93F35qOL3ioZ+Dq8C2JTe/xi1zdZmarLTrZUHIxlWcO76I\r
  62         MKw5Hyi3zPNI65Q3KSePa/0q3Hi1fFto3sJyJZbijERDLeai4kQAHmqfVtACAAA=\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Thu, 23 Oct 2014 12:31:09 -0000\r
  76 \r
  77 From: Austin Clements <amdragon@mit.edu>\r
  78 \r
  79 Somehow this is the first upgrade pass that actually does *any* error\r
  80 checking, so this also adds the bit of necessary infrastructure to\r
  81 handle that.\r
  82 ---\r
  83  lib/database.cc | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--\r
  84  1 file changed, 64 insertions(+), 2 deletions(-)\r
  85 \r
  86 diff --git a/lib/database.cc b/lib/database.cc\r
  87 index 92a92d9..b673718 100644\r
  88 --- a/lib/database.cc\r
  89 +++ b/lib/database.cc\r
  90 @@ -1231,6 +1231,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
  91      notmuch_bool_t timer_is_active = FALSE;\r
  92      enum _notmuch_features target_features, new_features;\r
  93      notmuch_status_t status;\r
  94 +    notmuch_private_status_t private_status;\r
  95      unsigned int count = 0, total = 0;\r
  96  \r
  97      status = _notmuch_database_ensure_writable (notmuch);\r
  98 @@ -1275,6 +1276,13 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
  99         for (t = db->allterms_begin ("XTIMESTAMP"); t != t_end; t++)\r
 100             ++total;\r
 101      }\r
 102 +    if (new_features & NOTMUCH_FEATURE_GHOSTS) {\r
 103 +       /* The ghost message upgrade converts all thread_id_*\r
 104 +        * metadata values into ghost message documents. */\r
 105 +       t_end = db->metadata_keys_end ("thread_id_");\r
 106 +       for (t = db->metadata_keys_begin ("thread_id_"); t != t_end; ++t)\r
 107 +           ++total;\r
 108 +    }\r
 109  \r
 110      /* Perform the upgrade in a transaction. */\r
 111      db->begin_transaction (true);\r
 112 @@ -1378,10 +1386,64 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
 113         }\r
 114      }\r
 115  \r
 116 +    /* Perform metadata upgrades. */\r
 117 +\r
 118 +    /* Prior to NOTMUCH_FEATURE_GHOSTS, thread IDs for missing\r
 119 +     * messages were stored as database metadata. Change these to\r
 120 +     * ghost messages.\r
 121 +     */\r
 122 +    if (new_features & NOTMUCH_FEATURE_GHOSTS) {\r
 123 +       notmuch_message_t *message;\r
 124 +       std::string message_id, thread_id;\r
 125 +\r
 126 +       t_end = db->metadata_keys_end (NOTMUCH_METADATA_THREAD_ID_PREFIX);\r
 127 +       for (t = db->metadata_keys_begin (NOTMUCH_METADATA_THREAD_ID_PREFIX);\r
 128 +            t != t_end; ++t) {\r
 129 +           if (do_progress_notify) {\r
 130 +               progress_notify (closure, (double) count / total);\r
 131 +               do_progress_notify = 0;\r
 132 +           }\r
 133 +\r
 134 +           message_id = (*t).substr (\r
 135 +               strlen (NOTMUCH_METADATA_THREAD_ID_PREFIX));\r
 136 +           thread_id = db->get_metadata (*t);\r
 137 +\r
 138 +           /* Create ghost message */\r
 139 +           message = _notmuch_message_create_for_message_id (\r
 140 +               notmuch, message_id.c_str (), &private_status);\r
 141 +           if (private_status == NOTMUCH_PRIVATE_STATUS_SUCCESS) {\r
 142 +               /* Document already exists; ignore the stored thread ID */\r
 143 +           } else if (private_status ==\r
 144 +                      NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {\r
 145 +               private_status = _notmuch_message_initialize_ghost (\r
 146 +                   message, thread_id.c_str ());\r
 147 +               if (! private_status)\r
 148 +                   _notmuch_message_sync (message);\r
 149 +           }\r
 150 +\r
 151 +           if (private_status) {\r
 152 +               fprintf (stderr,\r
 153 +                        "Upgrade failed while creating ghost messages.\n");\r
 154 +               status = COERCE_STATUS (private_status, "Unexpected status from _notmuch_message_initialize_ghost");\r
 155 +               goto DONE;\r
 156 +           }\r
 157 +\r
 158 +           /* Clear saved metadata thread ID */\r
 159 +           db->set_metadata (*t, "");\r
 160 +\r
 161 +           ++count;\r
 162 +       }\r
 163 +    }\r
 164 +\r
 165 +    status = NOTMUCH_STATUS_SUCCESS;\r
 166      db->set_metadata ("features", _print_features (local, notmuch->features));\r
 167      db->set_metadata ("version", STRINGIFY (NOTMUCH_DATABASE_VERSION));\r
 168  \r
 169 -    db->commit_transaction ();\r
 170 + DONE:\r
 171 +    if (status == NOTMUCH_STATUS_SUCCESS)\r
 172 +       db->commit_transaction ();\r
 173 +    else\r
 174 +       db->cancel_transaction ();\r
 175  \r
 176      if (timer_is_active) {\r
 177         /* Now stop the timer. */\r
 178 @@ -1397,7 +1459,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
 179      }\r
 180  \r
 181      talloc_free (local);\r
 182 -    return NOTMUCH_STATUS_SUCCESS;\r
 183 +    return status;\r
 184  }\r
 185  \r
 186  notmuch_status_t\r
 187 -- \r
 188 2.1.0\r
 189 \r