unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Cc: amdragon@mit.edu
Subject: [PATCH 04/10] lib: Make _notmuch_message_sync capable of deleting a message.
Date: Fri, 18 Feb 2011 02:58:54 -0500	[thread overview]
Message-ID: <1298015940-31986-5-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1298015940-31986-1-git-send-email-amdragon@mit.edu>

---
 lib/message.cc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lib/message.cc b/lib/message.cc
index 0590f76..06747fe 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -29,6 +29,7 @@ struct _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;
     int frozen;
+    notmuch_bool_t deleted;
     char *message_id;
     char *thread_id;
     char *in_reply_to;
@@ -96,6 +97,7 @@ _notmuch_message_create_for_document (const void *talloc_owner,
     message->doc_id = doc_id;
 
     message->frozen = 0;
+    message->deleted = FALSE;
     message->flags = 0;
 
     /* Each of these will be lazily created as needed. */
@@ -765,7 +767,10 @@ _notmuch_message_sync (notmuch_message_t *message)
 	return;
 
     db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db);
-    db->replace_document (message->doc_id, message->doc);
+    if (message->deleted)
+	db->delete_document (message->doc_id);
+    else
+	db->replace_document (message->doc_id, message->doc);
 }
 
 /* Ensure that 'message' is not holding any file object open. Future
-- 
1.7.2.3

  parent reply	other threads:[~2011-02-18  7:59 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-18  7:58 [PATCH 00/10] Fix 'notmuch new' atomicity issues Austin Clements
2011-02-18  7:58 ` [PATCH 01/10] test: Test atomicity of notmuch new Austin Clements
2011-05-04 20:32   ` [PATCH 01/10 v2] " Austin Clements
2011-02-18  7:58 ` [PATCH 02/10] new: Don't loose messages on SIGINT Austin Clements
2011-02-18  7:58 ` [PATCH 03/10] new: Defer updating directory mtimes until the end Austin Clements
2011-02-18  7:58 ` Austin Clements [this message]
2011-02-18  7:58 ` [PATCH 05/10] lib: Indicate if there are more filenames after removal Austin Clements
2011-02-18  7:58 ` [PATCH 06/10] lib: Add API's to find by filename and remove a filename from a message Austin Clements
2011-02-18  7:58 ` [PATCH 07/10] new: Use the new filename removal API Austin Clements
2011-02-18  7:58 ` [PATCH 08/10] new: Synchronize maildir flags eagerly Austin Clements
2011-02-18  7:58 ` [PATCH 09/10] lib: Add notmuch_database_{begin,end}_atomic Austin Clements
2011-02-18  7:59 ` [PATCH 10/10] new: Wrap adding a message in an atomic section Austin Clements
2011-04-26  4:13 ` [PATCH 00/10] Fix 'notmuch new' atomicity issues Austin Clements
2011-05-04 20:30   ` Austin Clements
2011-05-29  2:51     ` Austin Clements
2011-06-08 22:05       ` Carl Worth
2011-06-10 21:11         ` Austin Clements
2011-06-10 22:02           ` Carl Worth
2011-06-10 22:27             ` Austin Clements
2011-06-11 20:04         ` [PATCH v6 00/17] " Austin Clements
2011-06-11 20:04           ` [PATCH 02/17] test: Report test failures from test_expect_* Austin Clements
2011-06-11 20:04           ` [PATCH 03/17] lib: Add missing status check in _notmuch_message_remove_filename Austin Clements
2011-06-11 20:04           ` [PATCH 04/17] test: Test atomicity of notmuch new Austin Clements
2011-06-11 20:04           ` [PATCH 05/17] new: Don't lose messages on SIGINT Austin Clements
2011-06-11 20:04           ` [PATCH 06/17] new: Defer updating directory mtimes until the end Austin Clements
2011-06-11 20:04           ` [PATCH 07/17] lib: Add notmuch_database_{begin,end}_atomic Austin Clements
2011-06-11 20:04           ` [PATCH 08/17] lib: Add support for nested atomic sections Austin Clements
2011-06-11 20:04           ` [PATCH 09/17] lib: Indicate if there are more filenames after removal Austin Clements
2011-06-11 20:04           ` [PATCH 10/17] lib: Remove message document directly after removing the last file name Austin Clements
2011-06-11 20:04           ` [PATCH 11/17] lib: Add an API to find a message by filename Austin Clements
2011-06-11 20:04           ` [PATCH 12/17] lib: Wrap notmuch_database_add_message in an atomic section Austin Clements
2011-06-11 20:04           ` [PATCH 13/17] new: Cleanup. Put removed/renamed message count in add_files_state_t Austin Clements
2011-06-11 20:04           ` [PATCH 14/17] new: Cleanup. De-duplicate file name removal code Austin Clements
2011-06-11 20:04           ` [PATCH 15/17] new: Synchronize maildir flags eagerly Austin Clements
2011-06-11 20:04           ` [PATCH 16/17] new: Wrap adding and removing messages in atomic sections Austin Clements
2011-06-11 20:04           ` [PATCH 17/17] lib: Improve notmuch_database_{add, remove}_message documentation Austin Clements
2011-06-11 20:49           ` [PATCH 01/17] test: Fix message when skipping test_expect_equal* tests Austin Clements
2011-06-11 20:53           ` [PATCH v6 00/17] Fix 'notmuch new' atomicity issues Austin Clements
2011-06-22 19:39           ` Austin Clements
2011-06-29  6:37             ` Austin Clements
2011-07-08 18:09             ` Austin Clements
2011-09-13 12:39               ` David Bremner
2011-09-24  3:14                 ` David Bremner
2011-09-24  4:03                   ` Austin Clements
2011-09-25  2:36                     ` David Bremner
2011-09-26 22:07                       ` Austin Clements
2011-09-26 23:32                         ` NEWS for 0.9 David Bremner
2011-09-27 13:08                           ` Ali Polatel
2011-09-28 16:36           ` [PATCH v6 00/17] Fix 'notmuch new' atomicity issues Sebastian Spaeth
2011-09-29 15:01             ` Austin Clements
2011-09-30  9:21               ` Sebastian Spaeth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1298015940-31986-5-git-send-email-amdragon@mit.edu \
    --to=amdragon@mit.edu \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).