<!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>[23300] trunk/wp-includes/post.php: In get_pages(), cache queries to individual cache buckets instead of storing them in one cached array.</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/23300">23300</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2013-01-15 17:32:35 +0000 (Tue, 15 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>In get_pages(), cache queries to individual cache buckets instead of storing them in one cached array. Also, store post IDs instead of full objects. This reduces overall memory usage as well as the size of the cache buckets. Use incrementor style passive cache invalidation.
Props nprasath002
see <a href="http://core.trac.wordpress.org/ticket/23167">#23167</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (23299 => 23300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2013-01-14 17:37:00 UTC (rev 23299)
+++ trunk/wp-includes/post.php 2013-01-15 17:32:35 UTC (rev 23300)
</span><span class="lines">@@ -3649,15 +3649,18 @@
</span><span class="cx"> if ( array_diff( $post_status, get_post_stati() ) )
</span><span class="cx"> return $pages;
</span><span class="cx">
</span><del>- $cache = array();
</del><ins>+ // $args can be whatever, only use the args defined in defaults to compute the key
</ins><span class="cx"> $key = md5( serialize( compact(array_keys($defaults)) ) );
</span><del>- if ( $cache = wp_cache_get( 'get_pages', 'posts' ) ) {
- if ( is_array($cache) && isset( $cache[ $key ] ) && is_array( $cache[ $key ] ) ) {
- // Convert to WP_Post instances
- $pages = array_map( 'get_post', $cache[ $key ] );
- $pages = apply_filters( 'get_pages', $pages, $r );
- return $pages;
- }
</del><ins>+ $last_changed = wp_cache_get( 'last_changed', 'posts' );
+ if ( ! $last_changed )
+ $last_changed = wp_cache_set( 'last_changed', 1, 'posts' );
+
+ $cache_key = "get_pages:$key:$last_changed";
+ if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) {
+ // Convert to WP_Post instances
+ $pages = array_map( 'get_post', $cache );
+ $pages = apply_filters('get_pages', $pages, $r);
+ return $pages;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !is_array($cache) )
</span><span class="lines">@@ -3827,9 +3830,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $cache[ $key ] = $pages;
- wp_cache_set( 'get_pages', $cache, 'posts' );
</del><ins>+ $page_structure = array();
+ foreach ( $pages as $page )
+ $page_structure[] = $page->ID;
</ins><span class="cx">
</span><ins>+ wp_cache_set( $cache_key, $page_structure, 'posts' );
+
</ins><span class="cx"> // Convert to WP_Post instances
</span><span class="cx"> $pages = array_map( 'get_post', $pages );
</span><span class="cx">
</span><span class="lines">@@ -4663,6 +4669,13 @@
</span><span class="cx"> wp_cache_delete( 'all_page_ids', 'posts' );
</span><span class="cx"> do_action( 'clean_page_cache', $post->ID );
</span><span class="cx"> }
</span><ins>+
+ if ( function_exists( 'wp_cache_incr' ) ) {
+ wp_cache_incr( 'last_changed', 1, 'posts' );
+ } else {
+ $last_changed = wp_cache_get( 'last_changed', 'posts' );
+ wp_cache_set( 'last_changed', $last_changed + 1, 'posts' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>