Changeset 38784

Timestamp:

10/12/2016 03:29:03 PM (8 years ago)

Author:

boonebgorges

Message:

Taxonomy: Cache results of term count queries.

Fixes #38295.

Location:

trunk

Files:

• src/wp-includes/class-wp-term-query.php (modified) (1 diff)
• tests/phpunit/tests/term/query.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-term-query.php

@@ -691 +691 @@
 
         if ( 'count' == $_fields ) {
-            return $wpdb->get_var( $this->request );
+            $count = $wpdb->get_var( $this->request );
+            wp_cache_set( $cache_key, $count, 'terms' );
+            return $count;
         }
 

trunk/tests/phpunit/tests/term/query.php

@@ -323 +323 @@
         $this->assertEqualSets( array( $terms[1] ), $found );
     }
+
+    /**
+     * @ticket 38295
+     * @group cache
+     */
+    public function test_count_query_should_be_cached() {
+        global $wpdb;
+
+        register_taxonomy( 'wptests_tax_1', 'post' );
+
+        $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax_1' ) );
+
+        $query = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_1',
+            'fields' => 'count',
+            'hide_empty' => false,
+        ) );
+        $count = $query->get_terms();
+        $this->assertEquals( 2, $count );
+
+        $num_queries = $wpdb->num_queries;
+
+        $query = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_1',
+            'fields' => 'count',
+            'hide_empty' => false,
+        ) );
+        $count = $query->get_terms();
+        $this->assertEquals( 2, $count );
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket 38295
+     * @group cache
+     */
+    public function test_count_query_cache_should_be_invalidated_with_incrementor_bump() {
+        register_taxonomy( 'wptests_tax_1', 'post' );
+
+        $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax_1' ) );
+
+        $query = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_1',
+            'fields' => 'count',
+            'hide_empty' => false,
+        ) );
+        $count = $query->get_terms();
+        $this->assertEquals( 2, $count );
+
+        wp_delete_term( $terms[0], 'wptests_tax_1' );
+
+        $query = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_1',
+            'fields' => 'count',
+            'hide_empty' => false,
+        ) );
+        $count = $query->get_terms();
+        $this->assertEquals( 1, $count );
+    }
 }