Changeset 5303 in subversion

Timestamp:

Oct 3, 2011 1:52:35 PM (21 months ago)

Author:

alec

Message:

• Fix: skip redundant cache queries when an entry doesn't exist

File:

• trunk/roundcubemail/program/include/rcube_cache.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_cache.php

@@ -246 +246 @@
         }
 
-        if ($this->type == 'memcache') {
-            $data = $this->db->get($this->ckey($key));
-        }
-        else if ($this->type == 'apc') {
-            $data = apc_fetch($this->ckey($key));
-            }
-
-        if ($data) {
-            $md5sum = md5($data);
-            $data   = $this->packed ? unserialize($data) : $data;
-
-            if ($nostore) {
-                return $data;
-            }
-
-            $this->cache_sums[$key] = $md5sum;
-            $this->cache[$key]      = $data;
-        }
-
-        if ($this->type == 'db') {
+        if ($this->type != 'db') {
+            if ($this->type == 'memcache') {
+                $data = $this->db->get($this->ckey($key));
+            }
+            else if ($this->type == 'apc') {
+                $data = apc_fetch($this->ckey($key));
+                }
+
+            if ($data) {
+                $md5sum = md5($data);
+                $data   = $this->packed ? unserialize($data) : $data;
+
+                if ($nostore) {
+                    return $data;
+                }
+
+                $this->cache_sums[$key] = $md5sum;
+                $this->cache[$key]      = $data;
+            }
+            else if (!$nostore) {
+                $this->cache[$key] = null;
+            }
+        }
+        else {
             $sql_result = $this->db->limitquery(
                 "SELECT cache_id, data, cache_key".
@@ -291 +295 @@
                 $this->cache_keys[$key] = $sql_arr['cache_id'];
             }
+            else if (!$nostore) {
+                $this->cache[$key] = null;
+            }
         }