Changeset 6585

Timestamp:

06/19/2017 05:05:18 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Cache: make bbp_clean_post_cache() an action-only function.

Instead of calling bbp_clean_post_cache() directly, we'll call clean_post_cache() as per normal and hook bbp_clean_post_cache() to the end of it. This reduces a bunch of superfluous cache invalidation from occurring back-to-back.

We'll also only ever update the last_changed cache key when we've reached the forum-root. This makes sure that subsequent recursive calls up the post_parent tree are dealing with the same last_changed value until the end.

This change will reduce the number of cache invalidation calls by a large amount, improving functional performance for database writes to the post & postmeta tables.

Location:

trunk

Files:

• src/includes/core/actions.php (modified) (1 diff)
• src/includes/core/cache.php (modified) (3 diffs)
• src/includes/forums/functions.php (modified) (3 diffs)
• src/includes/topics/functions.php (modified) (1 diff)
• tests/phpunit/testcases/admin/tools.php (modified) (3 diffs)
• tests/phpunit/testcases/core/cache.php (modified) (1 diff)
• tests/phpunit/testcases/topics/functions/counts.php (modified) (1 diff)

trunk/src/includes/core/actions.php

@@ -385 +385 @@
 add_action( 'bbp_user_edit_after', 'bbp_user_edit_after' );
 
-// New forum/topic/reply caches
-// @todo Investigate why clearing is necessary on both pre & post hooks
-add_action( 'bbp_new_forum_pre_extras',  'bbp_clean_post_cache' );
-add_action( 'bbp_new_forum_post_extras', 'bbp_clean_post_cache' );
-add_action( 'bbp_new_topic_pre_extras',  'bbp_clean_post_cache' );
-add_action( 'bbp_new_topic_post_extras', 'bbp_clean_post_cache' );
-add_action( 'bbp_new_reply_pre_extras',  'bbp_clean_post_cache' );
-add_action( 'bbp_new_reply_post_extras', 'bbp_clean_post_cache' );
-
 // Clean bbPress post caches when WordPress's is cleaned
 add_action( 'clean_post_cache', 'bbp_clean_post_cache', 10, 2 );

trunk/src/includes/core/cache.php

@@ -136 +136 @@
 function bbp_clean_post_cache( $post_id = null, $post = null ) {
 
-    // Get the post object.
-    if ( null !== $post ) {
-        $post = get_post( $post );
-    } else {
-        $post = get_post( $post_id );
-    }
-
-    // Bail if no post
-    if ( empty( $post ) ) {
-        return;
-    }
-
     // Child query types to clean
     $post_types = array(
@@ -159 +147 @@
         return;
     }
-
-    // Be sure we haven't recached the post data
-    wp_cache_delete( $post->ID, 'posts'     );
-    wp_cache_delete( $post->ID, 'post_meta' );
-
-    // Clean the term cache for the given post
-    clean_object_term_cache( $post->ID, $post->post_type );
-
-    // Bump the last_changed cache
-    wp_cache_set( 'last_changed', microtime(), 'bbpress_posts' );
 
     /**
@@ -182 +160 @@
     // Invalidate parent caches
     if ( ! empty( $post->post_parent ) ) {
-        bbp_clean_post_cache( $post->post_parent );
+        clean_post_cache( $post->post_parent );
+
+    // Only bump `last_changed` when forum-root is reached
+    } else {
+        wp_cache_set( 'last_changed', microtime(), 'bbpress_posts' );
     }
 }

trunk/src/includes/forums/functions.php

@@ -833 +833 @@
         $bbp_db->update( $bbp_db->posts, array( 'post_status' => bbp_get_public_status_id() ), array( 'ID' => $forum_id ) );
         wp_transition_post_status( bbp_get_public_status_id(), $current_visibility, get_post( $forum_id ) );
-        bbp_clean_post_cache( $forum_id );
+        clean_post_cache( $forum_id );
     }
 
@@ -882 +882 @@
         $bbp_db->update( $bbp_db->posts, array( 'post_status' => bbp_get_private_status_id() ), array( 'ID' => $forum_id ) );
         wp_transition_post_status( bbp_get_private_status_id(), $current_visibility, get_post( $forum_id ) );
-        bbp_clean_post_cache( $forum_id );
+        clean_post_cache( $forum_id );
     }
 
@@ -931 +931 @@
         $bbp_db->update( $bbp_db->posts, array( 'post_status' => bbp_get_hidden_status_id() ), array( 'ID' => $forum_id ) );
         wp_transition_post_status( bbp_get_hidden_status_id(), $current_visibility, get_post( $forum_id ) );
-        bbp_clean_post_cache( $forum_id );
+        clean_post_cache( $forum_id );
     }
 

trunk/src/includes/topics/functions.php

@@ -911 +911 @@
     // Clean old and new forum caches before proceeding, to ensure subsequent
     // calls to forum objects are using updated data.
-    bbp_clean_post_cache( $old_forum_id );
-    bbp_clean_post_cache( $new_forum_id );
+    clean_post_cache( $old_forum_id );
+    clean_post_cache( $new_forum_id );
 
     // Update topic forum's ID

trunk/tests/phpunit/testcases/admin/tools.php

@@ -161 +161 @@
         bbp_admin_repair_topic_voice_count();
 
-        bbp_clean_post_cache( $t );
+        clean_post_cache( $t );
 
         $count = bbp_get_topic_voice_count( $t );
@@ -215 +215 @@
         bbp_admin_repair_topic_hidden_reply_count();
 
-        bbp_clean_post_cache( $t );
+        clean_post_cache( $t );
 
         $count = bbp_get_topic_reply_count_hidden( $t, true );
@@ -662 +662 @@
         bbp_admin_repair_forum_meta();
 
-        bbp_clean_post_cache( $f );
-        bbp_clean_post_cache( $t );
-        bbp_clean_post_cache( $r );
+        clean_post_cache( $f );
+        clean_post_cache( $t );
+        clean_post_cache( $r );
 
         // Forums should NOT have a _bbp_forum_id meta key

trunk/tests/phpunit/testcases/core/cache.php

@@ -49 +49 @@
 
         // Clean the cache.
-        bbp_clean_post_cache( $r );
+        clean_post_cache( $r );
 
         // Setup

trunk/tests/phpunit/testcases/topics/functions/counts.php

@@ -127 +127 @@
 
         // ToDo: Update this to use bbp_delete_reply().
-        bbp_clean_post_cache( $t );
+        clean_post_cache( $t );
         wp_delete_post( $r2, true );