Changeset 11865 for trunk/tests/phpunit/testcases/friends/functions.php

Timestamp:

02/27/2018 01:29:33 PM (7 years ago)

Author:

dcavins

Message:

Change check in BP_Friends_Friendship::check_is_friend().

In BP2.5, we introduced a new friendship caching mechanism that created a new cache item containing all of a user's friendships. This approach worked well on sites with fewer friendships per user, but caused cache access issues on sites with lots of friendship connections.

This update replaces the cache-intensive change to BP_Friends_Friendship::check_is_friend() with a return to a single lookup to determine friendship status between two users. To minimize SQL lookups, individual friendships are now cached, and a new cache-warming function has been added to bulk update these new cache items: BP_Friends_Friendship::update_bp_friends_cache().

Props januzi_pl, boonebgorges, r-a-y, djpaul, dcavins.

Fixes #7436.

File:

• trunk/tests/phpunit/testcases/friends/functions.php (modified) (2 diffs)

trunk/tests/phpunit/testcases/friends/functions.php

@@ -283 +283 @@
      * @group friendship_caching
      */
-    public function test_friends_check_friendship_should_hit_user_cache() {
-        global $wpdb;
-        $now = time();
-        $u1 = self::factory()->user->create( array(
-            'last_activity' => date( 'Y-m-d H:i:s', $now ),
-        ) );
-        $u2 = self::factory()->user->create( array(
-            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
-        ) );
-        $u3 = self::factory()->user->create( array(
-            'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ),
-        ) );
-
-        friends_add_friend( $u1, $u2, true );
-        friends_add_friend( $u1, $u3, false );
-
-        friends_check_friendship_status( $u1, $u2 );
-        $first_query_count = $wpdb->num_queries;
-
-        friends_check_friendship_status( $u1, $u3 );
-
-        $this->assertEquals( $first_query_count, $wpdb->num_queries );
-    }
-
-    /**
-     * @group friendship_caching
-     */
     public function test_friends_check_friendship_should_hit_friendship_object_cache() {
         global $wpdb;
@@ -326 +299 @@
 
         /*
-         * We expect this to generate one query to find $u2's friendships,
-         * but the friendship object itself should come from cache.
+         * This should access the previous friendship check's cached items.
          */
         friends_check_friendship_status( $u2, $u1 );
 
-        $this->assertEquals( $first_query_count + 1, $wpdb->num_queries );
+        $this->assertEquals( $first_query_count, $wpdb->num_queries );
     }