X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fquery.cc;h=7e1b6b52984330d82f6c82462f64d02c2450f0f4;hp=1777e47dc044daa339c7ec0988e3d0fbef3de5a9;hb=aadb15a002dc01903d60ca40048d6d4ef3990863;hpb=93dcc3b695e19dd36cc8f638c6e01ecbbd9a447d

diff --git a/lib/query.cc b/lib/query.cc
index 1777e47d..7e1b6b52 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -31,16 +31,20 @@ struct _notmuch_query {
     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 *
@@ -61,7 +65,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;
 }
@@ -79,7 +83,7 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
  * talloc_set_destructor at all otherwise).
  */
 static int
-_notmuch_messages_destructor (notmuch_messages_t *messages)
+_notmuch_messages_destructor (notmuch_mset_messages_t *messages)
 {
     messages->iterator.~MSetIterator ();
     messages->iterator_end.~MSetIterator ();
@@ -88,19 +92,26 @@ _notmuch_messages_destructor (notmuch_messages_t *messages)
 }
 
 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_messages_t *messages;
+    notmuch_mset_messages_t *messages;
 
-    messages = talloc (query, notmuch_messages_t);
+    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"),
@@ -111,9 +122,12 @@ 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) {
+	if (strcmp (query_string, "") == 0 ||
+	    strcmp (query_string, "*") == 0)
+	{
 	    final_query = mail_query;
 	} else {
 	    string_query = notmuch->query_parser->
@@ -122,16 +136,20 @@ notmuch_query_search_messages (notmuch_query_t *query,
 					 mail_query, string_query);
 	}
 
+	enquire.set_weighting_scheme (Xapian::BoolWeight());
+
 	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:
 	    enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
 	    break;
+        case NOTMUCH_SORT_UNSORTED:
+	    break;
 	}
 
 #if DEBUG_QUERY
@@ -140,111 +158,99 @@ notmuch_query_search_messages (notmuch_query_t *query,
 
 	enquire.set_query (final_query);
 
-	if (max_messages == -1)
-	    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 ();
-
-	talloc_set_destructor (messages, _notmuch_messages_destructor);
+	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: %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 &messages->base;
 }
 
-/* Glib objects force use to use a talloc destructor as well, (but not
- * nearly as ugly as the for messages due to C++ objects). At
- * this point, I'd really like to have some talloc-friendly
- * equivalents for the few pieces of glib that I'm using. */
-static int
-_notmuch_threads_destructor (notmuch_threads_t *threads)
+notmuch_bool_t
+_notmuch_mset_messages_valid (notmuch_messages_t *messages)
 {
-    g_ptr_array_free (threads->threads, TRUE);
+    notmuch_mset_messages_t *mset_messages;
 
-    return 0;
+    mset_messages = (notmuch_mset_messages_t *) messages;
+
+    return (mset_messages->iterator != mset_messages->iterator_end);
 }
 
-notmuch_threads_t *
-notmuch_query_search_threads (notmuch_query_t *query,
-			      int first,
-			      int max_threads)
+notmuch_message_t *
+_notmuch_mset_messages_get (notmuch_messages_t *messages)
 {
-    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;
+    Xapian::docid doc_id;
+    notmuch_private_status_t status;
+    notmuch_mset_messages_t *mset_messages;
 
-    threads = talloc (query, notmuch_threads_t);
-    if (threads == NULL)
-	return NULL;
+    mset_messages = (notmuch_mset_messages_t *) messages;
 
-    threads->notmuch = query->notmuch;
-    threads->threads = g_ptr_array_new ();
-    threads->index = 0;
+    if (! _notmuch_mset_messages_valid (&mset_messages->base))
+	return NULL;
 
-    talloc_set_destructor (threads, _notmuch_threads_destructor);
+    doc_id = *mset_messages->iterator;
 
-    seen = g_hash_table_new_full (g_str_hash, g_str_equal,
-				  free, NULL);
+    message = _notmuch_message_create (mset_messages,
+				       mset_messages->notmuch, doc_id,
+				       &status);
 
-    while (threads_seen < first + max_threads)
+    if (message == NULL &&
+       status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
     {
-	int messages_seen_previously = messages_seen;
+	INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n");
+    }
 
-	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);
+    return message;
+}
 
-	    thread_id = notmuch_message_get_thread_id (message);
+void
+_notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)
+{
+    notmuch_mset_messages_t *mset_messages;
 
-	    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;
-		}
+    mset_messages = (notmuch_mset_messages_t *) messages;
 
-		g_hash_table_insert (seen, xstrdup (thread_id), thread);
+    mset_messages->iterator++;
+}
 
-		threads_seen++;
-	    }
+/* Glib objects force use to use a talloc destructor as well, (but not
+ * nearly as ugly as the for messages due to C++ objects). At
+ * this point, I'd really like to have some talloc-friendly
+ * equivalents for the few pieces of glib that I'm using. */
+static int
+_notmuch_threads_destructor (notmuch_threads_t *threads)
+{
+    g_hash_table_unref (threads->threads);
 
-	    if (thread)
-		_notmuch_thread_add_message (thread, message);
+    return 0;
+}
 
-	    notmuch_message_destroy (message);
+notmuch_threads_t *
+notmuch_query_search_threads (notmuch_query_t *query)
+{
+    notmuch_threads_t *threads;
 
-	    messages_seen++;
-	}
+    threads = talloc (query, notmuch_threads_t);
+    if (threads == NULL)
+	return NULL;
 
-	/* Stop if we're not seeing any more messages. */
-	if (messages_seen == messages_seen_previously)
-	    break;
-    }
+    threads->query = query;
+    threads->threads = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      free, NULL);
+
+    threads->messages = notmuch_query_search_messages (query);
 
-    g_hash_table_unref (seen);
+    threads->thread_id = NULL;
+
+    talloc_set_destructor (threads, _notmuch_threads_destructor);
 
     return threads;
 }
@@ -256,68 +262,53 @@ 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_valid (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;
+    if (threads->thread_id)
+	return TRUE;
 
-    doc_id = *messages->iterator;
-
-    message = _notmuch_message_create (messages,
-				       messages->notmuch, doc_id,
-				       &status);
-
-    if (message == NULL &&
-	status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
+    while (notmuch_messages_valid (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_move_to_next (threads->messages);
+	    return TRUE;
+	}
 
-void
-notmuch_messages_destroy (notmuch_messages_t *messages)
-{
-    talloc_free (messages);
-}
+	notmuch_messages_move_to_next (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 *
 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
@@ -325,3 +316,57 @@ 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 = 0;
+
+    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 ||
+	    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;
+}