Changeset 5082 in subversion

Timestamp:

Aug 17, 2011 5:15:53 AM (21 months ago)

Author:

alec

Message:

• Improve performance (minimize number of sql queries) in situation when a message is changed few times in one request (using some kind of auto-save and internal cache)

Location:

branches/devel-mcache/roundcubemail/program/include

Files:

• rcube_imap.php (modified) (2 diffs)
• rcube_imap_cache.php (modified) (7 diffs)

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

@@ -221 +221 @@
     {
         $this->conn->closeConnection();
+        if ($this->mcache)
+            $this->mcache->close();
     }
 
@@ -2008 +2010 @@
 
         $headers->structure = $struct;
-
-        // update cached headers with structure
-        if ($mcache = $this->get_mcache_engine()) {
-            $mcache->add_message($mailbox, $headers);
-        }
 
         return $this->icache['message'] = $headers;

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

@@ -77 +77 @@
 
 
+    /**
+     * Cleanup actions (on shutdown).
+     */
     public function close()
     {
+        $this->save_icache();
+        $this->icache = null;
     }
 
@@ -328 +333 @@
     function get_message($mailbox, $uid)
     {
+        // Check internal cache
+        if (($message = $this->icache['message'])
+            && $message['mailbox'] == $mailbox && $message['object']->uid == $uid
+        ) {
+            return $this->icache['message']['object'];
+        }
+
         $flag_fields = implode(', ', array_map(array($this->db, 'quoteIdentifier'), $this->flag_fields));
 
@@ -348 +360 @@
         if (empty($message)) {
             $message = $this->imap->get_headers($uid, $mailbox, true);
-            // update cache
-            $this->add_message($mailbox, $message, !$found);
+            // cache will be updated in close(), see below
+        }
+
+        // Save the message in internal cache, will be written to DB in close()
+        // Common scenario: user opens unseen message
+        // - get message (SELECT)
+        // - set message headers/structure (INSERT or UPDATE)
+        // - set \Seen flag (UPDATE)
+        // This way we can skip one UPDATE
+        if (!empty($message)) {
+            // Save current message from internal cache
+            $this->save_icache();
+
+            $this->icache['message'] = array(
+                'object'  => $message,
+                'mailbox' => $mailbox,
+                'exists'  => $found,
+                'md5sum'  => md5(serialize($message)),
+            );
         }
 
@@ -408 +437 @@
      *
      * @param string  $mailbox  Folder name
-     * @param array   $uids     Message UIDs or -1 to change flag
+     * @param array   $uids     Message UIDs or null to change flag
      *                          of all messages in a folder
      * @param string  $flag     The name of the flag
@@ -418 +447 @@
 
         if (in_array($flag, $this->flag_fields)) {
+            // Internal cache update
+            if ($uids && count($uids) == 1 && ($uid = current($uids))
+                && ($message = $this->icache['message'])
+                && $message['mailbox'] == $mailbox && $message['object']->uid == $uid
+            ) {
+                $message['object']->$flag = $enabled;
+                return;
+            }
+
             $this->db->query(
                 "UPDATE ".get_table_name('cache_messages')
@@ -449 +487 @@
         }
         else {
+            // Remove the message from internal cache
+            if (!empty($uids) && !is_array($uids) && ($message = $this->icache['message'])
+                && $message['mailbox'] == $mailbox && $message['object']->uid == $uids
+            ) {
+                $this->icache['message'] = null;
+            }
+
             $this->db->query(
                 "DELETE FROM ".get_table_name('cache_messages')
@@ -823 +868 @@
         }
     }
+
+
+    /**
+     * Saves message stored in internal cache
+     */
+    private function save_icache()
+    {
+        // Save current message from internal cache
+        if ($message = $this->icache['message']) {
+            $object = $message['object'];
+            // remove body too big (>500kB)
+            if ($object->body && strlen($object->body) > 500 * 1024)
+                $object->body = null;
+
+            // calculate current md5 sum
+            $md5sum = md5(serialize($object));
+
+            if ($message['md5sum'] != $md5sum) {
+                $this->add_message($message['mailbox'], $object, !$message['exists']);
+            }
+
+            $this->icache['message']['md5sum'] = $md5sum;
+        }
+    }
+
 }