Changeset 13126

Timestamp:

02/13/2010 11:09:54 PM (17 years ago)

Author:

ryan

Message:

Add ability to query by domain and/or path to get_blog_details(). Improve blog details caching. Use get_blog_details() in ms-settings.php so queries are cached. see #11644

Location:

trunk

Files:

• wp-includes/blogs.php (modified) (2 diffs)
• wp-includes/ms-settings.php (modified) (3 diffs)
• wp-settings.php (modified) (3 diffs)

trunk/wp-includes/blogs.php

@@ -75 +75 @@
  *
  * @since 3.0
- * @param int $blog_id Blog ID
+ * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
  * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
  * @return object Blog details.
  */
-function get_blog_details( $blog_id, $get_all = true ) {
-        global $wpdb;
-
-        if ( !is_numeric( $blog_id ) )
-                $blog_id = get_id_from_blogname( $blog_id );
+function get_blog_details( $fields, $get_all = true ) {
+        global $wpdb;
+
+        if ( is_array($fields ) ) {
+                if ( isset($fields['blog_id']) ) {
+                        $blog_id = $fields['blog_id'];
+                } elseif ( isset($fields['domain']) && isset($fields['path']) ) {
+                        $key = md5( $fields['domain'] . $fields['path'] );
+                        $blog = wp_cache_get($key, 'blog-lookup');
+                        if ( false !== $blog )
+                                return $blog;
+                        $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+                        if ( $blog ) {
+                                wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+                                $blog_id = $blog->blog_id;
+                        } else {
+                                return false;
+                        }
+                } elseif ( isset($fields['domain']) && is_subdomain_install() ) {
+                        $key = md5( $fields['domain'] );
+                        $blog = wp_cache_get($key, 'blog-lookup');
+                        if ( false !== $blog )
+                                return $blog;
+                        $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+                        if ( $blog ) {
+                                wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+                                $blog_id = $blog->blog_id;
+                        } else {
+                                return false;
+                        }
+                } else {
+                        return false;
+                }
+        } else {
+                if ( !is_numeric( $fields ) )
+                        $blog_id = get_id_from_blogname( $fields );
+                else
+                        $blog_id = $fields;
+        }
 
         $blog_id = (int) $blog_id;
@@ -101 +135 @@
         }
 
-        $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
-        if ( ! $details ) {
-                wp_cache_set( $blog_id . $all, -1, 'blog-details' );
-                return false;
+        // Try the other cache.
+        if ( $get_all ) {
+                $details = wp_cache_get( $blog_id . 'short', 'blog-details' );
+        } else {
+                $details = wp_cache_get( $blog_id, 'blog-details' );
+                // If short was requested and full cache is set, we can return.
+                if ( $details ) {
+                        if ( ! is_object( $details ) ) {
+                                if ( $details == -1 )
+                                        return false;
+                                else
+                                        // Clear old pre-serialized objects. Cache clients do better with that.
+                                        wp_cache_delete( $blog_id . $all, 'blog-details' );
+                        }
+                        return $details;
+                }
+        }
+
+        if ( !$details ) {
+                $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
+                if ( ! $details ) {
+                        // Set the full cache.
+                        wp_cache_set( $blog_id, -1, 'blog-details' );
+                        return false;
+                }
         }
 

trunk/wp-includes/ms-settings.php

@@ -49 +49 @@
         $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
         if ( !$current_blog ) {
-                $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain ) );
+                $current_blog = get_blog_details( array('domain' => $domain), false );
                 if ( $current_blog )
                         wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
@@ -68 +68 @@
         $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
         if ( ! $current_blog ) {
-                $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path ) );
+                $current_blog = $current_blog = get_blog_details( array('domain' => $domain, 'path' => $path ), false );
                 if ( $current_blog )
                         wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
@@ -92 +92 @@
                         exit;
                 }
-                $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
+                $current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
         }
         if ( ! $current_blog || ! $current_site )

trunk/wp-settings.php

@@ -60 +60 @@
 wp_set_lang_dir();
 
-// Include early WordPress files.
+// Load early WordPress files.
 require( ABSPATH . WPINC . '/compat.php' );
 require( ABSPATH . WPINC . '/functions.php' );
@@ -73 +73 @@
 // Start the WordPress object cache, or an external object cache if the drop-in is present.
 wp_start_object_cache();
+
+// Load early WordPress files.
+require( ABSPATH . WPINC . '/plugin.php' );
+require( ABSPATH . WPINC . '/default-filters.php' );
+include_once( ABSPATH . WPINC . '/pomo/mo.php' );
 
 // Initialize multisite if enabled.
@@ -79 +84 @@
         require( ABSPATH . WPINC . '/ms-settings.php' );
 }
-
-// Load early WordPress files.
-require( ABSPATH . WPINC . '/plugin.php' );
-require( ABSPATH . WPINC . '/default-filters.php' );
-include_once( ABSPATH . WPINC . '/pomo/mo.php' );
 
 // Stop most of WordPress from being loaded if we just want the basics.