Changeset 16596

Timestamp:

11/26/2010 09:35:26 PM (13 years ago)

Author:

ryan

Message:

Meta data caching improvements. Props mdawaffe. see #15545

Location:

trunk/wp-includes

Files:

• meta.php (modified) (3 diffs)
• user.php (modified) (1 diff)

trunk/wp-includes/meta.php

@@ -260 +260 @@
 
     if ( !$meta_cache ) {
-        update_meta_cache($meta_type, $object_id);
-        $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+        $meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
+        $meta_cache = $meta_cache[$object_id];
     }
 
@@ -310 +310 @@
     $cache_key = $meta_type . '_meta';
     $ids = array();
+    $cache = array();
     foreach ( $object_ids as $id ) {
-        if ( false === wp_cache_get($id, $cache_key) )
+        $cached_object = wp_cache_get( $id, $cache_key );
+        if ( false === $cached_object )
             $ids[] = $id;
+        else
+            $cache[$id] = $cached_object;
     }
 
     if ( empty( $ids ) )
-        return false;
+        return $cache;
 
     // Get meta info
     $id_list = join(',', $ids);
-    $cache = array();
     $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
         $meta_type), ARRAY_A );
@@ -344 +347 @@
         if ( ! isset($cache[$id]) )
             $cache[$id] = array();
-    }
-
-    foreach ( array_keys($cache) as $object)
-        wp_cache_add($object, $cache[$object], $cache_key);
+        wp_cache_add( $id, $cache[$id], $cache_key );
+    }
 
     return $cache;

trunk/wp-includes/user.php

@@ -1038 +1038 @@
         $objects[$id] = array();
 
-    update_meta_cache('user', $ids);
-
-    foreach ( $ids as $id ) {
-        $meta = get_metadata('user', $id);
+    $metas = update_meta_cache('user', $ids);
+
+    foreach ( $metas as $id => $meta ) {
         foreach ( $meta as $key => $metavalues ) {
             foreach ( $metavalues as $value ) {