Changeset 6243

Timestamp:

10/13/2007 06:23:59 PM (17 years ago)

Author:

ryan

Message:

Eliminate object_term_cache array. see #5182

File:

• trunk/wp-includes/taxonomy.php (modified) (6 diffs)

trunk/wp-includes/taxonomy.php

@@ -1160 +1160 @@
         foreach ($terms as $term) {
             $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term) );
-            $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxnomy_id' => $term ) );
+            $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
         }
 
@@ -1175 +1175 @@
 
 function clean_object_term_cache($object_ids, $object_type) {
-    global $object_term_cache, $blog_id;
-
     if ( !is_array($object_ids) )
         $object_ids = array($object_ids);
 
-    $taxonomies = get_object_taxonomies($object_type);
-
-    foreach ( $object_ids as $id ) {
-        foreach ( $taxonomies as $taxonomy ) {
-            if ( isset($object_term_cache[$blog_id][$id][$taxonomy]) )
-                unset($object_term_cache[$blog_id][$id][$taxonomy]);
-        }
-    }
+    foreach ( $object_ids as $id )
+        wp_cache_delete($id, 'object_terms');
 }
 
@@ -1223 +1215 @@
 
 function &get_object_term_cache($id, $taxonomy) {
-    global $object_term_cache, $blog_id;
-
-    if ( isset($object_term_cache[$blog_id][$id][$taxonomy]) )
-        return $object_term_cache[$blog_id][$id][$taxonomy];
-
-    if ( isset($object_term_cache[$blog_id][$id]) )
-        return array();
+    $terms = wp_cache_get($id, 'object_terms');
+    if ( false !== $terms ) {
+        if ( isset($terms[$taxonomy]) )
+            return $terms[$taxonomy];
+        else
+            return array();
+    }
 
     return false;
@@ -1235 +1227 @@
 
 function update_object_term_cache($object_ids, $object_type) {
-    global $wpdb, $object_term_cache, $blog_id;
+    global $wpdb;
 
     if ( empty($object_ids) )
@@ -1243 +1235 @@
         $object_ids = explode(',', $object_ids);
 
-    $count = count( $object_ids);
-    for ( $i = 0; $i < $count; $i++ ) {
-        $object_id = (int) $object_ids[ $i ];
-        if ( isset( $object_term_cache[$blog_id][$object_id] ) ) {
-            unset( $object_ids[ $i ] );
-            continue;
-        }
-    }
-
-    if ( count( $object_ids ) == 0 )
-        return;
-
-    $terms = wp_get_object_terms($object_ids, get_object_taxonomies($object_type), 'fields=all_with_object_id');
-
-    if ( empty($terms) )
-        return;
-
-    foreach ( $terms as $term )
-        $object_term_cache[$blog_id][$term->object_id][$term->taxonomy][$term->term_id] = $term;
-
-    foreach ( $object_ids as $id ) {
-        if ( ! isset($object_term_cache[$blog_id][$id]) )
-                $object_term_cache[$blog_id][$id] = array();
-    }
+    $object_ids = array_map('intval', $object_ids);
+
+    $ids = array();
+    foreach ( (array) $object_ids as $id ) {
+        if ( false === wp_cache_get($id, 'object_terms') )
+            $ids[] = $id;
+    }
+
+    if ( empty( $ids ) )
+        return false;
+
+    $terms = wp_get_object_terms($ids, get_object_taxonomies($object_type), 'fields=all_with_object_id');
+
+    $object_terms = array();
+    foreach ( (array) $terms as $term )
+        $object_terms[$term->object_id][$term->taxonomy][$term->term_id] = $term;
+
+    foreach ( $ids as $id ) {
+        if ( ! isset($object_terms[$id]) )
+                $object_terms[$id] = array();
+    }
+
+    foreach ( $object_terms as $id => $value )
+        wp_cache_set($id, $value, 'object_terms');
 }
 
@@ -1394 +1386 @@
     foreach ( $terms as $term ) {
         $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term ) );
-        $wpdb->update( $wpdb->term_taxnomoy, compact( 'count' ), array( 'term_taxnomy_id' => $term ) );
+        $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
     }
 }