Changeset 9102

Timestamp:

10/08/2008 10:50:46 PM (18 years ago)

Author:

ryan

Message:

New caching style for term queries

File:

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

trunk/wp-includes/taxonomy.php

@@ -610 +610 @@
         $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
         $key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
-
-        if ( $cache = wp_cache_get( 'get_terms', 'terms' ) ) {
-                if ( isset( $cache[ $key ] ) ) {
-                        $terms = apply_filters('get_terms', $cache[$key], $taxonomies, $args);
-                        return $terms;
-                }
+        $last_changed = wp_cache_get('last_changed', 'terms');
+        if ( !$last_changed ) {
+                $last_changed = time();
+                wp_cache_set('last_changed', $last_changed, 'terms');
+        }
+        $cache_key = "get_terms:$key:$last_changed";
+
+        if ( $cache = wp_cache_get( $cache_key, 'terms' ) ) {
+                $terms = apply_filters('get_terms', $cache, $taxonomies, $args);
+                return $terms;
         }
 
@@ -747 +751 @@
         reset ( $terms );
 
-        $cache[ $key ] = $terms;
-        wp_cache_set( 'get_terms', $cache, 'terms' );
+        wp_cache_add( $cache_key, $terms, 'terms' );
 
         $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
@@ -1699 +1702 @@
 function clean_term_cache($ids, $taxonomy = '') {
         global $wpdb;
+        static $cleaned = array();
 
         if ( !is_array($ids) )
@@ -1721 +1725 @@
 
         foreach ( $taxonomies as $taxonomy ) {
+                if ( isset($cleaned[$taxonomy]) )
+                        continue;
+                $cleaned[$taxonomy] = true;
                 wp_cache_delete('all_ids', $taxonomy);
                 wp_cache_delete('get', $taxonomy);
@@ -1726 +1733 @@
         }
 
-        wp_cache_delete('get_terms', 'terms');
+        wp_cache_set('last_changed', time(), 'terms');
 
         do_action('clean_term_cache', $ids, $taxonomy);