Changeset 4059

Timestamp:

07/05/2012 05:32:33 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Performance:

• Add 'numeric' to applicable meta-queries to avoid casting as char.
• Remove meta-queries, and use post_parent where possible.
• Introduce _bbp_has_replies_where() filter, attached to 'posts_where' which is responsible for adding the lead topic to the results. This avoids having to use a costly meta-query, potentially resulting in full table scans.
• Audit meta-queries, and tweak where needed.
• Fixes #1885.
• Props vibol for investigation.

Location:

branches/plugin/bbp-includes

Files:

• bbp-common-functions.php (modified) (3 diffs)
• bbp-core-filters.php (modified) (1 diff)
• bbp-core-shortcodes.php (modified) (2 diffs)
• bbp-forum-functions.php (modified) (6 diffs)
• bbp-reply-functions.php (modified) (1 diff)
• bbp-reply-template.php (modified) (1 diff)
• bbp-topic-functions.php (modified) (4 diffs)

branches/plugin/bbp-includes/bbp-common-functions.php

@@ -1471 +1471 @@
                             'key'     => '_bbp_forum_id',
                             'value'   => $forum_id,
+                            'type'    => 'numeric',
                             'compare' => '='
                         ) );
@@ -1501 +1502 @@
                             'feed'           => true,
                             'post_type'      => bbp_get_topic_post_type(),
-                            'post_parent'    => 'any',
+                            'post_parent'    => $forum_id,
                             'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
                             'posts_per_page' => bbp_get_topics_per_rss_page(),
-                            'order'          => 'DESC',
-                            'meta_query'     => $meta_query
+                            'order'          => 'DESC'
                         );
 
@@ -1550 +1550 @@
 
                         // Output the feed
-                        bbp_display_replies_feed_rss2();
+                        bbp_display_replies_feed_rss2( array( 'feed' => true ) );
 
                     // All topics

branches/plugin/bbp-includes/bbp-core-filters.php

@@ -201 +201 @@
 add_filter( 'bbp_pre_anonymous_post_author_website', 'wp_filter_kses',      10 );
 
+// Queries
+add_filter( 'posts_where', '_bbp_has_replies_where', 10, 2 );
+
 /** Functions *****************************************************************/
 

branches/plugin/bbp-includes/bbp-core-shortcodes.php

@@ -377 +377 @@
         }
 
-        // Filter the query
-        if ( ! bbp_is_single_topic() ) {
-            add_filter( 'bbp_before_has_replies_parse_args', array( $this, 'display_topic_query' ) );
-        }
-
         // Start output buffer
         $this->start( 'bbp_single_topic' );
@@ -749 +744 @@
         $args['show_stickies'] = true;
         $args['order']         = 'DESC';
-        return $args;
-    }
-
-    /**
-     * Filter the query for the topic index
-     *
-     * @since bbPress (r3637)
-     *
-     * @param array $args
-     * @return array
-     */
-    public function display_topic_query( $args = array() ) {
-        $args['meta_query'] = array( array(
-            'key'     => '_bbp_topic_id',
-            'value'   => bbpress()->current_topic_id,
-            'compare' => '='
-        ) );
-
         return $args;
     }

branches/plugin/bbp-includes/bbp-forum-functions.php

@@ -1569 +1569 @@
 
     // Setup arrays
-    $retval = $private = $hidden = $meta_query = $forum_ids = array();
-
+    $private = $hidden = $meta_query = $forum_ids = array();
+
+    // Default return value
+    switch ( $type ) {
+        case 'string' :
+            $retval = '';
+            break;
+
+        case 'array'  :
+            $retval = array();
+            break;
+
+        case 'meta_query' :
+            $retval = array( array() ) ;
+            break;
+    }
+    
     // Exclude for everyone but super admins
     if ( !is_super_admin() ) {
@@ -1605 +1620 @@
                         'key'     => '_bbp_forum_id',
                         'value'   => implode( ',', $forum_ids ),
+                        'type'    => 'numeric',
                         'compare' => ( 1 < count( $forum_ids ) ) ? 'NOT IN' : '!='
                     );
@@ -1949 +1965 @@
     // Validate forum ID
     $forum_id = bbp_get_forum_id( $forum_id );
-
     if ( empty( $forum_id ) )
         return;
