* The 'set the flags' portion of IMAP COPY now sets the flags of all messages

  in bulk, instead of one message at a time.  Big performance boost.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index e2300c3c7cde7f979d3f40315af23b01be2194e4..df6aa0f0df4037102e481fd6379bc8b0faf2970e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 11 12:55:43 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
+* The "set the flags" portion of IMAP COPY now sets the flags of all messages
+  in bulk, instead of one message at a time.  Big performance boost.
+
 Tue Oct 11 01:09:59 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
 * Fixed a problem with replication.  I believe we've got it now but it needs
   another round of testing.

diff --git a/citadel/imap_misc.c b/citadel/imap_misc.c
index 7d616d1e484c137e2ddb3de452da578bc414cedf..f6759da7bf978ee2edb9a0c6b26d9096113bfb6b 100644 (file)
--- a/citadel/imap_misc.c
+++ b/citadel/imap_misc.c
@@ -64,6 +64,7 @@ int imap_do_copy(char *destination_folder) {
        char roomname[ROOMNAMELEN];
        struct ctdlroom qrbuf;
        struct timeval tv1, tv2, tv3;
+       int num_selected = 0;
 
        if (IMAP->num_msgs < 1) {
                return(0);
@@ -85,46 +86,83 @@ int imap_do_copy(char *destination_folder) {
         * the code which appears below, to copy all the message pointers in
         * one shot.
         * 
-        * But the REAL resource waster is further down, where we call
-        * the CtdlSetSeen() API for each message moved.  That's a HUGE
-        * performance drag.  Fix that too.
-        *
         */
        gettimeofday(&tv1, NULL);
        for (i = 0; i < IMAP->num_msgs; ++i) {
                if (IMAP->flags[i] & IMAP_SELECTED) {
+                       ++num_selected;
                        CtdlCopyMsgToRoom(IMAP->msgids[i], roomname);
                }
        }
 
-       /* Set the flags... */
-       gettimeofday(&tv2, NULL);
-       i = getroom(&qrbuf, roomname);
-       if (i != 0) return(i);
+       /* Don't bother wasting any more time if there were no messages. */
+       if (num_selected == 0) {
+               return(0);
+       }
+
+       /* Enumerate lists of messages for which flags are toggled */
+       long *seen_yes = NULL;
+       int num_seen_yes = 0;
+       long *seen_no = NULL;
+       int num_seen_no = 0;
+       long *answ_yes = NULL;
+       int num_answ_yes = 0;
+       long *answ_no = NULL;
+       int num_answ_no = 0;
+
+       seen_yes = malloc(num_selected * sizeof(long));
+       seen_no = malloc(num_selected * sizeof(long));
+       answ_yes = malloc(num_selected * sizeof(long));
+       answ_no = malloc(num_selected * sizeof(long));
 
        for (i = 0; i < IMAP->num_msgs; ++i) {
                if (IMAP->flags[i] & IMAP_SELECTED) {
-                       CtdlSetSeen(&IMAP->msgids[i], 1,
-                               ((IMAP->flags[i] & IMAP_SEEN) ? 1 : 0),
-                               ctdlsetseen_seen,
-                               NULL, &qrbuf
-                       );
-                       CtdlSetSeen(&IMAP->msgids[i], 1,
-                               ((IMAP->flags[i] & IMAP_ANSWERED) ? 1 : 0),
-                               ctdlsetseen_answered,
-                               NULL, &qrbuf
-                       );
+                       if (IMAP->flags[i] & IMAP_SEEN) {
+                               seen_yes[num_seen_yes++] = IMAP->msgids[i];
+                       }
+                       if ((IMAP->flags[i] & IMAP_SEEN) == 0) {
+                               seen_no[num_seen_no++] = IMAP->msgids[i];
+                       }
+                       if (IMAP->flags[i] & IMAP_ANSWERED) {
+                               answ_yes[num_answ_yes++] = IMAP->msgids[i];
+                       }
+                       if ((IMAP->flags[i] & IMAP_ANSWERED) == 0) {
+                               answ_no[num_answ_no++] = IMAP->msgids[i];
+                       }
                }
        }
 
+       /* Set the flags... */
+       gettimeofday(&tv2, NULL);
+       i = getroom(&qrbuf, roomname);
+       if (i == 0) {
+               CtdlSetSeen(seen_yes, num_seen_yes, 1,
+                       ctdlsetseen_seen, NULL, &qrbuf
+               );
+               CtdlSetSeen(seen_no, num_seen_no, 0,
+                       ctdlsetseen_seen, NULL, &qrbuf
+               );
+               CtdlSetSeen(answ_yes, num_answ_yes, 1,
+                       ctdlsetseen_answered, NULL, &qrbuf
+               );
+               CtdlSetSeen(answ_no, num_answ_no, 0,
+                       ctdlsetseen_answered, NULL, &qrbuf
+               );
+       }
+
+       free(seen_yes);
+       free(seen_no);
+       free(answ_yes);
+       free(answ_no);
+
        gettimeofday(&tv3, NULL);
        lprintf(CTDL_DEBUG, "Copying the pointers took %ld microseconds\n",
-               (tv2.tv_usec + (tv2.tv_sec * 1000))
-               - (tv1.tv_usec + (tv1.tv_sec * 1000))
+               (tv2.tv_usec + (tv2.tv_sec * 1000000))
+               - (tv1.tv_usec + (tv1.tv_sec * 1000000))
        );
        lprintf(CTDL_DEBUG, "Setting the flags took %ld microseconds\n",
-               (tv3.tv_usec + (tv3.tv_sec * 1000))
-               - (tv2.tv_usec + (tv2.tv_sec * 1000))
+               (tv3.tv_usec + (tv3.tv_sec * 1000000))
+               - (tv2.tv_usec + (tv2.tv_sec * 1000000))
        );
        return(0);
 }