<!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][7780] trunk/bp-xprofile/bp-xprofile-classes.php: Split xprofile group query, and add caching support for individual xprofile groups.</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/7780">7780</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-04 02:05:24 +0000 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split xprofile group query, and add caching support for individual xprofile groups.
See <a href="http://buddypress.trac.wordpress.org/ticket/1332">#1332</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (7779 => 7780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2014-02-04 01:35:15 UTC (rev 7779)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2014-02-04 02:05:24 UTC (rev 7780)
</span><span class="lines">@@ -26,10 +26,15 @@
</span><span class="cx"> public function populate( $id ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id );
</del><ins>+ $group = wp_cache_get( 'xprofile_group_' . $this->id, 'bp' );
</ins><span class="cx">
</span><del>- if ( !$group = $wpdb->get_row( $sql ) )
</del><ins>+ if ( false === $group ) {
+ $group = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id ) );
+ }
+
+ if ( empty( $group ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $this->id = $group->id;
</span><span class="cx"> $this->name = stripslashes( $group->name );
</span><span class="lines">@@ -135,11 +140,14 @@
</span><span class="cx"> elseif ( $exclude_groups )
</span><span class="cx"> $where_sql = $wpdb->prepare( "WHERE g.id NOT IN ({$exclude_groups})");
</span><span class="cx">
</span><del>- if ( !empty( $hide_empty_groups ) )
- $groups = $wpdb->get_results( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" );
- else
- $groups = $wpdb->get_results( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" );
</del><ins>+ if ( ! empty( $hide_empty_groups ) ) {
+ $group_ids = $wpdb->get_col( "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" );
+ } else {
+ $group_ids = $wpdb->get_col( "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" );
+ }
</ins><span class="cx">
</span><ins>+ $groups = self::get_group_data( $group_ids );
+
</ins><span class="cx"> if ( empty( $fetch_fields ) )
</span><span class="cx"> return $groups;
</span><span class="cx">
</span><span class="lines">@@ -264,6 +272,63 @@
</span><span class="cx"> return $groups;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Get data about a set of groups, based on IDs.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $group_ids Array of IDs.
+ * @return array
+ */
+ protected static function get_group_data( $group_ids ) {
+ global $wpdb;
+
+ // Bail if no group IDs are passed
+ if ( empty( $group_ids ) ) {
+ return array();
+ }
+
+ $groups = array();
+ $uncached_gids = array();
+
+ foreach ( $group_ids as $group_id ) {
+
+ // If cached data is found, use it
+ if ( $group_data = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
+ $groups[ $group_id ] = $group_data;
+
+ // Otherwise leave a placeholder so we don't lose the order
+ } else {
+ $groups[ $group_id ] = '';
+
+ // Add to the list of items to be queried
+ $uncached_gids[] = $group_id;
+ }
+ }
+
+ // Fetch uncached data from the DB if necessary
+ if ( ! empty( $uncached_gids ) ) {
+ $uncached_gids_sql = implode( ',', wp_parse_id_list( $uncached_gids ) );
+
+ $bp = buddypress();
+
+ // Fetch data, preserving order
+ $queried_gdata = $wpdb->get_results( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id IN ({$uncached_gids_sql}) ORDER BY FIELD( id, {$uncached_gids_sql} )");
+
+ // Put queried data into the placeholders created earlier,
+ // and add it to the cache
+ foreach ( (array) $queried_gdata as $gdata ) {
+ $groups[ $gdata->id ] = $gdata;
+ wp_cache_set( 'xprofile_group_' . $gdata->id, $gdata, 'bp' );
+ }
+ }
+
+ // Reset indexes
+ $groups = array_values( $groups );
+
+ return $groups;
+ }
+
</ins><span class="cx"> public static function admin_validate() {
</span><span class="cx"> global $message;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>