Changeset 2533

Timestamp:

02/02/2010 12:40:49 PM (17 years ago)

Author:

apeatling

Message:

Removing database hits inside BP loops to improve overall performance.

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (3 diffs)
• bp-friends/bp-friends-templatetags.php (modified) (2 diffs)
• bp-groups/bp-groups-classes.php (modified) (9 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (4 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

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

@@ -340 +340 @@
                 }
 
+                /* Fetch whether or not the user is a friend */
+                if ( function_exists( 'friends_install' ) ) {
+                        $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
+                        for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+                                foreach ( $friend_status as $status ) {
+                                        if ( $status->initiator_user_id == $paged_users[$i]->id || $status->friend_user_id == $paged_users[$i]->id )
+                                                $paged_users[$i]->is_friend = $status->is_confirmed;
+                                }
+                        }
+                }
+
+                if ( 'active' != $type ) {
+                        $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'last_activity' AND user_id IN ( {$user_ids} )" );
+                        for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+                                foreach ( $user_activity as $activity ) {
+                                        if ( $activity->id == $paged_users[$i]->id )
+                                                $paged_users[$i]->last_activity = $activity->last_activity;
+                                }
+                        }
+                }
+
                 /* Fetch the user's last_activity */
                 if ( 'active' != $type ) {

trunk/bp-core/bp-core-templatetags.php

@@ -342 +342 @@
 
         if ( function_exists( 'bp_add_friend_button' ) ) {
-                echo bp_add_friend_button( $members_template->member->id );
+                if ( null === $members_template->member->is_friend )
+                        $friend_status = 'not_friends';
+                else
+                        $friend_status = ( 0 == $members_template->member->is_friend ) ? 'pending' : 'is_friend';
+
+                echo bp_add_friend_button( $members_template->member->id, $friend_status );
         }
 }

trunk/bp-forums.php

@@ -334 +334 @@
 }
 
+function bp_forums_get_topic_extras( $topics ) {
+        global $bp, $wpdb, $bbdb;
+
+        if ( empty( $topics ) )
+                return $topics;
+
+        /* Get the topic ids */
+        foreach ( $topics as $topic ) $topic_ids[] = $topic->topic_id;
+        $topic_ids = $wpdb->escape( join( ',', (array)$topic_ids ) );
+
+        /* Fetch the topic's last poster details */
+        $poster_details = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, t.topic_last_poster, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u, {$bbdb->topics} t WHERE u.ID = t.topic_last_poster AND t.topic_id IN ( {$topic_ids} )" ) );
+        for ( $i = 0; $i < count( $topics ); $i++ ) {
+                foreach ( $poster_details as $poster ) {
+                        if ( $poster->topic_id == $topics[$i]->topic_id ) {
+                                $topics[$i]->topic_last_poster_email = $poster->user_email;
+                                $topics[$i]->topic_last_poster_nicename = $poster->user_nicename;
+                                $topics[$i]->topic_last_poster_login = $poster->user_login;
+                                $topics[$i]->topic_last_poster_displayname = $poster->display_name;
+                        }
+                }
+        }
+
+        /* Fetch fullname for the topic's last poster */
+        if ( function_exists( 'xprofile_install' ) ) {
+                $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
+                for ( $i = 0; $i < count( $topics ); $i++ ) {
+                        foreach ( $poster_names as $name ) {
+                                if ( $name->topic_id == $topics[$i]->topic_id )
+                                        $topics[$i]->topic_last_poster_displayname = $name->value;
+                        }
+                }
+        }
+
+        return $topics;
+}
+
 /* Post Functions */
 

trunk/bp-forums/bp-forums-templatetags.php

@@ -93 +93 @@
                 }
 
