--- /dev/null
+Return-Path: <amthrax@drake.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 0B73C429E2F\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:07:02 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 fnkPnziW2kGq for <notmuch@notmuchmail.org>;\r
+ Sat, 11 Jun 2011 13:07:01 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id DA566429E2D\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:07:00 -0700 (PDT)\r
+X-AuditID: 12074425-b7b82ae000000a2a-84-4df3cacc1b72\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 00.75.02602.CCAC3FD4; Sat, 11 Jun 2011 16:06:36 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id p5BK70Kg015055; \r
+ Sat, 11 Jun 2011 16:07:00 -0400\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p5BK6xtl006026\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 11 Jun 2011 16:07:00 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.76)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1QVUSR-0000II-8J; Sat, 11 Jun 2011 16:06:59 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 10/17] lib: Remove message document directly after removing\r
+ the last file name.\r
+Date: Sat, 11 Jun 2011 16:04:36 -0400\r
+Message-Id: <1307822683-848-11-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.5.1\r
+In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
+References: <87ei34rnc5.fsf@yoom.home.cworth.org>\r
+ <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixCmqrHvm1Gdfg2kTtC2u35zJ7MDo8WzV\r
+ LeYAxigum5TUnMyy1CJ9uwSujNb+1ywFm+UrTp1/z9rAeFKyi5GTQ0LAROJ28z8mCFtM4sK9\r
+ 9WxdjFwcQgL7GCXmve+DcjYwShyceogZwrnPJHHpYTs7hDOfUeLcwe+MIP1sAhoS2/YvB7NF\r
+ BKQldt6dzdrFyMHBLKAm8adLBSQsLBAvsW/zDrB1LAKqEn+nXAcr5xWwl9i55D0jxBkKEleu\r
+ zGMBsTmB4vMOXgWzhQTSJJbc2s0+gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0LvdzM\r
+ Er3UlNJNjKCwYXdR3cE44ZDSIUYBDkYlHl7FtZ99hVgTy4orcw8xSnIwKYny6pwACvEl5adU\r
+ ZiQWZ8QXleakFh9ilOBgVhLhXd/+yVeINyWxsiq1KB8mJc3BoiTOO19S3VdIID2xJDU7NbUg\r
+ tQgmK8PBoSTBKwmMDyHBotT01Iq0zJwShDQTByfIcB6g4UdPAtXwFhck5hZnpkPkTzEaczze\r
+ sOkQI0f7ZiApxJKXn5cqJc57H6RUAKQ0ozQPbhos9l8xigM9J8z7A6SKB5g24Oa9AlrFBLRK\r
+ oBRsVUkiQkqqgZHD9/LM8ruX+KKmfc40iVgdH7LAPIb1+gXRz/KRHOmT/hSyKebcf+sboW0l\r
+ d3hv19M1EXPt5zfe9hDnrrPff8zZo/tXrLiJ8PLUg+1aR1L3bCnb/2L+QaH1fvrhBlIfvJ1k\r
+ OL+qbLe43n95Q8PEla2MLtvn/+N+dOx98kxLyZAXIYm3l4Yo+SqxFGckGmoxFxUnAgCCMVy9\r
+ 2AIAAA==\r
+Cc: Austin Clements <amdragon@mit.edu>\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: Sat, 11 Jun 2011 20:07:02 -0000\r
+\r
+Previously, notmuch_database_remove_message would remove the message\r
+file name, sync the change to the message document, re-find the\r
+message document, and then delete it if there were no more file names.\r
+An interruption after sync'ing would result in a file-name-less,\r
+permanently un-removable zombie message that would produce errors and\r
+odd results in searches. We could wrap this in an atomic section, but\r
+it's much simpler to eliminate the round-about approach and just\r
+delete the message document instead of sync'ing it if we removed the\r
+last filename.\r
+---\r
+ lib/database.cc | 25 +++++--------------------\r
+ lib/message.cc | 16 ++++++++++++++++\r
+ lib/notmuch-private.h | 3 +++\r
+ 3 files changed, 24 insertions(+), 20 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index b766e94..9886622 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1747,7 +1747,6 @@ notmuch_status_t\r
+ notmuch_database_remove_message (notmuch_database_t *notmuch,\r
+ const char *filename)\r
+ {\r
+- Xapian::WritableDatabase *db;\r
+ void *local;\r
+ const char *prefix = _find_prefix ("file-direntry");\r
+ char *direntry, *term;\r
+@@ -1761,8 +1760,6 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,\r
+ \r
+ local = talloc_new (notmuch);\r
+ \r
+- db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);\r
+-\r
+ try {\r
+ \r
+ status = _notmuch_database_filename_to_direntry (local, notmuch,\r
+@@ -1785,23 +1782,11 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,\r
+ return COERCE_STATUS (private_status,\r
+ "Inconsistent document ID in datbase.");\r
+ \r
+- _notmuch_message_remove_filename (message, filename);\r
+- _notmuch_message_sync (message);\r
+-\r
+- /* Take care to find document after sync'ing filename removal. */\r
+- document = find_document_for_doc_id (notmuch, *i);\r
+- j = document.termlist_begin ();\r
+- j.skip_to (prefix);\r
+-\r
+- /* Was this the last file-direntry in the message? */\r
+- if (j == document.termlist_end () ||\r
+- strncmp ((*j).c_str (), prefix, strlen (prefix)))\r
+- {\r
+- db->delete_document (document.get_docid ());\r
+- status = NOTMUCH_STATUS_SUCCESS;\r
+- } else {\r
+- status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
+- }\r
++ status = _notmuch_message_remove_filename (message, filename);\r
++ if (status == NOTMUCH_STATUS_SUCCESS)\r
++ _notmuch_message_delete (message);\r
++ else if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)\r
++ _notmuch_message_sync (message);\r
+ }\r
+ } catch (const Xapian::Error &error) {\r
+ fprintf (stderr, "Error: A Xapian exception occurred removing message: %s\n",\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 5120b3a..9de60d2 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -797,6 +797,22 @@ _notmuch_message_sync (notmuch_message_t *message)\r
+ db->replace_document (message->doc_id, message->doc);\r
+ }\r
+ \r
++/* Delete a message document from the database. */\r
++notmuch_status_t\r
++_notmuch_message_delete (notmuch_message_t *message)\r
++{\r
++ notmuch_status_t status;\r
++ Xapian::WritableDatabase *db;\r
++\r
++ status = _notmuch_database_ensure_writable (message->notmuch);\r
++ if (status)\r
++ return status;\r
++\r
++ db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db);\r
++ db->delete_document (message->doc_id);\r
++ return NOTMUCH_STATUS_SUCCESS;\r
++}\r
++\r
+ /* Ensure that 'message' is not holding any file object open. Future\r
+ * calls to various functions will still automatically open the\r
+ * message file as needed.\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 02e24ee..d319530 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -293,6 +293,9 @@ _notmuch_message_set_date (notmuch_message_t *message,\r
+ void\r
+ _notmuch_message_sync (notmuch_message_t *message);\r
+ \r
++notmuch_status_t\r
++_notmuch_message_delete (notmuch_message_t *message);\r
++\r
+ void\r
+ _notmuch_message_close (notmuch_message_t *message);\r
+ \r
+-- \r
+1.7.5.1\r
+\r
projects / notmuch-archives.git / commitdiff