char *message_id;
char *thread_id;
char *in_reply_to;
- notmuch_filename_list_t *filename_list;
+ notmuch_string_list_t *filename_list;
char *author;
notmuch_message_file_t *message_file;
notmuch_message_list_t *replies;
unsigned long flags;
Xapian::Document doc;
+ Xapian::termcount termpos;
};
#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
talloc_set_destructor (message, _notmuch_message_destructor);
message->doc = doc;
+ message->termpos = 0;
return message;
}
return message;
}
-unsigned int
-_notmuch_message_get_doc_id (notmuch_message_t *message)
-{
- return message->doc_id;
-}
-
-const char *
-notmuch_message_get_message_id (notmuch_message_t *message)
+static char *
+_notmuch_message_get_term (notmuch_message_t *message,
+ Xapian::TermIterator &i, Xapian::TermIterator &end,
+ const char *prefix)
{
- Xapian::TermIterator i;
+ int prefix_len = strlen (prefix);
+ const char *term = NULL;
+ char *value;
- if (message->message_id)
- return message->message_id;
+ i.skip_to (prefix);
- i = message->doc.termlist_begin ();
- i.skip_to (_find_prefix ("id"));
+ if (i != end)
+ term = (*i).c_str ();
- if (i == message->doc.termlist_end ())
- INTERNAL_ERROR ("Message with document ID of %d has no message ID.\n",
- message->doc_id);
+ if (!term || strncmp (term, prefix, prefix_len))
+ return NULL;
- message->message_id = talloc_strdup (message, (*i).c_str () + 1);
+ value = talloc_strdup (message, term + prefix_len);
#if DEBUG_DATABASE_SANITY
i++;
- if (i != message->doc.termlist_end () &&
- strncmp ((*i).c_str (), _find_prefix ("id"),
- strlen (_find_prefix ("id"))) == 0)
- {
- INTERNAL_ERROR ("Mail (doc_id: %d) has duplicate message IDs",
- message->doc_id);
+ if (i != end && strncmp ((*i).c_str (), prefix, prefix_len) == 0) {
+ INTERNAL_ERROR ("Mail (doc_id: %d) has duplicate %s terms: %s and %s\n",
+ message->doc_id, prefix, value,
+ (*i).c_str () + prefix_len);
}
#endif
+ return value;
+}
+
+void
+_notmuch_message_ensure_metadata (notmuch_message_t *message)
+{
+ Xapian::TermIterator i, end;
+ const char *thread_prefix = _find_prefix ("thread"),
+ *id_prefix = _find_prefix ("id"),
+ *replyto_prefix = _find_prefix ("replyto");
+
+ /* We do this all in a single pass because Xapian decompresses the
+ * term list every time you iterate over it. Thus, while this is
+ * slightly more costly than looking up individual fields if only
+ * one field of the message object is actually used, it's a huge
+ * win as more fields are used. */
+
+ i = message->doc.termlist_begin ();
+ end = message->doc.termlist_end ();
+
+ /* Get thread */
+ if (!message->thread_id)
+ message->thread_id =
+ _notmuch_message_get_term (message, i, end, thread_prefix);
+
+ /* Get id */
+ assert (strcmp (thread_prefix, id_prefix) < 0);
+ if (!message->message_id)
+ message->message_id =
+ _notmuch_message_get_term (message, i, end, id_prefix);
+
+ /* Get reply to */
+ assert (strcmp (id_prefix, replyto_prefix) < 0);
+ if (!message->in_reply_to)
+ message->in_reply_to =
+ _notmuch_message_get_term (message, i, end, replyto_prefix);
+ /* It's perfectly valid for a message to have no In-Reply-To
+ * header. For these cases, we return an empty string. */
+ if (!message->in_reply_to)
+ message->in_reply_to = talloc_strdup (message, "");
+}
+
+static void
+_notmuch_message_invalidate_metadata (notmuch_message_t *message,
+ const char *prefix_name)
+{
+ if (strcmp ("thread", prefix_name) == 0) {
+ talloc_free (message->thread_id);
+ message->thread_id = NULL;
+ }
+
+ if (strcmp ("replyto", prefix_name) == 0) {
+ talloc_free (message->in_reply_to);
+ message->in_reply_to = NULL;
+ }
+}
+
+unsigned int
+_notmuch_message_get_doc_id (notmuch_message_t *message)
+{
+ return message->doc_id;
+}
+
+const char *
+notmuch_message_get_message_id (notmuch_message_t *message)
+{
+ if (!message->message_id)
+ _notmuch_message_ensure_metadata (message);
+ if (!message->message_id)
+ INTERNAL_ERROR ("Message with document ID of %u has no message ID.\n",
+ message->doc_id);
return message->message_id;
}
const char *
_notmuch_message_get_in_reply_to (notmuch_message_t *message)
{
- const char *prefix = _find_prefix ("replyto");
- int prefix_len = strlen (prefix);
- Xapian::TermIterator i;
- std::string in_reply_to;
-
- if (message->in_reply_to)
- return message->in_reply_to;
-
- i = message->doc.termlist_begin ();
- i.skip_to (prefix);
-
- if (i != message->doc.termlist_end ())
- in_reply_to = *i;
-
- /* It's perfectly valid for a message to have no In-Reply-To
- * header. For these cases, we return an empty string. */
- if (i == message->doc.termlist_end () ||
- strncmp (in_reply_to.c_str (), prefix, prefix_len))
- {
- message->in_reply_to = talloc_strdup (message, "");
- return message->in_reply_to;
- }
-
- message->in_reply_to = talloc_strdup (message,
- in_reply_to.c_str () + prefix_len);
-
-#if DEBUG_DATABASE_SANITY
- i++;
-
- in_reply_to = *i;
-
- if (i != message->doc.termlist_end () &&
- strncmp ((*i).c_str (), prefix, prefix_len) == 0)
- {
- INTERNAL_ERROR ("Message %s has duplicate In-Reply-To IDs: %s and %s\n",
- notmuch_message_get_message_id (message),
- message->in_reply_to,
- (*i).c_str () + prefix_len);
- }
-#endif
-
+ if (!message->in_reply_to)
+ _notmuch_message_ensure_metadata (message);
return message->in_reply_to;
}
const char *
notmuch_message_get_thread_id (notmuch_message_t *message)
{
- const char *prefix = _find_prefix ("thread");
- Xapian::TermIterator i;
- std::string id;
-
- /* This code is written with the assumption that "thread" has a
- * single-character prefix. */
- assert (strlen (prefix) == 1);
-
- if (message->thread_id)
- return message->thread_id;
-
- i = message->doc.termlist_begin ();
- i.skip_to (prefix);
-
- if (i != message->doc.termlist_end ())
- id = *i;
-
- if (i == message->doc.termlist_end () || id[0] != *prefix)
- INTERNAL_ERROR ("Message with document ID of %d has no thread ID.\n",
+ if (!message->thread_id)
+ _notmuch_message_ensure_metadata (message);
+ if (!message->thread_id)
+ INTERNAL_ERROR ("Message with document ID of %u has no thread ID.\n",
message->doc_id);
-
- message->thread_id = talloc_strdup (message, id.c_str () + 1);
-
-#if DEBUG_DATABASE_SANITY
- i++;
- id = *i;
-
- if (i != message->doc.termlist_end () && id[0] == *prefix)
- {
- INTERNAL_ERROR ("Message %s has duplicate thread IDs: %s and %s\n",
- notmuch_message_get_message_id (message),
- message->thread_id,
- id.c_str () + 1);
- }
-#endif
-
return message->thread_id;
}
INTERNAL_ERROR ("Message filename cannot be NULL.");
if (message->filename_list) {
- _notmuch_filename_list_destroy (message->filename_list);
+ talloc_free (message->filename_list);
message->filename_list = NULL;
}
Xapian::TermIterator i, last;
if (message->filename_list) {
- _notmuch_filename_list_destroy (message->filename_list);
+ talloc_free (message->filename_list);
message->filename_list = NULL;
}
if (message->filename_list)
return;
- message->filename_list = _notmuch_filename_list_create (message);
+ message->filename_list = _notmuch_string_list_create (message);
i = message->doc.termlist_begin ();
i.skip_to (prefix);
if (data == NULL)
INTERNAL_ERROR ("message with no filename");
- _notmuch_filename_list_add_filename (message->filename_list, data);
+ _notmuch_string_list_append (message->filename_list, data);
return;
}
filename = talloc_asprintf (message, "%s/%s",
db_path, basename);
- _notmuch_filename_list_add_filename (message->filename_list,
- filename);
+ _notmuch_string_list_append (message->filename_list, filename);
talloc_free (local);
}
return NULL;
if (message->filename_list->head == NULL ||
- message->filename_list->head->filename == NULL)
+ message->filename_list->head->string == NULL)
{
INTERNAL_ERROR ("message with no filename");
}
- return message->filename_list->head->filename;
+ return message->filename_list->head->string;
}
notmuch_filenames_t *
notmuch_message_get_tags (notmuch_message_t *message)
{
Xapian::TermIterator i, end;
+ notmuch_string_list_t *tags;
i = message->doc.termlist_begin();
end = message->doc.termlist_end();
- return _notmuch_convert_tags(message, i, end);
+ tags = _notmuch_database_get_terms_with_prefix (message, i, end,
+ _find_prefix ("tag"));
+ _notmuch_string_list_sort (tags);
+ return _notmuch_tags_create (message, tags);
}
const char *
talloc_free (term);
+ _notmuch_message_invalidate_metadata (message, prefix_name);
+
return NOTMUCH_PRIVATE_STATUS_SUCCESS;
}
return NOTMUCH_PRIVATE_STATUS_NULL_POINTER;
term_gen->set_document (message->doc);
+ term_gen->set_termpos (message->termpos);
if (prefix_name) {
const char *prefix = _find_prefix (prefix_name);
term_gen->index_text (text, 1, prefix);
+ message->termpos = term_gen->get_termpos ();
}
term_gen->index_text (text);
talloc_free (term);
+ _notmuch_message_invalidate_metadata (message, prefix_name);
+
return NOTMUCH_PRIVATE_STATUS_SUCCESS;
}
projects / notmuch / blobdiff