--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 19B12431FCF\r
+ for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:19 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id ApxhGS3X9hyG for <notmuch@notmuchmail.org>;\r
+ Thu, 31 Jul 2014 19:10:11 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+ [18.7.68.35])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9784B431FB6\r
+ for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:11 -0700 (PDT)\r
+X-AuditID: 12074423-f79bf6d000007580-d3-53daf702bcb3\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ (using TLS with cipher AES256-SHA (256/256 bits))\r
+ (Client did not present a certificate)\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 61.55.30080.207FAD35; Thu, 31 Jul 2014 22:10:10 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s712AA36008863; \r
+ Thu, 31 Jul 2014 22:10:10 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s712A6KK029969\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 31 Jul 2014 22:10:09 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XD2IH-00033S-Pm; Thu, 31 Jul 2014 22:10:05 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 00/13] Implement and use database "features"\r
+Date: Thu, 31 Jul 2014 22:09:50 -0400\r
+Message-Id: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsUixCmqrcv0/VawQd90S4vVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZcyec5OxoEWkYuPFU4wNjFMFuhg5OSQETCRO\r
+ /tnPCmGLSVy4t56ti5GLQ0hgNpPEljOdUM5GRonNvX3sEM4dJonXW/5AZeYyShy4vp0ZpJ9N\r
+ QENi2/7ljCC2iIC0xM67s8HmMgvISvw4/wfMFhawl1ja+R3MZhFQlThw5RuYzSvgING/4B8z\r
+ xB1yEg03PrFNYORdwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdMLzezRC81pXQTIyg02F2U\r
+ dzD+Oah0iFGAg1GJh3dG+K1gIdbEsuLK3EOMkhxMSqK8Nh+BQnxJ+SmVGYnFGfFFpTmpxYcY\r
+ JTiYlUR4X34AyvGmJFZWpRblw6SkOViUxHnfWlsFCwmkJ5akZqemFqQWwWRlODiUJHjPfAVq\r
+ FCxKTU+tSMvMKUFIM3FwggznARp+DaSGt7ggMbc4Mx0if4pRUUqcdw9IQgAkkVGaB9cLi91X\r
+ jOJArwjzPgSp4gHGPVz3K6DBTECDn9+6DjK4JBEhJdXAuHnvin3HXOv68/YfWh/7b0rJrczP\r
+ U7ZFe6WdPLaptIEjT1W9VDvc/WDGmW63t7eveOQs226xSis+ZHFdWtXWrVaiE17JxfEl2tWa\r
+ hily5ZrNtK76ESro7LgmnW3XlhPxTN+LLbXni5hmrpfnljCrOXzuxO95eg/32/+4Ln+87VB3\r
+ 3oRbUcHPlFiKMxINtZiLihMBhVnICbgCAAA=\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 01 Aug 2014 02:10:19 -0000\r
+\r
+This is v3 of id:1406652492-27803-1-git-send-email-amdragon@mit.edu.\r
+This fixes one issue and tidies up another thing in\r
+notmuch_database_upgrade I found while working on change tracking\r
+support. Most of the patches are logically identical to v2, but the\r
+changes ripple through the patch context, so I'm sending a new series.\r
+\r
+First, this updates notmuch->features before starting the upgrade,\r
+rather than after, so that functions called by upgrade will use the\r
+new database features instead of the old (this didn't matter in this\r
+series because nothing modified the database differently depending on\r
+features). Second, this combines multiple _notmuch_message_sync calls\r
+into one, which cleans up the code, should further improve upgrade\r
+performance, and makes way for additional per-message upgrades.\r
+\r
+The diff from v2 is below (excluding patch 2, which David pushed).\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index b323691..d90a924 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1252,6 +1252,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ /* Perform the upgrade in a transaction. */\r
+ db->begin_transaction (true);\r
+ \r
++ /* Set the target features so we write out changes in the desired\r
++ * format. */\r
++ notmuch->features = target_features;\r
++\r
+ /* Perform per-message upgrades. */\r
+ if (new_features &\r
+ (NOTMUCH_FEATURE_FILE_TERMS | NOTMUCH_FEATURE_BOOL_FOLDER)) {\r
+@@ -1280,7 +1284,6 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ if (filename && *filename != '\0') {\r
+ _notmuch_message_add_filename (message, filename);\r
+ _notmuch_message_clear_data (message);\r
+- _notmuch_message_sync (message);\r
+ }\r
+ talloc_free (filename);\r
+ }\r
+@@ -1289,10 +1292,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ * probabilistic and stemmed. Change it to the current\r
+ * boolean prefix. Add "path:" prefixes while at it.\r
+ */\r
+- if (new_features & NOTMUCH_FEATURE_BOOL_FOLDER) {\r
++ if (new_features & NOTMUCH_FEATURE_BOOL_FOLDER)\r
+ _notmuch_message_upgrade_folder (message);\r
+- _notmuch_message_sync (message);\r
+- }\r
++\r
++ _notmuch_message_sync (message);\r
+ \r
+ notmuch_message_destroy (message);\r
+ \r
+@@ -1348,7 +1351,6 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ }\r
+ }\r
+ \r
+- notmuch->features = target_features;\r
+ db->set_metadata ("features", _print_features (local, notmuch->features));\r
+ db->set_metadata ("version", STRINGIFY (NOTMUCH_DATABASE_VERSION));\r
+\r
projects / notmuch-archives.git / commitdiff