<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38659] trunk: Multisite: Use `get_sites()` instead of a database lookup in `get_id_from_blogname()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38659">38659</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38659","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-27 18:17:23 +0000 (Tue, 27 Sep 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: Use `get_sites()` instead of a database lookup in `get_id_from_blogname()`.
Because queries generated via `get_sites()` are cached, we can remove the `get_id_from_blogname` cache key.
Props flixos90.
Fixes <a href="https://core.trac.wordpress.org/ticket/38175">#38175</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2016-09-27 17:56:53 UTC (rev 38658)
+++ trunk/src/wp-includes/ms-blogs.php 2016-09-27 18:17:23 UTC (rev 38659)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,25 +72,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Given a blog's (subdomain or directory) slug, retrieve its id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves a sites ID given its (subdomain or directory) slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.7.0 Converted to use get_sites().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $slug
- * @return int A blog id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $slug A site's slug.
+ * @return int|null The site ID, or null if no site is found for the given slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_id_from_blogname( $slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $current_site = get_current_site();
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = trim( $slug, '/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
- if ( $blog_id )
- return $blog_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $current_site->path;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,9 +92,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $current_site->path . $slug . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
- wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
- return $blog_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_ids = get_sites( array(
+ 'number' => 1,
+ 'fields' => 'ids',
+ 'domain' => $domain,
+ 'path' => $path,
+ ) );
+
+ if ( empty( $site_ids ) ) {
+ return null;
+ }
+
+ return array_shift( $site_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +455,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $domain_path_key, 'blog-lookup' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
</del><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $domain_path_key, 'blog-id-cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2016-09-27 17:56:53 UTC (rev 38658)
+++ trunk/tests/phpunit/tests/multisite/site.php 2016-09-27 18:17:23 UTC (rev 38659)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,10 +87,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // get_id_from_blogname(), see #20950
- $this->assertEquals( $blog_id, get_id_from_blogname( $details->path ) );
- $this->assertEquals( $blog_id, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // get_blogaddress_by_name()
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +134,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site without forcing a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +172,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site and force a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +210,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site and force a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
</span></span></pre>
</div>
</div>
</body>
</html>