Changeset 30900 for trunk/src/wp-includes/taxonomy.php

Timestamp:

12/16/2014 01:26:19 PM (12 years ago)

Author:

boonebgorges

Message:

Remove caching for get_term_by() calls.

The new cache group scheme causes term invalidation to be overly broad, so
that busting the cache for one term will bust the cache for all terms in the
taxonomy. We'll have another go at more focused use of the 'last_changed'
incrementor in a future release.

Reverts [29915], [30073], [30080], [30108], [30112].
See #21760.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1306 +1306 @@
         }
 
-        $incrementor = wp_cache_get( 'last_changed', 'terms' );
         if ( is_object($term) && empty($term->filter) ) {
-                wp_cache_add( $term->term_id, $term, $taxonomy . ':terms:' . $incrementor );
-                wp_cache_add( $term->slug, $term->term_id, $taxonomy . ':slugs:' . $incrementor );
-                wp_cache_add( $term->name, $term->term_id, $taxonomy . ':names:' . $incrementor );
+                wp_cache_add( $term->term_id, $term, $taxonomy );
                 $_term = $term;
         } else {
@@ -1317 +1314 @@
                 if ( !$term = (int) $term )
                         return null;
-                if ( ! $_term = wp_cache_get( $term, $taxonomy . ':terms:' . $incrementor ) ) {
+                if ( ! $_term = wp_cache_get( $term, $taxonomy ) ) {
                         $_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND t.term_id = %d LIMIT 1", $taxonomy, $term) );
                         if ( ! $_term )
                                 return null;
-                        wp_cache_add( $term, $_term, $taxonomy . ':terms:' . $incrementor );
-                        wp_cache_add( $_term->slug, $term, $taxonomy . ':slugs:' . $incrementor );
-                        wp_cache_add( $_term->name, $term, $taxonomy . ':names:' . $incrementor );
+                        wp_cache_add( $term, $_term, $taxonomy );
                 }
         }
@@ -1394 +1389 @@
                 return false;
 
-        $cache = false;
-        $incrementor = wp_cache_get( 'last_changed', 'terms' );
         if ( 'slug' == $field ) {
                 $field = 't.slug';
@@ -1401 +1394 @@
                 if ( empty($value) )
                         return false;
-
-                $term_id = wp_cache_get( $value, $taxonomy . ':slugs:' . $incrementor );
-                if ( $term_id ) {
-                        $value = $term_id;
-                        $cache = true;
-                }
         } else if ( 'name' == $field ) {
                 // Assume already escaped
                 $value = wp_unslash($value);
                 $field = 't.name';
-                $term_id = wp_cache_get( $value, $taxonomy . ':names:' . $incrementor  );
-                if ( $term_id ) {
-                        $value = $term_id;
-                        $cache = true;
-                }
         } else if ( 'term_taxonomy_id' == $field ) {
                 $value = (int) $value;
                 $field = 'tt.term_taxonomy_id';
         } else {
-                $cache = true;
-        }
-
-        if ( $cache ) {
-                $term = get_term( (int) $value, $taxonomy, $output, $filter);
-                if ( is_wp_error( $term ) ) {
+                $term = get_term( (int) $value, $taxonomy, $output, $filter );
+                if ( is_wp_error( $term ) )
                         $term = false;
-                }
-        } else {
-                $term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND $field = %s LIMIT 1", $taxonomy, $value) );
-        }
-
-        if ( !$term )
+                return $term;
+        }
+
+        $term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND $field = %s LIMIT 1", $taxonomy, $value ) );
+        if ( ! $term )
                 return false;
+
+        wp_cache_add( $term->term_id, $term, $taxonomy );
 
         /** This filter is documented in wp-includes/taxonomy.php */
@@ -1442 +1421 @@
 
         $term = sanitize_term($term, $taxonomy, $filter);
-
-        wp_cache_add( $term->term_id, $term, $taxonomy . ':terms:' . $incrementor );
-        wp_cache_add( $term->slug, $term->term_id, $taxonomy . ':slugs:' . $incrementor );
-        wp_cache_add( $term->name, $term->term_id, $taxonomy . ':names:' . $incrementor );
 
         if ( $output == OBJECT ) {
@@ -3650 +3625 @@
  */
 function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
-        global $_wp_suspend_cache_invalidation, $wpdb;
-
-        if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
-                return;
-        }
+        global $wpdb;
 
         if ( !is_array($ids) )
@@ -3793 +3764 @@
  */
 function update_term_cache($terms, $taxonomy = '') {
-        global $_wp_suspend_cache_invalidation;
-
-        if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
-                return;
-        }
-
         foreach ( (array) $terms as $term ) {
                 $term_taxonomy = $taxonomy;
@@ -3804 +3769 @@
                         $term_taxonomy = $term->taxonomy;
 
-                $incrementor = wp_cache_set( 'last_changed', microtime(), 'terms' );
-
-                wp_cache_add( $term->term_id, $term, $term_taxonomy . ':terms:' . $incrementor );
-                wp_cache_add( $term->slug, $term->term_id, $taxonomy . ':slugs:' . $incrementor );
-                wp_cache_add( $term->name, $term->term_id, $taxonomy . ':names:' . $incrementor );
+                wp_cache_add( $term->term_id, $term, $term_taxonomy );
         }
 }