Changeset 5029 in subversion

Timestamp:

Aug 8, 2011 8:14:49 AM (23 months ago)

Author:

alec

Message:

• Fixed messages re-sorting with rcube_header_sorter
• More "use UID where possible"
• Improved parformance for case when id2uid() is called before listing messages

Location:

branches/devel-mcache/roundcubemail/program/include

Files:

• rcube_imap.php (modified) (5 diffs)
• rcube_imap_cache.php (modified) (7 diffs)
• rcube_imap_generic.php (modified) (1 diff)

branches/devel-mcache/roundcubemail/program/include/rcube_imap.php

@@ -892 +892 @@
         else if ($this->get_capability('SORT') &&
             // Courier-IMAP provides SORT capability but allows to disable it by admin (#1486959)
-            ($msg_index = $this->conn->sort($mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')) !== false
+            ($msg_index = $this->conn->sort($mailbox, $this->sort_field,
+                $this->skip_deleted ? 'UNDELETED' : '', true)) !== false
         ) {
             if (!empty($msg_index)) {
                 list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
                 $msg_index = array_slice($msg_index, $begin, $end-$begin);
+                $is_uid    = true;
 
                 if ($slice)
@@ -902 +904 @@
 
                 // fetch reqested headers from server
-                $a_msg_headers = $this->fetch_headers($mailbox, $msg_index);
+                $a_msg_headers = $this->fetch_headers($mailbox, $msg_index, true);
             }
         }
         // fetch specified header for all messages and sort
-        else if ($a_index = $this->conn->fetchHeaderIndex($mailbox, "1:*", $this->sort_field, $this->skip_deleted)) {
-            asort($a_index); // ASC
-            $msg_index = array_keys($a_index);
+        else if ($msg_index = $this->conn->fetchHeaderIndex($mailbox, "1:*",
+            $this->sort_field, $this->skip_deleted, true)
+        ) {
+            asort($msg_index); // ASC
+            $msg_index = array_keys($msg_index);
             list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
             $msg_index = array_slice($msg_index, $begin, $end-$begin);
+            $is_uid    = true;
 
             if ($slice)
@@ -916 +921 @@
 
             // fetch reqested headers from server
-            $a_msg_headers = $this->fetch_headers($mailbox, $msg_index);
+            $a_msg_headers = $this->fetch_headers($mailbox, $msg_index, true);
         }
 
@@ -1662 +1667 @@
 
             // Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
-            // but I've seen that Courier doesn't support UTF-8)
+            // but I've seen Courier with disabled UTF-8 support)
             if ($a_messages === false && $charset && $charset != 'US-ASCII')
                 $a_messages = $this->conn->sort($mailbox, $sort_field,
@@ -4500 +4505 @@
     function sort_headers(&$headers)
     {
-        if (!empty($uids))
+        if (!empty($this->uids))
             uksort($headers, array($this, "compare_uids"));
         else

branches/devel-mcache/roundcubemail/program/include/rcube_imap_cache.php

@@ -98 +98 @@
         // Seek in internal cache
         if (array_key_exists('index', $this->icache[$mailbox])
-            && ($this->icache[$mailbox]['index']['sort_field'] == $sort_field)
+            && ($sort_field == 'ANY' || $this->icache[$mailbox]['index']['sort_field'] == $sort_field)
         ) {
             if ($this->icache[$mailbox]['index']['sort_order'] == $sort_order)
@@ -122 +122 @@
         if (!empty($index)) {
             $exists = true;
+            if ($sort_field == 'ANY') {
+                $sort_field = $index['sort_field'];
+            }
 
             // Check UIDVALIDITY
@@ -195 +198 @@
             }
         }
-
-        $this->icache[$mailbox]['index'] = array(
-            'result'     => $data,
-            'sort_field' => $sort_field,
-            'sort_order' => $sort_order,
-        );
-
-        if ($data !== null) {
-            return $data;
+        else if ($sort_field == 'ANY') {
+            $sort_field = '';
         }
 
         // Index not found or not valid, get index from IMAP server
-        $data = array();
-        if ($mbox_data['EXISTS']) {
-            // fetch sorted sequence numbers
-            $data_seq = $this->imap->message_index_direct($mailbox, $sort_field, $sort_order);
-            // fetch UIDs
-            if (!empty($data_seq)) {
-                $data_uid = $this->imap->conn->fetchUIDs($mailbox, $data_seq);
-                // build index
-                if (!empty($data_uid)) {
-                    foreach ($data_seq as $seq)
-                        if ($uid = $data_uid[$seq])
-                            $data[$seq] = $uid;
-                }
-            }
-        }
-
-        if (is_array($data)) {
+        if ($data === null) {
+            $data = array();
+            if ($mbox_data['EXISTS']) {
+                // fetch sorted sequence numbers
+                $data_seq = $this->imap->message_index_direct($mailbox, $sort_field, $sort_order);
+                // fetch UIDs
+                if (!empty($data_seq)) {
+                    // Seek in internal cache
+                    if (array_key_exists('index', $this->icache[$mailbox]))
+                        $data_uid = $this->icache[$mailbox]['index']['result'];
+                    else
+                        $data_uid = $this->imap->conn->fetchUIDs($mailbox, $data_seq);
+
+                    // build index
+                    if (!empty($data_uid)) {
+                        foreach ($data_seq as $seq)
+                            if ($uid = $data_uid[$seq])
+                                $data[$seq] = $uid;
+                    }
+                }
+            }
+
             $in_data = implode(':', array(
                 implode(',', array_keys($data)),
                 implode(',', array_values($data)),
                 $sort_order,
-                (int)$this->skip_deleted,
-                (int)$mbox_data['UIDVALIDITY'],
+                (int) $this->skip_deleted,
+                (int) $mbox_data['UIDVALIDITY'],
             ));
 
@@ -246 +247 @@
                     ." VALUES (?, ?, ?, 0, ?, ".$this->db->now().")",
                     $this->userid, $mailbox, (string)$sort_field, $in_data);
-
-        }
-
-        return $this->icache[$mailbox]['index']['result'] = (array)$data;
+        }
+
+        $this->icache[$mailbox]['index'] = array(
+            'result'     => $data,
+            'sort_field' => $sort_field,
+            'sort_order' => $sort_order,
+        );
+
+        return $this->icache[$mailbox]['index']['result'];
     }
 
@@ -431 +437 @@
     function id2uid($mailbox, $id)
     {
-        $index = $this->get_index($mailbox);
+        $index = $this->get_index($mailbox, 'ANY');
 
         return $index[$id];
@@ -445 +451 @@
     function uid2id($mailbox, $uid)
     {
-        $index = $this->get_index($mailbox);
+        $index = $this->get_index($mailbox, 'ANY');
 
         return array_search($uid, $index);
@@ -456 +462 @@
     private function get_index_row($mailbox, $sort_field, $threaded = false)
     {
-        // Get index from DB, for query with no sort_field specified
-        // we'll get most recent index data
-        $sql_result = $this->db->query(
-            "SELECT data, sort_field"
-            ." FROM ".get_table_name('cache_index')
-            ." WHERE user_id = ?"
-                ." AND mailbox = ?"
-                ." AND sort_field = ?"
-                ." AND threaded = ?",
-            $this->userid, $mailbox, (string)$sort_field, (int)$threaded);
+        // Get index from DB
+        // There's a special case when we want most recent index
+        if ($sort_field == 'ANY')
+            $sql_result = $this->db->limitquery(
+                "SELECT data, sort_field"
+                ." FROM ".get_table_name('cache_index')
+                ." WHERE user_id = ?"
+                    ." AND mailbox = ?"
+                    ." AND threaded = ?"
+                ." ORDER BY changed DESC",
+                0, 1, $this->userid, $mailbox, (int)$threaded);
+        else
+            $sql_result = $this->db->query(
+                "SELECT data, sort_field"
+                ." FROM ".get_table_name('cache_index')
+                ." WHERE user_id = ?"
+                    ." AND mailbox = ?"
+                    ." AND threaded = ?"
+                    ." AND sort_field = ?",
+                $this->userid, $mailbox, (int)$threaded, (string)$sort_field);
 
         if ($sql_arr = $this->db->fetch_assoc($sql_result)) {

branches/devel-mcache/roundcubemail/program/include/rcube_imap_generic.php

@@ -62 +62 @@
     public $forwarded = false;
     public $flagged = false;
-    public $has_children = false;
-    public $depth = 0;
-    public $unread_children = 0;
     public $others = array();
 }