Changeset 11101 for trunk/src/bp-activity/classes/class-bp-activity-activity.php

Timestamp:

09/14/2016 02:06:10 AM (9 years ago)

Author:

boonebgorges

Message:

Activity: Invalidate query caches when a user's 'last_activity' is updated.

User 'last_activity' is stored in the activity table, but not updated
via the Activity API, so regular invalidation techniques do not work.

In addition, 'last_activity' is quite frequently updated, meaning that
the activity query cache becomes less valuable. To mitigate this, the
current changeset separates the cache for queries containing
'last_activity' from the cache for those that do not.

Fixes #7245.

File:

• trunk/src/bp-activity/classes/class-bp-activity-activity.php (modified) (2 diffs)

trunk/src/bp-activity/classes/class-bp-activity-activity.php

@@ -646 +646 @@
             $activity_ids_sql = apply_filters( 'bp_activity_paged_activities_sql', $activity_ids_sql, $r );
 
-            $cached = bp_core_get_incremented_cache( $activity_ids_sql, 'bp_activity' );
+            /*
+             * Queries that include 'last_activity' are cached separately,
+             * since they are generally much less long-lived.
+             */
+            if ( preg_match( '/a\.type NOT IN \([^\)]*\'last_activity\'[^\)]*\)/', $activity_ids_sql ) ) {
+                $cache_group = 'bp_activity';
+            } else {
+                $cache_group = 'bp_activity_with_last_activity';
+            }
+
+            $cached = bp_core_get_incremented_cache( $activity_ids_sql, $cache_group );
             if ( false === $cached ) {
                 $activity_ids = $wpdb->get_col( $activity_ids_sql );
-                bp_core_set_incremented_cache( $activity_ids_sql, 'bp_activity', $activity_ids );
+                bp_core_set_incremented_cache( $activity_ids_sql, $cache_group, $activity_ids );
             } else {
                 $activity_ids = $cached;
@@ -709 +719 @@
              */
             $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$join_sql} {$where_sql}", $where_sql, $sort );
-            $cached = bp_core_get_incremented_cache( $total_activities_sql, 'bp_activity' );
+            $cached = bp_core_get_incremented_cache( $total_activities_sql, $cache_group );
             if ( false === $cached ) {
                 $total_activities = $wpdb->get_var( $total_activities_sql );
-                bp_core_set_incremented_cache( $total_activities_sql, 'bp_activity', $total_activities );
+                bp_core_set_incremented_cache( $total_activities_sql, $cache_group, $total_activities );
             } else {
                 $total_activities = $cached;