Changeset 3021

Timestamp:

11/09/05 11:10:34 (3 years ago)

Author:

ryan

Message:

Add cache expiration. Cache requests for non-existant options.

Files:

• trunk/wp-includes/cache.php (modified) (10 diffs)

trunk/wp-includes/cache.php

@@ -52 +52 @@
-    var $cache_dir;
-    var $cache_enabled = false;
+    var $expiration_time = 86400;
-    var $use_flock = false;
-    var $flock_filename = 'wp_object_cache.lock';
@@ -58 +59 @@
-    var $cache = array ();
-    var $dirty_objects = array ();
+    var $non_existant_objects = array();
-    var $global_groups = array('users', 'usermeta');
-    var $blog_id;
@@ -68 +70 @@
-            $group = 'default';
-
-isset ($this->cache[$group][$id])
+ false !== $this->get($id, $group, false) 
-            return false;
-
@@ -78 +80 @@
-            $group = 'default';
-
-!isset ($this->cache[$group][$id])
+ false === $this->get($id, $group, false) 
-            return false;
-
-        unset ($this->cache[$group][$id]);
+        $this->non_existant_objects[$group][$id] = true;
-        $this->dirty_objects[$group][] = $id;
-        return true;
-    }
-
-
+, $count_hits = true
-        if ( empty($group) )
-            $group = 'default';
-
-        if (isset ($this->cache[$group][$id])) {
-
+
+
-            return $this->cache[$group][$id];
-        }
+
+        if ( isset($this->non_existant_objects[$group][$id]) )
+            return false;
-
-        //  If caching is not enabled, we have to fall back to pulling from the DB.
@@ -105 +112 @@
-            }
-
+            $this->non_existant_objects[$group][$id] = true;
-            $this->cache_misses += 1;
-            return false;
@@ -111 +119 @@
-        $cache_file = $this->cache_dir . $this->get_group_dir($group) . "/" . md5($id . DB_PASSWORD) . '.php';
-        if (!file_exists($cache_file)) {
+            $this->non_existant_objects[$group][$id] = true;
-            $this->cache_misses += 1;
-            return false;
-        }
+
+        // If the object has expired, remove it from the cache and return false to force
+        // a refresh.
+        $now = time();
+        if ( (filemtime($cache_file) + $this->expiration_time) <= $now ) {
+            $this->cache_misses += 1;
+            $this->delete($id, $group);
+            return false;
+        }
+
-        $this->cache[$group][$id] = unserialize(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER)));
-        if ( false === $this->cache[$group][$id])
-            $this->cache[$group][$id] = '';
+
-        $this->cold_cache_hits += 1;
-        return $this->cache[$group][$id];
@@ -183 +203 @@
-            $group = 'default';
-
-!isset ($this->cache[$group][$id])
+ false === $this->get($id, $group, false) 
-            return false;
-
@@ -193 +213 @@
-            $group = 'default';
-
+        if ( NULL == $data)
+            $data = '';
+
-        $this->cache[$group][$id] = $data;
+        unset($this->non_existant_objects[$group][$id]);
-        $this->dirty_objects[$group][] = $id;
+
-        return true;
-    }
-
+
-    function save() {
-        //$this->stats();
@@ -239 +264 @@
-            $ids = array_unique($ids);
-            foreach ($ids as $id) {
-                // TODO:  If the id is no longer in the cache, it was deleted and
-                // the file should be removed.
-                $cache_file = $group_dir . md5($id . DB_PASSWORD) . '.php';
+
+                // Remove the cache file if the key is not set.
+                if ( ! isset($this->cache[$group][$id]) ) {
+                    echo "Deleting $group $id<br/>";
+                    if ( file_exists($cache_file) )
+                        unlink($cache_file);
+                    continue;
+                }
+
-                $temp_file = tempnam($group_dir, 'tmp');
-                $serial = CACHE_SERIAL_HEADER . serialize($this->cache[$group][$id]) . CACHE_SERIAL_FOOTER;
@@ -303 +335 @@
-            $this->cache_enabled = true;
-        }
-
+
+
+
+
-        $this->blog_id = md5($blog_id);
-    }