<!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" />
<title>[BuddyPress][7765] trunk/bp-activity/bp-activity-classes.php: Split primary Activity query up into separate, more performant queries.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7765">7765</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-01-29 17:16:39 +0000 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split primary Activity query up into separate, more performant queries. Introduces BP_Activity_Activity::get_activity_data() method to help with converting data for template output. Props boonebgorges. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5349">#5349</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.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 (7764 => 7765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-01-29 17:01:17 UTC (rev 7764)
+++ trunk/bp-activity/bp-activity-classes.php 2014-01-29 17:16:39 UTC (rev 7765)
</span><span class="lines">@@ -292,11 +292,11 @@
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><span class="cx"> // Select conditions
</span><del>- $select_sql = "SELECT DISTINCT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
</del><ins>+ $select_sql = "SELECT DISTINCT a.id";
</ins><span class="cx">
</span><del>- $from_sql = " FROM {$bp->activity->table_name} a LEFT JOIN {$wpdb->users} u ON a.user_id = u.ID";
</del><ins>+ $from_sql = " FROM {$bp->activity->table_name} a";
</ins><span class="cx">
</span><del>- $join_sql = '';
</del><ins>+ $join_sql = '';
</ins><span class="cx">
</span><span class="cx"> // Where conditions
</span><span class="cx"> $where_conditions = array();
</span><span class="lines">@@ -377,22 +377,40 @@
</span><span class="cx"> $index_hint_sql = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $per_page ) && !empty( $page ) ) {
</del><ins>+ // Sanitize page and per_page parameters
+ $page = absint( $page );
+ $per_page = absint( $per_page );
</ins><span class="cx">
</span><del>- // Make sure page values are absolute integers
- $page = absint( $page );
- $per_page = absint( $per_page );
</del><ins>+ // Filter and return true to use the legacy query structure (not recommended)
+ if ( apply_filters( 'bp_use_legacy_activity_query', false, __METHOD__, $r ) ) {
</ins><span class="cx">
</span><del>- $pag_sql = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
- $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
</del><ins>+ // Legacy queries joined against the user table
+ $select_sql = "SELECT DISTINCT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
+ $from_sql = " FROM {$bp->activity->table_name} a LEFT JOIN {$wpdb->users} u ON a.user_id = u.ID";
+
+ if ( ! empty( $page ) && ! empty( $per_page ) ) {
+ $pag_sql = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
+ $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_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', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort ) );
+ }
+
</ins><span class="cx"> } else {
</span><del>- $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort ) );
</del><ins>+
+ // Query first for activity IDs
+ $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}";
+
+ if ( ! empty( $per_page ) && ! empty( $page ) ) {
+ $activity_ids_sql .= $wpdb->prepare( " LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
+ }
+
+ $activity_ids = $wpdb->get_col( $activity_ids_sql );
+ $activities = self::get_activity_data( $activity_ids );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$index_hint_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $where_sql, $sort );
</span><ins>+ $total_activities = $wpdb->get_var( $total_activities_sql );
</ins><span class="cx">
</span><del>- $total_activities = $wpdb->get_var( $total_activities_sql );
-
</del><span class="cx"> // Get the fullnames of users so we don't have to query in the loop
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) && !empty( $activities ) ) {
</span><span class="cx"> $activity_user_ids = wp_list_pluck( $activities, 'user_id' );
</span><span class="lines">@@ -400,12 +418,15 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $activity_user_ids ) ) {
</span><span class="cx"> if ( $names = $wpdb->get_results( "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><del>- foreach ( (array) $names as $name )
</del><ins>+
+ foreach ( (array) $names as $name ) {
</ins><span class="cx"> $tmp_names[$name->user_id] = $name->user_fullname;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> foreach ( (array) $activities as $i => $activity ) {
</span><del>- if ( !empty( $tmp_names[$activity->user_id] ) )
</del><ins>+ if ( !empty( $tmp_names[$activity->user_id] ) ) {
</ins><span class="cx"> $activities[$i]->user_fullname = $tmp_names[$activity->user_id];
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unset( $names );
</span><span class="lines">@@ -437,6 +458,53 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Convert activity IDs to activity objects, as expected in template loop.
+ *
+ * @since 2.0
+ *
+ * @param array $activity_ids Array of activity IDs.
+ * @return array
+ */
+ protected static function get_activity_data( $activity_ids = array() ) {
+ global $wpdb;
+
+ // Bail if no activity ID's passed
+ if ( empty( $activity_ids ) ) {
+ return array();
+ }
+
+ // Get BuddyPress
+ $bp = buddypress();
+
+ // Format the activity ID's for use in the query below
+ $activity_ids_sql = implode( ',', wp_parse_id_list( $activity_ids ) );
+
+ // First fetch data from activity table, preserving order
+ $activities = $wpdb->get_results( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids_sql}) ORDER BY FIELD( id, {$activity_ids_sql} )");
+
+ // Then fetch user data
+ $user_query = new BP_User_Query( array(
+ 'user_ids' => wp_list_pluck( $activities, 'user_id' ),
+ 'populate_extras' => false,
+ ) );
+
+ // Associated located user data with activity items
+ foreach ( $activities as $a_index => $a_item ) {
+ $a_user_id = intval( $a_item->user_id );
+ $a_user = isset( $user_query->results[ $a_user_id ] ) ? $user_query->results[ $a_user_id ] : '';
+
+ if ( !empty( $a_user ) ) {
+ $activities[ $a_index ]->user_email = $a_user->user_email;
+ $activities[ $a_index ]->user_nicename = $a_user->user_nicename;
+ $activities[ $a_index ]->user_login = $a_user->user_login;
+ $activities[ $a_index ]->display_name = $a_user->display_name;
+ }
+ }
+
+ return $activities;
+ }
+
+ /**
</ins><span class="cx"> * Get the SQL for the 'meta_query' param in BP_Activity_Activity::get().
</span><span class="cx"> *
</span><span class="cx"> * We use WP_Meta_Query to do the heavy lifting of parsing the
</span></span></pre>
</div>
</div>
</body>
</html>