<!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][9336] trunk: XProfile data cache group updates:</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9336">9336</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9336","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-09 20:38:37 +0000 (Fri, 09 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>XProfile data cache group updates:
* Switches from dynamic cache group to unique key for `$user_id:$field_id`.
* Introduces `bp_xprofile_get_non_cached_field_ids()` as a helper, based on `bp_get_non_cached_field_ids()`.
* Registers `bp_xprofile` and `bp_xprofile_data` as global cache groups.
* Updates unit tests to pass with new cache keys.
Props r-a-y. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6100">#6100</a>. See <a href="http://buddypress.trac.wordpress.org/ticket/5733">#5733</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofilecachephp">trunk/src/bp-xprofile/bp-xprofile-cache.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileclassesphp">trunk/src/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileloaderphp">trunk/src/bp-xprofile/bp-xprofile-loader.php</a></li>
<li><a href="#trunktestsphpunittestcasesmembersfunctionsphp">trunk/tests/phpunit/testcases/members/functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesxprofileclassbpxprofileprofiledataphp">trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofilecachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-cache.php 2015-01-09 19:54:02 UTC (rev 9335)
+++ trunk/src/bp-xprofile/bp-xprofile-cache.php 2015-01-09 20:38:37 UTC (rev 9336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determine which xprofile fields do not have cached values for a user.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param int $user_id User ID to check
+ * @param array $field_ids XProfile field IDs.
+ * @return array
+ */
+function bp_xprofile_get_non_cached_field_ids( $user_id = 0, $field_ids = array() ) {
+ $uncached_fields = array();
+
+ foreach ( $field_ids as $field_id ) {
+ $field_id = (int) $field_id;
+ $cache_key = "{$user_id}:{$field_id}";
+ if ( false === wp_cache_get( $cache_key, 'bp_xprofile_data' ) ) {
+ $uncached_fields[] = $field_id;
+ }
+ }
+
+ return $uncached_fields;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Slurp up xprofilemeta for a specified set of profile objects.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * We do not use bp_update_meta_cache() for the xprofile component. This is
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $uncached_object_ids = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'group' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'data' => array(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'data' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_groups = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,9 +193,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_XProfile_ProfileData $data_obj
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function xprofile_clear_profiledata_object_cache( $data_obj ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $data_obj->field_id, 'bp_xprofile_data_' . $data_obj->user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$data_obj->user_id}:{$data_obj->field_id}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'xprofile_data_after_save', 'xprofile_clear_profiledata_object_cache' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'xprofile_data_after_save', 'xprofile_clear_profiledata_object_cache' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'xprofile_data_after_delete', 'xprofile_clear_profiledata_object_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-classes.php 2015-01-09 19:54:02 UTC (rev 9335)
+++ trunk/src/bp-xprofile/bp-xprofile-classes.php 2015-01-09 20:38:37 UTC (rev 9336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1222,15 +1222,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function populate( $field_id, $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $bp;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache_group = 'bp_xprofile_data_' . $user_id;
- $profiledata = wp_cache_get( $field_id, $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$user_id}:{$field_id}";
+ $profiledata = wp_cache_get( $cache_key, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $profiledata ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $profiledata = $wpdb->get_row( $sql );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $profiledata ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $field_id, $profiledata, $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $cache_key, $profiledata, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1259,7 +1259,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $bp;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check cache first
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cached = wp_cache_get( $this->field_id, 'bp_xprofile_data_' . $this->user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$this->user_id}:{$this->field_id}";
+ $cached = wp_cache_get( $cache_key, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cached && ! empty( $cached->id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1400,10 +1401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache_group = 'bp_xprofile_data_' . $user_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uncached_field_ids = bp_xprofile_get_non_cached_field_ids( $user_id, $field_ids, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uncached_field_ids = bp_get_non_cached_ids( $field_ids, $cache_group );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Prime the cache
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $uncached_field_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1426,9 +1425,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set caches
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $uncached_field_ids as $field_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$user_id}:{$field_id}";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If a value was found, cache it
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $queried_data[ $field_id ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $field_id, $queried_data[ $field_id ], $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $cache_key, $queried_data[ $field_id ], 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no value was found, cache an empty item
</span><span class="cx" style="display: block; padding: 0 10px"> // to avoid future cache misses
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1440,14 +1441,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d->value = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $d->last_updated = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $field_id, $d, $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $cache_key, $d, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now that all items are cached, fetch them
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $field_ids as $field_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data[] = wp_cache_get( $field_id, $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$user_id}:{$field_id}";
+ $data[] = wp_cache_get( $cache_key, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1460,7 +1462,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_all_for_user( $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $bp;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = bp_xprofile_get_groups( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1514,7 +1515,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check cache first
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fielddata = wp_cache_get( $field_id, 'bp_xprofile_data_' . $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$user_id}:{$field_id}";
+ $fielddata = wp_cache_get( $cache_key, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $fielddata || empty( $fielddata->id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fielddata_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1551,7 +1553,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Assemble uncached IDs
</span><span class="cx" style="display: block; padding: 0 10px"> $uncached_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user_ids as $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === wp_cache_get( $field_id, 'bp_xprofile_data_' . $user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$user_id}:{$field_id}";
+ if ( false === wp_cache_get( $cache_key, 'bp_xprofile_data' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uncached_ids[] = $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1583,14 +1586,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d->last_updated = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $field_id, $d, 'bp_xprofile_data_' . $d->user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$d->user_id}:{$field_id}";
+ wp_cache_set( $cache_key, $d, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now that the cache is primed with all data, fetch it
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user_ids as $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data[] = wp_cache_get( $field_id, 'bp_xprofile_data_' . $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = "{$user_id}:{$field_id}";
+ $data[] = wp_cache_get( $cache_key, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a single ID was passed, just return the value
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-loader.php 2015-01-09 19:54:02 UTC (rev 9335)
+++ trunk/src/bp-xprofile/bp-xprofile-loader.php 2015-01-09 20:38:37 UTC (rev 9336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,6 +353,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Setup cache groups
+ *
+ * @since BuddyPress (2.2.0)
+ */
+ public function setup_cache_groups() {
+
+ // Global groups
+ wp_cache_add_global_groups( array(
+ 'bp_xprofile',
+ 'bp_xprofile_data',
+ //'xprofile_meta'
+ ) );
+
+ parent::setup_cache_groups();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds "Settings > Profile" subnav item under the "Settings" adminbar menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (2.0.0)
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/members/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/members/functions.php 2015-01-09 19:54:02 UTC (rev 9335)
+++ trunk/tests/phpunit/testcases/members/functions.php 2015-01-09 20:38:37 UTC (rev 9336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $bp;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = 1", $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'bp_user_fullname_' . $u, 'bp' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( 1, 'bp_xprofile_data_' . $u, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u}:1", 'bp_xprofile_data', 'bp' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', xprofile_get_field_data( 1, $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Foo Foo', bp_core_get_user_displayname( $u ) );
</span></span></pre></div>
<a id="trunktestsphpunittestcasesxprofileclassbpxprofileprofiledataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php 2015-01-09 19:54:02 UTC (rev 9335)
+++ trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php 2015-01-09 20:38:37 UTC (rev 9336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $d = new BP_XProfile_ProfileData( $f, $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $d->exists() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Fake the cache
</span><span class="cx" style="display: block; padding: 0 10px"> $c = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $c->id = 3;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $f, $c, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( "{$u}:{$f}", $c, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $d->exists() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Just to be sure
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, BP_XProfile_ProfileData::get_fielddataid_byid( $f, $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d->save();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure it's deleted from cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $d->id, BP_XProfile_ProfileData::get_fielddataid_byid( $f, $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Fake the cache
</span><span class="cx" style="display: block; padding: 0 10px"> $d = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $d->id = 5;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $f, $d, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( "{$u}:{$f}", $d, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 5, BP_XProfile_ProfileData::get_fielddataid_byid( $f, $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d->save();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure it's deleted from cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', BP_XProfile_ProfileData::get_value_byid( $f, $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,8 +179,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'xprofile_data_last_updated_before_save', array( $this, 'filter_time' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure it's deleted from cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $f, 'bp_xprofile_data_' . $u1 );
- wp_cache_delete( $f, 'bp_xprofile_data_' . $u2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u1}:{$f}", 'bp_xprofile_data' );
+ wp_cache_delete( "{$u2}:{$f}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $eu1 = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $eu1->user_id = $u1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $d->value = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $d->field_id = $f;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $f, $d, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( "{$u}:{$f}", $d, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', BP_XProfile_ProfileData::get_value_byid( $f, $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,8 +252,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d2->value = 'bar';
</span><span class="cx" style="display: block; padding: 0 10px"> $d2->last_updated = $time;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $f, $d1, 'bp_xprofile_data_' . $u1 );
- wp_cache_set( $f, $d2, 'bp_xprofile_data_' . $u2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( "{$u1}:{$f}", $d1, 'bp_xprofile_data' );
+ wp_cache_set( "{$u2}:{$f}", $d2, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $eu1 = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $eu1->id = 10;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,8 +313,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d2->save();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure it's deleted from cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $f1, 'bp_xprofile_data_' . $u );
- wp_cache_delete( $f2, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$u}:{$f1}", 'bp_xprofile_data' );
+ wp_cache_delete( "{$u}:{$f2}", 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u_obj = new WP_User( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,8 +389,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $d2->last_updated = $time;
</span><span class="cx" style="display: block; padding: 0 10px"> $d2->id = 2;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $f1, $d1, 'bp_xprofile_data_' . $u );
- wp_cache_set( $f2, $d2, 'bp_xprofile_data_' . $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( "{$u}:{$f1}", $d1, 'bp_xprofile_data' );
+ wp_cache_set( "{$u}:{$f2}", $d2, 'bp_xprofile_data' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u_obj = new WP_User( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>