Changeset 7809

Timestamp:

02/06/2014 06:58:17 PM (11 years ago)

Author:

boonebgorges

Message:

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 #4954.

See #5362

Props Denis-de-Bernardy

Location:

trunk

Files:

• bp-core/bp-core-cache.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)
• tests/testcases/core/functions.php (modified) (1 diff)

trunk/bp-core/bp-core-cache.php

@@ -56 +56 @@
 add_action( 'bp_first_activity_for_member',   'bp_core_clear_member_count_caches' );
 add_action( 'deleted_user',                   'bp_core_clear_member_count_caches' );
+
+/**
+ * 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' );
 
 /**

trunk/bp-core/bp-core-functions.php

@@ -358 +358 @@
     global $wpdb;
 
-    // Set pages as standard class
-    $pages = new stdClass;
-
-    // Get pages and IDs
-    $page_ids = bp_core_get_directory_page_ids();
-    if ( !empty( $page_ids ) ) {
-
-        // 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' " );
-
-        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;
+    // Look in cache first
+    $pages = wp_cache_get( 'directory_pages', 'bp' );
+
+    if ( false === $pages ) {
+
+        // Set pages as standard class
+        $pages = new stdClass;
+
+        // Get pages and IDs
+        $page_ids = bp_core_get_directory_page_ids();
+        if ( !empty( $page_ids ) ) {
+
+            // 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' " );
+
+            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 ) );
                     }
 
-                    $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 ) );
+                    unset( $slug );
                 }
-
-                unset( $slug );
             }
         }
+
+        wp_cache_set( 'directory_pages', $pages, 'bp' );
     }
 

trunk/tests/testcases/core/functions.php

@@ -256 +256 @@
     }
 
+    /**
+     * @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 );
+    }
+
 }