Changeset 5505

Timestamp:

12/11/2011 04:58:11 PM (14 years ago)

Author:

boonebgorges

Message:

Collect and cache activity meta at the beginning of the activity loop, for quicker lookups. Fixes #3814

Location:

trunk

Files:

• bp-activity/bp-activity-cache.php (added)
• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-activity/bp-activity-functions.php (modified) (4 diffs)
• bp-activity/bp-activity-loader.php (modified) (1 diff)
• bp-core/bp-core-cache.php (modified) (1 diff)

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

@@ -51 +51 @@
             $this->mptt_right        = $row->mptt_right;
             $this->is_spam           = $row->is_spam;
+            
+            bp_activity_update_meta_cache( $this->id );
         }
     }
@@ -190 +192 @@
                 }
             }
+        }
+        
+        // Get activity meta
+        $activity_ids = array();
+        foreach ( (array)$activities as $activity ) {
+            $activity_ids[] = $activity->id;
+        }
+        
+        if ( !empty( $activity_ids ) ) {
+            bp_activity_update_meta_cache( $activity_ids );
         }
 

trunk/bp-activity/bp-activity-functions.php

@@ -483 +483 @@
 
     // Delete cache entry
-    wp_cache_delete( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, 'bp' );
+    wp_cache_delete( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, 'bp' );
 
     // Success
@@ -524 +524 @@
 
         // Check cache
-        if ( !$metas = wp_cache_get( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, 'bp' ) ) {
+        if ( !$metas = wp_cache_get( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, 'bp' ) ) {
+            var_dump( 'miss' );
 
             // No cache so hit the DB
@@ -530 +531 @@
 
             // Set cache
-            wp_cache_set( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, $metas, 'bp' );
+            wp_cache_set( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, $metas, 'bp' );
         }
 
@@ -606 +607 @@
 
     // Set cache
-    wp_cache_set( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, $meta_value, 'bp' );
+    wp_cache_set( 'bp_activity_meta_' . $activity_id . '_' . $meta_key, $meta_value, 'bp' );
 
     // Victory is ours!

trunk/bp-activity/bp-activity-loader.php

@@ -48 +48 @@
             'functions',
             'notifications',
+            'cache'
         );
 

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

@@ -96 +96 @@
     // Get meta info
     $id_list   = join( ',', $object_ids );
-    $meta_list = $wpdb->get_results( $wpdb->prepare( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE group_id IN ($id_list)" ), ARRAY_A );
+    $meta_list = $wpdb->get_results( $wpdb->prepare( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE $object_column IN ($id_list)" ), ARRAY_A );
 
     if ( !empty( $meta_list ) ) {