sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix post meta caching system to reduce queries and eliminate redundant WP code. fixes #3273

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@4419 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2006-10-24 10:52:59 +00:00
parent 60fb538b78
commit f3f5188f24
2 changed files with 31 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/functions.php
View File

@ -563,10 +563,27 @@ function update_post_caches(&$posts) {
update_post_category_cache($post_id_list); update_post_category_cache($post_id_list);
update_postmeta_cache($post_id_list);
}
function update_postmeta_cache($post_id_list = '') {
global $wpdb, $post_meta_cache;
// We should validate this comma-separated list for the upcoming SQL query
$post_id_list = preg_replace('|[^0-9,]|', '', $post_id_list);
// we're marking each post as having its meta cached (with no keys... empty array), to prevent posts with no meta keys from being queried again
// any posts that DO have keys will have this empty array overwritten with a proper array, down below
$post_id_array = explode(',', $post_id_list);
foreach ( (array) $post_id_array as $pid )
$post_meta_cache[$pid] = array();
// Get post-meta info // Get post-meta info
if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id IN($post_id_list) ORDER BY post_id, meta_key", ARRAY_A) ) { if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id IN($post_id_list) ORDER BY post_id, meta_key", ARRAY_A) ) {
// Change from flat structure to hierarchical: // Change from flat structure to hierarchical:
$post_meta_cache = array(); if ( !isset($post_meta_cache) )
$post_meta_cache = array();
foreach ($meta_list as $metarow) { foreach ($meta_list as $metarow) {
$mpid = (int) $metarow['post_id']; $mpid = (int) $metarow['post_id'];
$mkey = $metarow['meta_key']; $mkey = $metarow['meta_key'];

62
wp-includes/post.php
View File

@ -274,34 +274,17 @@ function get_post_meta($post_id, $key, $single = false) {
$post_id = (int) $post_id; $post_id = (int) $post_id;
if ( isset($post_meta_cache[$post_id][$key]) ) { if ( !isset($post_meta_cache[$post_id]) )
if ( $single ) { update_postmeta_cache($post_id);
return maybe_unserialize( $post_meta_cache[$post_id][$key][0] );
} else {
return maybe_unserialize( $post_meta_cache[$post_id][$key] );
}
}
$metalist = $wpdb->get_results("SELECT meta_value FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key'", ARRAY_N);
$values = array();
if ( $metalist ) {
foreach ($metalist as $metarow) {
$values[] = $metarow[0];
}
}
if ( $single ) { if ( $single ) {
if ( count($values) ) { if ( isset($post_meta_cache[$post_id][$key][0]) )
$return = maybe_unserialize( $values[0] ); return maybe_unserialize($post_meta_cache[$post_id][$key][0]);
} else { else
return ''; return '';
} } else {
} else { return maybe_unserialize($post_meta_cache[$post_id][$key]);
$return = $values;
} }
return maybe_unserialize($return);
} }
function update_post_meta($post_id, $key, $value, $prev_value = '') { function update_post_meta($post_id, $key, $value, $prev_value = '') {
@ -340,43 +323,24 @@ function update_post_meta($post_id, $key, $value, $prev_value = '') {
} }
function get_post_custom( $post_id = 0 ) { function get_post_custom($post_id = 0) {
global $id, $post_meta_cache, $wpdb; global $id, $post_meta_cache, $wpdb;
if ( ! $post_id ) if ( !$post_id )
$post_id = $id; $post_id = $id;
$post_id = (int) $post_id; $post_id = (int) $post_id;
if ( isset($post_meta_cache[$post_id]) ) if ( !isset($post_meta_cache[$post_id]) )
return $post_meta_cache[$post_id]; update_postmeta_cache($post_id);
if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id = '$post_id' ORDER BY post_id, meta_key", ARRAY_A) ) { return $post_meta_cache[$post_id];
// Change from flat structure to hierarchical:
$post_meta_cache = array();
foreach ( $meta_list as $metarow ) {
$mpid = (int) $metarow['post_id'];
$mkey = $metarow['meta_key'];
$mval = $metarow['meta_value'];
// Force subkeys to be array type:
if ( !isset($post_meta_cache[$mpid]) || !is_array($post_meta_cache[$mpid]) )
$post_meta_cache[$mpid] = array();
if ( !isset($post_meta_cache[$mpid]["$mkey"]) || !is_array($post_meta_cache[$mpid]["$mkey"]) )
$post_meta_cache[$mpid]["$mkey"] = array();
// Add a value to the current pid/key:
$post_meta_cache[$mpid][$mkey][] = $mval;
}
return $post_meta_cache[$mpid];
}
} }
function get_post_custom_keys( $post_id = 0 ) { function get_post_custom_keys( $post_id = 0 ) {
$custom = get_post_custom( $post_id ); $custom = get_post_custom( $post_id );
if ( ! is_array($custom) ) if ( !is_array($custom) )
return; return;
if ( $keys = array_keys($custom) ) if ( $keys = array_keys($custom) )