<!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>[15579] trunk/wp-includes:
Rewrite WP_User_Query to use JOIN instead of subquery.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15579">15579</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-06 08:09:41 +0000 (Mon, 06 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite WP_User_Query to use JOIN instead of subquery. See <a href="http://trac.wordpress.org/ticket/14572">#14572</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15578 => 15579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-09-05 21:26:27 UTC (rev 15578)
+++ trunk/wp-includes/functions.php 2010-09-06 08:09:41 UTC (rev 15579)
</span><span class="lines">@@ -4244,10 +4244,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @param array $queries An array of queries
</span><span class="cx"> * @param string $meta_id_column The column that holds the object id
</span><del>- * @param string $table Which meta table to look in
</del><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function _wp_meta_sql( $queries, $meta_id_column, $table ) {
</del><ins>+function _wp_meta_sql( $queries, $meta_id_column ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $clauses = array();
</span><span class="lines">@@ -4278,9 +4277,7 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> return "
</span><del>- SELECT $meta_id_column
- FROM $table
- WHERE CASE meta_key
</del><ins>+ AND CASE meta_key
</ins><span class="cx"> " . implode( "\n", $clauses ) . "
</span><span class="cx"> END
</span><span class="cx"> GROUP BY $meta_id_column
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15578 => 15579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-09-05 21:26:27 UTC (rev 15578)
+++ trunk/wp-includes/user.php 2010-09-06 08:09:41 UTC (rev 15579)
</span><span class="lines">@@ -463,10 +463,11 @@
</span><span class="cx">
</span><span class="cx"> $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
</span><span class="cx">
</span><del>- $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id', $wpdb->usermeta );
</del><ins>+ $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id' );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $meta_query_sql ) ) {
</span><del>- $this->query_where .= " AND $wpdb->users.ID IN ($meta_query_sql)";
</del><ins>+ $this->query_from .= " INNER JOIN $wpdb->usermeta ON ($wpdb->users.ID = $wpdb->usermeta.user_id)";
+ $this->query_where .= $meta_query_sql;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($qv['include']) ) {
</span><span class="lines">@@ -490,13 +491,13 @@
</span><span class="cx"> function query() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- $this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
</del><ins>+ $this->results = $wpdb->get_col("SELECT $wpdb->users.ID" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
</ins><span class="cx">
</span><span class="cx"> if ( !$this->results )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( $this->query_vars['count_total'] )
</span><del>- $this->total_users = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
</del><ins>+ $this->total_users = $wpdb->get_var("SELECT COUNT($wpdb->users.ID)" . $this->query_from . $this->query_where);
</ins><span class="cx">
</span><span class="cx"> if ( 'all' == $this->query_vars['fields'] ) {
</span><span class="cx"> cache_users($this->results);
</span></span></pre>
</div>
</div>
</body>
</html>