<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16489] trunk/wp-admin/includes/class-wp-ms-sites-list-table.php:
Site search performance tweaks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16489">16489</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-19 18:16:03 +0000 (Fri, 19 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Site search performance tweaks. Use subquery for registration log queries to allow cross DB queries. Lose order by id by default. Search only by blog_id for numeric search strings. see <a href="http://trac.wordpress.org/ticket/15170">#15170</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (16488 => 16489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-11-19 17:10:35 UTC (rev 16488)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-11-19 18:16:03 UTC (rev 16489)
</span><span class="lines">@@ -54,28 +54,29 @@
</span><span class="cx"> // Nothing to do.
</span><span class="cx"> } elseif ( preg_match('/^[0-9]+\./', $s) ) {
</span><span class="cx"> // IP address
</span><ins>+ $reg_blog_ids = $wpdb->get_col( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE ( '{$like_s}$wild' )" );
+
+ if ( !$reg_blog_ids )
+ $reg_blog_ids = array( 0 );
+
</ins><span class="cx"> $query = "SELECT *
</span><del>- FROM {$wpdb->blogs}, {$wpdb->registration_log}
</del><ins>+ FROM {$wpdb->blogs}
</ins><span class="cx"> WHERE site_id = '{$wpdb->siteid}'
</span><del>- AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
- AND {$wpdb->registration_log}.IP LIKE ( '{$like_s}$wild' )";
</del><ins>+ AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
</ins><span class="cx"> } else {
</span><del>- if ( is_subdomain_install() ) {
</del><ins>+ if ( is_numeric($s) ) {
+ $query .= " AND ( {$wpdb->blogs}.blog_id = '{$like_s}' )";
+ } elseif ( is_subdomain_install() ) {
</ins><span class="cx"> $blog_s = str_replace( '.' . $current_site->domain, '', $like_s );
</span><span class="cx"> $blog_s .= $wild . '.' . $current_site->domain;
</span><del>- $query .= " AND ( {$wpdb->blogs}.domain LIKE '$blog_s' ";
</del><ins>+ $query .= " AND ( {$wpdb->blogs}.domain LIKE '$blog_s' ) ";
</ins><span class="cx"> } else {
</span><span class="cx"> if ( $like_s != trim('/', $current_site->path) )
</span><span class="cx"> $blog_s = $current_site->path .= $like_s . $wild . '/';
</span><span class="cx"> else
</span><span class="cx"> $blog_s = $like_s;
</span><del>- $query .= " AND ( {$wpdb->blogs}.path LIKE '$blog_s' ";
</del><ins>+ $query .= " AND ( {$wpdb->blogs}.path LIKE '$blog_s' )";
</ins><span class="cx"> }
</span><del>-
- if ( is_numeric($s) )
- $query .= " OR {$wpdb->blogs}.blog_id = '{$like_s}' ";
-
- $query .= ' )';
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
</span><span class="lines">@@ -86,12 +87,13 @@
</span><span class="cx"> } elseif ( $order_by == 'blogname' ) {
</span><span class="cx"> $query .= ' ORDER BY domain ';
</span><span class="cx"> } else {
</span><del>- $order_by = 'id';
- $query .= " ORDER BY {$wpdb->blogs}.blog_id ";
</del><ins>+ $order_by = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
- $query .= $order;
</del><ins>+ if ( isset( $order_by ) ) {
+ $order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+ $query .= $order;
+ }
</ins><span class="cx">
</span><span class="cx"> // Don't do an unbounded count on large networks
</span><span class="cx"> if ( ! $large_network )
</span></span></pre>
</div>
</div>
</body>
</html>