Ticket #4045: 4045.01.diff

bp-activity/bp-activity-classes.php

@@ -162 +162 @@
                         $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
                         $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ), $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
                 } else {
-                        $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}" ), $select_sql, $from_sql, $where_sql, $sort ) );
+                        $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$index_hint_sql} {$where_sql} ORDER BY a.date_recorded {$sort}" ), $select_sql, $from_sql, $where_sql, $sort ) );
+                }
+                
+                $indexes = array( 'user_id', 'item_id', 'secondary_item_id', 'date_recorded', 'component', 'type', 'hide_sitewide', 'is_spam' );
+                
+                foreach( $indexes as $key => $index ) {
+                        if ( false !== strpos( $where_sql, $index ) ) {
+                                $the_index = $index;
+                                break;
+                        }
+                }
+                
+                if ( !empty( $the_index ) ) {
+                        $index_hint_sql = $wpdb->prepare( "USE INDEX ({$the_index})" ); 
+                } else {
+                        $index_hint_sql = '';
                 }
 
-                $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', $wpdb->prepare( "SELECT count(a.id) FROM {$bp->activity->table_name} a {$where_sql} ORDER BY a.date_recorded {$sort}" ), $where_sql, $sort );
+                $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', $wpdb->prepare( "SELECT count(*) FROM {$bp->activity->table_name} a {$index_hint_sql} {$where_sql}" ), $where_sql, $sort );
 
                 $total_activities = $wpdb->get_var( $total_activities_sql );