<!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][5505] trunk: Collect and cache activity meta at the beginning of the activity loop, for quicker lookups.</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, #logmsg > ol { margin-left: 0; 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/5505">5505</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-12-11 16:58:11 +0000 (Sun, 11 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Collect and cache activity meta at the beginning of the activity loop, for quicker lookups. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3814">#3814</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpcorebpcorecachephp">trunk/bp-core/bp-core-cache.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitycachephp">trunk/bp-activity/bp-activity-cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitycachephp"></a>
<div class="addfile"><h4>Added: trunk/bp-activity/bp-activity-cache.php (0 => 5505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-cache.php (rev 0)
+++ trunk/bp-activity/bp-activity-cache.php 2011-12-11 16:58:11 UTC (rev 5505)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<?php
+/**
+ * Functions related to the BuddyPress Activity component and the WP Cache
+ *
+ * @since 1.6
+ */
+
+/**
+ * Slurps up activitymeta
+ *
+ * This function is called in two places in the BP_Groups_Group class:
+ * - in the populate() method, when single group objects are populated
+ * - in the get() method, when multiple groups are queried
+ *
+ * It grabs all groupmeta associated with all of the groups passed in $group_ids and adds it to
+ * the WP cache. This improves efficiency when using groupmeta inline
+ *
+ * @param int|str|array $group_ids Accepts a single group_id, or a comma-separated list or array of
+ * group ids
+ */
+function bp_activity_update_meta_cache( $activity_ids = false ) {
+ global $bp;
+
+ $cache_args = array(
+ 'object_ids' => $activity_ids,
+ 'object_type' => $bp->activity->id,
+ 'object_column' => 'activity_id',
+ 'meta_table' => $bp->activity->table_name_meta,
+ 'cache_key_prefix' => 'bp_activity_meta'
+ );
+
+ bp_update_meta_cache( $cache_args );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (5504 => 5505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2011-12-11 16:34:39 UTC (rev 5504)
+++ trunk/bp-activity/bp-activity-classes.php 2011-12-11 16:58:11 UTC (rev 5505)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> $this->mptt_left = $row->mptt_left;
</span><span class="cx"> $this->mptt_right = $row->mptt_right;
</span><span class="cx"> $this->is_spam = $row->is_spam;
</span><ins>+
+ bp_activity_update_meta_cache( $this->id );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -190,6 +192,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ // Get activity meta
+ $activity_ids = array();
+ foreach ( (array)$activities as $activity ) {
+ $activity_ids[] = $activity->id;
+ }
+
+ if ( !empty( $activity_ids ) ) {
+ bp_activity_update_meta_cache( $activity_ids );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( $activities && $display_comments )
</span><span class="cx"> $activities = BP_Activity_Activity::append_comments( $activities, $spam );
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (5504 => 5505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-12-11 16:34:39 UTC (rev 5504)
+++ trunk/bp-activity/bp-activity-functions.php 2011-12-11 16:58:11 UTC (rev 5505)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> $retval = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s", $activity_id, $meta_key ) );
</span><span class="cx">
</span><span class="cx"> // Delete cache entry
</span><del>- wp_cache_delete( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, 'bp' );
</del><ins>+ wp_cache_delete( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, 'bp' );
</ins><span class="cx">
</span><span class="cx"> // Success
</span><span class="cx"> if ( !is_wp_error( $retval ) )
</span><span class="lines">@@ -523,13 +523,14 @@
</span><span class="cx"> $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</span><span class="cx">
</span><span class="cx"> // Check cache
</span><del>- if ( !$metas = wp_cache_get( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, 'bp' ) ) {
</del><ins>+ if ( !$metas = wp_cache_get( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, 'bp' ) ) {
+ var_dump( 'miss' );
</ins><span class="cx">
</span><span class="cx"> // No cache so hit the DB
</span><span class="cx"> $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s", $activity_id, $meta_key ) );
</span><span class="cx">
</span><span class="cx"> // Set cache
</span><del>- wp_cache_set( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, $metas, 'bp' );
</del><ins>+ wp_cache_set( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, $metas, 'bp' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // No key so get all for activity_id
</span><span class="lines">@@ -605,7 +606,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Set cache
</span><del>- wp_cache_set( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, $meta_value, 'bp' );
</del><ins>+ wp_cache_set( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, $meta_value, 'bp' );
</ins><span class="cx">
</span><span class="cx"> // Victory is ours!
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (5504 => 5505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2011-12-11 16:34:39 UTC (rev 5504)
+++ trunk/bp-activity/bp-activity-loader.php 2011-12-11 16:58:11 UTC (rev 5505)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> 'template',
</span><span class="cx"> 'functions',
</span><span class="cx"> 'notifications',
</span><ins>+ 'cache'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Load Akismet support if Akismet is configured
</span></span></pre></div>
<a id="trunkbpcorebpcorecachephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cache.php (5504 => 5505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cache.php 2011-12-11 16:34:39 UTC (rev 5504)
+++ trunk/bp-core/bp-core-cache.php 2011-12-11 16:58:11 UTC (rev 5505)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> // Get meta info
</span><span class="cx"> $id_list = join( ',', $object_ids );
</span><del>- $meta_list = $wpdb->get_results( $wpdb->prepare( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE group_id IN ($id_list)" ), ARRAY_A );
</del><ins>+ $meta_list = $wpdb->get_results( $wpdb->prepare( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE $object_column IN ($id_list)" ), ARRAY_A );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $meta_list ) ) {
</span><span class="cx"> foreach ( $meta_list as $metarow ) {
</span></span></pre>
</div>
</div>
</body>
</html>