Ticket #1925: 0001-bbPress-performance-enhancements-http-bbpress.trac.w.patch

wp-content/plugins/bbpress/includes/admin/tools.php

@@ -744 +744 @@
         $statement = __( 'Recomputing latest post in every topic and forum… %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
-        // First, delete everything.
+        /* First, delete everything.
+           We're not using _bbp_last_active_time anymore, but
+           it makes sense to keep it here to help migrate to the
+           new data model.
+        */
         if ( is_wp_error( $wpdb->query( "DELETE FROM `$wpdb->postmeta` WHERE `meta_key` IN ( '_bbp_last_reply_id', '_bbp_last_topic_id', '_bbp_last_active_id', '_bbp_last_active_time' );" ) ) )
                 return array( 1, sprintf( $statement, $result ) );
 
@@ -797 +801 @@
                 return array( 7, sprintf( $statement, $result ) );
 
         // Give topics with replies their last update time.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
-                        ( SELECT `topic`.`ID`, '_bbp_last_active_time', MAX( `reply`.`post_date` )
-                        FROM `$wpdb->posts` AS `topic` INNER JOIN `$wpdb->posts` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
-                        WHERE `reply`.`post_status` IN ( '" . bbp_get_public_status_id() . "' ) AND `topic`.`post_type` = 'topic' AND `reply`.`post_type` = 'reply'
-                        GROUP BY `topic`.`ID` );" ) ) )
-                return array( 8, sprintf( $statement, $result ) );
+        $sql = $wpdb->prepare(
+                "UPDATE $wpdb->posts p1
+                        LEFT JOIN (SELECT  post_parent,
+                                                        MAX(post_date) AS max_date
+                                                        FROM $wpdb->posts
+                                                        WHERE post_status = %s AND post_type = 'reply'
+                                                        GROUP BY post_parent
+                                                ) p2
+                        ON p1.ID = p2.post_parent
+                        SET p1.post_modified = p2.max_date", bbp_get_public_status_id()
+        );
 
-        // Give topics without replies their last update time.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
-                        ( SELECT `ID`, '_bbp_last_active_time', `post_date`
-                        FROM `$wpdb->posts` AS `topic` LEFT JOIN `$wpdb->postmeta` AS `reply`
-                        ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_active_time'
-                        WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = 'topic' );" ) ) )
-                return array( 9, sprintf( $statement, $result ) );
+        if ( is_wp_error( $wpdb->query( $sql ) ) )
+                return array( 8, sprintf( $statement, $result ) );
 
         // Forums need to know what their last active item is as well. Now it gets a bit more complex to do in the database.
         $forums = $wpdb->get_col( "SELECT `ID` FROM `$wpdb->posts` WHERE `post_type` = 'forum' and `post_status` != 'auto-draft';" );

wp-content/plugins/bbpress/includes/common/widgets.php

@@ -544 +544 @@
                                         'posts_per_page' => $max_shown,
                                         'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
                                         'show_stickes'   => false,
-                                        'meta_key'       => '_bbp_last_active_time',
-                                        'orderby'        => 'meta_value',
+                                        'orderby'        => 'modified',
                                         'order'          => 'DESC',
                                         'meta_query'     => array( bbp_exclude_forum_ids( 'meta_query' ) )
                                 );

wp-content/plugins/bbpress/includes/forums/functions.php

@@ -1102 +1102 @@
                 $post_vars = array(
                         'post_parent' => $forum_id,
                         'post_type'   => bbp_get_topic_post_type(),
-                        'meta_key'    => '_bbp_last_active_time',
-                        'orderby'     => 'meta_value',
+                        'orderby'     => 'modified',
+                        'order'       => 'DESC',
                         'numberposts' => 1
                 );
 
@@ -1272 +1272 @@
  * @return bool True on success, false on failure
  */
 function bbp_update_forum_last_active_time( $forum_id = 0, $new_time = '' ) {
+        global $wpdb;
         $forum_id = bbp_get_forum_id( $forum_id );
-
         // Check time and use current if empty
         if ( empty( $new_time ) )
                 $new_time = get_post_field( 'post_date', bbp_get_forum_last_active_id( $forum_id ) );
 
         // Update only if there is a time
-        if ( !empty( $new_time ) )
-                update_post_meta( $forum_id, '_bbp_last_active_time', $new_time );
+        if ( !empty( $new_time ) ) {
+                $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_modified=%s WHERE ID=%d", $new_time, $forum_id));
+        }
 
         return (int) apply_filters( 'bbp_update_forum_last_active', $new_time, $forum_id );
 }
