Changeset 12317

Timestamp:

12/07/2018 06:41:16 PM (6 years ago)

Author:

boonebgorges

Message:

XProfile: Add caching to group and field queries.

See #7435.

Location:

trunk

Files:

• src/bp-xprofile/bp-xprofile-cache.php (modified) (1 diff)
• src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (2 diffs)
• src/bp-xprofile/classes/class-bp-xprofile-group.php (modified) (4 diffs)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php (modified) (1 diff)

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

@@ -288 +288 @@
 add_action( 'xprofile_field_before_save', 'bp_xprofile_reset_fields_by_name_cache_incrementor' );
 
+/**
+ * Resets all incremented bp_xprofile_groups caches.
+ *
+ * @since 5.0.0
+ */
+function bp_xprofile_reset_groups_cache_incrementor() {
+    bp_core_reset_incrementor( 'bp_xprofile_groups' );
+}
+add_action( 'xprofile_group_after_delete', 'bp_xprofile_reset_groups_cache_incrementor' );
+add_action( 'xprofile_group_after_save', 'bp_xprofile_reset_groups_cache_incrementor' );
+add_action( 'xprofile_field_after_delete', 'bp_xprofile_reset_groups_cache_incrementor' );
+add_action( 'xprofile_field_after_save', 'bp_xprofile_reset_groups_cache_incrementor' );
+
 // List actions to clear super cached pages on, if super cache is installed.
 add_action( 'xprofile_updated_profile', 'bp_core_clear_cache' );

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

@@ -978 +978 @@
         $parent     = $wpdb->query( $sql );
 
+        $retval = false;
+
         // Update $field_id with new $position and $field_group_id.
         if ( ! empty( $parent ) && ! is_wp_error( $parent ) ) {
@@ -985 +987 @@
             $wpdb->query( $sql );
 
-            // Invalidate profile field cache.
+            // Invalidate profile field and group query cache.
             wp_cache_delete( $field_id, 'bp_xprofile_fields' );
 
-            return $parent;
-        }
-
-        return false;
+            $retval = $parent;
+        }
+
+        bp_core_reset_incrementor( 'bp_xprofile_groups' );
+
+        return $retval;
     }
 

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

@@ -289 +289 @@
         );
 
