<!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>[40921] trunk: Cache results in `get_objects_in_term()`.</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/40921">40921</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/40921","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-06-22 03:18:18 +0000 (Thu, 22 Jun 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'>Cache results in `get_objects_in_term()`.
This helps to reduce database queries when generating nav menus.
Props spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/37094">#37094</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2017-06-21 04:11:58 UTC (rev 40920)
+++ trunk/src/wp-includes/taxonomy.php 2017-06-22 03:18:18 UTC (rev 40921)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,8 +650,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = "'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids = "'" . implode( "', '", $term_ids ) . "'";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql = "SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_changed = wp_cache_get_last_changed( 'terms' );
+ $cache_key = 'get_objects_in_term:' . md5( $sql ) . ":$last_changed";
+ $cache = wp_cache_get( $cache_key, 'terms' );
+ if ( false === $cache ) {
+ $object_ids = $wpdb->get_col( $sql );
+ wp_cache_set( $cache_key, $object_ids, 'terms' );
+ } else {
+ $object_ids = (array) $cache;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $object_ids ){
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2017-06-21 04:11:58 UTC (rev 40920)
+++ trunk/tests/phpunit/tests/taxonomy.php 2017-06-22 03:18:18 UTC (rev 40921)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,6 +292,75 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 37094
+ */
+ public function test_term_assignment_should_invalidate_get_objects_in_term_cache() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $posts = self::factory()->post->create_many( 2 );
+ $term_id = self::factory()->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ wp_set_object_terms( $posts[1], $term_id, 'wptests_tax' );
+
+ // Prime cache.
+ $before = get_objects_in_term( $term_id, 'wptests_tax' );
+ $this->assertEqualSets( array( $posts[1] ), $before );
+
+ wp_set_object_terms( $posts[1], array(), 'wptests_tax' );
+
+ $after = get_objects_in_term( $term_id, 'wptests_tax' );
+ $this->assertSame( array(), $after );
+ }
+
+ /**
+ * @ticket 37094
+ */
+ public function test_term_deletion_should_invalidate_get_objects_in_term_cache() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $posts = self::factory()->post->create_many( 2 );
+ $term_id = self::factory()->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ wp_set_object_terms( $posts[1], $term_id, 'wptests_tax' );
+
+ // Prime cache.
+ $before = get_objects_in_term( $term_id, 'wptests_tax' );
+ $this->assertEqualSets( array( $posts[1] ), $before );
+
+ wp_delete_term( $term_id, 'wptests_tax' );
+
+ $after = get_objects_in_term( $term_id, 'wptests_tax' );
+ $this->assertSame( array(), $after );
+ }
+
+ /**
+ * @ticket 37094
+ */
+ public function test_post_deletion_should_invalidate_get_objects_in_term_cache() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $posts = self::factory()->post->create_many( 2 );
+ $term_id = self::factory()->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ wp_set_object_terms( $posts[1], $term_id, 'wptests_tax' );
+
+ // Prime cache.
+ $before = get_objects_in_term( $term_id, 'wptests_tax' );
+ $this->assertEqualSets( array( $posts[1] ), $before );
+
+ wp_delete_post( $posts[1], true );
+
+ $after = get_objects_in_term( $term_id, 'wptests_tax' );
+ $this->assertSame( array(), $after );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25706
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_in_category() {
</span></span></pre>
</div>
</div>
</body>
</html>