Changeset 5598

Timestamp:

05/30/2007 03:36:59 AM (19 years ago)

Author:

ryan

Message:

Some term caching. see #4189

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/category-template.php

@@ -61 +61 @@
 
 function get_the_category($id = false) {
-        global $post, $category_cache, $blog_id;
+        global $post, $term_cache, $blog_id;
 
         $id = (int) $id;
@@ -67 +67 @@
                 $id = (int) $post->ID;
 
-        $categories = get_object_terms($id, 'category');
+        $categories = get_post_term_cache($id, 'category');
+        if ( false === $categories )
+                $categories = get_object_terms($id, 'category');
 
         if ( !empty($categories) )
@@ -417 +419 @@
                 $id = (int) $post->ID;
 
-        $tags = wp_get_post_tags( $id );
+        $tags = get_post_term_cache($id, 'post_tag');
+        if ( false === $tags )
+                $tags = get_object_terms($id, 'post_tag');
+
         $tags = apply_filters( 'get_the_tags', $tags );
         if ( empty( $tags ) ) 

trunk/wp-includes/post.php

@@ -1657 +1657 @@
 
 function clean_post_cache($id) {
-        global $post_cache, $post_meta_cache, $category_cache, $tag_cache, $blog_id;
+        global $post_cache, $post_meta_cache, $post_term_cache, $blog_id;
 
         if ( isset( $post_cache[$blog_id][$id] ) )
@@ -1665 +1665 @@
                 unset( $post_meta_cache[$blog_id][$id] );
 
-        if ( isset( $category_cache[$blog_id][$id]) )
-                unset ( $category_cache[$blog_id][$id] );
-
-        if ( isset( $tag_cache[$blog_id][$id]) )
-                unset ( $tag_cache[$blog_id][$id] );
+        if ( isset( $post_term_cache[$blog_id][$id]) )
+                unset ( $post_term_cache[$blog_id][$id] );
 }
 
@@ -1695 +1692 @@
 }
 
-function update_post_category_cache($post_ids) {
-        global $wpdb, $term_cache, $blog_id;
-        // TODO
-        return;
+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;
@@ -1709 +1715 @@
         for ( $i = 0; $i < $count; $i++ ) {
                 $post_id = (int) $post_id_array[ $i ];
-                if ( isset( $term_cache[$blog_id][$post_id] ) ) {
+                if ( isset( $post_term_cache[$blog_id][$post_id] ) ) {
                         unset( $post_id_array[ $i ] );
                         continue;
@@ -1717 +1723 @@
                 return;
 
-        $dogs = get_object_terms($post_id_array, array('category', 'post_tag'));
-
-        if ( empty($dogs) )
+        $terms = get_object_terms($post_id_array, array('category', 'post_tag'), 'fields=all_with_object_id');
+
+        if ( empty($terms) )
                 return;
 
-        foreach ($dogs as $catt) {
-                $term_cache[$blog_id][$catt->post_id][$catt->taxonomy][$catt->category_id] = &get_category($catt->category_id);
+        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();
+                }
         }
 }
@@ -1743 +1755 @@
         $post_id_list = implode(',', $post_id_array);
 
-        update_post_category_cache($post_id_list);
+        update_post_term_cache($post_id_list);
 
         update_postmeta_cache($post_id_list);

trunk/wp-includes/taxonomy.php

@@ -429 +429 @@
 
         if ( 'all' == $fields )
-                $select_this = 't.*';
+                $select_this = 't.*, tt.*';
         else if ( 'ids' == $fields )
                 $select_this = 't.term_id';
+        else if ( 'all_with_object_id' == $fields )
+                $select_this = 't.*, tt.*, tr.object_id';
 
         $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) ORDER BY $orderby $order";
 
-        if ( 'all' == $fields )
-                $taxonomy_data = $wpdb->get_results($query);
-        else if ( 'ids' == $fields )
-                $taxonomy_data = $wpdb->get_col($query);
-        else if ( 'tt_ids' == $fields )
-                $taxonomy_data = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) ORDER BY tr.term_taxonomy_id $order");
-
-        if ( ! $taxonomy_data )
+        if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
+                $terms = $wpdb->get_results($query);
+                update_term_cache($terms);
+        } else if ( 'ids' == $fields ) {
+                $terms = $wpdb->get_col($query);
+        } else if ( 'tt_ids' == $fields ) {
+                $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) ORDER BY tr.term_taxonomy_id $order");
+        }
+
+        if ( ! $terms )
                 return array();
 
-        return $taxonomy_data;
+        return $terms;
 }
 
@@ -554 +558 @@
         $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $number";
 
-        if ( 'all' == $fields )
+        if ( 'all' == $fields ) {
                 $terms = $wpdb->get_results($query);
-        else if ( 'ids' == $fields )
+                update_term_cache($terms);
+        } else if ( 'ids' == $fields ) {
                 $terms = $wpdb->get_col($query);
+        }
 
         if ( empty($terms) )
@@ -591 +597 @@
 
         $cache[ $key ] = $terms;
-        wp_cache_add( 'get_terms', $cache, 'term' );
+        wp_cache_set( 'get_terms', $cache, 'term' );
 
         $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
@@ -680 +686 @@
 }
 
+function update_term_cache($terms, $taxonomy = '') {
+        foreach ( $terms as $term ) {
+                $term_taxonomy = $taxonomy;
+                if ( empty($term_taxonomy) )
+                        $term_taxonomy = $term->taxonomy;
+
+                wp_cache_add($term->term_id, $term, $term_taxonomy);
+        }
+}
+
 function clean_term_cache($ids, $taxonomy) {
         if ( !is_array($ids) )