Changeset 4419

Timestamp:

10/24/2006 10:52:59 AM (18 years ago)

Author:

markjaquith

Message:

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

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• post.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -564 +564 @@
     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
     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:
-        $post_meta_cache = array();
+        if ( !isset($post_meta_cache) )
+            $post_meta_cache = array();
+
         foreach ($meta_list as $metarow) {
             $mpid = (int) $metarow['post_id'];

trunk/wp-includes/post.php

@@ -275 +275 @@
     $post_id = (int) $post_id;
 
-    if ( isset($post_meta_cache[$post_id][$key]) ) {
-        if ( $single ) {
-            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 ( !isset($post_meta_cache[$post_id]) )
+        update_postmeta_cache($post_id);
 
     if ( $single ) {
-        if ( count($values) ) {
-            $return = maybe_unserialize( $values[0] );
-        } else {
+        if ( isset($post_meta_cache[$post_id][$key][0]) )
+            return maybe_unserialize($post_meta_cache[$post_id][$key][0]);
+        else
             return '';
-        }
-    } else {
-        $return = $values;
-    }
-
-    return maybe_unserialize($return);
+    }   else {
+        return maybe_unserialize($post_meta_cache[$post_id][$key]);
+    }
 }
 
@@ -341 +324 @@
 
 
-function get_post_custom( $post_id = 0 ) {
+function get_post_custom($post_id = 0) {
     global $id, $post_meta_cache, $wpdb;
 
-    if ( ! $post_id )
+    if ( !$post_id )
         $post_id = $id;
 
     $post_id = (int) $post_id;
 
-    if ( isset($post_meta_cache[$post_id]) )
-        return $post_meta_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) ) {
-        // 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];
-    }
+    if ( !isset($post_meta_cache[$post_id]) )
+        update_postmeta_cache($post_id);
+
+    return $post_meta_cache[$post_id];
 }
 
@@ -377 +341 @@
     $custom = get_post_custom( $post_id );
 
-    if ( ! is_array($custom) )
+    if ( !is_array($custom) )
         return;