Changeset 11352

Timestamp:

12/29/2016 02:16:02 AM (8 years ago)

Author:

boonebgorges

Message:

XProfile: Add caching for fetching a field ID by name.

Fixes #7404.

Location:

trunk

Files:

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

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

@@ -307 +307 @@
 add_action( 'xprofile_field_after_save', 'bp_xprofile_clear_field_cache' );
 
+/**
+ * Clear the field-name cache.
+ *
+ * @since 2.8.0
+ */
+function bp_xprofile_reset_fields_by_name_cache_incrementor() {
+    bp_core_reset_incrementor( 'bp_xprofile_fields_by_name' );
+}
+add_action( 'xprofile_field_before_save', 'bp_xprofile_reset_fields_by_name_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

@@ -918 +918 @@
         }
 
-        $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s AND parent_id = 0", $field_name );
-
-        $query = $wpdb->get_var( $sql );
-
-        return is_numeric( $query ) ? (int) $query : $query;
+        $id = bp_core_get_incremented_cache( $field_name, 'bp_xprofile_fields_by_name' );
+        if ( false === $id ) {
+            $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s AND parent_id = 0", $field_name );
+            $id = $wpdb->get_var( $sql );
+            bp_core_set_incremented_cache( $field_name, 'bp_xprofile_fields_by_name', $id );
+        }
+
+        return is_numeric( $id ) ? (int) $id : $id;
     }
 

trunk/tests/phpunit/testcases/xprofile/cache.php

@@ -165 +165 @@
         $this->assertSame( 'Bar', $field_2->name );
     }
+
+    /**
+     * @ticket BP7407
+     */
+    public function test_get_field_id_from_name_should_be_cached() {
+        global $wpdb;
+
+        $g = $this->factory->xprofile_group->create();
+        $f = $this->factory->xprofile_field->create( array(
+            'field_group_id' => $g,
+            'name' => 'Foo',
+        ) );
+
+        // Prime cache.
+        BP_XProfile_Field::get_id_from_name( 'Foo' );
+
+        $num_queries = $wpdb->num_queries;
+
+        $this->assertSame( $f, BP_XProfile_Field::get_id_from_name( 'Foo' ) );
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket BP7407
+     */
+    public function test_get_field_id_from_name_cache_should_be_invalidated_on_field_update() {
+        $g = $this->factory->xprofile_group->create();
+        $f1 = $this->factory->xprofile_field->create( array(
+            'field_group_id' => $g,
+            'name' => 'Foo',
+        ) );
+        $f2 = $this->factory->xprofile_field->create( array(
+            'field_group_id' => $g,
+            'name' => 'Bar',
+        ) );
+
+        // Prime cache.
+        xprofile_get_field_id_from_name( 'Foo' );
+        xprofile_get_field_id_from_name( 'Bar' );
+
+        // Free up the name 'Bar'.
+        $field2 = xprofile_get_field( $f2 );
+        $field2->name = 'Quz';
+        $field2->save();
+
+        // Take the name 'Bar'.
+        $field1 = xprofile_get_field( $f1 );
+        $field1->name = 'Bar';
+        $field1->save();
+
+        $this->assertSame( $f1, BP_XProfile_Field::get_id_from_name( 'Bar' ) );
+    }
+
+    /**
+     * @ticket BP7407
+     */
+    public function test_get_field_id_from_name_cache_should_be_invalidated_on_field_deletion() {
+        $g = $this->factory->xprofile_group->create();
+        $f = $this->factory->xprofile_field->create( array(
+            'field_group_id' => $g,
+            'name' => 'Foo',
+        ) );
+
+        // Prime cache.
+        xprofile_get_field_id_from_name( 'Foo' );
+
+        xprofile_delete_field( $f );
+
+        $this->assertNull( BP_XProfile_Field::get_id_from_name( 'Bar' ) );
+    }
 }