Changeset 3903

Timestamp:

09/01/2016 03:15:59 AM (8 years ago)

Author:

jmdodd

Message:

Support Forums: Improve performance.

Use fuzzy numbers for forum totals, as these are constantly changing.

Bound views by the last six months of posts. This can be adjusted later not performant enough.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums

Files:

• inc/class-performance-optimizations.php (modified) (5 diffs)
• inc/class-plugin.php (modified) (1 diff)
• support-forums.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php

@@ -7 +7 @@
     var $term = null;
     var $query = null;
+    var $bound_id = array();
 
     function __construct() {
@@ -44 +45 @@
             }
 
-            // has_topics() uses this by default.
-            if ( isset( $r['meta_key'] ) && '_bbp_last_active_time' == $r['meta_key'] ) {
-                unset( $r['meta_key'] );
-                unset( $r['meta_type'] );
-                $r['orderby'] = 'ID';
+            if ( isset( $r['meta_key'] ) ) {
+                // has_topics() uses this by default.
+                if ( '_bbp_last_active_time' == $r['meta_key'] ) {
+                    unset( $r['meta_key'] );
+                    unset( $r['meta_type'] );
+                    $r['orderby'] = 'ID';
+                // Some views use meta key lookups and should only look at known
+                // open topics.
+                } elseif ( ! empty( $r['meta_key'] ) ) {
+                    $r['orderby'] = 'ID';
+                    add_filter( 'posts_where', array( $this, 'posts_in_six_months' ) );
+                }
             }
 
             // If this is a forum, limit the number of pages we're dealing with.
-            if ( isset( $r['post_parent'] ) && get_post_type( $r['post_parent'] ) === bbp_get_forum_post_type() ) {
+            if ( bbp_is_single_forum() && isset( $r['post_parent'] ) && get_post_type( $r['post_parent'] ) === bbp_get_forum_post_type() ) {
                 $r['no_found_rows'] = true;
                 add_filter( 'bbp_topic_pagination', array( $this, 'forum_pagination' ) );
@@ -59 +67 @@
         }
         return $r;
+    }
+
+    public function posts_in_last_six_months( $w ) {
+        global $wpdb;
+
+        $bound_id = $this->get_bound_id( '6 MONTH' );
+        $w .= $wpdb->prepare( " AND ( $wpdb->posts.ID >= %d )", $bound_id );
+        return $w;
     }
 
@@ -73 +89 @@
         // Try SQL.
         if ( ! is_null( $this->query ) ) {
-            $count = $wpdb->query( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'topic' AND post_status = 'publish' LIMIT 1", $this->query['post_parent'] ) );
+            $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'topic' AND post_status IN ( 'publish', 'closed' ) LIMIT 1", $this->query['post_parent'] ) );
             if ( $count ) {
                 $r['total'] = $count / bbp_get_topics_per_page();
+                update_post_meta( $this->query['post_parent'], '_bbp_topic_count', $count );
+                update_post_meta( $this->query['post_parent'], '_bbp_total_topic_count', $count );
                 return $r;
             }
         }
 
-        // If all else fails...
+        // Give a reasonable default to fall back on.
         $r['total'] = 10;
         return $r;
@@ -108 +126 @@
         return $term;
     }
+
+    /**
+     * Get the ID from a topic one year ago so that we can only look at topics
+     * after that ID.
+     */
+    public function get_bound_id( $interval ) {
+        global $wpdb;
+
+        if ( ! in_array( $interval, array( '1 WEEK', '1 MONTH', '6 MONTH', '1 YEAR' ) ) ) {
+            $interval = '1 WEEK';
+        }
+
+        if ( array_key_exists( $interval, $this->bound_id ) ) {
+            return $this->bound_id[ $interval ];
+        }
+
+        // Check cache.
+        $cache_key = str_replace( ' ', '-', $interval );
+        $cache_group = 'topic-bound-ids';
+        $bound_id = wp_cache_get( $cache_key, $cache_group );
+        if ( false === $bound_id ) {
+
+            // Use the type_status_date index.
+            $bound_id = $wpdb->get_var( "
+                SELECT `ID`
+                FROM $wpdb->posts
+                WHERE post_type = 'topic'
+                    AND post_status IN ( 'publish', 'closed' )
+                    AND post_date < DATE_SUB( NOW(), INTERVAL $interval )
+                ORDER BY `ID` DESC
+                LIMIT 1 " );
+            // Set the bound id to 1 if there is not a suitable range.
+            if ( ! $bound_id ) {
+                $bound_id = 1;
+            }
+            $this->bound_id[ $interval ] = $bound_id;
+
+            wp_cache_set( $cache_key, $bound_id, $cache_group, 86400 );
+        }
+        return $bound_id;
+    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin.php

@@ -35 +35 @@
         $this->performance = new Performance_Optimizations;
         $this->users       = new Users;
+        $this->hooks       = new Hooks;
 
         // These modifications are specific to https://wordpress.org/support/
         $blog_id = get_current_blog_id();
         if ( $blog_id && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID == $blog_id ) {
+            $this->dropin  = new Dropin;
             $this->themes  = new Theme_Directory_Compat;
             $this->plugins = new Plugin_Directory_Compat;

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/support-forums.php

@@ -17 +17 @@
 include( dirname( __FILE__ ) . '/inc/class-plugin.php' );
 include( dirname( __FILE__ ) . '/inc/class-users.php' );
+include( dirname( __FILE__ ) . '/inc/class-dropin.php' );
+include( dirname( __FILE__ ) . '/inc/class-hooks.php' );
 include( dirname( __FILE__ ) . '/inc/class-directory-compat.php' );
 include( dirname( __FILE__ ) . '/inc/class-theme-directory-compat.php' );