Changeset 7700

Timestamp:

12/18/2013 12:01:01 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Remove unnecessary DISTINCT usages from bp-core-classes.php. See #5303.

File:

• trunk/bp-core/bp-core-classes.php (modified) (11 diffs)

trunk/bp-core/bp-core-classes.php

@@ -246 +246 @@
             case 'online' :
                 $this->uid_name = 'user_id';
-                $sql['select']  = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
+                $sql['select']  = "SELECT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
                 $sql['where'][] = $wpdb->prepare( "u.meta_key = %s", bp_get_user_meta_key( 'last_activity' ) );
                 $sql['where'][] = $wpdb->prepare( "u.meta_value >= DATE_SUB( UTC_TIMESTAMP(), INTERVAL %d MINUTE )", apply_filters( 'bp_user_query_online_interval', 15 ) );
@@ -260 +260 @@
             case 'random' :
                 $this->uid_name = 'user_id';
-                $sql['select']  = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
+                $sql['select']  = "SELECT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
                 $sql['where'][] = $wpdb->prepare( "u.meta_key = %s", bp_get_user_meta_key( 'last_activity' ) );
 
@@ -278 +278 @@
             case 'popular' :
                 $this->uid_name = 'user_id';
-                $sql['select']  = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
+                $sql['select']  = "SELECT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
                 $sql['where'][] = $wpdb->prepare( "u.meta_key = %s", bp_get_user_meta_key( 'total_friend_count' ) );
                 $sql['orderby'] = "ORDER BY CONVERT(u.meta_value, SIGNED)";
@@ -295 +295 @@
                 if ( ! bp_disable_profile_sync() || ! bp_is_active( 'xprofile' ) ) {
                     $this->uid_name = 'ID';
-                    $sql['select']  = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->users} u";
+                    $sql['select']  = "SELECT u.{$this->uid_name} as id FROM {$wpdb->users} u";
                     $sql['orderby'] = "ORDER BY u.display_name";
                     $sql['order']   = "ASC";
@@ -305 +305 @@
 
                     $this->uid_name = 'user_id';
-                    $sql['select']  = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$bp->profile->table_name_data} u";
+                    $sql['select']  = "SELECT u.{$this->uid_name} as id FROM {$bp->profile->table_name_data} u";
                     $sql['where'][] = "u.field_id = {$fullname_field_id}";
                     $sql['orderby'] = "ORDER BY u.value";
@@ -314 +314 @@
                 // to infer spam/deleted/non-activated users. To ensure that these users
                 // are filtered out, we add an appropriate sub-query.
-                $sql['where'][] = "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE " . bp_core_get_status_sql( '' ) . " )";
+                $sql['where'][] = "u.{$this->uid_name} IN ( SELECT id FROM {$wpdb->users} WHERE " . bp_core_get_status_sql( '' ) . " )";
 
                 break;
@@ -321 +321 @@
             default :
                 $this->uid_name = 'ID';
-                $sql['select']  = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->users} u";
+                $sql['select']  = "SELECT u.{$this->uid_name} as id FROM {$wpdb->users} u";
 
                 // In this case, we assume that a plugin is
@@ -438 +438 @@
             $this->total_users = $wpdb->get_var( apply_filters( 'bp_found_user_query', "SELECT FOUND_ROWS()", $this ) );
         } elseif ( 'count_query' == $this->query_vars['count_total'] ) {
-            $count_select      = preg_replace( '/^SELECT.*?FROM (\S+) u/', "SELECT COUNT(DISTINCT u.{$this->uid_name}) FROM $1 u", $this->uid_clauses['select'] );
+            $count_select      = preg_replace( '/^SELECT.*?FROM (\S+) u/', "SELECT COUNT(u.{$this->uid_name}) FROM $1 u", $this->uid_clauses['select'] );
             $this->total_users = $wpdb->get_var( apply_filters( 'bp_found_user_query', "{$count_select} {$this->uid_clauses['where']}", $this ) );
         }
@@ -872 +872 @@
         $sql = array();
 
-        $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
+        $sql['select_main'] = "SELECT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
 
         if ( 'active' == $type || 'online' == $type || 'newest' == $type  ) {
@@ -1014 +1014 @@
         }
 
-        array_unshift( $sql, "SELECT COUNT(DISTINCT u.ID)" );
+        array_unshift( $sql, "SELECT COUNT(u.ID)" );
 
         // Get total user results
@@ -1132 +1132 @@
         $status_sql = bp_core_get_status_sql();
 
-        $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT COUNT(DISTINCT ID) FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids})" );
-        $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids}) {$pag_sql}" );
+        $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT COUNT(ID) FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids})" );
+        $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT ID as id, user_registered, user_nicename, user_login, user_email FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids}) {$pag_sql}" );
 
         $total_users = $wpdb->get_var( $total_users_sql );