Changeset 9676

Timestamp:

04/01/2015 11:14:16 PM (9 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Introduce bp_xprofile_groups cache group, to replace bp cache group usage.

• Reduces field group cache keys down to just their ID, using a unique cache group
• Use all key instead of 'xprofile_groups_inc_empty`
• Use default_visibility_levels key instead of xprofile_default_visibility_levels

See #6341, #5733.

Location:

trunk/src/bp-xprofile

Files:

• bp-xprofile-cache.php (modified) (5 diffs)
• bp-xprofile-loader.php (modified) (1 diff)
• bp-xprofile-template.php (modified) (2 diffs)
• classes/class-bp-xprofile-group.php (modified) (7 diffs)

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

@@ -53 +53 @@
  *        object type ('group', 'field', 'data')
  */
-function bp_xprofile_update_meta_cache( $object_ids = array(), $user_id = 0 ) {
+function bp_xprofile_update_meta_cache( $object_ids = array() ) {
     global $wpdb;
 
@@ -76 +76 @@
     foreach ( $uncached_object_ids as $object_type => $uncached_object_type_ids ) {
         if ( ! empty( $object_ids[ $object_type ] ) ) {
+
             // Sanitize $object_ids passed to the function
             $object_type_ids = wp_parse_id_list( $object_ids[ $object_type ] );
@@ -90 +91 @@
 
     // If there are uncached items, go ahead with the query
-    if ( $do_query ) {
+    if ( true === $do_query ) {
         $where = array();
         foreach ( $uncached_object_ids as $otype => $oids ) {
@@ -139 +140 @@
 }
 
+/**
+ * Clear cached XProfile field group data
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param object $group_obj
+ */
 function xprofile_clear_profile_groups_object_cache( $group_obj ) {
-    wp_cache_delete( 'xprofile_groups_inc_empty',        'bp' );
-    wp_cache_delete( 'xprofile_group_' . $group_obj->id, 'bp' );
+    wp_cache_delete( 'all',          'bp_xprofile_groups' );
+    wp_cache_delete( $group_obj->id, 'bp_xprofile_groups' );
 }
 add_action( 'xprofile_group_after_delete', 'xprofile_clear_profile_groups_object_cache' );
 add_action( 'xprofile_group_after_save',   'xprofile_clear_profile_groups_object_cache' );
 
-function xprofile_clear_profile_data_object_cache( $group_id ) {
-    wp_cache_delete( 'bp_user_fullname_' . bp_loggedin_user_id(), 'bp' );
-}
-add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache'   );
+/**
+ * Clear cached XProfile fullname data for user
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param int $user_id ID of user whose fullname cache to delete
+ */
+function xprofile_clear_profile_data_object_cache( $user_id = 0 ) {
+    wp_cache_delete( 'bp_user_fullname_' . $user_id, 'bp' );
+}
+add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
 
 /**
@@ -174 +189 @@
  */
 function xprofile_clear_profile_field_object_cache( $field_obj ) {
+
     // Clear default visibility level cache
-    wp_cache_delete( 'xprofile_default_visibility_levels', 'bp' );
+    wp_cache_delete( 'default_visibility_levels', 'bp_xprofile' );
 
     // Modified fields can alter parent group status, in particular when
     // the group goes from empty to non-empty. Bust its cache, as well as
-    // the global group_inc_empty cache
-    wp_cache_delete( 'xprofile_group_' . $field_obj->group_id, 'bp' );
-    wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
-}
-add_action( 'xprofile_fields_saved_field', 'xprofile_clear_profile_field_object_cache' );
+    // the global 'all' cache
+    wp_cache_delete( 'all',                'bp_xprofile_groups' );
+    wp_cache_delete( $field_obj->group_id, 'bp_xprofile_groups' );
+}
+add_action( 'xprofile_fields_saved_field',   'xprofile_clear_profile_field_object_cache' );
 add_action( 'xprofile_fields_deleted_field', 'xprofile_clear_profile_field_object_cache' );
 

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

@@ -368 +368 @@
             'bp_xprofile',
             'bp_xprofile_data',
+            'bp_xprofile_groups',
             'xprofile_meta'
         ) );

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

@@ -881 +881 @@
  */
 function bp_profile_get_field_groups() {
-    $groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' );
-
-    if ( empty( $groups ) ) {
+
+    $groups = wp_cache_get( 'all', 'bp_xprofile_groups' );
+    if ( false === $groups ) {
         $groups = bp_xprofile_get_groups( array( 'fetch_fields' => true ) );
-        wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
+        wp_cache_set( 'all', $groups, 'bp_xprofile' );
     }
 
@@ -974 +974 @@
 }
     function bp_get_profile_group_name() {
-        if ( !$group_id = bp_action_variable( 1 ) )
+
+        // Check action variable
+        $group_id = bp_action_variable( 1 );
+        if ( empty( $group_id ) || ! is_numeric( $group_id ) ) {
             $group_id = 1;
-
-        if ( !is_numeric( $group_id ) )
-            $group_id = 1;
-
-        if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
-            $group = new BP_XProfile_Group($group_id);
-            wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
-        }
+        }
+
+        // Check for cached group
+        $group = new BP_XProfile_Group( $group_id );
 
         /**

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

@@ -82 +82 @@
         global $wpdb;
 
-        $group = wp_cache_get( 'xprofile_group_' . $this->id, 'bp' );
+        $group = wp_cache_get( $id, 'bp_xprofile_groups' );
 
         if ( false === $group ) {
-            $bp = buddypress();
+            $bp    = buddypress();
             $group = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id ) );
+            wp_cache_set( $id, $group, 'bp_xprofile_groups' );
         }
 
@@ -94 +95 @@
 
         $this->id          = $group->id;
-        $this->name        = stripslashes( $group->name );
-        $this->description = stripslashes( $group->description );
+        $this->name        = $group->name;
+        $this->description = $group->description;
         $this->can_delete  = $group->can_delete;
         $this->group_order = $group->group_order;
@@ -456 +457 @@
 
             // If cached data is found, use it
-            $cache_key  = 'xprofile_group_' . $group_id;
-            $group_data = wp_cache_get( $cache_key, 'bp' );
+            $group_data = wp_cache_get( $group_id, 'bp_xprofile_groups' );
             if ( false !== $group_data ) {
                 $groups[ $group_id ] = $group_data;
@@ -493 +493 @@
 
                     // Cache previously uncached group data
-                    $cache_key = 'xprofile_group_' . $gdata->id;
-                    wp_cache_set( $cache_key, $gdata, 'bp' );
+                    wp_cache_set( $gdata->id, $gdata, 'bp_xprofile_groups' );
                 }
             }
@@ -543 +542 @@
 
         // Purge profile field group cache
-        wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
+        wp_cache_delete( 'all', 'bp_xprofile_groups' );
 
         $bp = buddypress();
@@ -608 +607 @@
         global $wpdb;
 
-        $default_visibility_levels = wp_cache_get( 'xprofile_default_visibility_levels', 'bp' );
+        $default_visibility_levels = wp_cache_get( 'default_visibility_levels', 'bp_xprofile' );
 
         if ( false === $default_visibility_levels ) {
@@ -628 +627 @@
             }
 
-            wp_cache_set( 'xprofile_default_visibility_levels', $default_visibility_levels, 'bp' );
+            wp_cache_set( 'default_visibility_levels', $default_visibility_levels, 'bp_xprofile' );
         }