<!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>[48422] trunk: Revisions: optimize performance when post has large number of revisions.</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/48422">48422</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/48422","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-10 15:12:00 +0000 (Fri, 10 Jul 2020)</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'>Revisions: optimize performance when post has large number of revisions.
Improve speed and reduce the memory footprint when loading posts with many revisions.
* Use a direct query in `wp_get_post_autosave` to avoid loading all revisions.
* Query for IDs vs full objects in `register_and_do_post_meta_boxes`.
Props pdfernhout, johnnyb, miqrogroove, ocean90, senatorman, DBrumbaugh10Up, martijn-van-der-kooij, pavelevap, mackensen, mikeyarce, whyisjake.
Fixes <a href="https://core.trac.wordpress.org/ticket/34560">#34560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunktestsphpunittestsajaxCustomizeManagerphp">trunk/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2020-07-10 12:44:38 UTC (rev 48421)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2020-07-10 15:12:00 UTC (rev 48422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1437,7 +1437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $publish_callback_args = array( '__back_compat_meta_box' => true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_supports( $post_type, 'revisions' ) && 'auto-draft' !== $post->post_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $revisions = wp_get_post_revisions( $post->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $revisions = wp_get_post_revisions( $post->ID, array( 'fields' => 'ids' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We should aim to show the revisions meta box only when there are revisions.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $revisions ) > 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1444,7 +1444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> reset( $revisions ); // Reset pointer for key().
</span><span class="cx" style="display: block; padding: 0 10px"> $publish_callback_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'revisions_count' => count( $revisions ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'revision_id' => key( $revisions ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'revision_id' => array_shift( $revisions ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '__back_compat_meta_box' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'revisionsdiv', __( 'Revisions' ), 'post_revisions_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2020-07-10 12:44:38 UTC (rev 48421)
+++ trunk/src/wp-includes/revision.php 2020-07-10 15:12:00 UTC (rev 48422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieve the autosaved data of the specified post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns a post object containing the information that was autosaved for the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns an object containing the information that was autosaved for the
</ins><span class="cx" style="display: block; padding: 0 10px"> * specified post. If the optional $user_id is passed, returns the autosave for that user
</span><span class="cx" style="display: block; padding: 0 10px"> * otherwise returns the latest autosave.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,19 +232,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_post_autosave( $post_id, $user_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $revisions as $revision ) {
- if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
- if ( $user_id && $user_id != $revision->post_author ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $autosave_name = $post_id . '-autosave-v1';
+ $user_id_query = ( 0 !== $user_id ) ? "AND post_author = $user_id" : null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $revision;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Construct the autosave query
+ $autosave_query = "
+ SELECT *
+ FROM $wpdb->posts
+ WHERE post_parent = %d
+ AND post_type = 'revision'
+ AND post_status = 'inherit'
+ AND post_name = %s " . $user_id_query . '
+ ORDER BY post_date DESC
+ LIMIT 1';
+
+ $autosave = $wpdb->get_results(
+ $wpdb->prepare(
+ $autosave_query,
+ $post_id,
+ $autosave_name
+ )
+ );
+
+ if ( ! $autosave ) {
+ return false;
</ins><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">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $autosave[0];
</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="trunktestsphpunittestsajaxCustomizeManagerphp"></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/ajax/CustomizeManager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2020-07-10 12:44:38 UTC (rev 48421)
+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2020-07-10 15:12:00 UTC (rev 48422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $this->_last_response_parsed['data']['changeset_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $autosave_revision = wp_get_post_autosave( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInstanceOf( 'WP_Post', $autosave_revision );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInstanceOf( 'stdClass', $autosave_revision );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'New Site Title', get_post( $post_id )->post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Autosaved Site Title', $autosave_revision->post_content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $r );
</span><span class="cx" style="display: block; padding: 0 10px"> $autosave_revision = wp_get_post_autosave( $wp_customize->changeset_post_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInstanceOf( 'WP_Post', $autosave_revision );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInstanceOf( 'stdClass', $autosave_revision );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Bar', $autosave_revision->post_content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2020-07-10 12:44:38 UTC (rev 48421)
+++ trunk/tests/phpunit/tests/customize/manager.php 2020-07-10 15:12:00 UTC (rev 48422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1891,7 +1891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify that autosave happened.
</span><span class="cx" style="display: block; padding: 0 10px"> $autosave_revision = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInstanceOf( 'WP_Post', $autosave_revision );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInstanceOf( 'stdClass', $autosave_revision );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Draft Title', get_post( $changeset_post_id )->post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Autosave Title', $autosave_revision->post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>