+                /* Fetch extra information for topics, so we don't have to query inside the loop */
+                $this->topics = bp_forums_get_topic_extras( &$this->topics );
+
                 $this->pag_links = paginate_links( array(
                         'base' => add_query_arg( array( 'p' => '%#%', 'n' => $this->pag_num ) ),
@@ -348 +351 @@
                 global $forum_template;
 
-                if ( !$name = bp_core_get_userlink( $forum_template->topic->topic_last_poster ) )
+                if ( !$domain = bp_core_get_user_domain( $forum_template->topic->topic_last_poster, $forum_template->topic->topic_last_poster_nicename, $forum_template->topic->topic_last_poster_login ) )
                         return __( 'Deleted User', 'buddypress' );
 
-                return apply_filters( 'bp_get_the_topic_last_poster_name', $name );
+                return apply_filters( 'bp_get_the_topic_last_poster_name', '<a href="' . $domain . '">' . $forum_template->topic->topic_last_poster_displayname . '</a>' );
         }
 
@@ -387 +390 @@
                 extract( $r, EXTR_SKIP );
 
-                return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_last_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+                return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_fetch_avatar( array( 'email' => $forum_template->topic->topic_last_poster_email, 'item_id' => $forum_template->topic->topic_last_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
         }
 

trunk/bp-friends/bp-friends-templatetags.php

@@ -115 +115 @@
 }
 
-function bp_add_friend_button( $potential_friend_id = false ) {
-        echo bp_get_add_friend_button( $potential_friend_id );
-}
-        function bp_get_add_friend_button( $potential_friend_id = false ) {
+function bp_add_friend_button( $potential_friend_id = false, $friend_status = false ) {
+        echo bp_get_add_friend_button( $potential_friend_id, $friend_status );
+}
+        function bp_get_add_friend_button( $potential_friend_id = false, $friend_status = false ) {
                 global $bp, $friends_template;
 
@@ -132 +132 @@
                         return false;
 
-                $friend_status = friends_check_friendship_status( $bp->loggedin_user->id, $potential_friend_id );
+                if ( empty( $friend_status ) )
+                        $friend_status = friends_check_friendship_status( $bp->loggedin_user->id, $potential_friend_id );
 
                 $button = '<div class="generic-button friendship-button ' . $friend_status . '" id="friendship-button-' . $potential_friend_id . '">';

trunk/bp-groups/bp-groups-classes.php

@@ -48 +48 @@
                                 $this->user_dataset = $this->get_user_dataset();
 
-                                //if ( !$this->total_member_count ) {
                                 $this->total_member_count = count( $this->user_dataset );
                                 groups_update_groupmeta( $this->id, 'total_member_count', $this->total_member_count );
-                                //}
                         }
+
+                        /* Get group extras */
+                        $this->is_member = BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $this->id );
                 }
         }
@@ -336 +337 @@
                 }
 
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
@@ -361 +365 @@
                 }
 
+                foreach ( $paged_groups as $group ) $group_ids[] = $group->id;
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'active' );
+
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
@@ -387 +395 @@
                 }
 
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'popular' );
+
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
@@ -412 +423 @@
                 }
 
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'alphabetical' );
+
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
@@ -441 +455 @@
                 }
 
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'most_forum_topics' );
+
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
@@ -469 +486 @@
                         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_groupmeta} gm3, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND g.id = gm3.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql}" ) );
                 }
+
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'most_forum_posts' );
 
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -535 +555 @@
                 $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
 
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'letter' );
+
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
@@ -560 +583 @@
                 }
 
-                return array( 'groups' => $paged_groups, 'total' => $total_groups );
+                $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+                $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'random' );
+
+                return array( 'groups' => $paged_groups, 'total' => $total_groups );
+        }
+
+        function get_group_extras( $paged_groups, $group_ids, $type = false ) {
+                global $bp, $wpdb;
+
+                if ( empty( $group_ids ) )
+                        return $paged_groups;
+
+                /* Fetch the logged in users status within each group */
+                $user_status = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_confirmed = 1 AND is_banned = 0", $bp->loggedin_user->id ) );
+                for ( $i = 0; $i < count( $paged_groups ); $i++ ) {
+                        foreach ( $user_status as $group_id ) {
+                                if ( $group_id == $paged_groups[$i]->id )
+                                        $paged_groups[$i]->is_member = true;
+                        }
+                }
+
+                $user_banned = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE is_banned = 1 AND user_id = %d AND group_id IN ( {$group_ids} )", $bp->loggedin_user->id ) );
+                for ( $i = 0; $i < count( $paged_groups ); $i++ ) {
+                        foreach ( $user_banned as $group_id ) {
+                                if ( $group_id == $paged_groups[$i]->id )
+                                        $paged_groups[$i]->is_banned = true;
+                        }
+                }
+
+                return $paged_groups;
         }
 

trunk/bp-groups/bp-groups-templatetags.php

@@ -1080 +1080 @@
                 $group =& $groups_template->group;
 
-        if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
-                return true;
-
-        return false;
+        if ( null == $group->is_member )
+                return false;
+
+        return true;
 }
 
@@ -1168 +1168 @@
 
         // If they're not logged in or are banned from the group, no join button.
-        if ( !is_user_logged_in() || groups_is_user_banned( $bp->loggedin_user->id, $group->id ) )
+        if ( !is_user_logged_in() || $group->is_banned )
                 return false;
 
@@ -1178 +1178 @@
         switch ( $group->status ) {
                 case 'public':
-                        if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
+                        if ( $group->is_member )
                                 echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
                         else
@@ -1185 +1185 @@
 
                 case 'private':
-                        if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
+                        if ( $group->is_member ) {
                                 echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
                         } else {

trunk/bp-themes/bp-default/_inc/global.js

@@ -797 +797 @@
         /** Alternate Highlighting ******************************************/
 
-        j('table tr').each( function(i) {
-                if ( i % 2 == 1 )
-                        j(this).addClass('alt');
-        });
-
-        j('div.message-box, ul#topic-post-list li').each( function(i) {
+        j('table tr, div.message-box, ul#topic-post-list li').each( function(i) {
                 if ( i % 2 != 1 )
                         j(this).addClass('alt');