<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41880] trunk: Don't force distinct term queries when specifying `number` and `object_ids`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41880">41880</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41880","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-16 18:34:29 +0000 (Mon, 16 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Don't force distinct term queries when specifying `number` and `object_ids`.
This reverts <a href="https://core.trac.wordpress.org/changeset/41377">[41377]</a>, which caused performance problems on sites with a large
number of terms.
See <a href="https://core.trac.wordpress.org/ticket/41796">#41796</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswptermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2017-10-16 18:14:33 UTC (rev 41879)
+++ trunk/src/wp-includes/class-wp-term-query.php 2017-10-16 18:34:29 UTC (rev 41880)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,17 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $limits = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $do_distinct = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * 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;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['search'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['search'] = $this->get_search_sql( $args['search'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +570,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta_clauses ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join .= $mq_sql['join'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $do_distinct = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $distinct .= "DISTINCT";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $selects = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,8 +633,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = implode( ' AND ', $this->sql_clauses['where'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $distinct = $do_distinct ? 'DISTINCT' : '';
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the terms query SQL clauses.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunitteststermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/query.php 2017-10-16 18:14:33 UTC (rev 41879)
+++ trunk/tests/phpunit/tests/term/query.php 2017-10-16 18:34:29 UTC (rev 41880)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,61 +471,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $found2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $found3 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @ticket 41796
- */
- public function test_number_should_work_with_object_ids() {
- register_taxonomy( 'wptests_tax', 'post' );
-
- $term_1 = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- ) );
- $term_2 = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- ) );
-
- $post_1 = self::factory()->post->create();
- $post_2 = self::factory()->post->create();
-
- wp_set_object_terms( $post_1, array( $term_1, $term_2 ), 'wptests_tax' );
- wp_set_object_terms( $post_2, array( $term_1 ), 'wptests_tax' );
-
- $q = new WP_Term_Query( array(
- 'taxonomy' => 'wptests_tax',
- 'object_ids' => array( $post_1, $post_2 ),
- 'number' => 2,
- ) );
-
- $this->assertEqualSets( array( $term_1, $term_2 ), wp_list_pluck( $q->terms, 'term_id' ) );
- }
-
- /**
- * @ticket 41796
- */
- public function test_number_should_work_with_object_ids_and_all_with_object_id() {
- register_taxonomy( 'wptests_tax', 'post' );
-
- $term_1 = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- ) );
- $term_2 = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- ) );
-
- $post_1 = self::factory()->post->create();
- $post_2 = self::factory()->post->create();
-
- wp_set_object_terms( $post_1, array( $term_1, $term_2 ), 'wptests_tax' );
- wp_set_object_terms( $post_2, array( $term_1 ), 'wptests_tax' );
-
- $q = new WP_Term_Query( array(
- 'taxonomy' => 'wptests_tax',
- 'object_ids' => array( $post_1, $post_2 ),
- 'fields' => 'all_with_object_id',
- 'number' => 2,
- ) );
-
- $this->assertEqualSets( array( $term_1, $term_1 ), wp_list_pluck( $q->terms, 'term_id' ) );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>