Code cleanups

--HG--
branch : HEAD

diff --git a/src/imap/imap-thread-finish.c b/src/imap/imap-thread-finish.c
index c6ebf8fb14c002312654d603174ad216f2800e92..89dc9288916349495df507e7b842a44fe1f64a35 100644 (file)
--- a/src/imap/imap-thread-finish.c
+++ b/src/imap/imap-thread-finish.c
@@ -515,13 +515,10 @@ static int send_root(struct thread_finish_context *ctx, string_t *str,
                     const struct mail_thread_root_node *root)
 {
        const struct mail_thread_shadow_node *shadow;
-       const struct mail_thread_node *node;
        int ret;
 
        if (!root->dummy) {
-               node = mail_hash_lookup_idx(ctx->hash_trans, root->node.idx);
-               i_assert(node->uid != 0 && node->exists);
-               if (str_add_id(ctx, str, node->uid) < 0)
+               if (str_add_id(ctx, str, root->node.uid) < 0)
                        return -1;
        }
 
@@ -586,41 +583,20 @@ static int send_roots(struct thread_finish_context *ctx)
        return ret;
 }
 
-int mail_thread_finish(struct mail *tmp_mail,
-                      struct mail_hash_transaction *hash_trans,
-                      enum mail_thread_type thread_type,
-                      struct ostream *output, bool id_is_uid)
+static void mail_thread_create_shadows(struct thread_finish_context *ctx,
+                                      uint32_t record_count)
 {
-       struct thread_finish_context ctx;
-       const struct mail_hash_header *hdr;
        struct mail_thread_node *node, *parent;
        struct mail_thread_root_node root;
        ARRAY_TYPE(uint32_t) free_indexes;
        const uint32_t *indexes;
-       uint32_t idx, parent_idx;
        unsigned int i, count;
-       int ret;
-
-       memset(&ctx, 0, sizeof(ctx));
-       ctx.box = tmp_mail->box;
-       ctx.output = output;
-       ctx.tmp_mail = tmp_mail;
-       ctx.hash_trans = hash_trans;
-       ctx.id_is_uid = id_is_uid;
-       ctx.use_sent_date = thread_type == MAIL_THREAD_REFERENCES;
-
-       hdr = mail_hash_get_header(ctx.hash_trans);
-       if (hdr->record_count == 0)
-               return 0;
-       ctx.next_new_root_idx = hdr->record_count + 1;
+       uint32_t idx, parent_idx;
 
-       /* (2) save root nodes and (3) remove dummy messages */
        memset(&root, 0, sizeof(root));
        i_array_init(&free_indexes, 128);
-       i_array_init(&ctx.roots, I_MIN(128, hdr->record_count));
-       i_array_init(&ctx.shadow_nodes, hdr->record_count);
-       for (idx = 1; idx < hdr->record_count; idx++) {
-               node = mail_hash_lookup_idx(ctx.hash_trans, idx);
+       for (idx = 1; idx < record_count; idx++) {
+               node = mail_hash_lookup_idx(ctx->hash_trans, idx);
                if (MAIL_HASH_RECORD_IS_DELETED(&node->rec))
                        continue;
 
@@ -630,17 +606,18 @@ int mail_thread_finish(struct mail *tmp_mail,
                        continue;
                }
                parent = node->parent_idx == 0 ? NULL :
-                       mail_hash_lookup_idx(ctx.hash_trans, node->parent_idx);
+                       mail_hash_lookup_idx(ctx->hash_trans, node->parent_idx);
                if (thread_node_is_root(parent)) {
                        if (parent != NULL) {
                                /* parent is a duplicate root. replace it with
                                   the real root. */
                                node->parent_idx = 0;
-                               mail_hash_update(ctx.hash_trans, idx);
+                               mail_hash_update(ctx->hash_trans, idx);
                        }
                        root.node.idx = idx;
+                       root.node.uid = node->uid;
                        root.dummy = !node->exists;
-                       array_append(&ctx.roots, &root, 1);
+                       array_append(&ctx->roots, &root, 1);
                } else if (node->exists) {
                        /* Find the node's first non-dummy parent and add the
                           node as its child. If there are no non-dummy
@@ -648,22 +625,52 @@ int mail_thread_finish(struct mail *tmp_mail,
                        parent_idx = node->parent_idx;
                        while (!parent->exists && parent->parent_idx != 0) {
                                parent_idx = parent->parent_idx;
-                               parent = mail_hash_lookup_idx(ctx.hash_trans,
+                               parent = mail_hash_lookup_idx(ctx->hash_trans,
                                                              parent_idx);
                        }
-                       thread_add_shadow_child(&ctx, parent_idx, idx);
+                       thread_add_shadow_child(ctx, parent_idx, idx);
                }
        }
-       /* make sure all shadow indexes are accessible directly */
-       (void)array_idx_modifiable(&ctx.shadow_nodes, hdr->record_count);
 
+       /* remove records from hash that have been marked as deleted */
        indexes = array_get(&free_indexes, &count);
        for (i = 0; i < count; i++) {
-               node = mail_hash_lookup_idx(ctx.hash_trans, indexes[i]);
-               mail_hash_remove(ctx.hash_trans, indexes[i],
+               node = mail_hash_lookup_idx(ctx->hash_trans, indexes[i]);
+               mail_hash_remove(ctx->hash_trans, indexes[i],
                                 node->msgid_crc32);
        }
        array_free(&free_indexes);
+}
+
+int mail_thread_finish(struct mail *tmp_mail,
+                      struct mail_hash_transaction *hash_trans,
+                      enum mail_thread_type thread_type,
+                      struct ostream *output, bool id_is_uid)
+{
+       struct thread_finish_context ctx;
+       const struct mail_hash_header *hdr;
+       int ret;
+
+       memset(&ctx, 0, sizeof(ctx));
+       ctx.box = tmp_mail->box;
+       ctx.output = output;
+       ctx.tmp_mail = tmp_mail;
+       ctx.hash_trans = hash_trans;
+       ctx.id_is_uid = id_is_uid;
+       ctx.use_sent_date = thread_type == MAIL_THREAD_REFERENCES;
+
+       hdr = mail_hash_get_header(ctx.hash_trans);
+       if (hdr->record_count == 0)
+               return 0;
+       ctx.next_new_root_idx = hdr->record_count + 1;
+
+       /* (2) save root nodes and (3) remove dummy messages */
+       i_array_init(&ctx.roots, I_MIN(128, hdr->record_count));
+       i_array_init(&ctx.shadow_nodes, hdr->record_count);
+       /* make sure all shadow indexes are accessible directly. */
+       (void)array_idx_modifiable(&ctx.shadow_nodes, hdr->record_count);
+
+       mail_thread_create_shadows(&ctx, hdr->record_count);
 
        /* (4) */
        if (sort_root_nodes(&ctx) < 0)