Changeset 4785 in subversion

Timestamp:

May 18, 2011 8:37:00 AM (2 years ago)

Author:

alec

Message:

• Add APC support in rcube_cache

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcmail.php (modified) (1 diff)
• program/include/rcube_cache.php (modified) (6 diffs)
• program/include/rcube_imap.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
-- Added general rcube_cache class with memcache support
+- Added general rcube_cache class with Memcache and APC support
 - Improved caching performance by skipping writes of unchanged data
 - Option enable_caching replaced by imap_cache and messages_cache options

trunk/roundcubemail/config/main.inc.php.dist

@@ -110 +110 @@
 $rcmail_config['imap_auth_pw'] = null;
 
-// Type of IMAP indexes cache. Supported values: 'db' and 'memcache'.
+// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
 $rcmail_config['imap_cache'] = null;
 

trunk/roundcubemail/program/include/rcmail.php

@@ -357 +357 @@
    *
    * @param string $name Cache identifier
-   * @param string $type Cache type ('db' or 'memcache')
+   * @param string $type Cache type ('db', 'apc' or 'memcache')
    *
    * @return rcube_cache Cache object

trunk/roundcubemail/program/include/rcube_cache.php

@@ -52 +52 @@
      * Object constructor.
      *
-     * @param string $type   Engine type ('db' or 'memcache')
+     * @param string $type   Engine type ('db' or 'memcache' or 'apc')
      * @param int    $userid User identifier
      * @param string $prefix Key name prefix
@@ -59 +59 @@
     {
         $rcmail = rcmail::get_instance();
+        $type   = strtolower($type);
     
-        if (strtolower($type) == 'memcache') {
+        if ($type == 'memcache') {
             $this->type = 'memcache';
             $this->db   = $rcmail->get_memcache();
+        }
+        else if ($type == 'apc') {
+            $this->type = 'apc';
+            $this->db   = function_exists('apc_exists'); // APC 3.1.4 required
         }
         else {
@@ -209 +214 @@
 
         if ($this->type == 'memcache') {
-            $data = $this->db->get($this->mc_key($key));
+            $data = $this->db->get($this->ckey($key));
+                
+            if ($data) {
+                $this->cache_sums[$key] = md5($data);
+                $data = unserialize($data);
+            }
+            return $this->cache[$key] = $data;
+        }
+
+        if ($this->type == 'apc') {
+            $data = apc_fetch($this->ckey($key));
                 
             if ($data) {
@@ -264 +279 @@
 
         if ($this->type == 'memcache') {
-            $key = $this->mc_key($key);
+            $key = $this->ckey($key);
             $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED);
             if (!$result)
                 $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED);
             return $result;
+        }
+
+        if ($this->type == 'apc') {
+            $key = $this->ckey($key);
+            if (apc_exists($key))
+                apc_delete($key);
+            return apc_store($key, $data);
         }
 
@@ -315 +337 @@
 
         if ($this->type == 'memcache') {
-            return $this->db->delete($this->mc_key($key));
+            return $this->db->delete($this->ckey($key));
+        }
+
+        if ($this->type == 'apc') {
+            return apc_delete($this->ckey($key));
         }
 
@@ -329 +355 @@
 
     /**
-     * Creates per-user Memcache key
+     * Creates per-user cache key (for memcache and apc)
      *
      * @param string $key Cache key
      * @access private
      */
-    private function mc_key($key)
+    private function ckey($key)
     {
         return sprintf('[%d]%s', $this->userid, $key);

trunk/roundcubemail/program/include/rcube_imap.php

@@ -3739 +3739 @@
      * Enable or disable indexes caching
      *
-     * @param boolean $type Cache type (memcache' or 'db')
+     * @param boolean $type Cache type (@see rcmail::get_cache)
      * @access public
      */