WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New caching style for term queries 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-10-08 22:50:46 +00:00
parent da50360c41
commit 5d1f8b93eb
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/taxonomy.php
View File

@ -609,12 +609,16 @@ function &get_terms($taxonomies, $args = '') {
// $args can be whatever, only use the args defined in defaults to compute the key // $args can be whatever, only use the args defined in defaults to compute the key
$filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : ''; $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 ); $key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
$last_changed = wp_cache_get('last_changed', 'terms');
if ( $cache = wp_cache_get( 'get_terms', 'terms' ) ) { if ( !$last_changed ) {
if ( isset( $cache[ $key ] ) ) { $last_changed = time();
$terms = apply_filters('get_terms', $cache[$key], $taxonomies, $args); wp_cache_set('last_changed', $last_changed, 'terms');
return $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;
} }
if ( 'count' == $orderby ) if ( 'count' == $orderby )
@ -746,8 +750,7 @@ function &get_terms($taxonomies, $args = '') {
} }
reset ( $terms ); reset ( $terms );
$cache[ $key ] = $terms; wp_cache_add( $cache_key, $terms, 'terms' );
wp_cache_set( 'get_terms', $cache, 'terms' );
$terms = apply_filters('get_terms', $terms, $taxonomies, $args); $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
return $terms; return $terms;
@ -1698,6 +1701,7 @@ function clean_object_term_cache($object_ids, $object_type) {
*/ */
function clean_term_cache($ids, $taxonomy = '') { function clean_term_cache($ids, $taxonomy = '') {
global $wpdb; global $wpdb;
static $cleaned = array();
if ( !is_array($ids) ) if ( !is_array($ids) )
$ids = array($ids); $ids = array($ids);
@ -1720,12 +1724,15 @@ function clean_term_cache($ids, $taxonomy = '') {
} }
foreach ( $taxonomies as $taxonomy ) { foreach ( $taxonomies as $taxonomy ) {
if ( isset($cleaned[$taxonomy]) )
continue;
$cleaned[$taxonomy] = true;
wp_cache_delete('all_ids', $taxonomy); wp_cache_delete('all_ids', $taxonomy);
wp_cache_delete('get', $taxonomy); wp_cache_delete('get', $taxonomy);
delete_option("{$taxonomy}_children"); delete_option("{$taxonomy}_children");
} }
wp_cache_delete('get_terms', 'terms'); wp_cache_set('last_changed', time(), 'terms');
do_action('clean_term_cache', $ids, $taxonomy); do_action('clean_term_cache', $ids, $taxonomy);
} }