Changeset 9336 for trunk/src/bp-xprofile/bp-xprofile-classes.php

Timestamp:

01/09/2015 08:38:37 PM (10 years ago)

Author:

johnjamesjacoby

Message:

XProfile data cache group updates:

• Switches from dynamic cache group to unique key for $user_id:$field_id.
• Introduces bp_xprofile_get_non_cached_field_ids() as a helper, based on bp_get_non_cached_field_ids().
• Registers bp_xprofile and bp_xprofile_data as global cache groups.
• Updates unit tests to pass with new cache keys.

Props r-a-y. Fixes #6100. See #5733.

File:

• trunk/src/bp-xprofile/bp-xprofile-classes.php (modified) (11 diffs)

trunk/src/bp-xprofile/bp-xprofile-classes.php

@@ -1223 +1223 @@
         global $wpdb, $bp;
 
-        $cache_group = 'bp_xprofile_data_' . $user_id;
-        $profiledata = wp_cache_get( $field_id, $cache_group );
+        $cache_key   = "{$user_id}:{$field_id}";
+        $profiledata = wp_cache_get( $cache_key, 'bp_xprofile_data' );
 
         if ( false === $profiledata ) {
-            $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
+            $sql         = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
             $profiledata = $wpdb->get_row( $sql );
 
             if ( $profiledata ) {
-                wp_cache_set( $field_id, $profiledata, $cache_group );
+                wp_cache_set( $cache_key, $profiledata, 'bp_xprofile_data' );
             }
         }
@@ -1260 +1260 @@
 
         // Check cache first
-        $cached = wp_cache_get( $this->field_id, 'bp_xprofile_data_' . $this->user_id );
+        $cache_key = "{$this->user_id}:{$this->field_id}";
+        $cached    = wp_cache_get( $cache_key, 'bp_xprofile_data' );
 
         if ( $cached && ! empty( $cached->id ) ) {
@@ -1401 +1402 @@
         $data = array();
 
-        $cache_group = 'bp_xprofile_data_' . $user_id;
-
-        $uncached_field_ids = bp_get_non_cached_ids( $field_ids, $cache_group );
+        $uncached_field_ids = bp_xprofile_get_non_cached_field_ids( $user_id, $field_ids, 'bp_xprofile_data' );
 
         // Prime the cache
@@ -1427 +1426 @@
             foreach ( $uncached_field_ids as $field_id ) {
 
+                $cache_key = "{$user_id}:{$field_id}";
+
                 // If a value was found, cache it
                 if ( isset( $queried_data[ $field_id ] ) ) {
-                    wp_cache_set( $field_id, $queried_data[ $field_id ], $cache_group );
+                    wp_cache_set( $cache_key, $queried_data[ $field_id ], 'bp_xprofile_data' );
 
                 // If no value was found, cache an empty item
@@ -1441 +1442 @@
                     $d->last_updated = '';
 
-                    wp_cache_set( $field_id, $d, $cache_group );
+                    wp_cache_set( $cache_key, $d, 'bp_xprofile_data' );
                 }
             }
@@ -1448 +1449 @@
         // Now that all items are cached, fetch them
         foreach ( $field_ids as $field_id ) {
-            $data[] = wp_cache_get( $field_id, $cache_group );
+            $cache_key = "{$user_id}:{$field_id}";
+            $data[]    = wp_cache_get( $cache_key, 'bp_xprofile_data' );
         }
 
@@ -1461 +1463 @@
      */
     public static function get_all_for_user( $user_id ) {
-        global $wpdb, $bp;
 
         $groups = bp_xprofile_get_groups( array(
@@ -1515 +1516 @@
 
             // Check cache first
-            $fielddata = wp_cache_get( $field_id, 'bp_xprofile_data_' . $user_id );
+            $cache_key = "{$user_id}:{$field_id}";
+            $fielddata = wp_cache_get( $cache_key, 'bp_xprofile_data' );
             if ( false === $fielddata || empty( $fielddata->id ) ) {
                 $fielddata_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id ) );
@@ -1552 +1554 @@
         $uncached_ids = array();
         foreach ( $user_ids as $user_id ) {
-            if ( false === wp_cache_get( $field_id, 'bp_xprofile_data_' . $user_id ) ) {
+            $cache_key = "{$user_id}:{$field_id}";
+            if ( false === wp_cache_get( $cache_key, 'bp_xprofile_data' ) ) {
                 $uncached_ids[] = $user_id;
             }
@@ -1584 +1587 @@
                 }
 
-                wp_cache_set( $field_id, $d, 'bp_xprofile_data_' . $d->user_id );
+                $cache_key = "{$d->user_id}:{$field_id}";
+                wp_cache_set( $cache_key, $d, 'bp_xprofile_data' );
             }
         }
@@ -1591 +1595 @@
         $data = array();
         foreach ( $user_ids as $user_id ) {
-            $data[] = wp_cache_get( $field_id, 'bp_xprofile_data_' . $user_id );
+            $cache_key = "{$user_id}:{$field_id}";
+            $data[]    = wp_cache_get( $cache_key, 'bp_xprofile_data' );
         }