Changeset 31730

Timestamp:

03/11/2015 08:45:17 PM (10 years ago)

Author:

johnbillion

Message:

Introduce a new algorithm for displaying a hierarchical list of post objects in the WP_Posts_List_Table. This reduces processing time, reduces database queries, and substantially reduces memory use on sites with a high number of Pages.

Props nofearinc, rodrigosprimo, nacin, johnbillion.
Fixes #15459

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-posts-list-table.php (modified) (13 diffs)
• src/wp-admin/includes/post.php (modified) (1 diff)
• tests/phpunit/tests/admin/includesListTable.php (added)

trunk/src/wp-admin/includes/class-wp-posts-list-table.php

@@ -87 +87 @@
     }
 
+    /**
+     * Sets whether the table layout should be hierarchical or not.
+     *
+     * @since 4.2.0
+     *
+     * @param bool $display Whether the table layout should be hierarchical.
+     */
+    public function set_hierarchical_display( $display ) {
+        $this->hierarchical_display = $display;
+    }
+
     public function ajax_user_can() {
         return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
@@ -96 +107 @@
         $avail_post_stati = wp_edit_posts_query();
 
-        $this->hierarchical_display = ( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
+        $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
 
         $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
@@ -479 +490 @@
         $start = ( $pagenum - 1 ) * $per_page;
         $end = $start + $per_page;
+        $to_display = array();
 
         foreach ( $pages as $page ) {
@@ -485 +497 @@
 
             if ( $count >= $start ) {
-                echo "\t";
-                $this->single_row( $page, $level );
+                $to_display[$page->ID] = $level;
             }
 
@@ -492 +503 @@
 
             if ( isset( $children_pages ) )
-                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
         }
 
@@ -503 +514 @@
 
                     if ( $count >= $start ) {
-                        echo "\t";
-                        $this->single_row( $op, 0 );
+                        $to_display[$op->ID] = 0;
                     }
 
@@ -510 +520 @@
                 }
             }
+        }
+
+        $ids = array_keys( $to_display );
+        _prime_post_caches( $ids );
+
+        if ( ! isset( $GLOBALS['post'] ) ) {
+            $GLOBALS['post'] = array_shift( $ids );
+        }
+
+        foreach ( $to_display as $page_id => $level ) {
+            echo "\t";
+            $this->single_row( $page_id, $level );
         }
     }
@@ -518 +540 @@
      *
      * @since 3.1.0 (Standalone function exists since 2.6.0)
+     * @since 4.2.0 Added the `$to_display` parameter.
      *
      * @param array $children_pages
@@ -525 +548 @@
      * @param int $pagenum
      * @param int $per_page
+     * @param array $to_display list of pages to be displayed
      */
-    private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
+    private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
 
         if ( ! isset( $children_pages[$parent] ) )
@@ -544 +568 @@
                 $my_parent = $page->post_parent;
                 while ( $my_parent ) {
-                    $my_parent = get_post( $my_parent );
+                    // Get the ID from the list or the attribute if my_parent is an object
+                    $parent_id = $my_parent;
+                    if ( is_object( $my_parent ) ) {
+                        $parent_id = $my_parent->ID;
+                    }
+
+                    $my_parent = get_post( $parent_id );
                     $my_parents[] = $my_parent;
                     if ( !$my_parent->post_parent )
@@ -552 +582 @@
                 $num_parents = count( $my_parents );
                 while ( $my_parent = array_pop( $my_parents ) ) {
-                    echo "\t";
-                    $this->single_row( $my_parent, $level - $num_parents );
+                    $to_display[$my_parent->ID] = $level - $num_parents;
                     $num_parents--;
                 }
@@ -559 +588 @@
 
             if ( $count >= $start ) {
-                echo "\t";
-                $this->single_row( $page, $level );
+                $to_display[$page->ID] = $level;
             }
 
             $count++;
 
-            $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+            $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
         }
 
@@ -580 +608 @@
 
         $global_post = get_post();
+
+        $post = get_post( $post );
+
         $GLOBALS['post'] = $post;
         setup_postdata( $post );

trunk/src/wp-admin/includes/post.php

@@ -1040 +1040 @@
         $query['posts_per_page'] = -1;
         $query['posts_per_archive_page'] = -1;
+        $query['fields'] = 'id=>parent';
     }