Changeset 13066 for trunk/wp-includes/cache.php

Timestamp:

02/12/2010 05:06:43 PM (16 years ago)

Author:

ryan

Message:

Preload commonly loaded site options when running multisite without a persistent cache. Introduce wp_cache_reset() and call it instead of wp_cache_init() when re-initing after the blog ID chanages to avoid throwing out the entire cache. Pass cached site options through the site option filter when fetching.

File:

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

trunk/wp-includes/cache.php

@@ -150 +150 @@
  */
 function wp_cache_add_global_groups( $groups ) {
-    // Default cache doesn't persist so nothing to do here.
-    return;
+    global $wp_object_cache;
+
+    return $wp_object_cache->add_global_groups($groups);
 }
 
@@ -164 +165 @@
     // Default cache doesn't persist so nothing to do here.
     return;
+}
+
+/**
+ * Reset internal cache keys and structures.  If the cache backend uses global blog or site IDs as part of its cache keys,
+ * this function instructs the backend to reset those keys and perform any cleanup since blog or site IDs have changed since cache init.
+ *
+ * @since 2.6.0
+ *
+ * @param string|array $groups A group or an array of groups to add
+ */
+function wp_cache_reset() {
+    global $wp_object_cache;
+
+    return $wp_object_cache->reset();
 }
 
@@ -219 +234 @@
      */
     var $cache_misses = 0;
+
+    /**
+     * List of global groups
+     *
+     * @var array
+     * @access protected
+     * @since 3.0.0
+     */
+    var $global_groups = array();
 
     /**
@@ -235 +259 @@
      * @return bool False if cache ID and group already exists, true on success
      */
-    function add($id, $data, $group = 'default', $expire = '') {
-        if (empty ($group))
+    function add( $id, $data, $group = 'default', $expire = '' ) {
+        if ( empty ($group) )
             $group = 'default';
 
@@ -243 +267 @@
 
         return $this->set($id, $data, $group, $expire);
+    }
+
+    /**
+     * Sets the list of global groups.
+     *
+     * @since 3.0.0
+     *
+     * @param array $groups List of groups that are global.
+     */
+    function add_global_groups( $groups ) {
+        $groups = (array) $groups;
+
+        $this->global_groups = array_merge($this->global_groups, $groups);
+        $this->global_groups = array_unique($this->global_groups);
     }
 
@@ -309 +347 @@
      */
     function get($id, $group = 'default') {
-        if (empty ($group))
+        if ( empty ($group) )
             $group = 'default';
 
-        if (isset ($this->cache[$group][$id])) {
+        if ( isset ($this->cache[$group][$id]) ) {
             $this->cache_hits += 1;
             if ( is_object($this->cache[$group][$id]) )
@@ -344 +382 @@
             $group = 'default';
 
-        if (false === $this->get($id, $group))
+        if ( false === $this->get($id, $group) )
             return false;
 
         return $this->set($id, $data, $group, $expire);
+    }
+
+    /**
+     * Reset keys
+     *
+     * @since 3.0.0
+     */
+    function reset() {
+        // Clear out non-global caches since the blog ID has changed.
+        foreach ( array_keys($this->cache) as $group ) {
+            if ( !in_array($group, $this->global_groups) )
+                unset($this->cache[$group]);
+        }
     }
 
@@ -371 +422 @@
      */
     function set($id, $data, $group = 'default', $expire = '') {
-        if (empty ($group))
+        if ( empty ($group) )
             $group = 'default';
 
-        if (NULL === $data)
+        if ( NULL === $data )
             $data = '';
 
@@ -382 +433 @@
         $this->cache[$group][$id] = $data;
 
-        if(isset($this->non_existent_objects[$group][$id]))
+        if ( isset($this->non_existent_objects[$group][$id]) )
             unset ($this->non_existent_objects[$group][$id]);