Changeset 4162 in subversion

Timestamp:

Oct 29, 2010 2:02:19 PM (3 years ago)

Author:

alec

Message:

• Improve performance of message cache status checking when skip_disabled=true

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (4 diffs)
• program/include/rcube_imap_generic.php (modified) (6 diffs)

trunk/roundcubemail/CHANGELOG

@@ -58 +58 @@
 - Plugin API: add possibility to disable plugin in framed mode, 'noframe' property
 - Improve performance of setting IMAP flags using .SILENT suffix
+- Improve performance of message cache status checking with skip_disabled=true
 
 RELEASE 0.4.2

trunk/roundcubemail/program/include/rcube_imap.php

@@ -547 +547 @@
                 $search_str .= " UNSEEN";
             }
-            else if ($status) {
-                $keys[]   = 'MAX';
-                $need_uid = true;
+            else {
+                if ($this->caching_enabled) {
+                    $keys[] = 'ALL';
+                }
+                if ($status) {
+                    $keys[]   = 'MAX';
+                    $need_uid = true;
+                }
             }
 
@@ -558 +563 @@
             $count = is_array($index) ? $index['COUNT'] : 0;
 
-            if ($mode == 'ALL' && $status) {
-                $this->set_folder_stats($mailbox, 'cnt', $count);
-                $this->set_folder_stats($mailbox, 'maxuid', is_array($index) ? $index['MAX'] : 0);
+            if ($mode == 'ALL') {
+                if ($need_uid && $this->caching_enabled) {
+                    // Save messages index for check_cache_status()
+                    $this->icache['all_undeleted_idx'] = $index['ALL'];
+                }
+                if ($status) {
+                    $this->set_folder_stats($mailbox, 'cnt', $count);
+                    $this->set_folder_stats($mailbox, 'maxuid', is_array($index) ? $index['MAX'] : 0);
+                }
             }
         }
@@ -3647 +3658 @@
 
         // empty mailbox
-        if (!$msg_count)
+        if (!$msg_count) {
             return $cache_count ? -2 : 1;
+        }
 
         if ($cache_count == $msg_count) {
             if ($this->skip_deleted) {
-                    $h_index = $this->conn->fetchHeaderIndex($mailbox, "1:*", 'UID', $this->skip_deleted);
-
-                // Save index in internal cache, will be used when syncing the cache
-                $this->icache['folder_index'] = $h_index;
-
-                if (empty($h_index))
-                    return -2;
-
-                    if (sizeof($h_index) == $cache_count) {
-                        $cache_index = array_flip($cache_index);
-                        foreach ($h_index as $idx => $uid)
-                        unset($cache_index[$uid]);
-
-                        if (empty($cache_index))
-                            return 1;
-                    }
-                    return -2;
+                if (!empty($this->icache['all_undeleted_idx'])) {
+                    $uids = rcube_imap_generic::uncompressMessageSet($this->icache['all_undeleted_idx']);
+                    $uids = array_flip($uids);
+                    foreach ($cache_index as $uid) {
+                        unset($uids[$uid]);
+                    }
+                }
+                else {
+                    // get all undeleted messages excluding cached UIDs
+                    $uids = $this->search_once($mailbox, 'ALL UNDELETED NOT UID '.
+                        rcube_imap_generic::compressMessageSet($cache_index));
+                }
+                if (empty($uids)) {
+                    return 1;
+                }
             } else {
                 // get UID of the message with highest index
@@ -3675 +3685 @@
 
                 // uids of highest message matches -> cache seems OK
-                if ($cache_uid == $uid)
+                if ($cache_uid == $uid) {
                     return 1;
+                }
             }
             // cache is dirty
             return -1;
         }
+
         // if cache count differs less than 10% report as dirty
-        else if (abs($msg_count - $cache_count) < $msg_count/10)
-            return -1;
-        else
-            return -2;
+        return (abs($msg_count - $cache_count) < $msg_count/10) ? -1 : -2;
     }
 

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -1009 +1009 @@
 
             // message IDs
-            if (is_array($add))
-                    $add = $this->compressMessageSet(join(',', $add));
+            if (!empty($add))
+                    $add = $this->compressMessageSet($add);
 
             list($code, $response) = $this->execute($is_uid ? 'UID SORT' : 'SORT',
@@ -1027 +1027 @@
     {
             if (is_array($message_set)) {
-                    if (!($message_set = $this->compressMessageSet(join(',', $message_set))))
+                    if (!($message_set = $this->compressMessageSet($message_set)))
                             return false;
             } else {
@@ -1151 +1151 @@
     }
 
-    private function compressMessageSet($messages, $force=false)
+    static function compressMessageSet($messages, $force=false)
     {
             // given a comma delimited list of independent mid's,
             // compresses by grouping sequences together
 
-        if (!is_array($message_set)) {
+        if (!is_array($messages)) {
                 // if less than 255 bytes long, let's not bother
                 if (!$force && strlen($messages)<255) {
@@ -1200 +1200 @@
     }
 
+    static function uncompressMessageSet($messages)
+    {
+            $result   = array();
+            $messages = explode(',', $messages);
+
+        foreach ($messages as $part) {
+            $items = explode(':', $part);
+            $max   = max($items[0], $items[1]);
+
+            for ($x=$items[0]; $x<=$max; $x++) {
+                $result[] = $x;
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Returns message sequence identifier
@@ -1265 +1282 @@
                     return false;
             }
-
-            if (is_array($message_set))
-                    $message_set = join(',', $message_set);
 
             $message_set = $this->compressMessageSet($message_set);
@@ -1825 +1839 @@
                         $result['MAX'] = !empty($response) ? max($response) : 0;
                     if (in_array('ALL', $items))
-                        $result['ALL'] = $this->compressMessageSet(implode(',', $response), true);
+                        $result['ALL'] = $this->compressMessageSet($response, true);
 
                     return $result;