Changeset 2053 in subversion

Timestamp:

Nov 15, 2008 6:11:33 AM (5 years ago)

Author:

alec

Message:

• Fix big memory consumption and speed up searching on servers without SORT capability

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/11/15 (alec)
+----------
+- Fix big memory consumption and speed up searching on servers without SORT capability
 
 2008/11/12 (alec)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -593 +593 @@
       $a_msg_headers = array();
       $deleted_count = $this->_fetch_headers($mailbox, $msgs, $a_msg_headers, $cache_key);
-      if ($this->sort_order == 'DESC' && $headers_sorted) {  
-        //since the sort order is not used in the iil_c_sort function we have to do it here
-        $a_msg_headers = array_reverse($a_msg_headers);
-      }
+
       // delete cached messages with a higher index than $max+1
       // Changed $max to $max+1 to fix this bug : #1484295
       $this->clear_message_cache($cache_key, $max + 1);
 
-
       // kick child process to sync cache
       // ...
-
       }
 
@@ -678 +673 @@
       return array_values($a_msg_headers);
       }
-    else { // SEARCH searching result
-      // not sorted, so we must fetch headers for all messages
-      // TODO: to minimize big memory consumption on servers without SORT 
-      // capability, we should fetch only headers used for sorting, and then
-      // fetch all headers needed for displaying one page of messages list.
-      // Of course it has sense only for big results if count($msgs) > $this->pagesize
-      $this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
-    
-      // return empty array if no messages found
-      if (!is_array($a_msg_headers) || empty($a_msg_headers))
-        return array();
-
-      // if not already sorted
-      $a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);
-      
-      // only return the requested part of the set
-      return array_slice(array_values($a_msg_headers), $start_msg, min(count($msgs)-$start_msg, $this->page_size));
+    else { // SEARCH searching result, need sorting
+      if ($cnt > $this->pagesize * 2) {
+        // use memory less expensive (and quick) method for big result set
+        $a_index = $this->message_index($mailbox, $this->sort_field, $this->sort_order);
+        // get messages uids for one page...
+        $msgs = array_slice(array_keys($a_index), $start_msg, min(count($msgs)-$start_msg, $this->page_size));
+        // ...and fetch headers
+        $this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
+
+        // return empty array if no messages found
+        if (!is_array($a_msg_headers) || empty($a_msg_headers))
+          return array();
+
+        $sorter = new rcube_header_sorter();
+        $sorter->set_sequence_numbers($msgs);
+        $sorter->sort_headers($a_msg_headers);
+
+        return array_values($a_msg_headers);
+        }
+      else {
+        // for small result set we can fetch all messages headers
+        $this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
+    
+        // return empty array if no messages found
+        if (!is_array($a_msg_headers) || empty($a_msg_headers))
+          return array();
+
+        // if not already sorted
+        $a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);
+      
+        // only return the requested part of the set
+        return array_slice(array_values($a_msg_headers), $start_msg, min(count($msgs)-$start_msg, $this->page_size));
+        }
       }
     }
@@ -814 +825 @@
       else
         {
-        // TODO: see list_header_set (fetch only one header field needed for sorting)
-        $this->_fetch_headers($mailbox, join(',', $this->search_set), $a_msg_headers, NULL);
-
-        foreach (iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order) as $i => $msg)
-          $this->cache[$key][] = $msg->id;
+        $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, join(',', $this->search_set), $this->sort_field);
+
+        if ($this->sort_order=="ASC")
+          asort($a_index);
+        else if ($this->sort_order=="DESC")
+          arsort($a_index);
+
+        $this->cache[$key] = $a_index;
         }
     }