Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-30 16:55:02 +02:00
Code Issues Projects Releases Wiki Activity

Post meta caching fix by mdawaffe. fixes #3229

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@4372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2006-10-11 09:18:54 +00:00
parent d26379af97
commit 6e8d3ba537
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/functions.php
View File

@ -542,7 +542,7 @@ function update_post_caches(&$posts) {
// Change from flat structure to hierarchical: // Change from flat structure to hierarchical:
$post_meta_cache = array(); $post_meta_cache = array();
foreach ($meta_list as $metarow) { foreach ($meta_list as $metarow) {
$mpid = $metarow['post_id']; $mpid = (int) $metarow['post_id'];
$mkey = $metarow['meta_key']; $mkey = $metarow['meta_key'];
$mval = $metarow['meta_value']; $mval = $metarow['meta_value'];

2
wp-includes/post-template.php
View File

@ -211,7 +211,7 @@ function post_custom( $key = '' ) {
// this will probably change at some point... // this will probably change at some point...
function the_meta() { function the_meta() {
global $id, $post_meta_cache; global $id;
if ( $keys = get_post_custom_keys() ) { if ( $keys = get_post_custom_keys() ) {
echo "<ul class='post-meta'>\n"; echo "<ul class='post-meta'>\n";

54
wp-includes/post.php
View File

@ -221,9 +221,10 @@ function get_posts($args) {
function add_post_meta($post_id, $key, $value, $unique = false) { function add_post_meta($post_id, $key, $value, $unique = false) {
global $wpdb, $post_meta_cache; global $wpdb, $post_meta_cache;
$post_id = (int) $post_id;
if ( $unique ) { if ( $unique ) {
if ( $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key if ( $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = '$key' AND post_id = '$post_id'") ) {
= '$key' AND post_id = '$post_id'") ) {
return false; return false;
} }
} }
@ -234,7 +235,7 @@ function add_post_meta($post_id, $key, $value, $unique = false) {
$wpdb->query("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value) VALUES ('$post_id','$key','$value')"); $wpdb->query("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value) VALUES ('$post_id','$key','$value')");
$post_meta_cache['$post_id'][$key][] = $original; $post_meta_cache[$post_id][$key][] = $original;
return true; return true;
} }
@ -242,31 +243,29 @@ function add_post_meta($post_id, $key, $value, $unique = false) {
function delete_post_meta($post_id, $key, $value = '') { function delete_post_meta($post_id, $key, $value = '') {
global $wpdb, $post_meta_cache; global $wpdb, $post_meta_cache;
$post_id = (int) $post_id;
if ( empty($value) ) { if ( empty($value) ) {
$meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key'");
post_id = '$post_id' AND meta_key = '$key'");
} else { } else {
$meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
} }
if ( !$meta_id ) if ( !$meta_id )
return false; return false;
if ( empty($value) ) { if ( empty($value) ) {
$wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id' $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key'");
AND meta_key = '$key'"); unset($post_meta_cache[$post_id][$key]);
unset($post_meta_cache['$post_id'][$key]);
} else { } else {
$wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id' $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
AND meta_key = '$key' AND meta_value = '$value'"); $cache_key = $post_meta_cache[$post_id][$key];
$cache_key = $post_meta_cache['$post_id'][$key];
if ($cache_key) foreach ( $cache_key as $index => $data ) if ($cache_key) foreach ( $cache_key as $index => $data )
if ( $data == $value ) if ( $data == $value )
unset($post_meta_cache['$post_id'][$key][$index]); unset($post_meta_cache[$post_id][$key][$index]);
} }
unset($post_meta_cache['$post_id'][$key]); unset($post_meta_cache[$post_id][$key]);
return true; return true;
} }
@ -274,6 +273,8 @@ AND meta_key = '$key' AND meta_value = '$value'");
function get_post_meta($post_id, $key, $single = false) { function get_post_meta($post_id, $key, $single = false) {
global $wpdb, $post_meta_cache; global $wpdb, $post_meta_cache;
$post_id = (int) $post_id;
if ( isset($post_meta_cache[$post_id][$key]) ) { if ( isset($post_meta_cache[$post_id][$key]) ) {
if ( $single ) { if ( $single ) {
return maybe_unserialize( $post_meta_cache[$post_id][$key][0] ); return maybe_unserialize( $post_meta_cache[$post_id][$key][0] );
@ -307,6 +308,8 @@ function get_post_meta($post_id, $key, $single = false) {
function update_post_meta($post_id, $key, $value, $prev_value = '') { function update_post_meta($post_id, $key, $value, $prev_value = '') {
global $wpdb, $post_meta_cache; global $wpdb, $post_meta_cache;
$post_id = (int) $post_id;
$original_value = $value; $original_value = $value;
if ( is_array($value) || is_object($value) ) if ( is_array($value) || is_object($value) )
$value = $wpdb->escape(serialize($value)); $value = $wpdb->escape(serialize($value));
@ -315,26 +318,23 @@ function update_post_meta($post_id, $key, $value, $prev_value = '') {
if ( is_array($prev_value) || is_object($prev_value) ) if ( is_array($prev_value) || is_object($prev_value) )
$prev_value = $wpdb->escape(serialize($prev_value)); $prev_value = $wpdb->escape(serialize($prev_value));
if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = '$key' AND post_id = '$post_id'") ) {
= '$key' AND post_id = '$post_id'") ) {
return false; return false;
} }
if ( empty($prev_value) ) { if ( empty($prev_value) ) {
$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE meta_key = '$key' AND post_id = '$post_id'");
meta_key = '$key' AND post_id = '$post_id'"); $cache_key = $post_meta_cache[$post_id][$key];
$cache_key = $post_meta_cache['$post_id'][$key];
if ( !empty($cache_key) ) if ( !empty($cache_key) )
foreach ($cache_key as $index => $data) foreach ($cache_key as $index => $data)
$post_meta_cache['$post_id'][$key][$index] = $original_value; $post_meta_cache[$post_id][$key][$index] = $original_value;
} else { } else {
$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'");
meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'"); $cache_key = $post_meta_cache[$post_id][$key];
$cache_key = $post_meta_cache['$post_id'][$key];
if ( !empty($cache_key) ) if ( !empty($cache_key) )
foreach ($cache_key as $index => $data) foreach ($cache_key as $index => $data)
if ( $data == $original_prev ) if ( $data == $original_prev )
$post_meta_cache['$post_id'][$key][$index] = $original_value; $post_meta_cache[$post_id][$key][$index] = $original_value;
} }
return true; return true;
@ -347,6 +347,8 @@ function get_post_custom( $post_id = 0 ) {
if ( ! $post_id ) if ( ! $post_id )
$post_id = $id; $post_id = $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]; return $post_meta_cache[$post_id];
@ -354,7 +356,7 @@ function get_post_custom( $post_id = 0 ) {
// Change from flat structure to hierarchical: // Change from flat structure to hierarchical:
$post_meta_cache = array(); $post_meta_cache = array();
foreach ( $meta_list as $metarow ) { foreach ( $meta_list as $metarow ) {
$mpid = $metarow['post_id']; $mpid = (int) $metarow['post_id'];
$mkey = $metarow['meta_key']; $mkey = $metarow['meta_key'];
$mval = $metarow['meta_value']; $mval = $metarow['meta_value'];