--- /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 D4B76431FC7\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:49:18 -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 dHmVjMPNZrTi for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Jul 2014 09:49:12 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+ [18.9.25.15])\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 8A37A431FBC\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:31 -0700 (PDT)\r
+X-AuditID: 1209190f-f79f86d0000061c8-12-53d7d05d56c3\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-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 83.B5.25032.D50D7D35; Tue, 29 Jul 2014 12:48:29 -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 s6TGmIu7030916; \r
+ Tue, 29 Jul 2014 12:48:18 -0400\r
+Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu\r
+ [128.31.33.71]) (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 s6TGmFXl030266\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 29 Jul 2014 12:48:17 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XCAZS-0007H2-UZ; Tue, 29 Jul 2014 12:48:14 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 10/14] lib: Reorganize upgrade around document types\r
+Date: Tue, 29 Jul 2014 12:48:08 -0400\r
+Message-Id: <1406652492-27803-11-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrRt74XqwwbdHyhar5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgynj+rI29YK1ixYUj5Q2Ma6S6GDk5JARMJI6s\r
+ +ssEYYtJXLi3ng3EFhKYzSSxanZgFyMXkL2RUWLv3GeMEIljTBKPm0UhEnMZJT6vW8cCkmAT\r
+ 0JDYtn85WJGIgLTEzruzWUFsZgFHic/7F4FNFRZwl3g59S3YNhYBVYl3U9vB4rxANcdbn7BB\r
+ XCEn0XDjE5jNCRS/de8uE8RiB4lDszazTGDkX8DIsIpRNiW3Sjc3MTOnODVZtzg5MS8vtUjX\r
+ RC83s0QvNaV0EyM4iCT5dzB+O6h0iFGAg1GJh5djwbVgIdbEsuLK3EOMkhxMSqK8evuuBwvx\r
+ JeWnVGYkFmfEF5XmpBYfYpTgYFYS4eU7C5TjTUmsrEotyodJSXOwKInzvrW2ChYSSE8sSc1O\r
+ TS1ILYLJynBwKEnwGp0HahQsSk1PrUjLzClBSDNxcIIM5wEa3gxSw1tckJhbnJkOkT/FqCgl\r
+ zpt9DighAJLIKM2D64VF+StGcaBXhHndQdp5gAkCrvsV0GAmoMGsLmCDSxIRUlINjJIHFypP\r
+ 9nkv837VN6vwE7NzfN3KP8xjjdi3+NiTbJPH6qpxs1JC++9MDUh4I2kj+qhQ3qIoms0zYm69\r
+ nGdRguyza4Jdjl/y43Z6/lJwsf+w+Z7VtCUz1pv/XON84cuF6c9tveZIynk3LeAN+XNz0TEd\r
+ Lxnzr/7dFSsPPp0l2le5f3Jb0Qn1bCWW4oxEQy3mouJEAL46PhXNAgAA\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: Tue, 29 Jul 2014 16:49:19 -0000\r
+\r
+Rather than potentially making multiple passes over the same type of\r
+data in the database, reorganize upgrade around each type of data that\r
+may be upgraded. This eliminates code duplication, will make\r
+multi-version upgrades faster, and will let us improve progress\r
+reporting.\r
+---\r
+ lib/database.cc | 71 +++++++++++++++++++++------------------------------------\r
+ 1 file changed, 26 insertions(+), 45 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 5f68550..4940634 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1237,11 +1237,9 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ /* Perform the upgrade in a transaction. */\r
+ db->begin_transaction (true);\r
+ \r
+- /* Before version 1, each message document had its filename in the\r
+- * data field. Copy that into the new format by calling\r
+- * notmuch_message_add_filename.\r
+- */\r
+- if (new_features & NOTMUCH_FEATURE_FILE_TERMS) {\r
++ /* Perform per-message upgrades. */\r
++ if (new_features &\r
++ (NOTMUCH_FEATURE_FILE_TERMS | NOTMUCH_FEATURE_BOOL_FOLDER)) {\r
+ notmuch_query_t *query = notmuch_query_create (notmuch, "");\r
+ notmuch_messages_t *messages;\r
+ notmuch_message_t *message;\r
+@@ -1260,13 +1258,28 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ \r
+ message = notmuch_messages_get (messages);\r
+ \r
+- filename = _notmuch_message_talloc_copy_data (message);\r
+- if (filename && *filename != '\0') {\r
+- _notmuch_message_add_filename (message, filename);\r
+- _notmuch_message_clear_data (message);\r
++ /* Before version 1, each message document had its\r
++ * filename in the data field. Copy that into the new\r
++ * format by calling notmuch_message_add_filename.\r
++ */\r
++ if (new_features & NOTMUCH_FEATURE_FILE_TERMS) {\r
++ filename = _notmuch_message_talloc_copy_data (message);\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
++\r
++ /* Prior to version 2, the "folder:" prefix was\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
++ _notmuch_message_upgrade_folder (message);\r
+ _notmuch_message_sync (message);\r
+ }\r
+- talloc_free (filename);\r
+ \r
+ notmuch_message_destroy (message);\r
+ \r
+@@ -1276,7 +1289,9 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ notmuch_query_destroy (query);\r
+ }\r
+ \r
+- /* Also, before version 1 we stored directory timestamps in\r
++ /* Perform per-directory upgrades. */\r
++\r
++ /* Before version 1 we stored directory timestamps in\r
+ * XTIMESTAMP documents instead of the current XDIRECTORY\r
+ * documents. So copy those as well. */\r
+ if (new_features & NOTMUCH_FEATURE_DIRECTORY_DOCS) {\r
+@@ -1318,40 +1333,6 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ }\r
+ }\r
+ \r
+- /*\r
+- * Prior to version 2, the "folder:" prefix was probabilistic and\r
+- * stemmed. Change it to the current boolean prefix. Add "path:"\r
+- * prefixes while at it.\r
+- */\r
+- if (new_features & NOTMUCH_FEATURE_BOOL_FOLDER) {\r
+- notmuch_query_t *query = notmuch_query_create (notmuch, "");\r
+- notmuch_messages_t *messages;\r
+- notmuch_message_t *message;\r
+-\r
+- count = 0;\r
+- total = notmuch_query_count_messages (query);\r
+-\r
+- for (messages = notmuch_query_search_messages (query);\r
+- notmuch_messages_valid (messages);\r
+- notmuch_messages_move_to_next (messages)) {\r
+- if (do_progress_notify) {\r
+- progress_notify (closure, (double) count / total);\r
+- do_progress_notify = 0;\r
+- }\r
+-\r
+- message = notmuch_messages_get (messages);\r
+-\r
+- _notmuch_message_upgrade_folder (message);\r
+- _notmuch_message_sync (message);\r
+-\r
+- notmuch_message_destroy (message);\r
+-\r
+- count++;\r
+- }\r
+-\r
+- notmuch_query_destroy (query);\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
+2.0.0\r
+\r
projects / notmuch-archives.git / commitdiff