Changeset 15579

Timestamp:

09/06/2010 08:09:41 AM (16 years ago)

Author:

scribu

Message:

Rewrite WP_User_Query to use JOIN instead of subquery. See #14572

Location:

trunk/wp-includes

Files:

• functions.php (modified) (2 diffs)
• user.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -4245 +4245 @@
  * @param array $queries An array of queries
  * @param string $meta_id_column The column that holds the object id
- * @param string $table Which meta table to look in
  * @return string
  */
-function _wp_meta_sql( $queries, $meta_id_column, $table ) {
+function _wp_meta_sql( $queries, $meta_id_column ) {
         global $wpdb;
 
@@ -4279 +4278 @@
 
         return "
-                SELECT $meta_id_column 
-                FROM $table 
-                WHERE CASE meta_key 
+                AND CASE meta_key 
                 " . implode( "\n", $clauses ) . "
                 END

trunk/wp-includes/user.php

@@ -464 +464 @@
                 $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
 
-                $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id', $wpdb->usermeta );
+                $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id' );
 
                 if ( !empty( $meta_query_sql ) ) {
-                        $this->query_where .= " AND $wpdb->users.ID IN ($meta_query_sql)";
+                        $this->query_from .= " INNER JOIN $wpdb->usermeta ON ($wpdb->users.ID = $wpdb->usermeta.user_id)";
+                        $this->query_where .= $meta_query_sql;
                 }
 
@@ -491 +492 @@
                 global $wpdb;
 
-                $this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+                $this->results = $wpdb->get_col("SELECT $wpdb->users.ID" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
                 if ( !$this->results )
@@ -497 +498 @@
 
                 if ( $this->query_vars['count_total'] )
-                        $this->total_users = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+                        $this->total_users = $wpdb->get_var("SELECT COUNT($wpdb->users.ID)" . $this->query_from . $this->query_where);
 
                 if ( 'all' == $this->query_vars['fields'] ) {