-        // WHERE.
+        $bp = buddypress();
+
+        $group_ids = self::get_group_ids( $r );
+
+        // Get all group data.
+        $groups = self::get_group_data( $group_ids );
+
+        // Bail if not also getting fields.
+        if ( empty( $r['fetch_fields'] ) ) {
+            return $groups;
+        }
+
+        // Get the group ids from the groups we found.
+        $group_ids = wp_list_pluck( $groups, 'id' );
+
+        // Store for meta cache priming.
+        $object_ids['group'] = $group_ids;
+
+        // Bail if no groups found.
+        if ( empty( $group_ids ) ) {
+            return $groups;
+        }
+
+        $field_ids = self::get_group_field_ids( $group_ids, $r );
+
+        foreach( $groups as $group ) {
+            $group->fields = array();
+        }
+
+        // Bail if no fields.
+        if ( empty( $field_ids ) ) {
+            return $groups;
+        }
+
+        $field_ids = array_map( 'intval', $field_ids );
+
+        // Prime the field cache.
+        $uncached_field_ids = bp_get_non_cached_ids( $field_ids, 'bp_xprofile_fields' );
+        if ( ! empty( $uncached_field_ids ) ) {
+            $_uncached_field_ids = implode( ',', array_map( 'intval', $uncached_field_ids ) );
+            $uncached_fields = $wpdb->get_results( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id IN ({$_uncached_field_ids})" );
+            foreach ( $uncached_fields as $uncached_field ) {
+                $fid = intval( $uncached_field->id );
+                wp_cache_set( $fid, $uncached_field, 'bp_xprofile_fields' );
+            }
+        }
+
+        // Pull field objects from the cache.
+        $fields = array();
+        foreach ( $field_ids as $field_id ) {
+            $fields[] = xprofile_get_field( $field_id, null, false );
+        }
+
+        // Store field IDs for meta cache priming.
+        $object_ids['field'] = $field_ids;
+
+        // Maybe fetch field data.
+        if ( ! empty( $r['fetch_field_data'] ) ) {
+
+            // Get field data for user ID.
+            if ( ! empty( $field_ids ) && ! empty( $r['user_id'] ) ) {
+                $field_data = BP_XProfile_ProfileData::get_data_for_user( $r['user_id'], $field_ids );
+            }
+
+            // Remove data-less fields, if necessary.
+            if ( ! empty( $r['hide_empty_fields'] ) && ! empty( $field_ids ) && ! empty( $field_data ) ) {
+
+                // Loop through the results and find the fields that have data.
+                foreach( (array) $field_data as $data ) {
+
+                    // Empty fields may contain a serialized empty array.
+                    $maybe_value = maybe_unserialize( $data->value );
+
+                    // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731.
+                    if ( ( ! empty( $maybe_value ) || '0' == $maybe_value ) && false !== $key = array_search( $data->field_id, $field_ids ) ) {
+
+                        // Fields that have data get removed from the list.
+                        unset( $field_ids[ $key ] );
+                    }
+                }
+
+                // The remaining members of $field_ids are empty. Remove them.
+                foreach( $fields as $field_key => $field ) {
+                    if ( in_array( $field->id, $field_ids ) ) {
+                        unset( $fields[ $field_key ] );
+                    }
+                }
+
+                // Reset indexes.
+                $fields = array_values( $fields );
+            }
+
+            // Field data was found.
+            if ( ! empty( $fields ) && ! empty( $field_data ) && ! is_wp_error( $field_data ) ) {
+
+                // Loop through fields.
+                foreach( (array) $fields as $field_key => $field ) {
+
+                    // Loop through the data in each field.
+                    foreach( (array) $field_data as $data ) {
+
+                        // Assign correct data value to the field.
+                        if ( $field->id == $data->field_id ) {
+                            $fields[ $field_key ]->data        = new stdClass;
+                            $fields[ $field_key ]->data->value = $data->value;
+                            $fields[ $field_key ]->data->id    = $data->id;
+                        }
+
+                        // Store for meta cache priming.
+                        $object_ids['data'][] = $data->id;
+                    }
+                }
+            }
+        }
+
+        // Prime the meta cache, if necessary.
+        if ( ! empty( $r['update_meta_cache'] ) ) {
+            bp_xprofile_update_meta_cache( $object_ids );
+        }
+
+        // Maybe fetch visibility levels.
+        if ( ! empty( $r['fetch_visibility_level'] ) ) {
+            $fields = self::fetch_visibility_level( $r['user_id'], $fields );
+        }
+
+        // Merge the field array back in with the group array.
+        foreach( (array) $groups as $group ) {
+            // Indexes may have been shifted after previous deletions, so we get a
+            // fresh one each time through the loop.
+            $index = array_search( $group, $groups );
+
+            foreach( (array) $fields as $field ) {
+                if ( $group->id === $field->group_id ) {
+                    $groups[ $index ]->fields[] = $field;
+                }
+            }
+
+            // When we unset fields above, we may have created empty groups.
+            // Remove them, if necessary.
+            if ( empty( $group->fields ) && ! empty( $r['hide_empty_groups'] ) ) {
+                unset( $groups[ $index ] );
+            }
+
+            // Reset indexes.
+            $groups = array_values( $groups );
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Gets group IDs, based on passed parameters.
+     *
+     * @since 5.0.0
+     *
+     * @param array $args {
+     *    Array of optional arguments:
+     *    @type int   $profile_group_id  Limit results to a single profile group. Default false.
+     *    @type array $exclude_groups    Comma-separated list or array of group IDs to exclude. Default false.
+     *    @type bool  $hide_empty_groups True to hide groups that don't have any fields. Default: false.
+     * }
+     * @return array
+     */
+    public static function get_group_ids( $args = array() ) {
+        global $wpdb;
+
+        $r = array_merge(
+            array(
+                'profile_group_id'  => false,
+                'exclude_groups'    => false,
+                'hide_empty_groups' => false,
+            ),
+            $args
+        );
+
+        $bp = buddypress();
+
         if ( ! empty( $r['profile_group_id'] ) ) {
             $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $r['profile_group_id'] );
@@ -299 +475 @@
         }
 
-        $bp = buddypress();
-
         // Include or exclude empty groups.
         if ( ! empty( $r['hide_empty_groups'] ) ) {
-            $group_ids = $wpdb->get_col( "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" );
+            $group_ids_sql = "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC";
         } else {
-            $group_ids = $wpdb->get_col( "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" );
-        }
-
-        // Get all group data.
-        $groups = self::get_group_data( $group_ids );
-
-        // Bail if not also getting fields.
-        if ( empty( $r['fetch_fields'] ) ) {
-            return $groups;
-        }
-
-        // Get the group ids from the groups we found.
-        $group_ids = wp_list_pluck( $groups, 'id' );
-
-        // Store for meta cache priming.
-        $object_ids['group'] = $group_ids;
-
-        // Bail if no groups found.
+            $group_ids_sql = "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC";
+        }
+
+        $cached = bp_core_get_incremented_cache( $group_ids_sql, 'bp_xprofile_groups' );
+        if ( false === $cached ) {
+            $group_ids = $wpdb->get_col( $group_ids_sql );
+            bp_core_set_incremented_cache( $group_ids_sql, 'bp_xprofile_groups', $group_ids );
+        } else {
+            $group_ids = $cached;
+        }
+
+        return array_map( 'intval', $group_ids );
+    }
+
+    /**
+     * Gets group field IDs, based on passed parameters.
+     *
+     * @since 5.0.0
+     *
+     * @param array $group_ids Array of group IDs.
+     * @param array $args {
+     *    Array of optional arguments:
+     *      @type array        $exclude_fields    Comma-separated list or array of field IDs to exclude.
+     *                                            Default empty.
+     *      @type int          $user_id           Limit results to fields associated with a given user's
+     *                                            member type. Default empty.
+     *      @type array|string $member_type       Limit fields by those restricted to a given member type, or array of
+     *                                            member types. If `$user_id` is provided, the value of `$member_type`
+     *                                            is honored.
+     * }
+     * @return array
+     */
+    public static function get_group_field_ids( $group_ids, $args = array() ) {
+        global $wpdb;
+
+        $r = array_merge(
+            array(
+                'exclude_fields' => false,
+                'user_id' => false,
+                'member_type' => false,
+            ),
+            $args
+        );
+
+        $bp = buddypress();
+
+        // Setup IN query from group IDs.
         if ( empty( $group_ids ) ) {
-            return $groups;
-        }
-
-        // Setup IN query from group IDs.
-        $group_ids_in = implode( ',', (array) $group_ids );
+            $group_ids = array( 0 );
+        }
+        $group_ids_in = implode( ',', array_map( 'intval', $group_ids ) );
 
         // Support arrays and comma-separated strings.
