Changeset 48422

Timestamp:

07/10/2020 03:12:00 PM (4 years ago)

Author:

adamsilverstein

Message:

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 #34560.

Location:

trunk

Files:

• src/wp-admin/includes/meta-boxes.php (modified) (2 diffs)
• src/wp-includes/revision.php (modified) (2 diffs)
• tests/phpunit/tests/ajax/CustomizeManager.php (modified) (2 diffs)
• tests/phpunit/tests/customize/manager.php (modified) (1 diff)

trunk/src/wp-admin/includes/meta-boxes.php

@@ -1438 +1438 @@
     $publish_callback_args = array( '__back_compat_meta_box' => true );
     if ( post_type_supports( $post_type, 'revisions' ) && 'auto-draft' !== $post->post_status ) {
-        $revisions = wp_get_post_revisions( $post->ID );
+        $revisions = wp_get_post_revisions( $post->ID, array( 'fields' => 'ids' ) );
 
         // We should aim to show the revisions meta box only when there are revisions.
@@ -1445 +1445 @@
             $publish_callback_args = array(
                 'revisions_count'        => count( $revisions ),
-                'revision_id'            => key( $revisions ),
+                'revision_id'            => array_shift( $revisions ),
                 '__back_compat_meta_box' => true,
             );

trunk/src/wp-includes/revision.php

@@ -222 +222 @@
  * Retrieve the autosaved data of the specified post.
  *
- * Returns a post object containing the information that was autosaved for the
+ * Returns an object containing the information that was autosaved for the
  * specified post. If the optional $user_id is passed, returns the autosave for that user
  * otherwise returns the latest autosave.
@@ -233 +233 @@
  */
 function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-    $revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
-
-    foreach ( $revisions as $revision ) {
-        if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-            if ( $user_id && $user_id != $revision->post_author ) {
-                continue;
-            }
-
-            return $revision;
-        }
-    }
-
-    return false;
+    global $wpdb;
+
+    $autosave_name = $post_id . '-autosave-v1';
+    $user_id_query = ( 0 !== $user_id ) ? "AND post_author = $user_id" : null;
+
+    // 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;
+    }
+
+    return $autosave[0];
 }
 

trunk/tests/phpunit/tests/ajax/CustomizeManager.php

@@ -473 +473 @@
         $this->assertEquals( 'draft', $this->_last_response_parsed['data']['changeset_status'] );
         $autosave_revision = wp_get_post_autosave( $post_id );
-        $this->assertInstanceOf( 'WP_Post', $autosave_revision );
+        $this->assertInstanceOf( 'stdClass', $autosave_revision );
 
         $this->assertContains( 'New Site Title', get_post( $post_id )->post_content );
@@ -700 +700 @@
         $this->assertNotWPError( $r );
         $autosave_revision = wp_get_post_autosave( $wp_customize->changeset_post_id() );
-        $this->assertInstanceOf( 'WP_Post', $autosave_revision );
+        $this->assertInstanceOf( 'stdClass', $autosave_revision );
         $this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
         $this->assertContains( 'Bar', $autosave_revision->post_content );

trunk/tests/phpunit/tests/customize/manager.php

@@ -1892 +1892 @@
         // Verify that autosave happened.
         $autosave_revision = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
-        $this->assertInstanceOf( 'WP_Post', $autosave_revision );
+        $this->assertInstanceOf( 'stdClass', $autosave_revision );
         $this->assertContains( 'Draft Title', get_post( $changeset_post_id )->post_content );
         $this->assertContains( 'Autosave Title', $autosave_revision->post_content );