<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19918] trunk/wp-includes: Split the main WP_Query posts query into two queries to avoid temp tables.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19918">19918</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-02-14 15:09:35 +0000 (Tue, 14 Feb 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/18536">#18536</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludespostthumbnailtemplatephp">trunk/wp-includes/post-thumbnail-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (19917 => 19918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2012-02-14 10:01:00 UTC (rev 19917)
+++ trunk/wp-includes/functions.php        2012-02-14 15:09:35 UTC (rev 19918)
</span><span class="lines">@@ -3703,3 +3703,26 @@
</span><span class="cx">         else
</span><span class="cx">                 return $caller;
</span><span class="cx"> }
</span><ins>+
+/**
+ * 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;
+}
+
</ins></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (19917 => 19918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php        2012-02-14 10:01:00 UTC (rev 19917)
+++ trunk/wp-includes/pluggable.php        2012-02-14 15:09:35 UTC (rev 19918)
</span><span class="lines">@@ -139,13 +139,7 @@
</span><span class="cx"> function cache_users( $user_ids ) {
</span><span class="cx">         global $wpdb;
</span><span class="cx"> 
</span><del>-        $clean = array();
-        foreach ( $user_ids as $id ) {
-                $id = (int) $id;
-                if ( !wp_cache_get( $id, 'users' ) ) {
-                        $clean[] = $id;
-                }
-        }
</del><ins>+        $clean = _get_non_cached_ids( $user_ids, 'users' );
</ins><span class="cx"> 
</span><span class="cx">         if ( empty( $clean ) )
</span><span class="cx">                 return;
</span></span></pre></div>
<a id="trunkwpincludespostthumbnailtemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-thumbnail-template.php (19917 => 19918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-thumbnail-template.php        2012-02-14 10:01:00 UTC (rev 19917)
+++ trunk/wp-includes/post-thumbnail-template.php        2012-02-14 15:09:35 UTC (rev 19918)
</span><span class="lines">@@ -64,13 +64,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( ! empty ( $thumb_ids ) ) {
</span><del>-                get_posts( array(
-                                'update_post_term_cache' =&gt; false,
-                                'include' =&gt; $thumb_ids,
-                                'post_type' =&gt; 'attachment',
-                                'post_status' =&gt; 'inherit',
-                                'nopaging' =&gt; true
-                ) );
</del><ins>+                _prime_post_caches( $thumb_ids, false, true );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $wp_query-&gt;thumbnails_cached = true;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (19917 => 19918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2012-02-14 10:01:00 UTC (rev 19917)
+++ trunk/wp-includes/post.php        2012-02-14 15:09:35 UTC (rev 19918)
</span><span class="lines">@@ -5318,3 +5318,26 @@
</span><span class="cx">                 wp_update_term_count( $tt_ids, $taxonomy );
</span><span class="cx">         }
</span><span class="cx"> }
</span><ins>+
+/**
+ * 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-&gt;get_results( sprintf( &quot;SELECT $wpdb-&gt;posts.* FROM $wpdb-&gt;posts WHERE ID IN (%s)&quot;, join( &quot;,&quot;, $non_cached_ids ) ) );
+
+                update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+        }
+}
+
</ins></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (19917 => 19918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2012-02-14 10:01:00 UTC (rev 19917)
+++ trunk/wp-includes/query.php        2012-02-14 15:09:35 UTC (rev 19918)
</span><span class="lines">@@ -2606,10 +2606,12 @@
</span><span class="cx">                 if ( !$q['no_found_rows'] &amp;&amp; !empty($limits) )
</span><span class="cx">                         $found_rows = 'SQL_CALC_FOUND_ROWS';
</span><span class="cx"> 
</span><del>-                $this-&gt;request = &quot; SELECT $found_rows $distinct $fields FROM $wpdb-&gt;posts $join WHERE 1=1 $where $groupby $orderby $limits&quot;;
-                if ( !$q['suppress_filters'] )
-                        $this-&gt;request = apply_filters_ref_array('posts_request', array( $this-&gt;request, &amp;$this ) );
</del><ins>+                $this-&gt;request = $old_request = &quot;SELECT $found_rows $distinct $fields FROM $wpdb-&gt;posts $join WHERE 1=1 $where $groupby $orderby $limits&quot;;
</ins><span class="cx"> 
</span><ins>+                if ( !$q['suppress_filters'] ) {
+                        $this-&gt;request = apply_filters( 'posts_request', $this-&gt;request, $this );
+                }
+
</ins><span class="cx">                 if ( 'ids' == $q['fields'] ) {
</span><span class="cx">                         $this-&gt;posts = $wpdb-&gt;get_col($this-&gt;request);
</span><span class="cx"> 
</span><span class="lines">@@ -2626,8 +2628,30 @@
</span><span class="cx">                         return $r;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                $this-&gt;posts = $wpdb-&gt;get_results($this-&gt;request);
</del><ins>+                if ( $old_request == $this-&gt;request &amp;&amp; &quot;$wpdb-&gt;posts.*&quot; == $fields ) {
+                        // First get the IDs and then fill in the objects
</ins><span class="cx"> 
</span><ins>+                        $this-&gt;request = &quot;SELECT $found_rows $distinct $wpdb-&gt;posts.ID FROM $wpdb-&gt;posts $join WHERE 1=1 $where $groupby $orderby $limits&quot;;
+
+                        $this-&gt;request = apply_filters( 'posts_request_ids', $this-&gt;request, $this );
+
+                        $ids = $wpdb-&gt;get_col( $this-&gt;request );
+
+                        if ( $ids ) {
+                                $this-&gt;set_found_posts( $q, $limits );
+
+                                _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+
+                                $this-&gt;posts = array_map( 'get_post', $ids );
+                        } else {
+                                $this-&gt;found_posts = $this-&gt;max_num_pages = 0;
+                                $this-&gt;posts = array();
+                        }
+                } else {
+                        $this-&gt;posts = $wpdb-&gt;get_results( $this-&gt;request );
+                        $this-&gt;set_found_posts( $q, $limits );
+                }
+
</ins><span class="cx">                 // Raw results filter. Prior to status checks.
</span><span class="cx">                 if ( !$q['suppress_filters'] )
</span><span class="cx">                         $this-&gt;posts = apply_filters_ref_array('posts_results', array( $this-&gt;posts, &amp;$this ) );
</span><span class="lines">@@ -2645,13 +2669,6 @@
</span><span class="cx">                         $this-&gt;comment_count = count($this-&gt;comments);
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                if ( !$q['no_found_rows'] &amp;&amp; !empty($limits) ) {
-                        $found_posts_query = apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &amp;$this ) );
-                        $this-&gt;found_posts = $wpdb-&gt;get_var( $found_posts_query );
-                        $this-&gt;found_posts = apply_filters_ref_array( 'found_posts', array( $this-&gt;found_posts, &amp;$this ) );
-                        $this-&gt;max_num_pages = ceil($this-&gt;found_posts / $q['posts_per_page']);
-                }
-
</del><span class="cx">                 // Check post status to determine if post should be displayed.
</span><span class="cx">                 if ( !empty($this-&gt;posts) &amp;&amp; ($this-&gt;is_single || $this-&gt;is_page) ) {
</span><span class="cx">                         $status = get_post_status($this-&gt;posts[0]);
</span><span class="lines">@@ -2754,6 +2771,18 @@
</span><span class="cx">                 return $this-&gt;posts;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        function set_found_posts( $q, $limits ) {
+                global $wpdb;
+
+                if ( $q['no_found_rows'] || empty( $limits ) )
+                        return;
+
+                $this-&gt;found_posts = $wpdb-&gt;get_var( apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()', $this ) );
+                $this-&gt;found_posts = apply_filters( 'found_posts', $this-&gt;found_posts, $this );
+
+                $this-&gt;max_num_pages = ceil( $this-&gt;found_posts / $q['posts_per_page'] );
+        }
+
</ins><span class="cx">         /**
</span><span class="cx">          * Set up the next post and iterate current post index.
</span><span class="cx">          *
</span></span></pre>
</div>
</div>

</body>
</html>