<!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>[37479] trunk: Cache queries in `get_page_by_path()`.</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/37479">37479</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/37479","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>2016-05-21 17:26:55 +0000 (Sat, 21 May 2016)</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 queries in `get_page_by_path()`.
Props spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/36711">#36711</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPageByPathphp">trunk/tests/phpunit/tests/post/getPageByPath.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2016-05-21 02:40:56 UTC (rev 37478)
+++ trunk/src/wp-includes/post.php 2016-05-21 17:26:55 UTC (rev 37479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4231,6 +4231,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><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', 'posts' );
+ if ( false === $last_changed ) {
+ $last_changed = microtime();
+ wp_cache_set( 'last_changed', $last_changed, 'posts' );
+ }
+
+ $hash = md5( $page_path . serialize( $post_type ) );
+ $cache_key = "get_page_by_path:$hash:$last_changed";
+ $cached = wp_cache_get( $cache_key, 'posts' );
+ if ( false !== $cached ) {
+ // Special case: '0' is a bad `$page_path`.
+ if ( '0' === $cached || 0 === $cached ) {
+ return;
+ } else {
+ return get_post( $cached );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_path = rawurlencode(urldecode($page_path));
</span><span class="cx" style="display: block; padding: 0 10px"> $page_path = str_replace('%2F', '/', $page_path);
</span><span class="cx" style="display: block; padding: 0 10px"> $page_path = str_replace('%20', ' ', $page_path);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4285,6 +4303,9 @@
</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">+ // We cache misses as well as hits.
+ wp_cache_set( $cache_key, $foundid, 'posts' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $foundid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_post( $foundid, $output );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPageByPathphp"></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/post/getPageByPath.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPageByPath.php 2016-05-21 02:40:56 UTC (rev 37478)
+++ trunk/tests/phpunit/tests/post/getPageByPath.php 2016-05-21 17:26:55 UTC (rev 37479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,4 +123,123 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $found );
</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 36711
+ */
+ public function test_should_hit_cache() {
+ global $wpdb;
+
+ $page = self::factory()->post->create( array(
+ 'post_type' => 'page',
+ 'post_name' => 'foo',
+ ) );
+
+ // Prime cache.
+ $found = get_page_by_path( 'foo' );
+ $this->assertSame( $page, $found->ID );
+
+ $num_queries = $wpdb->num_queries;
+
+ $found = get_page_by_path( 'foo' );
+ $this->assertSame( $page, $found->ID );
+ $this->assertSame( $num_queries, $wpdb->num_queries );
+ }
+
+ /**
+ * @ticket 36711
+ */
+ public function test_bad_path_should_be_cached() {
+ global $wpdb;
+
+ // Prime cache.
+ $found = get_page_by_path( 'foo' );
+ $this->assertNull( $found );
+
+ $num_queries = $wpdb->num_queries;
+
+ $found = get_page_by_path( 'foo' );
+ $this->assertNull( $found );
+ $this->assertSame( $num_queries, $wpdb->num_queries );
+ }
+
+ /**
+ * @ticket 36711
+ */
+ public function test_bad_path_served_from_cache_should_not_fall_back_on_current_post() {
+ global $wpdb, $post;
+
+ // Fake the global.
+ $post = self::factory()->post->create_and_get();
+
+ // Prime cache.
+ $found = get_page_by_path( 'foo' );
+ $this->assertNull( $found );
+
+ $num_queries = $wpdb->num_queries;
+
+ $found = get_page_by_path( 'foo' );
+ $this->assertNull( $found );
+ $this->assertSame( $num_queries, $wpdb->num_queries );
+
+ unset( $post );
+ }
+
+ /**
+ * @ticket 36711
+ */
+ public function test_cache_should_not_match_post_in_different_post_type_with_same_path() {
+ global $wpdb;
+
+ register_post_type( 'wptests_pt' );
+
+ $p1 = self::factory()->post->create( array(
+ 'post_type' => 'page',
+ 'post_name' => 'foo',
+ ) );
+
+ $p2 = self::factory()->post->create( array(
+ 'post_type' => 'wptests_pt',
+ 'post_name' => 'foo',
+ ) );
+
+ // Prime cache for the page.
+ $found = get_page_by_path( 'foo' );
+ $this->assertSame( $p1, $found->ID );
+
+ $num_queries = $wpdb->num_queries;
+
+ $found = get_page_by_path( 'foo', OBJECT, 'wptests_pt' );
+ $this->assertSame( $p2, $found->ID );
+ $num_queries++;
+ $this->assertSame( $num_queries, $wpdb->num_queries );
+ }
+
+ /**
+ * @ticket 36711
+ */
+ public function test_cache_should_be_invalidated_when_post_name_is_edited() {
+ global $wpdb;
+
+ $page = self::factory()->post->create( array(
+ 'post_type' => 'page',
+ 'post_name' => 'foo',
+ ) );
+
+ // Prime cache.
+ $found = get_page_by_path( 'foo' );
+ $this->assertSame( $page, $found->ID );
+
+ wp_update_post( array(
+ 'ID' => $page,
+ 'post_name' => 'bar',
+ ) );
+
+ $num_queries = $wpdb->num_queries;
+
+ $found = get_page_by_path( 'bar' );
+ $this->assertSame( $page, $found->ID );
+ $num_queries++;
+ $this->assertSame( $num_queries, $wpdb->num_queries );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>