@@ -371 +572 @@
         }
 
-        // Fetch the fields.
-        $field_ids = $wpdb->get_col( "SELECT id FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids_in} ) AND parent_id = 0 {$exclude_fields_sql} {$in_sql} ORDER BY field_order" );
-
-        foreach( $groups as $group ) {
-            $group->fields = array();
-        }
-
-        // Bail if no fields.
-        if ( empty( $field_ids ) ) {
-            return $groups;
-        }
-
-        $field_ids = array_map( 'intval', $field_ids );
-
-        // Prime the field cache.
-        $uncached_field_ids = bp_get_non_cached_ids( $field_ids, 'bp_xprofile_fields' );
-        if ( ! empty( $uncached_field_ids ) ) {
-            $_uncached_field_ids = implode( ',', array_map( 'intval', $uncached_field_ids ) );
-            $uncached_fields = $wpdb->get_results( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id IN ({$_uncached_field_ids})" );
-            foreach ( $uncached_fields as $uncached_field ) {
-                $fid = intval( $uncached_field->id );
-                wp_cache_set( $fid, $uncached_field, 'bp_xprofile_fields' );
-            }
-        }
-
-        // Pull field objects from the cache.
-        $fields = array();
-        foreach ( $field_ids as $field_id ) {
-            $fields[] = xprofile_get_field( $field_id, null, false );
-        }
-
-        // Store field IDs for meta cache priming.
-        $object_ids['field'] = $field_ids;
-
-        // Maybe fetch field data.
-        if ( ! empty( $r['fetch_field_data'] ) ) {
-
-            // Get field data for user ID.
-            if ( ! empty( $field_ids ) && ! empty( $r['user_id'] ) ) {
-                $field_data = BP_XProfile_ProfileData::get_data_for_user( $r['user_id'], $field_ids );
-            }
-
-            // Remove data-less fields, if necessary.
-            if ( ! empty( $r['hide_empty_fields'] ) && ! empty( $field_ids ) && ! empty( $field_data ) ) {
-
-                // Loop through the results and find the fields that have data.
-                foreach( (array) $field_data as $data ) {
-
-                    // Empty fields may contain a serialized empty array.
-                    $maybe_value = maybe_unserialize( $data->value );
-
-                    // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731.
-                    if ( ( ! empty( $maybe_value ) || '0' == $maybe_value ) && false !== $key = array_search( $data->field_id, $field_ids ) ) {
-
-                        // Fields that have data get removed from the list.
-                        unset( $field_ids[ $key ] );
-                    }
-                }
-
-                // The remaining members of $field_ids are empty. Remove them.
-                foreach( $fields as $field_key => $field ) {
-                    if ( in_array( $field->id, $field_ids ) ) {
-                        unset( $fields[ $field_key ] );
-                    }
-                }
-
-                // Reset indexes.
-                $fields = array_values( $fields );
-            }
-
-            // Field data was found.
-            if ( ! empty( $fields ) && ! empty( $field_data ) && ! is_wp_error( $field_data ) ) {
-
-                // Loop through fields.
-                foreach( (array) $fields as $field_key => $field ) {
-
-                    // Loop through the data in each field.
-                    foreach( (array) $field_data as $data ) {
-
-                        // Assign correct data value to the field.
-                        if ( $field->id == $data->field_id ) {
-                            $fields[ $field_key ]->data        = new stdClass;
-                            $fields[ $field_key ]->data->value = $data->value;
-                            $fields[ $field_key ]->data->id    = $data->id;
-                        }
-
-                        // Store for meta cache priming.
-                        $object_ids['data'][] = $data->id;
-                    }
-                }
-            }
-        }
-
-        // Prime the meta cache, if necessary.
-        if ( ! empty( $r['update_meta_cache'] ) ) {
-            bp_xprofile_update_meta_cache( $object_ids );
-        }
-
-        // Maybe fetch visibility levels.
-        if ( ! empty( $r['fetch_visibility_level'] ) ) {
-            $fields = self::fetch_visibility_level( $r['user_id'], $fields );
-        }
-
-        // Merge the field array back in with the group array.
-        foreach( (array) $groups as $group ) {
-            // Indexes may have been shifted after previous deletions, so we get a
-            // fresh one each time through the loop.
-            $index = array_search( $group, $groups );
-
-            foreach( (array) $fields as $field ) {
-                if ( $group->id === $field->group_id ) {
-                    $groups[ $index ]->fields[] = $field;
-                }
-            }
-
-            // When we unset fields above, we may have created empty groups.
-            // Remove them, if necessary.
-            if ( empty( $group->fields ) && ! empty( $r['hide_empty_groups'] ) ) {
-                unset( $groups[ $index ] );
-            }
-
-            // Reset indexes.
-            $groups = array_values( $groups );
-        }
-
-        return $groups;
+        $field_ids_sql = "SELECT id FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids_in} ) AND parent_id = 0 {$exclude_fields_sql} {$in_sql} ORDER BY field_order";
+
+        $cached = bp_core_get_incremented_cache( $field_ids_sql, 'bp_xprofile_groups' );
+        if ( false === $cached ) {
+            $field_ids = $wpdb->get_col( $field_ids_sql );
+            bp_core_set_incremented_cache( $field_ids_sql, 'bp_xprofile_groups', $field_ids );
+        } else {
+            $field_ids = $cached;
+        }
+
+        return array_map( 'intval', $field_ids );
     }
 
