Changeset 19918

Timestamp:

02/14/2012 03:09:35 PM (13 years ago)

Author:

ryan

Message:

Split the main WP_Query posts query into two queries to avoid temp tables. Leverage cache to avoid second query in persistent cache environments. Props scribu, cheald, prettyboymp. see #18536

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• pluggable.php (modified) (1 diff)
• post-thumbnail-template.php (modified) (1 diff)
• post.php (modified) (1 diff)
• query.php (modified) (4 diffs)

trunk/wp-includes/functions.php

@@ -3704 +3704 @@
         return $caller;
 }
+
+/**
+ * Retrieve ids that are not already present in the cache
+ *
+ * @since 3.4.0
+ *
+ * @param array $object_ids ID list
+ * @param string $cache_key The cache bucket to check against
+ *
+ * @return array
+ */
+function _get_non_cached_ids( $object_ids, $cache_key ) {
+    $clean = array();
+    foreach ( $object_ids as $id ) {
+        $id = (int) $id;
+        if ( !wp_cache_get( $id, $cache_key ) ) {
+            $clean[] = $id;
+        }
+    }
+
+    return $clean;
+}
+

trunk/wp-includes/pluggable.php

@@ -140 +140 @@
     global $wpdb;
 
-    $clean = array();
-    foreach ( $user_ids as $id ) {
-        $id = (int) $id;
-        if ( !wp_cache_get( $id, 'users' ) ) {
-            $clean[] = $id;
-        }
-    }
+    $clean = _get_non_cached_ids( $user_ids, 'users' );
 
     if ( empty( $clean ) )

trunk/wp-includes/post-thumbnail-template.php

@@ -65 +65 @@
 
     if ( ! empty ( $thumb_ids ) ) {
-        get_posts( array(
-                'update_post_term_cache' => false,
-                'include' => $thumb_ids,
-                'post_type' => 'attachment',
-                'post_status' => 'inherit',
-                'nopaging' => true
-        ) );
+        _prime_post_caches( $thumb_ids, false, true );
     }
 

trunk/wp-includes/post.php

@@ -5319 +5319 @@
     }
 }
+
+/**
+ * Adds any posts from the given ids to the cache that do not already exist in cache
+ *
+ * @since 3.4.0
+ *
+ * @access private
+ *
+ * @param array $post_ids ID list
+ * @param bool $update_term_cache Whether to update the term cache. Default is true.
+ * @param bool $update_meta_cache Whether to update the meta cache. Default is true.
+ */
+function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache = true ) {
+    global $wpdb;
+
+    $non_cached_ids = _get_non_cached_ids( $ids, 'posts' );
+    if ( !empty( $non_cached_ids ) ) {
+        $fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ",", $non_cached_ids ) ) );
+
+        update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+    }
+}
+

trunk/wp-includes/query.php

@@ -2607 +2607 @@
             $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 ) );
+        $this->request = $old_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( 'posts_request', $this->request, $this );
+        }
 
         if ( 'ids' == $q['fields'] ) {
@@ -2627 +2629 @@
         }
 
-        $this->posts = $wpdb->get_results($this->request);
+        if ( $old_request == $this->request && "$wpdb->posts.*" == $fields ) {
+            // First get the IDs and then fill in the objects
+
+            $this->request = "SELECT $found_rows $distinct $wpdb->posts.ID FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+
+            $this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+
+            $ids = $wpdb->get_col( $this->request );
+
+            if ( $ids ) {
+                $this->set_found_posts( $q, $limits );
+
+                _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+
+                $this->posts = array_map( 'get_post', $ids );
+            } else {
+                $this->found_posts = $this->max_num_pages = 0;
+                $this->posts = array();
+            }
+        } else {
+            $this->posts = $wpdb->get_results( $this->request );
+            $this->set_found_posts( $q, $limits );
+        }
 
         // Raw results filter. Prior to status checks.
@@ -2644 +2668 @@
             $this->comments = $wpdb->get_results($comments_request);
             $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']);
         }
 
@@ -2755 +2772 @@
     }
 
+    function set_found_posts( $q, $limits ) {
+        global $wpdb;
+
+        if ( $q['no_found_rows'] || empty( $limits ) )
+            return;
+
+        $this->found_posts = $wpdb->get_var( apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()', $this ) );
+        $this->found_posts = apply_filters( 'found_posts', $this->found_posts, $this );
+
+        $this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+    }
+
     /**
      * Set up the next post and iterate current post index.