<!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>[53549] trunk: Posts, Post Types: Add caching to `_find_post_by_old_slug` and `_find_post_by_old_date` functions.</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 { white-space: pre-line; 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/53549">53549</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/53549","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>spacedmonkey</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-06-21 13:32:48 +0000 (Tue, 21 Jun 2022)</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'>Posts, Post Types: Add caching to `_find_post_by_old_slug` and `_find_post_by_old_date` functions.
Cache result of database queries in `_find_post_by_old_slug` and `_find_post_by_old_date` functions. This means that repeated requests to a url where the page is not found, will result in hitting a cache for sites running persistent object caching.
Props Spacedmonkey, dd32, mukesh27, pbearne, flixos90.
Fixes <a href="https://core.trac.wordpress.org/ticket/36723">#36723</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldDateRedirectphp">trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldSlugRedirectphp">trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2022-06-21 13:16:10 UTC (rev 53548)
+++ trunk/src/wp-includes/query.php 2022-06-21 13:32:48 UTC (rev 53549)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1150,7 +1150,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= $wpdb->prepare( ' AND DAYOFMONTH(post_date) = %d', get_query_var( 'day' ) );
</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">- $id = (int) $wpdb->get_var( $query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = md5( $query );
+ $last_changed = wp_cache_get_last_changed( 'posts' );
+ $cache_key = "find_post_by_old_slug:$key:$last_changed";
+ $cache = wp_cache_get( $cache_key, 'posts' );
+ if ( false !== $cache ) {
+ $id = $cache;
+ } else {
+ $id = (int) $wpdb->get_var( $query );
+ wp_cache_set( $cache_key, $id, 'posts' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1183,11 +1192,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $date_query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta AS pm_date, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_date' AND post_name = %s" . $date_query, $post_type, get_query_var( 'name' ) ) );
-
- if ( ! $id ) {
- // Check to see if an old slug matches the old date.
- $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts, $wpdb->postmeta AS pm_slug, $wpdb->postmeta AS pm_date WHERE ID = pm_slug.post_id AND ID = pm_date.post_id AND post_type = %s AND pm_slug.meta_key = '_wp_old_slug' AND pm_slug.meta_value = %s AND pm_date.meta_key = '_wp_old_date'" . $date_query, $post_type, get_query_var( 'name' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta AS pm_date, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_date' AND post_name = %s" . $date_query, $post_type, get_query_var( 'name' ) );
+ $key = md5( $query );
+ $last_changed = wp_cache_get_last_changed( 'posts' );
+ $cache_key = "find_post_by_old_date:$key:$last_changed";
+ $cache = wp_cache_get( $cache_key, 'posts' );
+ if ( false !== $cache ) {
+ $id = $cache;
+ } else {
+ $id = (int) $wpdb->get_var( $query );
+ if ( ! $id ) {
+ // Check to see if an old slug matches the old date.
+ $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts, $wpdb->postmeta AS pm_slug, $wpdb->postmeta AS pm_date WHERE ID = pm_slug.post_id AND ID = pm_date.post_id AND post_type = %s AND pm_slug.meta_key = '_wp_old_slug' AND pm_slug.meta_value = %s AND pm_date.meta_key = '_wp_old_date'" . $date_query, $post_type, get_query_var( 'name' ) ) );
+ }
+ wp_cache_set( $cache_key, $id, 'posts' );
</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">
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldDateRedirectphp"></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/rewrite/oldDateRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php 2022-06-21 13:16:10 UTC (rev 53548)
+++ trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php 2022-06-21 13:32:48 UTC (rev 53549)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,7 @@
</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"> * @group rewrite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers wp_old_slug_redirect
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Rewrite_OldDateRedirect extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $old_date_redirect_url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +87,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_date_redirect_url );
</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 36723
+ */
+ public function test_old_date_slug_redirect_cache() {
+ $old_permalink = user_trailingslashit( get_permalink( self::$post_id ) );
+
+ $time = '2004-01-03 00:00:00';
+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
+
+ $permalink = user_trailingslashit( get_permalink( self::$post_id ) );
+
+ $this->go_to( $old_permalink );
+ wp_old_slug_redirect();
+ $num_queries = get_num_queries();
+ $this->assertSame( $permalink, $this->old_date_redirect_url );
+ wp_old_slug_redirect();
+ $this->assertSame( $permalink, $this->old_date_redirect_url );
+ $this->assertSame( $num_queries, get_num_queries() );
+ }
+
+ /**
+ * @ticket 36723
+ */
+ public function test_old_date_redirect_cache_invalidation() {
+ global $wpdb;
+ $old_permalink = user_trailingslashit( get_permalink( self::$post_id ) );
+
+ $time = '2004-01-03 00:00:00';
+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
+
+ $permalink = user_trailingslashit( get_permalink( self::$post_id ) );
+
+ $this->go_to( $old_permalink );
+ wp_old_slug_redirect();
+ $this->assertSame( $permalink, $this->old_date_redirect_url );
+
+ $time = '2014-02-01 00:00:00';
+ wp_update_post(
+ array(
+ 'ID' => $this->post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
+
+ $num_queries = get_num_queries();
+ $this->go_to( $permalink );
+ wp_old_slug_redirect();
+ $this->assertSame( $permalink, $this->old_date_redirect_url );
+ $this->assertGreaterThan( $num_queries, get_num_queries() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_old_date_redirect_attachment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = get_attachment_link( self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldSlugRedirectphp"></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/rewrite/oldSlugRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2022-06-21 13:16:10 UTC (rev 53548)
+++ trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2022-06-21 13:32:48 UTC (rev 53549)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group rewrite
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33920
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers wp_old_slug_redirect
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Rewrite_OldSlugRedirect extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $old_slug_redirect_url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +53,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_slug_redirect_url );
</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 36723
+ */
+ public function test_old_slug_redirect_cache() {
+ $old_permalink = user_trailingslashit( get_permalink( $this->post_id ) );
+
+ wp_update_post(
+ array(
+ 'ID' => $this->post_id,
+ 'post_name' => 'bar-baz',
+ )
+ );
+
+ $permalink = user_trailingslashit( get_permalink( $this->post_id ) );
+
+ $this->go_to( $old_permalink );
+
+ wp_old_slug_redirect();
+ $num_queries = get_num_queries();
+ $this->assertSame( $permalink, $this->old_slug_redirect_url );
+ wp_old_slug_redirect();
+ $this->assertSame( $permalink, $this->old_slug_redirect_url );
+ $this->assertSame( $num_queries, get_num_queries() );
+ }
+
+ /**
+ * @ticket 36723
+ */
+ public function test_old_slug_redirect_cache_invalidation() {
+ $old_permalink = user_trailingslashit( get_permalink( $this->post_id ) );
+
+ wp_update_post(
+ array(
+ 'ID' => $this->post_id,
+ 'post_name' => 'bar-baz',
+ )
+ );
+
+ $permalink = user_trailingslashit( get_permalink( $this->post_id ) );
+
+ $this->go_to( $old_permalink );
+
+ wp_old_slug_redirect();
+ $this->assertSame( $permalink, $this->old_slug_redirect_url );
+
+ wp_update_post(
+ array(
+ 'ID' => $this->post_id,
+ 'post_name' => 'foo-bar',
+ )
+ );
+ $num_queries = get_num_queries();
+ wp_old_slug_redirect();
+ $this->assertSame( $permalink, $this->old_slug_redirect_url );
+ $this->assertSame( $num_queries + 1, get_num_queries() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_old_slug_redirect_attachment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span></span></pre>
</div>
</div>
</body>
</html>