<!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>[BuddyPress] [2616] trunk/bp-activity:
Pre-fetch activity comment parents to improve performance and to stop individual loop based queries
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2616</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-07 14:36:39 +0000 (Sun, 07 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pre-fetch activity comment parents to improve performance and to stop individual loop based queries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2615 => 2616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-02-07 14:11:08 UTC (rev 2615)
+++ trunk/bp-activity/bp-activity-classes.php 2010-02-07 14:36:39 UTC (rev 2616)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> $activity_user_ids[] = $activity->user_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $activity_user_ids = implode( ',', (array)$activity_user_ids );
</del><ins>+ $activity_user_ids = implode( ',', array_unique( (array)$activity_user_ids ) );
</ins><span class="cx"> if ( !empty( $activity_user_ids ) ) {
</span><span class="cx"> if ( $names = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) ) {
</span><span class="cx"> foreach ( (array)$names as $name )
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2615 => 2616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-02-07 14:11:08 UTC (rev 2615)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-02-07 14:36:39 UTC (rev 2616)
</span><span class="lines">@@ -52,6 +52,20 @@
</span><span class="cx">
</span><span class="cx"> $this->full_name = $bp->displayed_user->fullname;
</span><span class="cx">
</span><ins>+ /* Fetch parent content for activity comments so we do not have to query in the loop */
+ foreach ( (array)$this->activities as $activity ) {
+ if ( 'activity_comment' != $activity->type ) continue;
+ $parent_ids[] = $activity->item_id;
+ }
+
+ if ( !empty( $parent_ids ) )
+ $activity_parents = bp_activity_get_specific( array( 'activity_ids' => $parent_ids ) );
+
+ if ( !empty( $activity_parents['activities'] ) ) {
+ foreach( $activity_parents['activities'] as $parent ) $this->activity_parents[$parent->id] = $parent;
+ unset( $activity_parents );
+ }
+
</ins><span class="cx"> if ( (int) $this->total_activity_count && (int) $this->pag_num ) {
</span><span class="cx"> $this->pag_links = paginate_links( array(
</span><span class="cx"> 'base' => add_query_arg( 'acpage', '%#%' ),
</span><span class="lines">@@ -224,9 +238,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Support for basic filters in earlier BP versions. */
</span><ins>+ $filter = false;
</ins><span class="cx"> if ( isset( $_GET['afilter'] ) )
</span><span class="cx"> $filter = array( 'object' => $_GET['afilter'] );
</span><del>- else
</del><ins>+ else if ( !empty( $user_id ) || !empty( $object ) || !empty( $action ) || !empty( $primary_id ) || !empty( $secondary_id ) )
</ins><span class="cx"> $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
</span><span class="cx">
</span><span class="cx"> $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
</span><span class="lines">@@ -503,30 +518,14 @@
</span><span class="cx"> if ( !$parent_id = $activities_template->activity->item_id )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* Get the content of the parent by first checking to see if we already have it */
- $parent_activity = false;
-
- foreach( (array)$activities_template->activities as $activity ) {
- if ( $parent_id == $activity->id ) {
- /* Need a copy not a reference, this was the only PHP4 compat way I could find. */
- $parent_activity = (array)$activity;
- $parent_activity = (object)$parent_activity;
- }
- }
-
- /* We didn't find it, so let's get it from the DB */
- if ( !$parent_activity ) {
- $parent_activity = bp_activity_get_specific( array( 'activity_ids' => $parent_id ) );
- $parent_activity = $parent_activity['activities'][0];
- }
-
- if ( !$parent_activity )
</del><ins>+ /* Get the content of the parent */
+ if ( empty( $activities_template->activity_parents[$parent_id] ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( empty( $parent_activity->content ) )
- $content = $parent_activity->action;
</del><ins>+ if ( empty( $activities_template->activity_parents[$parent_id]->content ) )
+ $content = $activities_template->activity_parents[$parent_id]->action;
</ins><span class="cx"> else
</span><del>- $content = $parent_activity->action . $parent_activity->content;
</del><ins>+ $content = $activities_template->activity_parents[$parent_id]->action . $activities_template->activity_parents[$parent_id]->content;
</ins><span class="cx">
</span><span class="cx"> /* Remove the time since content */
</span><span class="cx"> $content = str_replace( '<span class="time-since">%s</span>', '', $content );
</span></span></pre>
</div>
</div>
</body>
</html>