WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Built from https://develop.svn.wordpress.org/trunk@41880


git-svn-id: http://core.svn.wordpress.org/trunk@41714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2017-10-16 18:35:47 +00:00
parent 24783cfc3e
commit 9f73875705
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/class-wp-term-query.php
View File

@ -553,16 +553,6 @@ class WP_Term_Query {
$limits = ''; $limits = '';
} }
$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'] ) ) { if ( ! empty( $args['search'] ) ) {
$this->sql_clauses['where']['search'] = $this->get_search_sql( $args['search'] ); $this->sql_clauses['where']['search'] = $this->get_search_sql( $args['search'] );
@ -580,7 +570,8 @@ class WP_Term_Query {
if ( ! empty( $meta_clauses ) ) { if ( ! empty( $meta_clauses ) ) {
$join .= $mq_sql['join']; $join .= $mq_sql['join'];
$this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] ); $this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
$do_distinct = true; $distinct .= "DISTINCT";
} }
$selects = array(); $selects = array();
@ -642,8 +633,6 @@ class WP_Term_Query {
$where = implode( ' AND ', $this->sql_clauses['where'] ); $where = implode( ' AND ', $this->sql_clauses['where'] );
$distinct = $do_distinct ? 'DISTINCT' : '';
/** /**
* Filters the terms query SQL clauses. * Filters the terms query SQL clauses.
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-beta2-41879'; $wp_version = '4.9-beta2-41880';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.