Changeset 9753 for trunk/src/bp-messages/bp-messages-cache.php

Timestamp:

04/15/2015 10:44:55 PM (10 years ago)

Author:

r-a-y

Message:

Messages: Cache calls to BP_Messages_Thread class.

This commit:

• Introduces static method - BP_Messages_Thread::get_messages() - caches fetching messages by thread ID and introduces the 'bp_messages_threads' cache group.
• Converts BP_Messages_Thread::check_access() and BP_Messages_Thread::is_valid() methods from using direct DB queries to reference the cache.
• Includes unit tests.
• Consolidates cache clearing functions in bp-messages-cache.php.

This handles the majority of uncached message DB queries. For the inbox
page, if there are 10 message threads in the loop, we save 20 DB queries.
On a single message thread, we save 5 DB queries.

Fixes #6221.

File:

• trunk/src/bp-messages/bp-messages-cache.php (modified) (4 diffs)

trunk/src/bp-messages/bp-messages-cache.php

@@ -47 +47 @@
 
 /**
- * Clear unread count cache for each recipient after a message is sent.
+ * Clear message cache after a message is saved.
  *
  * @since BuddyPress (2.0.0)
@@ -53 +53 @@
  * @param BP_Messages_Message $message
  */
-function bp_messages_clear_unread_count_cache_on_message_save( BP_Messages_Message $message ) {
+function bp_messages_clear_cache_on_message_save( BP_Messages_Message $message ) {
+    // Delete thread cache
+    wp_cache_delete( $message->thread_id, 'bp_messages_threads' );
+
+    // Delete unread count for each recipient
     foreach ( (array) $message->recipients as $recipient ) {
         wp_cache_delete( $recipient->user_id, 'bp_messages_unread_count' );
     }
+
+    // Delete thread recipient cache
+    wp_cache_delete( 'thread_recipients_' . $message->thread_id, 'bp_messages' );
 }
-add_action( 'messages_message_after_save', 'bp_messages_clear_unread_count_cache_on_message_save' );
+add_action( 'messages_message_after_save', 'bp_messages_clear_cache_on_message_save' );
 
 /**
- * Clear unread count cache for the logged-in user after a message is deleted.
+ * Clear message cache after a message thread is deleted.
  *
  * @since BuddyPress (2.0.0)
@@ -68 +75 @@
  *  array of thread IDs
  */
-function bp_messages_clear_unread_count_cache_on_message_delete( $thread_ids ) {
+function bp_messages_clear_cache_on_message_delete( $thread_ids ) {
+    // Delete thread and thread recipient cache
+    foreach( (array) $thread_ids as $thread_id ) {
+        wp_cache_delete( $thread_id, 'bp_messages_threads' );
+        wp_cache_delete( "thread_recipients_{$thread_id}", 'bp_messages' );
+    }
+
+    // Delete unread count for logged-in user
     wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
 }
-add_action( 'messages_before_delete_thread', 'bp_messages_clear_unread_count_cache_on_message_delete' );
+add_action( 'messages_delete_thread', 'bp_messages_clear_cache_on_message_delete' );
 
 /**
@@ -85 +99 @@
 add_action( 'messages_notice_after_save',    'bp_notices_clear_cache' );
 add_action( 'messages_notice_before_delete', 'bp_notices_clear_cache' );
-
-/**
- * Invalidate thread recipient cache on message update.
- *
- * @since BuddyPress (2.3.0)
- *
- * @param BP_Messages_Message $message Message object.
- */
-function bp_messages_clear_message_thread_recipient_cache_on_message_sent( BP_Messages_Message $message ) {
-    wp_cache_delete( 'thread_recipients_' . $message->thread_id, 'bp_messages' );
-}
-add_action( 'messages_message_sent', 'bp_messages_clear_message_thread_recipient_cache_on_message_sent' );
-
-/**
- * Invalidate thread recipient cache on thread deletion.
- *
- * @since BuddyPress (2.3.0)
- *
- * @param int|array $thread_ids IDs of deleted threads.
- */
-function bp_messages_clear_message_thread_recipient_cache_on_thread_delete( $thread_ids ) {
-    foreach ( (array) $thread_ids as $thread_id ) {
-        wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
-    }
-}
-add_action( 'messages_delete_thread', 'bp_messages_clear_message_thread_recipient_cache_on_thread_delete' );