Changeset 41880 for trunk/src/wp-includes/class-wp-term-query.php

Timestamp:

10/16/2017 06:34:29 PM (7 years ago)

Author:

boonebgorges

Message:

Don't force distinct term queries when specifying number and object_ids.

This reverts [41377], which caused performance problems on sites with a large
number of terms.

See #41796.

File:

• trunk/src/wp-includes/class-wp-term-query.php (modified) (3 diffs)

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

@@ -554 +554 @@
         }
 
-        $do_distinct = false;
-
-        /*
-         * Duplicate terms are generally removed when necessary after the database query.
-         * But when a LIMIT clause is included in the query, we let MySQL enforce
-         * distinctness so the count is correct.
-         */
-        if ( ! empty( $limits ) && 'all_with_object_id' !== $args['fields'] ) {
-            $do_distinct = true;
-        }
 
         if ( ! empty( $args['search'] ) ) {
@@ -581 +571 @@
             $join .= $mq_sql['join'];
             $this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
-            $do_distinct = true;
+            $distinct .= "DISTINCT";
+
         }
 
@@ -643 +634 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $distinct = $do_distinct ? 'DISTINCT' : '';
-
         /**
          * Filters the terms query SQL clauses.