Changeset 5616

Timestamp:

05/31/2007 09:38:33 PM (18 years ago)

Author:

ryan

Message:

Abstract object term cache a bit more. see #4189

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (2 diffs)
• post.php (modified) (3 diffs)
• taxonomy.php (modified) (3 diffs)

trunk/wp-includes/category-template.php

@@ -67 +67 @@
         $id = (int) $post->ID;
 
-    $categories = get_post_term_cache($id, 'category');
+    $categories = get_object_term_cache($id, 'category');
     if ( false === $categories )
         $categories = get_object_terms($id, 'category');
@@ -419 +419 @@
         $id = (int) $post->ID;
 
-    $tags = get_post_term_cache($id, 'post_tag');
+    $tags = get_object_term_cache($id, 'post_tag');
     if ( false === $tags )
         $tags = get_object_terms($id, 'post_tag');

trunk/wp-includes/post.php

@@ -1665 +1665 @@
         unset( $post_meta_cache[$blog_id][$id] );
 
-    if ( isset( $post_term_cache[$blog_id][$id]) )
-        unset ( $post_term_cache[$blog_id][$id] );
+    clean_object_term_cache($id, 'post');
 }
 
@@ -1690 +1689 @@
     wp_cache_delete( 'all_page_ids', 'pages' );
     wp_cache_delete( 'get_pages', 'page' );
-}
-
-function &get_post_term_cache($id, $taxonomy) {
-    global $post_term_cache, $blog_id;
-
-    if ( isset($post_term_cache[$blog_id][$id][$taxonomy]) )
-        return $post_term_cache[$blog_id][$id][$taxonomy];
-
-    return false;
-}
-
-// TODO abstract this to work for any object.
-function update_post_term_cache($post_ids) {
-    global $wpdb, $post_term_cache, $blog_id;
-
-    if ( empty($post_ids) )
-        return;
-
-    if ( is_array($post_ids) )
-        $post_id_list = implode(',', $post_ids);
-
-    $post_id_array = (array) explode(',', $post_ids);
-    $count = count( $post_id_array);
-    for ( $i = 0; $i < $count; $i++ ) {
-        $post_id = (int) $post_id_array[ $i ];
-        if ( isset( $post_term_cache[$blog_id][$post_id] ) ) {
-            unset( $post_id_array[ $i ] );
-            continue;
-        }
-    }
-    if ( count( $post_id_array ) == 0 )
-        return;
-
-    $terms = get_object_terms($post_id_array, array('category', 'post_tag'), 'fields=all_with_object_id');
-
-    if ( empty($terms) )
-        return;
-
-    foreach ( $terms as $term )
-        $post_term_cache[$blog_id][$term->object_id][$term->taxonomy][$term->term_id] = $term;
-
-    foreach ( $post_id_array as $id ) {
-        if ( ! isset($post_term_cache[$blog_id][$id]) ) {
-            $post_term_cache[$blog_id][$id]['category'] = array();
-            $post_term_cache[$blog_id][$id]['post_tag'] = array();
-        }
-    }
 }
 
@@ -1755 +1707 @@
     $post_id_list = implode(',', $post_id_array);
 
-    update_post_term_cache($post_id_list);
+    update_object_term_cache($post_id_list, 'post');
 
     update_postmeta_cache($post_id_list);

trunk/wp-includes/taxonomy.php

@@ -400 +400 @@
 }
 
+function get_object_taxonomies($object_type) {
+    global $wp_taxonomies;
+
+    $taxonomies = array();
+    foreach ( $wp_taxonomies as $taxonomy ) {
+        if ( $object_type == $taxonomy->object_type )
+            $taxonomies[] = $taxonomy->name;
+    }
+
+    return $taxonomies;
+}
+
 /**
  * Returns the terms associated with the given object(s), in the supplied taxonomies.
@@ -408 +420 @@
 function get_object_terms($object_ids, $taxonomies, $args = array()) {
     global $wpdb;
-    error_log("Objects: " . var_export($object_ids, true), 0);
+
     if ( !is_array($taxonomies) )
         $taxonomies = array($taxonomies);
@@ -716 +728 @@
 }
 
+function clean_object_term_cache($object_ids, $object_type) {
+    global $object_term_cache, $blog_id;
+
+    if ( !is_array($ids) )
+        $ids = array($ids);
+
+    $taxonomies = get_object_taxonomies($object_type);
+
+    foreach ( $ids as $id ) {
+        foreach ( $taxonomies as $taxonomy ) {
+            if ( isset($object_term_cache[$blog_id][$id][$taxonomy]) )
+                unset($object_term_cache[$blog_id][$id][$taxonomy]);
+        }
+    }
+}
+
+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();
+
+    return false;
+}
+
+function update_object_term_cache($object_ids, $object_type) {
+    global $wpdb, $object_term_cache, $blog_id;
+
+    if ( empty($object_ids) )
+        return;
+
+    if ( !is_array($object_ids) )
+        $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 = 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();
+    }
+}
+
 function _get_term_hierarchy($taxonomy) {
     // TODO Make sure taxonomy is hierarchical