X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fquery.cc;h=504ab9e6b5463436a048102435992d328a74f7de;hp=381529b538c270695144d4aef8ae7ba673dee996;hb=ba3554b8045e16ae883d559b7e575e8aca00f6d2;hpb=bbf4b8e4aec69b5684587b77bd0af743afd61eb1 diff --git a/lib/query.cc b/lib/query.cc index 381529b5..504ab9e6 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -38,9 +38,12 @@ struct _notmuch_messages { }; 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 * @@ -61,7 +64,7 @@ notmuch_query_create (notmuch_database_t *notmuch, query->query_string = talloc_strdup (query, query_string); - query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST; + query->sort = NOTMUCH_SORT_NEWEST_FIRST; return query; } @@ -72,21 +75,6 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort) 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_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, @@ -94,10 +82,11 @@ notmuch_query_search_messages (notmuch_query_t *query, { notmuch_database_t *notmuch = query->notmuch; const char *query_string = query->query_string; - notmuch_messages_t *messages; + notmuch_message_list_t *message_list; + Xapian::MSetIterator i; - messages = talloc (query, notmuch_messages_t); - if (unlikely (messages == NULL)) + message_list = _notmuch_message_list_create (query); + if (unlikely (message_list == NULL)) return NULL; try { @@ -111,7 +100,8 @@ notmuch_query_search_messages (notmuch_query_t *query, Xapian::QueryParser::FLAG_PHRASE | Xapian::QueryParser::FLAG_LOVEHATE | Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | - Xapian::QueryParser::FLAG_WILDCARD); + Xapian::QueryParser::FLAG_WILDCARD | + Xapian::QueryParser::FLAG_PURE_NOT); if (strcmp (query_string, "") == 0) { final_query = mail_query; @@ -123,10 +113,10 @@ notmuch_query_search_messages (notmuch_query_t *query, } switch (query->sort) { - case NOTMUCH_SORT_DATE_OLDEST_FIRST: + case NOTMUCH_SORT_OLDEST_FIRST: enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE); break; - case NOTMUCH_SORT_DATE_NEWEST_FIRST: + case NOTMUCH_SORT_NEWEST_FIRST: enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE); break; case NOTMUCH_SORT_MESSAGE_ID: @@ -144,22 +134,31 @@ notmuch_query_search_messages (notmuch_query_t *query, max_messages = notmuch->xapian_db->get_doccount (); mset = enquire.get_mset (first, max_messages); - messages->notmuch = notmuch; - - new (&messages->iterator) Xapian::MSetIterator (); - new (&messages->iterator_end) Xapian::MSetIterator (); + for (i = mset.begin (); i != mset.end (); i++) { + notmuch_message_t *message; + notmuch_private_status_t status; - talloc_set_destructor (messages, _notmuch_messages_destructor); + 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; + } - messages->iterator = mset.begin (); - messages->iterator_end = mset.end (); + _notmuch_message_list_add_message (message_list, message); + } } catch (const Xapian::Error &error) { - fprintf (stderr, "A Xapian exception occurred: %s\n", + fprintf (stderr, "A Xapian exception occurred performing query: %s\n", error.get_msg().c_str()); + fprintf (stderr, "Query string was: %s\n", query->query_string); + notmuch->exception_reported = TRUE; } - return messages; + return _notmuch_messages_create (message_list); } /* Glib objects force use to use a talloc destructor as well, (but not @@ -169,85 +168,29 @@ notmuch_query_search_messages (notmuch_query_t *query, 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_threads_t * -notmuch_query_search_threads (notmuch_query_t *query, - int first, - int max_threads) +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; - int messages_seen = 0, threads_seen = 0; 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); + threads->query = query; + threads->threads = g_hash_table_new_full (g_str_hash, g_str_equal, + free, NULL); - while (max_threads < 0 || threads_seen < first + max_threads) - { - int messages_seen_previously = messages_seen; + threads->messages = notmuch_query_search_messages (query, 0, -1); - for (messages = notmuch_query_search_messages (query, - messages_seen, - max_threads); - notmuch_messages_has_more (messages); - notmuch_messages_advance (messages)) - { - message = notmuch_messages_get (messages); + threads->thread_id = NULL; - thread_id = notmuch_message_get_thread_id (message); - - if (! g_hash_table_lookup_extended (seen, - thread_id, NULL, - (void **) &thread)) - { - if (threads_seen >= first) { - thread = _notmuch_thread_create (query, query->notmuch, - thread_id); - g_ptr_array_add (threads->threads, thread); - } else { - thread = NULL; - } - - g_hash_table_insert (seen, xstrdup (thread_id), thread); - - threads_seen++; - } - - if (thread) - _notmuch_thread_add_message (thread, message); - - notmuch_message_destroy (message); - - messages_seen++; - - if (max_threads >= 0 && threads_seen >= first + max_threads) - break; - } - - /* Stop if we're not seeing any more messages. */ - if (messages_seen == messages_seen_previously) - break; - } - - g_hash_table_unref (seen); + talloc_set_destructor (threads, _notmuch_threads_destructor); return threads; } @@ -259,52 +202,34 @@ notmuch_query_destroy (notmuch_query_t *query) } notmuch_bool_t -notmuch_messages_has_more (notmuch_messages_t *messages) -{ - return (messages->iterator != messages->iterator_end); -} - -notmuch_message_t * -notmuch_messages_get (notmuch_messages_t *messages) +notmuch_threads_has_more (notmuch_threads_t *threads) { notmuch_message_t *message; - Xapian::docid doc_id; - notmuch_private_status_t status; - if (! notmuch_messages_has_more (messages)) - return NULL; - - doc_id = *messages->iterator; - - message = _notmuch_message_create (messages, - messages->notmuch, doc_id, - &status); + if (threads->thread_id) + return TRUE; - if (message == NULL && - status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) + while (notmuch_messages_has_more (threads->messages)) { - INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n"); - } + message = notmuch_messages_get (threads->messages); - return message; -} + threads->thread_id = notmuch_message_get_thread_id (message); -void -notmuch_messages_advance (notmuch_messages_t *messages) -{ - messages->iterator++; -} + 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_advance (threads->messages); + return TRUE; + } -void -notmuch_messages_destroy (notmuch_messages_t *messages) -{ - talloc_free (messages); -} + notmuch_messages_advance (threads->messages); + } -notmuch_bool_t -notmuch_threads_has_more (notmuch_threads_t *threads) -{ - return (threads->index < threads->threads->len); + threads->thread_id = NULL; + return FALSE; } notmuch_thread_t * @@ -313,14 +238,16 @@ notmuch_threads_get (notmuch_threads_t *threads) if (! notmuch_threads_has_more (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); } void notmuch_threads_advance (notmuch_threads_t *threads) { - threads->index++; + threads->thread_id = NULL; } void @@ -328,3 +255,55 @@ notmuch_threads_destroy (notmuch_threads_t *threads) { talloc_free (threads); } + +unsigned +notmuch_query_count_messages (notmuch_query_t *query) +{ + notmuch_database_t *notmuch = query->notmuch; + const char *query_string = query->query_string; + Xapian::doccount count; + + try { + Xapian::Enquire enquire (*notmuch->xapian_db); + Xapian::Query mail_query (talloc_asprintf (query, "%s%s", + _find_prefix ("type"), + "mail")); + Xapian::Query string_query, final_query; + Xapian::MSet mset; + unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN | + Xapian::QueryParser::FLAG_PHRASE | + Xapian::QueryParser::FLAG_LOVEHATE | + Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | + Xapian::QueryParser::FLAG_WILDCARD | + Xapian::QueryParser::FLAG_PURE_NOT); + + if (strcmp (query_string, "") == 0) { + final_query = mail_query; + } else { + string_query = notmuch->query_parser-> + parse_query (query_string, flags); + final_query = Xapian::Query (Xapian::Query::OP_AND, + mail_query, string_query); + } + + enquire.set_weighting_scheme(Xapian::BoolWeight()); + enquire.set_docid_order(Xapian::Enquire::ASCENDING); + +#if DEBUG_QUERY + fprintf (stderr, "Final query is:\n%s\n", final_query.get_description().c_str()); +#endif + + enquire.set_query (final_query); + + mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ()); + + count = mset.get_matches_estimated(); + + } catch (const Xapian::Error &error) { + fprintf (stderr, "A Xapian exception occurred: %s\n", + error.get_msg().c_str()); + fprintf (stderr, "Query string was: %s\n", query->query_string); + } + + return count; +}