Changeset 40353 for trunk

Timestamp:

03/30/2017 04:49:47 PM (8 years ago)

Author:

boonebgorges

Message:

Invalidate term query caches when setting or deleting term relationships.

Prior to 4.7, term relationships - as set by wp_set_object_terms() or
wp_remove_object_terms() - did not affect the term query cache. The
introduction of the 'object_ids' parameter in 4.7 means that the query
cache must be aware of object-term relationships. As such, the
'last_changed' incrementor is now invalidated when term relationships
are modified.

This bug only reared its head when delaying term counting, because term
counting performs its own term query cache invalidation.

Props mboynes.
Fixes #40306.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (2 diffs)
• tests/phpunit/tests/term/getTheTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -2283 +2283 @@
 
     wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+    wp_cache_delete( 'last_changed', 'terms' );
 
     /**
@@ -2377 +2378 @@
 
         wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+        wp_cache_delete( 'last_changed', 'terms' );
 
         /**

trunk/tests/phpunit/tests/term/getTheTerms.php

@@ -192 +192 @@
 
     }
+
+    /**
+     * @ticket 40306
+     */
+    public function test_term_cache_should_be_invalidated_on_set_object_terms() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        // Temporarily disable term counting, which performs its own cache invalidation.
+        wp_defer_term_counting( true );
+
+        // Create Test Category.
+        $term_id = self::factory()->term->create( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $post_id = self::factory()->post->create();
+
+        // Prime cache.
+        get_the_terms( $post_id, 'wptests_tax' );
+
+        wp_set_object_terms( $post_id, $term_id, 'wptests_tax' );
+
+        $terms = get_the_terms( $post_id, 'wptests_tax' );
+
+        // Re-activate term counting so this doesn't affect other tests.
+        wp_defer_term_counting( false );
+
+        $this->assertTrue( is_array( $terms ) );
+        $this->assertSame( array( $term_id ), wp_list_pluck( $terms, 'term_id' ) );
+    }
+
+    /**
+     * @ticket 40306
+     */
+    public function test_term_cache_should_be_invalidated_on_remove_object_terms() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        // Create Test Category.
+        $term_ids = self::factory()->term->create_many( 2, array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $post_id = self::factory()->post->create();
+
+        wp_set_object_terms( $post_id, $term_ids, 'wptests_tax' );
+
+        // Prime cache.
+        get_the_terms( $post_id, 'wptests_tax' );
+
+        // Temporarily disable term counting, which performs its own cache invalidation.
+        wp_defer_term_counting( true );
+
+        wp_remove_object_terms( $post_id, $term_ids[0], 'wptests_tax' );
+
+        $terms = get_the_terms( $post_id, 'wptests_tax' );
+
+        // Re-activate term counting so this doesn't affect other tests.
+        wp_defer_term_counting( false );
+
+        $this->assertTrue( is_array( $terms ) );
+        $this->assertSame( array( $term_ids[1] ), wp_list_pluck( $terms, 'term_id' ) );
+    }
 }