@@ -1763 +1764 @@
  * @return Position change based on sort
  */
 function _bbp_forum_query_usort_subforum_ids( $a = 0, $b = 0 ) {
-        $ta = get_post_meta( $a, '_bbp_last_active_time', true );
-        $tb = get_post_meta( $b, '_bbp_last_active_time', true );
+        $ta = get_post_field( 'post_modified', $a );
+        $tb = get_post_field( 'post_modified', $b );
         return ( $ta < $tb ) ? -1 : 1;
 }
 

wp-content/plugins/bbpress/includes/forums/template-tags.php

@@ -452 +452 @@
         function bbp_get_forum_last_active_time( $forum_id = 0 ) {
                 $forum_id = bbp_get_forum_id( $forum_id );
 
-                $last_active = get_post_meta( $forum_id, '_bbp_last_active_time', true );
+                $last_active = get_post_field( 'post_modified', $forum_id );
                 if ( empty( $last_active ) ) {
                         $reply_id = bbp_get_forum_last_reply_id( $forum_id );
                         if ( !empty( $reply_id ) ) {

wp-content/plugins/bbpress/includes/topics/functions.php

@@ -2397 +2397 @@
  * @return bool True on success, false on failure
  */
 function bbp_update_topic_last_active_time( $topic_id = 0, $new_time = '' ) {
-
+        global $wpdb;
         // If it's a reply, then get the parent (topic id)
         if ( bbp_is_reply( $topic_id ) )
                 $topic_id = bbp_get_reply_topic_id( $topic_id );
@@ -2409 +2409 @@
                 $new_time = get_post_field( 'post_date', bbp_get_public_child_last_id( $topic_id, bbp_get_reply_post_type() ) );
 
         // Update only if published
-        if ( !empty( $new_time ) )
-                update_post_meta( $topic_id, '_bbp_last_active_time', $new_time );
+        if ( !empty( $new_time ) ) {
+                $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_modified=%s WHERE ID=%d", $new_time, $topic_id));
+        }
 
         return apply_filters( 'bbp_update_topic_last_active_time', $new_time, $topic_id );
 }
@@ -3255 +3256 @@
                                         <guid><?php bbp_topic_permalink(); ?></guid>
                                         <title><![CDATA[<?php bbp_topic_title(); ?>]]></title>
                                         <link><?php bbp_topic_permalink(); ?></link>
-                                        <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_meta( bbp_get_topic_id(), '_bbp_last_active_time', true ) ); ?></pubDate>
+                                        <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_field( 'post_modified', bbp_get_topic_id() ) ); ?></pubDate>
                                         <dc:creator><?php the_author() ?></dc:creator>
 
                                         <?php if ( !post_password_required() ) : ?>

wp-content/plugins/bbpress/includes/topics/template-tags.php

@@ -101 +101 @@
                 'post_type'      => bbp_get_topic_post_type(), // Narrow query down to bbPress topics
                 'post_parent'    => $default_post_parent,      // Forum ID
                 'post_status'    => $default_post_status,      // Post Status
-                'meta_key'       => '_bbp_last_active_time',   // Make sure topic has some last activity time
-                'orderby'        => 'meta_value',              // 'meta_value', 'author', 'date', 'title', 'modified', 'parent', rand',
+                'orderby'        => 'modified',                // 'meta_value', 'author', 'date', 'title', 'modified', 'parent', rand',
                 'order'          => 'DESC',                    // 'ASC', 'DESC'
                 'posts_per_page' => bbp_get_topics_per_page(), // Topics per page
                 'paged'          => bbp_get_paged(),           // Page Number
@@ -186 +185 @@
                                         'post_type'   => bbp_get_topic_post_type(),
                                         'post_parent' => 'any',
                                         'post_status' => $default_post_status,
-                                        'meta_key'    => '_bbp_last_active_time',
-                                        'orderby'     => 'meta_value',
+                                        'orderby'     => 'modified',
                                         'order'       => 'DESC',
                                         'include'     => $stickies
                                 );
@@ -1647 +1645 @@
                 $topic_id = bbp_get_topic_id( $topic_id );
 
                 // Try to get the most accurate freshness time possible
-                $last_active = get_post_meta( $topic_id, '_bbp_last_active_time', true );
+                $last_active = get_post_field( 'post_modified', $topic_id );
                 if ( empty( $last_active ) ) {
                         $reply_id = bbp_get_topic_last_reply_id( $topic_id );
                         if ( !empty( $reply_id ) ) {