Ticket #10964: query.php.r17522.diff

wp-includes/query.php

@@ -878 +878 @@
         var $request;
 
         /**
+         * Get quick post database query.
+         *
+         * @since trunk
+         * @access public
+         * @var string
+         */
+        var $quick_request;
+
+        /**
          * List of posts.
          *
          * @since 1.5.0
@@ -1893 +1902 @@
                 $join = '';
                 $search = '';
                 $groupby = '';
-                $fields = '';
+                $fields = "$wpdb->posts.ID"; // See #10964
+                $quick_fields = "$wpdb->posts.*";
                 $post_status_join = false;
                 $page = 1;
 
@@ -2514 +2524 @@
 
                 $orderby = $q['orderby'];
 
+                // Set up quick_* defaults from the standard placeholders, before filtering
+                $quick_distinct = $distinct;
+                $quick_where = $where;
+                $quick_join = $join;
+                $quick_groupby = $groupby;
+
                 $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+                $quick_pieces = array( 'quick_where', 'quick_groupby', 'quick_join', 'quick_orderby', 'quick_distinct', 'quick_fields', 'quick_limits' );
 
                 // Apply post-paging filters on where and join.  Only plugins that
                 // manipulate paging queries should use these hooks.
@@ -2531 +2548 @@
                         $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
                         foreach ( $pieces as $piece )
                                 $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
+
+                        // And again for the quick clauses
+                        $clauses = (array) apply_filters_ref_array( 'posts_quick_clauses', array( compact( $quick_pieces ), &$this ) );
+                        foreach ( $quick_pieces as $piece )
+                                $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
                 }
 
                 // Announce current selection parameters.  For use by caching plugins.
@@ -2550 +2572 @@
                         $clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
                         foreach ( $pieces as $piece )
                                 $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
+
+                        // And again for the quick clauses
+                        $clauses = (array) apply_filters_ref_array( 'posts_quick_clauses_request', array( compact( $quick_pieces ), &$this ) );
+                        foreach ( $quick_pieces as $piece )
+                                $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
                 }
 
                 if ( ! empty($groupby) )
                         $groupby = 'GROUP BY ' . $groupby;
+                if ( ! empty($quick_groupby) ) 
+                        $quick_groupby = 'GROUP BY ' . $quick_groupby;
                 if ( !empty( $orderby ) )
                         $orderby = 'ORDER BY ' . $orderby;
 
@@ -2561 +2590 @@
                 if ( !$q['no_found_rows'] && !empty($limits) )
                         $found_rows = 'SQL_CALC_FOUND_ROWS';
 
-                $this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
-                if ( !$q['suppress_filters'] )
-                        $this->request = apply_filters_ref_array('posts_request', array( $this->request, &$this ) );
+                if ( empty($limits) ) {
+                        // Do a direct query, as there is no benefit in fetching a huge load of IDs in an IN clause
+                        $this->request = " SELECT $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby";
+                        $this->quick_request = " SELECT $quick_distinct $quick_fields FROM $wpdb->posts $quick_join WHERE 1=1 $quick_where $quick_groupby $orderby";
 
-                if ( 'ids' == $q['fields'] ) {
-                        $this->posts = $wpdb->get_col($this->request);
+                        if ( 'ids' == $q['fields'] ) {
+                                $this->posts = $wpdb->get_col($this->request);
 
-                        return $this->posts;
-                }
+                                return $this->posts;
+                        }
 
-                if ( 'id=>parent' == $q['fields'] ) {
-                        $this->posts = $wpdb->get_results($this->request);
+                        if ( 'id=>parent' == $q['fields'] ) {
+                                $this->posts = $wpdb->get_results($this->request);
 
-                        $r = array();
-                        foreach ( $this->posts as $post )
-                                $r[ $post->ID ] = $post->post_parent;
+                                $r = array();
+                                foreach ( $this->posts as $post )
+                                        $r[ $post->ID ] = $post->post_parent;
 
-                        return $r;
+                                return $r;
+                        }
+
+                        if ( !$q['suppress_filters'] ) {
+                                        $this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this, false ) );
+                                        $this->quick_request = apply_filters_ref_array( 'posts_request', array( $this->quick_request, &$this, true ) );
+                        }
+
+                        $this->posts = $wpdb->get_results($this->quick_request);
+
+                        $this->found_posts = count($this->posts);
+                        $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+                        $this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+                } else {
+                        $this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+                        if ( !$q['suppress_filters'] )
+                                        $this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this, false ) );
+
+                        $post_ids = $wpdb->get_col($this->request);
+
+                        if ( empty($post_ids) ) {
+                                        $this->found_posts = 0;
+                                        $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+                                        $this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+
+                                        $this->quick_request = " SELECT $quick_distinct $quick_fields FROM $wpdb->posts $quick_join WHERE 1=1 $quick_where $quick_groupby $orderby";
+                                        if ( !$q['suppress_filters'] )
+                                                        $this->quick_request = apply_filters_ref_array('posts_request', array( $this->quick_request, &$this, true ) );
+
+                                        $this->posts = array(); // no point in querying, since there are no posts
+                        } else {
+                                        $found_posts_query = apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) );
+                                        $this->found_posts = $wpdb->get_var( $found_posts_query );
+                                        $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+                                        $this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+
+                                        $post_ids = implode(',', $post_ids);
+                                        $this->quick_request = " SELECT $quick_distinct $quick_fields FROM $wpdb->posts $quick_join WHERE 1 = 1 $quick_where AND $wpdb->posts.ID IN ($post_ids) $quick_groupby ORDER BY FIELD( $wpdb->posts.ID, $post_ids ) ";
+
+                                        if ( !$q['suppress_filters'] )
+                                                        $this->quick_request = apply_filters_ref_array( 'posts_request', array( $this->quick_request, &$this, true ) );
+
+                                        $this->posts = $wpdb->get_results($this->quick_request);
+                        }
                 }
 
-                $this->posts = $wpdb->get_results($this->request);
-
                 // Raw results filter.  Prior to status checks.
                 if ( !$q['suppress_filters'] )
                         $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
@@ -2600 +2671 @@
                         $this->comment_count = count($this->comments);
                 }
 
-                if ( !$q['no_found_rows'] && !empty($limits) ) {
-                        $found_posts_query = apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) );
-                        $this->found_posts = $wpdb->get_var( $found_posts_query );
-                        $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
-                        $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
-                }
-
                 // Check post status to determine if post should be displayed.
                 if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
                         $status = get_post_status($this->posts[0]);