<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16596] trunk/wp-includes: Meta data caching improvements.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16596">16596</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-26 21:35:26 +0000 (Fri, 26 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Meta data caching improvements. Props mdawaffe. see <a href="http://trac.wordpress.org/ticket/15545">#15545</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (16595 => 16596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-11-26 11:16:23 UTC (rev 16595)
+++ trunk/wp-includes/meta.php 2010-11-26 21:35:26 UTC (rev 16596)
</span><span class="lines">@@ -259,8 +259,8 @@
</span><span class="cx"> $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
</span><span class="cx">
</span><span class="cx"> if ( !$meta_cache ) {
</span><del>- update_meta_cache($meta_type, $object_id);
- $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
</del><ins>+ $meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
+ $meta_cache = $meta_cache[$object_id];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !$meta_key )
</span><span class="lines">@@ -309,17 +309,20 @@
</span><span class="cx">
</span><span class="cx"> $cache_key = $meta_type . '_meta';
</span><span class="cx"> $ids = array();
</span><ins>+ $cache = array();
</ins><span class="cx"> foreach ( $object_ids as $id ) {
</span><del>- if ( false === wp_cache_get($id, $cache_key) )
</del><ins>+ $cached_object = wp_cache_get( $id, $cache_key );
+ if ( false === $cached_object )
</ins><span class="cx"> $ids[] = $id;
</span><ins>+ else
+ $cache[$id] = $cached_object;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $ids ) )
</span><del>- return false;
</del><ins>+ return $cache;
</ins><span class="cx">
</span><span class="cx"> // Get meta info
</span><span class="cx"> $id_list = join(',', $ids);
</span><del>- $cache = array();
</del><span class="cx"> $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
</span><span class="cx"> $meta_type), ARRAY_A );
</span><span class="cx">
</span><span class="lines">@@ -343,11 +346,9 @@
</span><span class="cx"> foreach ( $ids as $id ) {
</span><span class="cx"> if ( ! isset($cache[$id]) )
</span><span class="cx"> $cache[$id] = array();
</span><ins>+ wp_cache_add( $id, $cache[$id], $cache_key );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- foreach ( array_keys($cache) as $object)
- wp_cache_add($object, $cache[$object], $cache_key);
-
</del><span class="cx"> return $cache;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16595 => 16596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-11-26 11:16:23 UTC (rev 16595)
+++ trunk/wp-includes/user.php 2010-11-26 21:35:26 UTC (rev 16596)
</span><span class="lines">@@ -1037,10 +1037,9 @@
</span><span class="cx"> foreach ( $ids as $id )
</span><span class="cx"> $objects[$id] = array();
</span><span class="cx">
</span><del>- update_meta_cache('user', $ids);
</del><ins>+ $metas = update_meta_cache('user', $ids);
</ins><span class="cx">
</span><del>- foreach ( $ids as $id ) {
- $meta = get_metadata('user', $id);
</del><ins>+ foreach ( $metas as $id => $meta ) {
</ins><span class="cx"> foreach ( $meta as $key => $metavalues ) {
</span><span class="cx"> foreach ( $metavalues as $value ) {
</span><span class="cx"> $objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
</span></span></pre>
</div>
</div>
</body>
</html>