@@ -1956 +1971 @@
     if ( bbp_has_topics( array(
         'post_type'      => bbp_get_topic_post_type(),
+        'post_parent'    => $forum_id,
         'post_status'    => 'any',
-        'posts_per_page' => -1,
-        'meta_query'     => array( array(
-            'key'        => '_bbp_forum_id',
-            'value'      => $forum_id,
-            'compare'    => '='
-        ) )
+        'posts_per_page' => -1
     ) ) ) {
         while ( bbp_topics() ) {
@@ -1993 +2004 @@
     // Validate forum ID
     $forum_id = bbp_get_forum_id( $forum_id );
-
     if ( empty( $forum_id ) )
         return;
@@ -2007 +2017 @@
     if ( bbp_has_topics( array(
         'post_type'      => bbp_get_topic_post_type(),
+        'post_parent'    => $forum_id,
         'post_status'    => $post_stati,
-        'posts_per_page' => -1,
-        'meta_query'     => array( array(
-            'key'        => '_bbp_forum_id',
-            'value'      => $forum_id,
-            'compare'    => '='
-        ) )
+        'posts_per_page' => -1
     ) ) ) {
 

branches/plugin/bbp-includes/bbp-reply-functions.php

@@ -1366 +1366 @@
 }
 
+/** Filters *******************************************************************/
+
+/**
+ * Used by bbp_has_replies() to add the topic to the posts
+ *
+ * This function filters the 'post_where' of the WP_Query, and changes the query
+ * to include both the topic AND its children in the same loop.
+ *
+ * @since bbPress (r4058)
+ *
+ * @param string $where
+ * @return string
+ */
+function _bbp_has_replies_where( $where, $query ) {
+
+    // Bail if no post_parent to replace
+    if ( ! is_numeric( $query->get( 'post_parent' ) ) )
+        return $where;
+
+    // Bail if not a topic and reply query
+    if ( array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) != $query->get( 'post_type' ) )
+        return $where;
+
+    // Get the topic ID
+    $topic_id = bbp_get_topic_id();
+
+    // The text we're searching for
+    $search   = 'wp_posts.post_parent = ' . $topic_id ;
+
+    // The text to replace it with
+    $replace  = '(wp_posts.ID = ' . $topic_id . ' OR wp_posts.post_parent = ' . $topic_id . ')';
+
+    // Try to replace the search text with the replacement
+    if ( $new_where = str_replace( $search, $replace, $where ) )
+        $where = $new_where;
+
+    return $where;
+}
+
 /** Feeds *********************************************************************/
 

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -67 +67 @@
     global $wp_rewrite;
 
-    // Default status
-    $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
-
-    // Skip topic_id if in the replies widget query
-    $parent_args['meta_query'] = array( array(
-        'key'     => '_bbp_topic_id',
-        'value'   => bbp_get_topic_id(),
-        'compare' => '='
-    ) );
-
     // What are the default allowed statuses (based on user caps)
     if ( bbp_get_view_all( 'edit_others_replies' ) )
-        $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
+        $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
+    else
+        $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
+
+    // Maybe Search 
+    $default_reply_search = !empty( $_REQUEST['rs'] ) ? $_REQUEST['rs'] : false;
+    $default_post_parent  = ( bbp_is_single_topic() ) ? bbp_get_topic_id() : 'any';
+    $default_post_type    = ( bbp_is_single_topic() && bbp_show_lead_topic() ) ? bbp_get_reply_post_type() : array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
 
     // Default query args
     $default = array(
-        'post_type'      => bbp_show_lead_topic() ? bbp_get_reply_post_type() : array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ),
-        'orderby'        => 'date',                                           // 'author', 'date', 'title', 'modified', 'parent', rand',
-        'order'          => 'ASC',                                            // 'ASC', 'DESC'
-        'posts_per_page' => bbp_get_replies_per_page(),                       // Max number
-        'paged'          => bbp_get_paged(),                                  // Page Number
-        's'              => !empty( $_REQUEST['rs'] ) ? $_REQUEST['rs'] : '', // Reply Search
-        'post_status'    => $default_status                                   // Post Status
+        'post_type'      => $default_post_type,         // Only replies
+        'post_parent'    => $default_post_parent,       // Of this topic
+        'post_status'    => $default_post_status,       // Of this status
+        'posts_per_page' => bbp_get_replies_per_page(), // This many
+        'paged'          => bbp_get_paged(),            // On this page
+        'orderby'        => 'date',                     // Sorted by date
+        'order'          => 'ASC',                      // Oldest to newest
+        's'              => $default_reply_search,      // Maybe search
     );
-
-    // Merge the default args and parent args together
-    if ( !empty( $parent_args ) )
-        $default = array_merge( $parent_args, $default );
 
     // Set up topic variables

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -2831 +2831 @@
 
     // Topic is being permanently deleted, so its replies gotta go too
+    // @todo remove meta query
     if ( bbp_has_replies( array(
         'post_type'      => bbp_get_reply_post_type(),
@@ -2838 +2839 @@
             'key'        => '_bbp_topic_id',
             'value'      => $topic_id,
+            'type'       => 'numeric',
             'compare'    => '='
         ) )
@@ -2875 +2877 @@
 
     // Topic is being trashed, so its replies are trashed too
+    // @todo remove meta query
     if ( bbp_has_replies( array( 
         'post_type'      => bbp_get_reply_post_type(),
@@ -2882 +2885 @@
             'key'        => '_bbp_topic_id',
             'value'      => $topic_id,
+            'type'       => 'numeric',
             'compare'    => '='
         ) )