py3k: All strings are unicode strings in py3k

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index c155470afd82128b37a512af892c08b86a1df3a2..b6c0f12d9cd87f73993be6ef6c822319df888995 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -44,7 +44,7 @@ struct _notmuch_doc_id_set {
 #define DOCIDSET_WORD(bit) ((bit) / sizeof (unsigned int))
 #define DOCIDSET_BIT(bit) ((bit) % sizeof (unsigned int))
 
-struct _notmuch_threads {
+struct visible _notmuch_threads {
     notmuch_query_t *query;
 
     /* The ordered list of doc ids matched by the query. */
@@ -260,17 +260,20 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)
 static notmuch_bool_t
 _notmuch_doc_id_set_init (void *ctx,
                          notmuch_doc_id_set_t *doc_ids,
-                         GArray *arr, unsigned int bound)
+                         GArray *arr)
 {
-    size_t count = (bound + sizeof (doc_ids->bitmap[0]) - 1) /
-       sizeof (doc_ids->bitmap[0]);
-    unsigned int *bitmap = talloc_zero_array (ctx, unsigned int, count);
+    unsigned int max = 0;
+    unsigned int *bitmap;
+
+    for (unsigned int i = 0; i < arr->len; i++)
+       max = MAX(max, g_array_index (arr, unsigned int, i));
+    bitmap = talloc_zero_array (ctx, unsigned int, 1 + max / sizeof (*bitmap));
 
     if (bitmap == NULL)
        return FALSE;
 
     doc_ids->bitmap = bitmap;
-    doc_ids->bound = bound;
+    doc_ids->bound = max + 1;
 
     for (unsigned int i = 0; i < arr->len; i++) {
        unsigned int doc_id = g_array_index (arr, unsigned int, i);
@@ -315,7 +318,6 @@ notmuch_query_search_threads (notmuch_query_t *query)
 {
     notmuch_threads_t *threads;
     notmuch_messages_t *messages;
-    Xapian::docid max_doc_id = 0;
 
     threads = talloc (query, notmuch_threads_t);
     if (threads == NULL)
@@ -335,7 +337,6 @@ notmuch_query_search_threads (notmuch_query_t *query)
     while (notmuch_messages_valid (messages)) {
        unsigned int doc_id = _notmuch_mset_messages_get_doc_id (messages);
        g_array_append_val (threads->doc_ids, doc_id);
-       max_doc_id = MAX (max_doc_id, doc_id);
        notmuch_messages_move_to_next (messages);
     }
     threads->doc_id_pos = 0;
@@ -343,7 +344,7 @@ notmuch_query_search_threads (notmuch_query_t *query)
     talloc_free (messages);
 
     if (! _notmuch_doc_id_set_init (threads, &threads->match_set,
-                                   threads->doc_ids, max_doc_id + 1)) {
+                                   threads->doc_ids)) {
        talloc_free (threads);
        return NULL;
     }
@@ -456,3 +457,47 @@ notmuch_query_count_messages (notmuch_query_t *query)
 
     return count;
 }
+
+unsigned
+notmuch_query_count_threads (notmuch_query_t *query)
+{
+    notmuch_messages_t *messages;
+    GHashTable *hash;
+    unsigned int count;
+    notmuch_sort_t sort;
+
+    sort = query->sort;
+    query->sort = NOTMUCH_SORT_UNSORTED;
+    messages = notmuch_query_search_messages (query);
+    query->sort = sort;
+    if (messages == NULL)
+       return 0;
+
+    hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+    if (hash == NULL) {
+       talloc_free (messages);
+       return 0;
+    }
+
+    while (notmuch_messages_valid (messages)) {
+       notmuch_message_t *message = notmuch_messages_get (messages);
+       const char *thread_id = notmuch_message_get_thread_id (message);
+       char *thread_id_copy = talloc_strdup (messages, thread_id);
+       if (unlikely (thread_id_copy == NULL)) {
+           notmuch_message_destroy (message);
+           count = 0;
+           goto DONE;
+       }
+       g_hash_table_insert (hash, thread_id_copy, NULL);
+       notmuch_message_destroy (message);
+       notmuch_messages_move_to_next (messages);
+    }
+
+    count = g_hash_table_size (hash);
+
+  DONE:
+    g_hash_table_unref (hash);
+    talloc_free (messages);
+
+    return count;
+}