--- /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 7D774431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:27:08 -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 ny5HVBsOmgFa for <notmuch@notmuchmail.org>;\r
+ Mon, 25 Aug 2014 10:27:02 -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 0013C431FD0\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:26:25 -0700 (PDT)\r
+X-AuditID: 12074423-f799d6d00000337c-c4-53fb71c11795\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\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 6C.A0.13180.1C17BF35; Mon, 25 Aug 2014 13:26:25 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s7PHQEWx007794; \r
+ Mon, 25 Aug 2014 13:26:14 -0400\r
+Received: from drake.dyndns.org (31-35-14.wireless.csail.mit.edu\r
+ [128.31.35.14]) (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 s7PHQC45029613\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 25 Aug 2014 13:26:13 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XLy1z-0003jV-W5; Mon, 25 Aug 2014 13:26:11 -0400\r
+From: Austin Clements <amdragon@mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 05/11] lib: Simplify upgrade code using a transaction\r
+Date: Mon, 25 Aug 2014 13:26:03 -0400\r
+Message-Id: <1408987569-14146-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1408987569-14146-1-git-send-email-amdragon@mit.edu>\r
+References: <1408987569-14146-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixCmqrHuw8Hewwa1Ofosbrd2MFk3TnS2u\r
+ 35zJ7MDscev+a3aPZ6tuMXtsOfSeOYA5issmJTUnsyy1SN8ugStjbV9JwT3ZihN3LjM2MC4X\r
+ 72Lk5JAQMJHYfvEvE4QtJnHh3nq2LkYuDiGB2UwSx4++ZoJwNjJK3O7cApU5xiTxe9FuRpAW\r
+ IYG5jBLr/jqA2GwCGhK/by0GGyUiIC2x8+5sVhCbWcBLYtmFfjBbWMBDYuahFrBeFgFViV1b\r
+ usHivAIOErtmrWCEOENOouHGJzYQm1PAUWL6wtlMELscJL5fPs88gZF/ASPDKkbZlNwq3dzE\r
+ zJzi1GTd4uTEvLzUIl0zvdzMEr3UlNJNjKDQYndR3sH456DSIUYBDkYlHt4b8b+DhVgTy4or\r
+ cw8xSnIwKYnyTssHCvEl5adUZiQWZ8QXleakFh9ilOBgVhLhbQbJ8aYkVlalFuXDpKQ5WJTE\r
+ ed9aWwULCaQnlqRmp6YWpBbBZGU4OJQkeHMLgBoFi1LTUyvSMnNKENJMHJwgw3mAhseD1PAW\r
+ FyTmFmemQ+RPMSpKifOuBdkqAJLIKM2D64XF/itGcaBXhHmPgrTzANMGXPcroMFMQINNe36C\r
+ DC5JREhJNTAekyiWtjzKP5l12Yq1SxaLnRY4F36geNWWt3M9H4tvnRe7a0fS2nW9TVUlq14n\r
+ /pDgXJ47Lzqb5WNjDkdm+PZZOw+yLbzCt3PyTr0Hq6Q+26x4Z9HAUnFf5IT9rvdeE65sNFm4\r
+ onq/l+fRRVdfecgc31Z6esrFrRN6eRInrfkms/q+0AHV+dO+nVFiKc5INNRiLipOBADOjV+J\r
+ 2AIAAA==\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: Mon, 25 Aug 2014 17:27:09 -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 2b566f7..1e46fc8 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1239,6 +1239,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
+ /* Set the target features so we write out changes in the desired\r
+ * format. */\r
+ notmuch->features |= NOTMUCH_FEATURES_CURRENT;\r
+@@ -1270,6 +1273,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
+@@ -1317,6 +1321,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
+@@ -1357,67 +1363,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ \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