Changeset 53037

Timestamp:

03/31/2022 10:04:25 AM (5 years ago)

Author:

spacedmonkey

Message:

Taxonomy: Improve performance by taxonomy queries by adding a limitting requested terms.

Add a limit to the number of terms requested in taxonomy queries. This improves the performance of the query and the likelihood of hitting an existing term query cache.

Props Spacedmonkey, peterwilsoncc, flixos90.
Fixes #55360.

Location:

trunk

Files:

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

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

@@ -638 +638 @@
                 }
 
+                if ( ! is_taxonomy_hierarchical( $query['taxonomy'] ) ) {
+                        $args['number'] = count( $terms );
+                }
+
                 $term_query = new WP_Term_Query();
                 $term_list  = $term_query->query( $args );

trunk/tests/phpunit/tests/query/taxQuery.php

@@ -1622 +1622 @@
                 $this->assertSameSets( array( $p ), $q->posts );
         }
+
+        /**
+         * @ticket 55360
+         *
+         * @covers WP_Tax_Query::transform_query
+         */
+        public function test_tax_terms_should_limit_query() {
+                $filter = new MockAction();
+                add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
+                register_taxonomy( 'wptests_tax', 'post' );
+                $name = 'foobar';
+                $t    = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax',
+                                'name'     => $name,
+                        )
+                );
+
+                $p = self::factory()->post->create();
+                wp_set_object_terms( $p, array( $t ), 'wptests_tax' );
+
+                $q = new WP_Query(
+                        array(
+                                'fields'    => 'ids',
+                                'tax_query' => array(
+                                        array(
+                                                'taxonomy' => 'wptests_tax',
+                                                'field'    => 'name',
+                                                'terms'    => $name,
+                                        ),
+                                ),
+                        )
+                );
+
+                $filter_args = $filter->get_args();
+                $query       = $filter_args[1][1]->request;
+
+                $this->assertSameSets( array( $p ), $q->posts );
+                $this->assertStringContainsString( 'LIMIT 1', $query );
+        }
+
+        /**
+         * @ticket 55360
+         *
+         * @covers WP_Tax_Query::transform_query
+         */
+        public function test_tax_terms_should_limit_query_to_one() {
+                $filter = new MockAction();
+                add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
+                register_taxonomy( 'wptests_tax', 'post' );
+                $name = 'foobar';
+                $t    = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax',
+                                'name'     => $name,
+                        )
+                );
+
+                $p = self::factory()->post->create();
+                wp_set_object_terms( $p, array( $t ), 'wptests_tax' );
+
+                $q = new WP_Query(
+                        array(
+                                'fields'    => 'ids',
+                                'tax_query' => array(
+                                        array(
+                                                'taxonomy' => 'wptests_tax',
+                                                'field'    => 'term_id',
+                                                'terms'    => array( $t, $t, $t ),
+                                        ),
+                                ),
+                        )
+                );
+
+                $filter_args = $filter->get_args();
+                $query       = $filter_args[1][1]->request;
+
+                $this->assertSameSets( array( $p ), $q->posts );
+                $this->assertStringContainsString( 'LIMIT 1', $query );
+        }
+
+        /**
+         * @ticket 55360
+         *
+         * @covers WP_Tax_Query::transform_query
+         */
+        public function test_hierarchical_taxonomies_do_not_limit_query() {
+                $filter = new MockAction();
+                add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $name = 'foobar';
+                $t    = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax',
+                                'name'     => $name,
+                        )
+                );
+
+                $p = self::factory()->post->create();
+                wp_set_object_terms( $p, array( $t ), 'wptests_tax' );
+
+                $q = new WP_Query(
+                        array(
+                                'fields'    => 'ids',
+                                'tax_query' => array(
+                                        array(
+                                                'taxonomy' => 'wptests_tax',
+                                                'field'    => 'name',
+                                                'terms'    => $name,
+                                        ),
+                                ),
+                        )
+                );
+
+                $filter_args = $filter->get_args();
+                $query       = $filter_args[0][1]->request;
+
+                $this->assertSameSets( array( $p ), $q->posts );
+                $this->assertStringNotContainsString( 'LIMIT 1', $query );
+        }
 }