<!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][7809] trunk: Store directory_pages data in the persistent cache.</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/7809">7809</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-06 18:58:17 +0000 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Store directory_pages data in the persistent cache.
This information is needed during every bootstrap, yet rarely changes, so there
should be significant performance benefit from caching it.
Invalidation takes place when one of the pages is updated, or when the bp-pages
option is changed.
Note that this change will likely be moot after migrating to the WP rewrite
API. See <a href="http://buddypress.trac.wordpress.org/ticket/4954">#4954</a>.
See <a href="http://buddypress.trac.wordpress.org/ticket/5362">#5362</a>
Props Denis-de-Bernardy</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecachephp">trunk/bp-core/bp-core-cache.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkteststestcasescorefunctionsphp">trunk/tests/testcases/core/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecachephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cache.php (7808 => 7809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cache.php 2014-02-06 02:23:51 UTC (rev 7808)
+++ trunk/bp-core/bp-core-cache.php 2014-02-06 18:58:17 UTC (rev 7809)
</span><span class="lines">@@ -57,6 +57,43 @@
</span><span class="cx"> add_action( 'deleted_user', 'bp_core_clear_member_count_caches' );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Clear the directory_pages cache when one of the pages is updated.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $post_id
+ */
+function bp_core_clear_directory_pages_cache_page_edit( $post_id ) {
+ if ( ! bp_is_root_blog() ) {
+ return;
+ }
+
+ // Bail if BP is not defined here
+ if ( ! buddypress() ) {
+ return;
+ }
+
+ $page_ids = bp_core_get_directory_page_ids();
+
+ if ( ! in_array( $post_id, (array) $page_ids ) ) {
+ return;
+ }
+
+ wp_cache_delete( 'directory_pages', 'bp' );
+}
+add_action( 'save_post_page', 'bp_core_clear_directory_pages_cache_page_edit' );
+
+/**
+ * Clear the directory_pages cache when the bp-pages option is updated.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_core_clear_directory_pages_cache_settings_edit() {
+ wp_cache_delete( 'directory_pages', 'bp' );
+}
+add_action( 'update_option_bp-pages', 'bp_core_clear_directory_pages_cache_settings_edit' );
+
+/**
</ins><span class="cx"> * Determine which items from a list do not have cached values.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (2.0.0)
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (7808 => 7809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2014-02-06 02:23:51 UTC (rev 7808)
+++ trunk/bp-core/bp-core-functions.php 2014-02-06 18:58:17 UTC (rev 7809)
</span><span class="lines">@@ -357,44 +357,52 @@
</span><span class="cx"> function bp_core_get_directory_pages() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- // Set pages as standard class
- $pages = new stdClass;
</del><ins>+ // Look in cache first
+ $pages = wp_cache_get( 'directory_pages', 'bp' );
</ins><span class="cx">
</span><del>- // Get pages and IDs
- $page_ids = bp_core_get_directory_page_ids();
- if ( !empty( $page_ids ) ) {
</del><ins>+ if ( false === $pages ) {
</ins><span class="cx">
</span><del>- // Always get page data from the root blog, except on multiblog mode, when it comes
- // from the current blog
- $posts_table_name = bp_is_multiblog_mode() ? $wpdb->posts : $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts';
- $page_ids_sql = implode( ',', wp_parse_id_list( $page_ids ) );
- $page_names = $wpdb->get_results( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " );
</del><ins>+ // Set pages as standard class
+ $pages = new stdClass;
</ins><span class="cx">
</span><del>- foreach ( (array) $page_ids as $component_id => $page_id ) {
- foreach ( (array) $page_names as $page_name ) {
- if ( $page_name->ID == $page_id ) {
- if ( !isset( $pages->{$component_id} ) || !is_object( $pages->{$component_id} ) ) {
- $pages->{$component_id} = new stdClass;
- }
</del><ins>+ // Get pages and IDs
+ $page_ids = bp_core_get_directory_page_ids();
+ if ( !empty( $page_ids ) ) {
</ins><span class="cx">
</span><del>- $pages->{$component_id}->name = $page_name->post_name;
- $pages->{$component_id}->id = $page_name->ID;
- $pages->{$component_id}->title = $page_name->post_title;
- $slug[] = $page_name->post_name;
</del><ins>+ // Always get page data from the root blog, except on multiblog mode, when it comes
+ // from the current blog
+ $posts_table_name = bp_is_multiblog_mode() ? $wpdb->posts : $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts';
+ $page_ids_sql = implode( ',', wp_parse_id_list( $page_ids ) );
+ $page_names = $wpdb->get_results( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " );
</ins><span class="cx">
</span><del>- // Get the slug
- while ( $page_name->post_parent != 0 ) {
- $parent = $wpdb->get_results( $wpdb->prepare( "SELECT post_name, post_parent FROM {$posts_table_name} WHERE ID = %d", $page_name->post_parent ) );
- $slug[] = $parent[0]->post_name;
- $page_name->post_parent = $parent[0]->post_parent;
</del><ins>+ foreach ( (array) $page_ids as $component_id => $page_id ) {
+ foreach ( (array) $page_names as $page_name ) {
+ if ( $page_name->ID == $page_id ) {
+ if ( !isset( $pages->{$component_id} ) || !is_object( $pages->{$component_id} ) ) {
+ $pages->{$component_id} = new stdClass;
+ }
+
+ $pages->{$component_id}->name = $page_name->post_name;
+ $pages->{$component_id}->id = $page_name->ID;
+ $pages->{$component_id}->title = $page_name->post_title;
+ $slug[] = $page_name->post_name;
+
+ // Get the slug
+ while ( $page_name->post_parent != 0 ) {
+ $parent = $wpdb->get_results( $wpdb->prepare( "SELECT post_name, post_parent FROM {$posts_table_name} WHERE ID = %d", $page_name->post_parent ) );
+ $slug[] = $parent[0]->post_name;
+ $page_name->post_parent = $parent[0]->post_parent;
+ }
+
+ $pages->{$component_id}->slug = implode( '/', array_reverse( (array) $slug ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $pages->{$component_id}->slug = implode( '/', array_reverse( (array) $slug ) );
</del><ins>+ unset( $slug );
</ins><span class="cx"> }
</span><del>-
- unset( $slug );
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ wp_cache_set( 'directory_pages', $pages, 'bp' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_get_directory_pages', $pages );
</span></span></pre></div>
<a id="trunkteststestcasescorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/core/functions.php (7808 => 7809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/core/functions.php 2014-02-06 02:23:51 UTC (rev 7808)
+++ trunk/tests/testcases/core/functions.php 2014-02-06 18:58:17 UTC (rev 7809)
</span><span class="lines">@@ -255,4 +255,45 @@
</span><span class="cx"> $this->assertEquals( $expected, bp_alpha_sort_by_key( $items, 'name' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @group bp_core_get_directory_pages
+ */
+ public function test_bp_core_get_directory_pages_after_page_edit() {
+ // Set the cache
+ $pages = bp_core_get_directory_pages();
+
+ // Update one of the posts
+ switch_to_blog( bp_get_root_blog_id() );
+
+ // grab the first one
+ foreach ( $pages as $page ) {
+ $p = $page;
+ break;
+ }
+
+ $post = get_post( $p->id );
+ $post->post_title .= ' Foo';
+ wp_update_post( $post );
+
+ restore_current_blog();
+
+ $this->assertFalse( wp_cache_get( 'directory_pages', 'bp' ) );
+ }
+
+ /**
+ * @group bp_core_get_directory_pages
+ */
+ public function test_bp_core_get_directory_pages_pages_settings_update() {
+ // Set the cache
+ $pages = bp_core_get_directory_pages();
+
+ // Mess with it but put it back
+ $v = bp_get_option( 'bp-pages' );
+ bp_update_option( 'bp-pages', 'foo' );
+
+ $this->assertFalse( wp_cache_get( 'directory_pages', 'bp' ) );
+
+ bp_update_option( 'bp-pages', $v );
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>