Changeset 11705

Timestamp:

09/27/2017 10:24:10 AM (7 years ago)

Author:

johnjamesjacoby

Message:

Members: trust WP_User::get_data_by() and eliminate an additional user cache layer.

This change removes ye olde bp_core_userdata_ cache key system, relying 100% on the baked-in object cache for user data and improving the liklihood of cache hits (particularly when other membership or community plugins are looking for user data outside of a BuddyPress specific context.)

For example, bbPress will look for authors of topics and latest posts on various forum pages, but BuddyPress will want to make sure it's XProfile Field display names are used. Previous to now, BuddyPress would need to re-query for these users and keep a separate cache of them. By relying on the traditional user objects, those duplicate database queries never happen, resulting in much joy.

This additionally improves page performance throughout the entire application. When user accounts are updated (via XProfile or related) and then immediately prime their caches, there is no more secondary BuddyPress-specific user object cache to prime.

Fixes #7595.

Location:

trunk/src

Files:

• bp-core/classes/class-bp-core-user.php (modified) (1 diff)
• bp-core/classes/class-bp-user-query.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-settings/bp-settings-actions.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-functions.php (modified) (1 diff)

trunk/src/bp-core/classes/class-bp-core-user.php

@@ -750 +750 @@
      * Get WordPress user details for a specified user.
      *
-     * @global wpdb $wpdb WordPress database object.
+     * @since 3.0.0 Results might be from cache
      *
      * @param int $user_id User ID.
-     * @return array Associative array.
+     * @return false|object WP_User if successful, false on failure.
      */
     public static function get_core_userdata( $user_id ) {
-        global $wpdb;
-
-        if ( !$user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE ID = %d LIMIT 1", $user_id ) ) )
-            return false;
-
-        return $user;
+        return WP_User::get_data_by( 'id', $user_id );
     }
 

trunk/src/bp-core/classes/class-bp-user-query.php

@@ -571 +571 @@
         ), $this ) );
 
-        // WP_User_Query doesn't cache the data it pulls from wp_users,
-        // and it does not give us a way to save queries by fetching
-        // only uncached users. However, BP does cache this data, so
-        // we set it here.
-        foreach ( $wp_user_query->results as $u ) {
-            wp_cache_set( 'bp_core_userdata_' . $u->ID, $u, 'bp' );
-        }
-
         // We calculate total_users using a standalone query, except
         // when a whitelist of user_ids is passed to the constructor.

trunk/src/bp-members/bp-members-functions.php

@@ -215 +215 @@
     }
 
-    $userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' );
-
-    // No cache.
-    if ( false === $userdata ) {
-        $userdata = BP_Core_User::get_core_userdata( $user_id );
-
-        // Cache data; no-result is cached as integer 0.
-        wp_cache_set( 'bp_core_userdata_' . $user_id, false === $userdata ? 0 : $userdata, 'bp' );
-
-    // Cached no-result, so set return value as false as expected.
-    } elseif ( 0 === $userdata ) {
-        $userdata = false;
-    }
+    // Get core user data
+    $userdata = BP_Core_User::get_core_userdata( $user_id );
 
     /**

trunk/src/bp-settings/bp-settings-actions.php

@@ -179 +179 @@
         // on the current page load.
         if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( $update_user ) ) ) {
-            wp_cache_delete( 'bp_core_userdata_' . bp_displayed_user_id(), 'bp' );
             $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
         }
@@ -455 +454 @@
 
         if ( $email_changed ) {
-            // Delete object cache for displayed user.
-            wp_cache_delete( 'bp_core_userdata_' . bp_displayed_user_id(), 'bp' );
 
             // Delete the pending email change key.

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

@@ -837 +837 @@
 
     wp_update_user( array( 'ID' => $user_id, 'display_name' => $fullname ) );
-    wp_cache_delete( 'bp_core_userdata_' . $user_id, 'bp' );
 }
 add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );