Changeset 29915

Timestamp:

10/16/2014 04:44:13 AM (10 years ago)

Author:

wonderboymusic

Message:

Cache get_term_by() calls:

• Add a helper function, wp_get_last_changed(), to retrieve a last-modified timestamp by cache group
• When caching a term, also make cache entries for slug and name via slug:{$term_id} and name:{$term_id} keys in the $taxonomy:$last_changed bucket that reference the term_id
• In clean_term_cache() and update_term_cache(), respect $_wp_suspend_cache_invalidation
• Original term cache entries maintain BC

Adds unit tests.

Props wonderboymusic, tollmanz, boonebgorges.
Fixes #21760.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (10 diffs)
• tests/phpunit/tests/term/cache.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -4630 +4630 @@
     return (bool) $var;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/taxonomy.php

@@ -1292 +1292 @@
     }
 
+
     if ( is_object($term) && empty($term->filter) ) {
-        wp_cache_add($term->term_id, $term, $taxonomy);
+        wp_cache_add( $term->term_id, $term, $taxonomy );
+        wp_cache_add( "slug:{$term->slug}", $term->term_id, $group );
+        wp_cache_add( "name:" . md5( $term->name ), $term->term_id, $group );
         $_term = $term;
     } else {
@@ -1304 +1307 @@
             if ( ! $_term )
                 return null;
-            wp_cache_add($term, $_term, $taxonomy);
+            wp_cache_add( $term, $_term, $taxonomy );
+            wp_cache_add( "slug:{$_term->slug}", $term, $group );
+            wp_cache_add( "name:" . md5( $_term->name ), $term, $group );
         }
     }
@@ -1376 +1381 @@
         return false;
 
+
+
     if ( 'slug' == $field ) {
         $field = 't.slug';
@@ -1381 +1388 @@
         if ( empty($value) )
             return false;
+
+
+
+
+
+
     } else if ( 'name' == $field ) {
         // Assume already escaped
         $value = wp_unslash($value);
         $field = 't.name';
+
+
+
+
+
     } else if ( 'term_taxonomy_id' == $field ) {
         $value = (int) $value;
         $field = 'tt.term_taxonomy_id';
     } else {
+
+
+
+
         $term = get_term( (int) $value, $taxonomy, $output, $filter);
-        if ( is_wp_error( $term ) )
+        if ( is_wp_error( $term ) )
             $term = false;
-        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) );
+        }
+    } 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 false;
 
-    wp_cache_add($term->term_id, $term, $taxonomy);
-
     /** This filter is documented in wp-includes/taxonomy.php */
     $term = apply_filters( 'get_term', $term, $taxonomy );
@@ -1408 +1429 @@
 
     $term = sanitize_term($term, $taxonomy, $filter);
+
+
+
+
 
     if ( $output == OBJECT ) {
@@ -1891 +1916 @@
 
     $terms = $wpdb->get_results($query);
-    if ( 'all' == $_fields ) {
-        update_term_cache($terms);
-    }
 
     if ( empty($terms) ) {
@@ -3585 +3607 @@
  */
 function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
-    global $wpdb;
+    global $_wp_suspend_cache_invalidation, $wpdb;
+
+    if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+        return;
+    }
 
     if ( !is_array($ids) )
@@ -3632 +3658 @@
     }
 
-    wp_cache_set( 'last_changed', microtime(), 'terms' );
+    wp_ );
 }
 
@@ -3727 +3753 @@
  */
 function update_term_cache($terms, $taxonomy = '') {
+
+
+
+
+
+
     foreach ( (array) $terms as $term ) {
         $term_taxonomy = $taxonomy;
@@ -3732 +3764 @@
             $term_taxonomy = $term->taxonomy;
 
-        wp_cache_add($term->term_id, $term, $term_taxonomy);
+        wp_cache_add( $term->term_id, $term, $term_taxonomy );
+        $group = $term_taxonomy . ':' . wp_get_last_changed( 'terms', true );
+        wp_cache_add( "slug:{$term->slug}", $term->term_id, $group );
+        wp_cache_add( "name:" . md5( $term->name ), $term->term_id, $group );
     }
 }

trunk/tests/phpunit/tests/term/cache.php

@@ -94 +94 @@
         _unregister_taxonomy( $tax );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }