From: Austin Clements <aclements@csail.mit.edu>
To: notmuch@notmuchmail.org
Subject: [PATCH 06/11] lib: Internal support for querying and creating ghost messages
Date: Fri, 3 Oct 2014 10:19:13 -0400 [thread overview]
Message-ID: <1412345958-8278-7-git-send-email-aclements@csail.mit.edu> (raw)
In-Reply-To: <1412345958-8278-1-git-send-email-aclements@csail.mit.edu>
From: Austin Clements <amdragon@mit.edu>
This updates the message abstraction to support ghost messages: it
adds a message flag that distinguishes regular messages from ghost
messages, and an internal function for initializing a newly created
(blank) message as a ghost message.
---
lib/message.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
lib/notmuch-private.h | 4 ++++
lib/notmuch.h | 9 ++++++++-
3 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 38bc929..ad832cf 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -39,6 +39,9 @@ struct visible _notmuch_message {
notmuch_message_file_t *message_file;
notmuch_message_list_t *replies;
unsigned long flags;
+ /* For flags that are initialized on-demand, lazy_flags indicates
+ * if each flag has been initialized. */
+ unsigned long lazy_flags;
Xapian::Document doc;
Xapian::termcount termpos;
@@ -99,6 +102,7 @@ _notmuch_message_create_for_document (const void *talloc_owner,
message->frozen = 0;
message->flags = 0;
+ message->lazy_flags = 0;
/* Each of these will be lazily created as needed. */
message->message_id = NULL;
@@ -192,7 +196,7 @@ _notmuch_message_create (const void *talloc_owner,
*
* There is already a document with message ID 'message_id' in the
* database. The returned message can be used to query/modify the
- * document.
+ * document. The message may be a ghost message.
*
* NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND:
*
@@ -305,6 +309,7 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message)
const char *thread_prefix = _find_prefix ("thread"),
*tag_prefix = _find_prefix ("tag"),
*id_prefix = _find_prefix ("id"),
+ *type_prefix = _find_prefix ("type"),
*filename_prefix = _find_prefix ("file-direntry"),
*replyto_prefix = _find_prefix ("replyto");
@@ -337,10 +342,23 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message)
message->message_id =
_notmuch_message_get_term (message, i, end, id_prefix);
+ /* Get document type */
+ assert (strcmp (id_prefix, type_prefix) < 0);
+ if (! (message->lazy_flags & (1 << NOTMUCH_MESSAGE_FLAG_GHOST))) {
+ i.skip_to (type_prefix);
+ if (*i == "Tmail")
+ message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);
+ else if (*i == "Tghost")
+ message->flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);
+ else
+ INTERNAL_ERROR ("Message without type term");
+ message->lazy_flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);
+ }
+
/* Get filename list. Here we get only the terms. We lazily
* expand them to full file names when needed in
* _notmuch_message_ensure_filename_list. */
- assert (strcmp (id_prefix, filename_prefix) < 0);
+ assert (strcmp (type_prefix, filename_prefix) < 0);
if (!message->filename_term_list && !message->filename_list)
message->filename_term_list =
_notmuch_database_get_terms_with_prefix (message, i, end,
@@ -371,6 +389,11 @@ _notmuch_message_invalidate_metadata (notmuch_message_t *message,
message->tag_list = NULL;
}
+ if (strcmp ("type", prefix_name) == 0) {
+ message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);
+ message->lazy_flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);
+ }
+
if (strcmp ("file-direntry", prefix_name) == 0) {
talloc_free (message->filename_term_list);
talloc_free (message->filename_list);
@@ -869,6 +892,10 @@ notmuch_bool_t
notmuch_message_get_flag (notmuch_message_t *message,
notmuch_message_flag_t flag)
{
+ if (flag == NOTMUCH_MESSAGE_FLAG_GHOST &&
+ ! (message->lazy_flags & (1 << flag)))
+ _notmuch_message_ensure_metadata (message);
+
return message->flags & (1 << flag);
}
@@ -880,6 +907,7 @@ notmuch_message_set_flag (notmuch_message_t *message,
message->flags |= (1 << flag);
else
message->flags &= ~(1 << flag);
+ message->lazy_flags |= (1 << flag);
}
time_t
@@ -989,6 +1017,24 @@ _notmuch_message_delete (notmuch_message_t *message)
return NOTMUCH_STATUS_SUCCESS;
}
+/* Transform a blank message into a ghost message. The caller must
+ * _notmuch_message_sync the message. */
+notmuch_private_status_t
+_notmuch_message_initialize_ghost (notmuch_message_t *message,
+ const char *thread_id)
+{
+ notmuch_private_status_t status;
+
+ status = _notmuch_message_add_term (message, "type", "ghost");
+ if (status)
+ return status;
+ status = _notmuch_message_add_term (message, "thread", thread_id);
+ if (status)
+ return status;
+
+ return NOTMUCH_PRIVATE_STATUS_SUCCESS;
+}
+
/* Ensure that 'message' is not holding any file object open. Future
* calls to various functions will still automatically open the
* message file as needed.
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 36cc12b..2fbd38e 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -297,6 +297,10 @@ _notmuch_message_sync (notmuch_message_t *message);
notmuch_status_t
_notmuch_message_delete (notmuch_message_t *message);
+notmuch_private_status_t
+_notmuch_message_initialize_ghost (notmuch_message_t *message,
+ const char *thread_id);
+
void
_notmuch_message_close (notmuch_message_t *message);
diff --git a/lib/notmuch.h b/lib/notmuch.h
index dae0416..92594b9 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1221,7 +1221,14 @@ notmuch_message_get_filenames (notmuch_message_t *message);
*/
typedef enum _notmuch_message_flag {
NOTMUCH_MESSAGE_FLAG_MATCH,
- NOTMUCH_MESSAGE_FLAG_EXCLUDED
+ NOTMUCH_MESSAGE_FLAG_EXCLUDED,
+
+ /* This message is a "ghost message", meaning it has no filenames
+ * or content, but we know it exists because it was referenced by
+ * some other message. A ghost message has only a message ID and
+ * thread ID.
+ */
+ NOTMUCH_MESSAGE_FLAG_GHOST,
} notmuch_message_flag_t;
/**
--
2.1.0
next prev parent reply other threads:[~2014-10-03 14:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-03 14:19 [PATCH 00/11] Add ghost messages and fix thread linking Austin Clements
2014-10-03 14:19 ` [PATCH 01/11] lib: Move message ID compression to _notmuch_message_create_for_message_id Austin Clements
2014-10-03 14:19 ` [PATCH 02/11] lib: Refactor _notmuch_database_link_message Austin Clements
2014-10-05 7:45 ` David Bremner
2014-10-05 23:20 ` Austin Clements
2014-10-06 6:04 ` David Bremner
2014-10-06 13:25 ` Austin Clements
2014-10-03 14:19 ` [PATCH 03/11] lib: Handle empty date value Austin Clements
2014-10-03 14:19 ` [PATCH 04/11] lib: Add a ghost messages database feature Austin Clements
2014-10-03 14:19 ` [PATCH 05/11] lib: Update database schema doc for ghost messages Austin Clements
2014-10-03 14:19 ` Austin Clements [this message]
2014-10-05 8:30 ` [PATCH 06/11] lib: Internal support for querying and creating " David Bremner
2014-10-05 23:24 ` Austin Clements
2014-10-06 6:19 ` David Bremner
2014-10-06 16:03 ` Austin Clements
2014-10-03 14:19 ` [PATCH 07/11] lib: Implement ghost-based thread linking Austin Clements
2014-10-03 14:19 ` [PATCH 08/11] lib: Implement upgrade to ghost messages feature Austin Clements
2014-10-05 8:56 ` David Bremner
2014-10-05 23:29 ` Austin Clements
2014-10-06 6:03 ` David Bremner
2014-10-03 14:19 ` [PATCH 09/11] lib: Enable " Austin Clements
2014-10-03 14:19 ` [PATCH 10/11] test: Test upgrade to " Austin Clements
2014-10-03 14:19 ` [PATCH 11/11] lib: Remove unnecessary thread linking steps when using ghost messages Austin Clements
2014-10-04 8:30 ` [PATCH 00/11] Add ghost messages and fix thread linking Tomi Ollila
2014-10-04 20:15 ` Austin Clements
2014-10-05 9:07 ` David Bremner
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=1412345958-8278-7-git-send-email-aclements@csail.mit.edu \
--to=aclements@csail.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).