notmuch_sort_t sort;
};
-struct _notmuch_messages {
+typedef struct _notmuch_mset_messages {
+ notmuch_messages_t base;
notmuch_database_t *notmuch;
Xapian::MSetIterator iterator;
Xapian::MSetIterator iterator_end;
-};
+} notmuch_mset_messages_t;
struct _notmuch_threads {
- notmuch_database_t *notmuch;
- GPtrArray *threads;
- unsigned int index;
+ notmuch_query_t *query;
+ GHashTable *threads;
+ notmuch_messages_t *messages;
+
+ /* This thread ID is our iterator state. */
+ const char *thread_id;
};
notmuch_query_t *
query->sort = sort;
}
+/* We end up having to call the destructors explicitly because we had
+ * to use "placement new" in order to initialize C++ objects within a
+ * block that we allocated with talloc. So C++ is making talloc
+ * slightly less simple to use, (we wouldn't need
+ * talloc_set_destructor at all otherwise).
+ */
+static int
+_notmuch_messages_destructor (notmuch_mset_messages_t *messages)
+{
+ messages->iterator.~MSetIterator ();
+ messages->iterator_end.~MSetIterator ();
+
+ return 0;
+}
+
notmuch_messages_t *
-notmuch_query_search_messages (notmuch_query_t *query,
- int first,
- int max_messages)
+notmuch_query_search_messages (notmuch_query_t *query)
{
notmuch_database_t *notmuch = query->notmuch;
const char *query_string = query->query_string;
- notmuch_message_list_t *message_list;
- Xapian::MSetIterator i;
+ notmuch_mset_messages_t *messages;
- message_list = _notmuch_message_list_create (query);
- if (unlikely (message_list == NULL))
+ messages = talloc (query, notmuch_mset_messages_t);
+ if (unlikely (messages == NULL))
return NULL;
try {
+
+ messages->base.is_of_list_type = FALSE;
+ messages->base.iterator = NULL;
+ messages->notmuch = notmuch;
+ new (&messages->iterator) Xapian::MSetIterator ();
+ new (&messages->iterator_end) Xapian::MSetIterator ();
+
+ talloc_set_destructor (messages, _notmuch_messages_destructor);
+
Xapian::Enquire enquire (*notmuch->xapian_db);
Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
_find_prefix ("type"),
Xapian::QueryParser::FLAG_WILDCARD |
Xapian::QueryParser::FLAG_PURE_NOT);
- if (strcmp (query_string, "") == 0) {
+ if (strcmp (query_string, "") == 0 ||
+ strcmp (query_string, "*") == 0)
+ {
final_query = mail_query;
} else {
string_query = notmuch->query_parser->
mail_query, string_query);
}
+ enquire.set_weighting_scheme (Xapian::BoolWeight());
+
switch (query->sort) {
case NOTMUCH_SORT_OLDEST_FIRST:
enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
case NOTMUCH_SORT_MESSAGE_ID:
enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
break;
+ case NOTMUCH_SORT_UNSORTED:
+ break;
}
#if DEBUG_QUERY
enquire.set_query (final_query);
- if (max_messages == -1)
- max_messages = notmuch->xapian_db->get_doccount ();
- mset = enquire.get_mset (first, max_messages);
-
- for (i = mset.begin (); i != mset.end (); i++) {
- notmuch_message_t *message;
- notmuch_private_status_t status;
-
- message = _notmuch_message_create (message_list, notmuch,
- *i, &status);
- if (message == NULL)
- {
- if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
- INTERNAL_ERROR ("A message iterator contains a "
- "non-existent document ID.\n");
- break;
- }
-
- _notmuch_message_list_add_message (message_list, message);
- }
+ mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
+
+ messages->iterator = mset.begin ();
+ messages->iterator_end = mset.end ();
} catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred performing query: %s\n",
notmuch->exception_reported = TRUE;
}
- return _notmuch_messages_create (message_list);
+ return &messages->base;
+}
+
+notmuch_bool_t
+_notmuch_mset_messages_valid (notmuch_messages_t *messages)
+{
+ notmuch_mset_messages_t *mset_messages;
+
+ mset_messages = (notmuch_mset_messages_t *) messages;
+
+ return (mset_messages->iterator != mset_messages->iterator_end);
+}
+
+notmuch_message_t *
+_notmuch_mset_messages_get (notmuch_messages_t *messages)
+{
+ notmuch_message_t *message;
+ Xapian::docid doc_id;
+ notmuch_private_status_t status;
+ notmuch_mset_messages_t *mset_messages;
+
+ mset_messages = (notmuch_mset_messages_t *) messages;
+
+ if (! _notmuch_mset_messages_valid (&mset_messages->base))
+ return NULL;
+
+ doc_id = *mset_messages->iterator;
+
+ message = _notmuch_message_create (mset_messages,
+ mset_messages->notmuch, doc_id,
+ &status);
+
+ if (message == NULL &&
+ status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
+ {
+ INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n");
+ }
+
+ return message;
+}
+
+void
+_notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)
+{
+ notmuch_mset_messages_t *mset_messages;
+
+ mset_messages = (notmuch_mset_messages_t *) messages;
+
+ mset_messages->iterator++;
}
/* Glib objects force use to use a talloc destructor as well, (but not
static int
_notmuch_threads_destructor (notmuch_threads_t *threads)
{
- g_ptr_array_free (threads->threads, TRUE);
+ g_hash_table_unref (threads->threads);
return 0;
}
notmuch_query_search_threads (notmuch_query_t *query)
{
notmuch_threads_t *threads;
- notmuch_thread_t *thread;
- const char *thread_id;
- notmuch_messages_t *messages;
- notmuch_message_t *message;
- GHashTable *seen;
threads = talloc (query, notmuch_threads_t);
if (threads == NULL)
return NULL;
- threads->notmuch = query->notmuch;
- threads->threads = g_ptr_array_new ();
- threads->index = 0;
-
- talloc_set_destructor (threads, _notmuch_threads_destructor);
-
- seen = g_hash_table_new_full (g_str_hash, g_str_equal,
- free, NULL);
-
- for (messages = notmuch_query_search_messages (query, 0, -1);
- notmuch_messages_has_more (messages);
- notmuch_messages_advance (messages))
- {
- message = notmuch_messages_get (messages);
-
- thread_id = notmuch_message_get_thread_id (message);
+ threads->query = query;
+ threads->threads = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
- if (! g_hash_table_lookup_extended (seen,
- thread_id, NULL,
- (void **) &thread))
- {
- thread = _notmuch_thread_create (query, query->notmuch,
- thread_id,
- query->query_string);
- g_ptr_array_add (threads->threads, thread);
+ threads->messages = notmuch_query_search_messages (query);
- g_hash_table_insert (seen, xstrdup (thread_id), thread);
- }
-
- notmuch_message_destroy (message);
- }
+ threads->thread_id = NULL;
- g_hash_table_unref (seen);
+ talloc_set_destructor (threads, _notmuch_threads_destructor);
return threads;
}
}
notmuch_bool_t
-notmuch_threads_has_more (notmuch_threads_t *threads)
+notmuch_threads_valid (notmuch_threads_t *threads)
{
- return (threads->index < threads->threads->len);
+ notmuch_message_t *message;
+
+ if (threads->thread_id)
+ return TRUE;
+
+ while (notmuch_messages_valid (threads->messages))
+ {
+ message = notmuch_messages_get (threads->messages);
+
+ threads->thread_id = notmuch_message_get_thread_id (message);
+
+ if (! g_hash_table_lookup_extended (threads->threads,
+ threads->thread_id,
+ NULL, NULL))
+ {
+ g_hash_table_insert (threads->threads,
+ xstrdup (threads->thread_id), NULL);
+ notmuch_messages_move_to_next (threads->messages);
+ return TRUE;
+ }
+
+ notmuch_messages_move_to_next (threads->messages);
+ }
+
+ threads->thread_id = NULL;
+ return FALSE;
}
notmuch_thread_t *
notmuch_threads_get (notmuch_threads_t *threads)
{
- if (! notmuch_threads_has_more (threads))
+ if (! notmuch_threads_valid (threads))
return NULL;
- return (notmuch_thread_t *) g_ptr_array_index (threads->threads,
- threads->index);
+ return _notmuch_thread_create (threads->query,
+ threads->query->notmuch,
+ threads->thread_id,
+ threads->query->query_string,
+ threads->query->sort);
}
void
-notmuch_threads_advance (notmuch_threads_t *threads)
+notmuch_threads_move_to_next (notmuch_threads_t *threads)
{
- threads->index++;
+ threads->thread_id = NULL;
}
void
{
notmuch_database_t *notmuch = query->notmuch;
const char *query_string = query->query_string;
- Xapian::doccount count;
+ Xapian::doccount count = 0;
try {
Xapian::Enquire enquire (*notmuch->xapian_db);
Xapian::QueryParser::FLAG_WILDCARD |
Xapian::QueryParser::FLAG_PURE_NOT);
- if (strcmp (query_string, "") == 0) {
+ if (strcmp (query_string, "") == 0 ||
+ strcmp (query_string, "*") == 0)
+ {
final_query = mail_query;
} else {
string_query = notmuch->query_parser->
projects / notmuch / blobdiff