Changeset 40921

Timestamp:

06/22/2017 03:18:18 AM (8 years ago)

Author:

boonebgorges

Message:

Cache results in get_objects_in_term().

This helps to reduce database queries when generating nav menus.

Props spacedmonkey.
Fixes #37094.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -651 +651 @@
     $term_ids = "'" . implode( "', '", $term_ids ) . "'";
 
-    $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
+    $sql = "SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order";
+
+    $last_changed = wp_cache_get_last_changed( 'terms' );
+    $cache_key = 'get_objects_in_term:' . md5( $sql ) . ":$last_changed";
+    $cache = wp_cache_get( $cache_key, 'terms' );
+    if ( false === $cache ) {
+        $object_ids = $wpdb->get_col( $sql );
+        wp_cache_set( $cache_key, $object_ids, 'terms' );
+    } else {
+        $object_ids = (array) $cache;
+    }
 
     if ( ! $object_ids ){

trunk/tests/phpunit/tests/taxonomy.php

@@ -293 +293 @@
 
     /**
+     * @ticket 37094
+     */
+    public function test_term_assignment_should_invalidate_get_objects_in_term_cache() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $posts = self::factory()->post->create_many( 2 );
+        $term_id = self::factory()->term->create( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        wp_set_object_terms( $posts[1], $term_id, 'wptests_tax' );
+
+        // Prime cache.
+        $before = get_objects_in_term( $term_id, 'wptests_tax' );
+        $this->assertEqualSets( array( $posts[1] ), $before );
+
+        wp_set_object_terms( $posts[1], array(), 'wptests_tax' );
+
+        $after = get_objects_in_term( $term_id, 'wptests_tax' );
+        $this->assertSame( array(), $after );
+    }
+
+    /**
+     * @ticket 37094
+     */
+    public function test_term_deletion_should_invalidate_get_objects_in_term_cache() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $posts = self::factory()->post->create_many( 2 );
+        $term_id = self::factory()->term->create( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        wp_set_object_terms( $posts[1], $term_id, 'wptests_tax' );
+
+        // Prime cache.
+        $before = get_objects_in_term( $term_id, 'wptests_tax' );
+        $this->assertEqualSets( array( $posts[1] ), $before );
+
+        wp_delete_term( $term_id, 'wptests_tax' );
+
+        $after = get_objects_in_term( $term_id, 'wptests_tax' );
+        $this->assertSame( array(), $after );
+    }
+
+    /**
+     * @ticket 37094
+     */
+    public function test_post_deletion_should_invalidate_get_objects_in_term_cache() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $posts = self::factory()->post->create_many( 2 );
+        $term_id = self::factory()->term->create( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        wp_set_object_terms( $posts[1], $term_id, 'wptests_tax' );
+
+        // Prime cache.
+        $before = get_objects_in_term( $term_id, 'wptests_tax' );
+        $this->assertEqualSets( array( $posts[1] ), $before );
+
+        wp_delete_post( $posts[1], true );
+
+        $after = get_objects_in_term( $term_id, 'wptests_tax' );
+        $this->assertSame( array(), $after );
+    }
+
+    /**
      * @ticket 25706
      */