Changeset 13066

Timestamp:

02/12/2010 05:06:43 PM (17 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.

Location:

trunk/wp-includes

Files:

• cache.php (modified) (9 diffs)
• functions.php (modified) (2 diffs)
• load.php (modified) (2 diffs)
• ms-load.php (modified) (3 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]);
 

trunk/wp-includes/functions.php

@@ -436 +436 @@
 
         return $alloptions;
+}
+
+function wp_load_core_site_options( $site_id = null ) {
+        global $wpdb, $_wp_using_ext_object_cache;
+
+        if ( !is_multisite() || $_wp_using_ext_object_cache || defined( 'WP_INSTALLING' ) )
+                return;
+
+        if ( empty($site_id) )
+                $site_id = $wpdb->siteid;
+
+        $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'dashboard_blog');
+
+        $core_options_in = "'" . implode("', '", $core_options) . "'";
+        $options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );
+
+        foreach ( $options as $option ) {
+                $key = $option->meta_key;
+                $cache_key = "{$site_id}:$key";
+                $option->meta_value = maybe_unserialize( $option->meta_value );
+
+                wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
+        }
 }
 
@@ -3321 +3344 @@
                 $value = get_option($key, $default);
         } else {
-                $cache_key = "{$wpdb->siteid}:$key";
-
-                if ( $use_cache == true && $value = wp_cache_get($cache_key, 'site-options') )
-                        return $value;
-
-                $value = $wpdb->get_var( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid) );
-
-                if ( is_null($value) )
-                        $value = $default;
-
-                $value = maybe_unserialize( $value );
-
-                wp_cache_set( $cache_key, $value, 'site-options' );
+                $cache_key = "$wpdb->siteid:$key";
+                if ( $use_cache )
+                        $value = wp_cache_get($cache_key, 'site-options');
+
+                if ( false === $value ) {
+                        $value = $wpdb->get_var( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid) );
+
+                        if ( is_null($value) )
+                                $value = $default;
+
+                        $value = maybe_unserialize( $value );
+
+                        wp_cache_set( $cache_key, $value, 'site-options' );
+                }
         }
 

trunk/wp-includes/load.php

@@ -319 +319 @@
  */
 function wp_start_object_cache() {
-        if ( ! function_exists( 'wp_cache_init' ) ) {
+        $first_init = false;
+        if ( ! function_exists( 'wp_cache_init' ) ) {
                 global $_wp_using_ext_object_cache;
                 if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
@@ -328 +329 @@
                         $_wp_using_ext_object_cache = false;
                 }
-        }
-
-        wp_cache_init();
+                $first_init = true;
+        }
+
+        // If cache supports reset, reset instead of init if already initialized.
+        // Reset signals to the cache that global IDs have changed and it may need to update keys
+        // and cleanup caches.
+        if ( !$first_init && function_exists('wp_cache_reset') )
+                wp_cache_reset();
+        else
+                wp_cache_init();
+
         if ( function_exists( 'wp_cache_add_global_groups' ) ) {
                 wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss' ) );

trunk/wp-includes/ms-load.php

@@ -76 +76 @@
 function get_current_site_name( $current_site ) {
         global $wpdb;
-        $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" );
+        $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', 'site-options' );
         if ( ! $current_site->site_name ) {
-                $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
-                if ( ! $current_site->site_name )
-                        $current_site->site_name = ucfirst( $current_site->domain );
+                $current_site->site_name = wp_cache_get( $current_site->id . ':site_name', 'site-options' );
+                if ( ! $current_site->site_name ) {
+                        $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
+                        if ( ! $current_site->site_name )
+                                $current_site->site_name = ucfirst( $current_site->domain );
+                }
                 wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options' );
         }
@@ -108 +111 @@
                         $current_site->cookie_domain = $current_site->domain;
 
+                wp_load_core_site_options($current_site->id);
+
                 return $current_site;
         }
@@ -117 +122 @@
         $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
         if ( 1 == count( $sites ) ) {
+                wp_load_core_site_options($current_site->id);
                 $current_site = $sites[0];
                 $path = $current_site->path;