--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 17198431FBC\r
+ for <notmuch@notmuchmail.org>; Sun, 27 Jul 2014 02:36:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.502\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.502 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_LOW=-0.7] 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 lWWKcPL7ktD6 for <notmuch@notmuchmail.org>;\r
+ Sun, 27 Jul 2014 02:36:01 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 740E7431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 27 Jul 2014 02:36:01 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1XBKs2-0006Xu-HR; Sun, 27 Jul 2014 10:35:58 +0100\r
+Received: from 94.196.249.126.threembb.co.uk ([94.196.249.126] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1XBKs1-0003Km-Gn; Sun, 27 Jul 2014 10:35:58 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 08/14] lib: Simplify upgrade code using a transaction\r
+In-Reply-To: <1406433173-19169-9-git-send-email-amdragon@mit.edu>\r
+References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+ <1406433173-19169-9-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 27 Jul 2014 10:35:53 +0100\r
+Message-ID: <87vbqjywhy.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.196.249.126\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 429daf3b5226ec8484a887b40bb937aa (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.1 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sun, 27 Jul 2014 09:36:09 -0000\r
+\r
+\r
+Hi\r
+\r
+On Sun, 27 Jul 2014, Austin Clements <amdragon@MIT.EDU> wrote:\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
+I like this but I wonder if it has a side effect: I think with the\r
+current code the user can interrupt the upgrade (ctrl-c) and continue\r
+roughly where it left off. This looks like it means the whole upgrade\r
+needs to be done in one go. Will this be a problem on large mail stores\r
+(eg rlb with over 1M messages)?\r
+\r
+I am not sure what could be done during the interrupted upgrade before\r
+so maybe this is not a problem.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\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 03eef3e..0be7180 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -1238,6 +1238,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
+> @@ -1265,6 +1268,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
+> @@ -1312,6 +1316,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
+> @@ -1353,67 +1359,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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff