--- /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 733C7431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:47 -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 eeFEN+UzuBel for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Jul 2014 09:48:41 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
+ [18.9.25.14])\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 31D0F431FC9\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:22 -0700 (PDT)\r
+X-AuditID: 1209190e-f79946d000007db1-cd-53d7d055d027\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-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id A9.F5.32177.550D7D35; Tue, 29 Jul 2014 12:48:22 -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 s6TGmIuU030919; \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 s6TGmFav030262\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-0007Gw-Sd; Tue, 29 Jul 2014 12:48:14 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 08/14] lib: Simplify upgrade code using a transaction\r
+Date: Tue, 29 Jul 2014 12:48:06 -0400\r
+Message-Id: <1406652492-27803-9-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+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrRt24XqwwSV3i9VzeSyu35zJ7MDk\r
+ sXPWXXaPZ6tuMQcwRXHZpKTmZJalFunbJXBl7Jm1nLFgrVzFvPVNjA2ML8W7GDk5JARMJJ6f\r
+ O8ECYYtJXLi3nq2LkYtDSGA2k8SEw5eZIJyNjBK/172Eco4xSXRcvMMM4cxllHjYf44NpJ9N\r
+ QENi2/7ljCC2iIC0xM67s1lBbGYBR4nP+xeB1QgLeEgc+38VKM7BwSKgKnFvvhZImFfAQeLb\r
+ 36tsEGfISTTc+ARmcwK13rp3lwnEFgKqOTRrM8sERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz\r
+ 8lKLdI31cjNL9FJTSjcxgsNIkm8H49eDSocYBTgYlXh4N8y9FizEmlhWXJl7iFGSg0lJlFdv\r
+ 3/VgIb6k/JTKjMTijPii0pzU4kOMEhzMSiK8fGeBcrwpiZVVqUX5MClpDhYlcd631lbBQgLp\r
+ iSWp2ampBalFMFkZDg4lCd7X54EaBYtS01Mr0jJzShDSTBycIMN5gIbvA6nhLS5IzC3OTIfI\r
+ n2JUlBLn3QSSEABJZJTmwfXC4vwVozjQK8K8B0GqeIApAq77FdBgJqDBrC5gg0sSEVJSDYzx\r
+ p/o3T7pr9YfDu203g8aDUqVeyfdbiwKK3Zb61AmcYVk6/83/ayGx9epWhcJrnBnvRLcX7P8s\r
+ oXFowe7jD84IpbKVP2A6uJFXimHadL1V2y6YJlx0PBXPHbDdat/Oc5Xfpv9ymFq0bunHLG3X\r
+ zRJ9SZtCWJsKdCWy1ATLS6e9iOi/KvdEp1mJpTgj0VCLuag4EQBt4z+fzgIAAA==\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:48:47 -0000\r
+\r
+Previously, the upgrade was organized as two passes -- an upgrade\r
+pass, and a separate cleanup pass -- so the database was always in a\r
+valid state. This change substantially simplifies this code by\r
+performing the upgrade in a transaction and combining both passes in\r
+to one. This 1) eliminates a lot of duplicate code between the\r
+passes, 2) speeds up the upgrade process, 3) makes progress reporting\r
+more accurate, 4) eliminates the potential for stale data if the\r
+upgrade is interrupted during the cleanup pass, and 5) makes it easier\r
+to reason about the safety of the upgrade code.\r
+---\r
+ lib/database.cc | 67 ++++++---------------------------------------------------\r
+ 1 file changed, 7 insertions(+), 60 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index e650798..e4a1072 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1232,6 +1232,9 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ timer_is_active = TRUE;\r
+ }\r
+ \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
+@@ -1259,6 +1262,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\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
+@@ -1306,6 +1310,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ NOTMUCH_FIND_CREATE, &status);\r
+ notmuch_directory_set_mtime (directory, mtime);\r
+ notmuch_directory_destroy (directory);\r
++\r
++ db->delete_document (*p);\r
+ }\r
+ }\r
+ }\r
+@@ -1347,67 +1353,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ notmuch->features |= NOTMUCH_FEATURES_CURRENT;\r
+ db->set_metadata ("features", _print_features (local, notmuch->features));\r
+ db->set_metadata ("version", STRINGIFY (NOTMUCH_DATABASE_VERSION));\r
+- db->flush ();\r
+-\r
+- /* Now that the upgrade is complete we can remove the old data\r
+- * and documents that are no longer needed. */\r
+- if (version < 1) {\r
+- notmuch_query_t *query = notmuch_query_create (notmuch, "");\r
+- notmuch_messages_t *messages;\r
+- notmuch_message_t *message;\r
+- char *filename;\r
+-\r
+- for (messages = notmuch_query_search_messages (query);\r
+- notmuch_messages_valid (messages);\r
+- notmuch_messages_move_to_next (messages))\r
+- {\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
+- filename = _notmuch_message_talloc_copy_data (message);\r
+- if (filename && *filename != '\0') {\r
+- _notmuch_message_clear_data (message);\r
+- _notmuch_message_sync (message);\r
+- }\r
+- talloc_free (filename);\r
+-\r
+- notmuch_message_destroy (message);\r
+- }\r
+ \r
+- notmuch_query_destroy (query);\r
+- }\r
+-\r
+- if (version < 1) {\r
+- Xapian::TermIterator t, t_end;\r
+-\r
+- t_end = notmuch->xapian_db->allterms_end ("XTIMESTAMP");\r
+-\r
+- for (t = notmuch->xapian_db->allterms_begin ("XTIMESTAMP");\r
+- t != t_end;\r
+- t++)\r
+- {\r
+- Xapian::PostingIterator p, p_end;\r
+- std::string term = *t;\r
+-\r
+- p_end = notmuch->xapian_db->postlist_end (term);\r
+-\r
+- for (p = notmuch->xapian_db->postlist_begin (term);\r
+- p != p_end;\r
+- p++)\r
+- {\r
+- if (do_progress_notify) {\r
+- progress_notify (closure, (double) count / total);\r
+- do_progress_notify = 0;\r
+- }\r
+-\r
+- db->delete_document (*p);\r
+- }\r
+- }\r
+- }\r
++ db->commit_transaction ();\r
+ \r
+ if (timer_is_active) {\r
+ /* Now stop the timer. */\r
+-- \r
+2.0.0\r
+\r
projects / notmuch-archives.git / commitdiff