@@ -614 +700 @@
         }
 
-        // Purge profile field group cache.
+        // Purge profile field group and group query caches.
         wp_cache_delete( 'all', 'bp_xprofile_groups' );
+        bp_core_reset_incrementor( 'bp_xprofile_groups' );
 
         $bp = buddypress();

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php

@@ -442 +442 @@
         $this->assertSame( "Test ' Name", $e1->name );
     }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_ids_query_should_be_cached() {
+        global $wpdb;
+
+        $group_ids   = array( 1 ); // Default group.
+        $group_ids[] = self::factory()->xprofile_group->create();
+        $group_ids[] = self::factory()->xprofile_group->create();
+        $group_ids[] = self::factory()->xprofile_group->create();
+
+        $params_1 = array(
+            'exclude_groups' => false,
+        );
+
+        $params_2 = array(
+            'exclude_groups' => array( 0 ),
+        );
+
+        // Prime cache.
+        $found_1 = BP_XProfile_Group::get_group_ids( $params_1 );
+        $this->assertEqualSets( $group_ids, $found_1 );
+
+        $num_queries = $wpdb->num_queries;
+
+        $found_1 = BP_XProfile_Group::get_group_ids( $params_1 );
+        $this->assertEqualSets( $group_ids, $found_1 );
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+
+        // Different parameters should trigger a cache miss.
+        $found_2 = BP_XProfile_Group::get_group_ids( $params_2 );
+        $this->assertEqualSets( $group_ids, $found_2 );
+        $this->assertNotSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_ids_query_cache_should_be_busted_on_group_delete() {
+        $group_ids    = array( 1 ); // Default group.
+        $group_ids[1] = self::factory()->xprofile_group->create();
+        $group_ids[2] = self::factory()->xprofile_group->create();
+        $group_ids[3] = self::factory()->xprofile_group->create();
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_ids();
+        $this->assertContains( $group_ids[1], $found );
+
+        $g1 = new BP_XProfile_Group( $group_ids[1] );
+        $g1->delete();
+
+        $found = BP_XProfile_Group::get_group_ids();
+        $this->assertNotContains( $group_ids[1], $found );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_ids_query_cache_should_be_busted_on_group_save() {
+        global $wpdb;
+
+        $group_ids    = array( 1 ); // Default group.
+        $group_ids[1] = self::factory()->xprofile_group->create();
+        $group_ids[2] = self::factory()->xprofile_group->create();
+        $group_ids[3] = self::factory()->xprofile_group->create();
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_ids();
+        $this->assertContains( $group_ids[1], $found );
+
+        $g1 = new BP_XProfile_Group( $group_ids[1] );
+        $g1->save();
+
+        $num_queries = $wpdb->num_queries;
+
+        $found = BP_XProfile_Group::get_group_ids();
+        $this->assertNotSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_ids_query_cache_should_be_busted_on_field_save() {
+        global $wpdb;
+
+        $group_ids    = array( 1 ); // Default group.
+        $group_ids[1] = self::factory()->xprofile_group->create();
+        $group_ids[2] = self::factory()->xprofile_group->create();
+        $group_ids[3] = self::factory()->xprofile_group->create();
+
+        $f = self::factory()->xprofile_field->create( array(
+            'field_group_id' => $group_ids[1],
+        ) );
+        $field = new BP_XProfile_Field( $f );
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_ids();
+        $this->assertContains( $group_ids[1], $found );
+
+        $field->save();
+
+        $num_queries = $wpdb->num_queries;
+
+        $found = BP_XProfile_Group::get_group_ids();
+        $this->assertNotSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_ids_query_cache_should_be_busted_on_field_delete() {
+        $group_ids    = array( 1 ); // Default group.
+        $group_ids[1] = self::factory()->xprofile_group->create();
+        $group_ids[2] = self::factory()->xprofile_group->create();
+        $group_ids[3] = self::factory()->xprofile_group->create();
+
+        $f = self::factory()->xprofile_field->create( array(
+            'field_group_id' => $group_ids[1],
+        ) );
+        $field = new BP_XProfile_Field( $f );
+
+        $args = array(
+            'hide_empty_groups' => true,
+        );
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_ids( $args );
+        $this->assertContains( $group_ids[1], $found );
+
+        $field->delete();
+
+        $found = BP_XProfile_Group::get_group_ids( $args );
+        $this->assertNotContains( $group_ids[1], $found );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_field_ids_query_cache() {
+        global $wpdb;
+
+        $group_id = self::factory()->xprofile_group->create();
+
+        $f = self::factory()->xprofile_field->create( array(
+            'field_group_id' => $group_id,
+        ) );
+        $field = new BP_XProfile_Field( $f );
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_field_ids( array( $group_id ) );
+        $this->assertContains( $f, $found );
+
+        $num_queries = $wpdb->num_queries;
+
+        $found = BP_XProfile_Group::get_group_field_ids( array( $group_id ) );
+        $this->assertContains( $f, $found );
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_field_ids_query_cache_should_be_busted_on_field_save() {
+        global $wpdb;
+
+        $group_id = self::factory()->xprofile_group->create();
+
+        $f = self::factory()->xprofile_field->create( array(
+            'field_group_id' => $group_id,
+        ) );
+        $field = new BP_XProfile_Field( $f );
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_field_ids( array( $group_id ) );
+        $this->assertContains( $f, $found );
+
+        $field->save();
+        $num_queries = $wpdb->num_queries;
+
+        $found = BP_XProfile_Group::get_group_field_ids( array( $group_id ) );
+        $this->assertContains( $f, $found );
+        $this->assertNotSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @group BP7435
+     * @group cache
+     */
+    public function test_group_field_ids_query_cache_should_be_busted_on_field_delete() {
+        $group_id = self::factory()->xprofile_group->create();
+
+        $f = self::factory()->xprofile_field->create( array(
+            'field_group_id' => $group_id,
+        ) );
+        $field = new BP_XProfile_Field( $f );
+
+        // Prime cache.
+        $found = BP_XProfile_Group::get_group_field_ids( array( $group_id ) );
+        $this->assertContains( $f, $found );
+
+        $field->delete();
+
+        $found = BP_XProfile_Group::get_group_field_ids( array( $group_id ) );
+        $this->assertNotContains( $f, $found );
+    }
 }