Ticket #21760: 21760.2.patch

src/wp-includes/functions.php

@@ -4629 +4629 @@
 
         return (bool) $var;
 }
+
+/**
+ * Helper function to retrieve an incrementer identified by $group
+ *
+ * @since 4.0.0
+ *
+ * @param string $group The cache group for the incrementer.
+ * @param bool $force Whether or not to generate a new incrementor.
+ * @return int The timestamp representing 'last_changed'.
+ */
+function wp_get_last_changed( $group, $force = false ) {
+        $last_changed = wp_cache_get( 'last_changed', $group );
+        if ( ! $last_changed || true === $force ) {
+                $last_changed = microtime();
+                wp_cache_set( 'last_changed', $last_changed, $group );
+        }
+        return $last_changed;
+}
+ No newline at end of file

src/wp-includes/taxonomy.php

@@ -963 +963 @@
                 return $error;
         }
 
+        $group = $taxonomy . ':' . wp_get_last_changed( 'terms' );
         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 {
                 if ( is_object($term) )
@@ -975 +978 @@
                         $_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);
+                        wp_cache_add( $term, $_term, $taxonomy );
+                        wp_cache_add( "slug:{$_term->slug}", $term, $group );
+                        wp_cache_add( "name:" . md5( $_term->name ), $term, $group );
                 }
         }
 
@@ -1047 +1052 @@
         if ( ! taxonomy_exists($taxonomy) )
                 return false;
 
+        $cache = false;
+        $group = $taxonomy . ':' . wp_get_last_changed( 'terms' );
         if ( 'slug' == $field ) {
                 $field = 't.slug';
                 $value = sanitize_title($value);
                 if ( empty($value) )
                         return false;
+
+                $term_id = wp_cache_get( "slug:{$value}", $group );
+                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( "name:" . md5( $value ), $group );
+                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 ) )
+                if ( is_wp_error( $term ) ) {
                         $term = false;
-                return $term;
+                }
+        } 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) );
         }
 
-        $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 );
 
@@ -1080 +1101 @@
 
         $term = sanitize_term($term, $taxonomy, $filter);
 
+        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 );
+
         if ( $output == OBJECT ) {
                 return $term;
         } elseif ( $output == ARRAY_A ) {
@@ -1562 +1587 @@
         }
 
         $terms = $wpdb->get_results($query);
-        if ( 'all' == $_fields ) {
-                update_term_cache($terms);
-        }
 
         if ( empty($terms) ) {
                 wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS );
@@ -3256 +3278 @@
  * @param bool $clean_taxonomy Whether to clean taxonomy wide caches (true), or just individual term object caches (false). Default is true.
  */
 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) )
                 $ids = array($ids);
@@ -3303 +3329 @@
                 do_action( 'clean_term_cache', $ids, $taxonomy );
         }
 
-        wp_cache_set( 'last_changed', microtime(), 'terms' );
+        wp_get_last_changed( 'terms', true );
 }
 
 /**
@@ -3398 +3424 @@
  * @param string $taxonomy Optional. Update Term to this taxonomy in cache
  */
 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;
                 if ( empty($term_taxonomy) )
                         $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 );
         }
 }
 

tests/phpunit/tests/term/cache.php

@@ -93 +93 @@
 
                 _unregister_taxonomy( $tax );
         }
+
+        /**
+         * @ticket 21760
+         */
+        function test_get_term_by_slug_cache() {
+                global $wpdb;
+                $term_id = $this->factory->term->create( array( 'slug' => 'burrito', 'taxonomy' => 'post_tag' ) );
+
+                $queries = $wpdb->num_queries;
+                get_term_by( 'slug', 'burrito', 'post_tag' );
+                $initial = $queries + 1;
+                $this->assertEquals( $initial, $wpdb->num_queries );
+                $term = get_term_by( 'slug', 'burrito', 'post_tag' );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+
+                $this->assertEquals( $term, wp_cache_get( $term_id, 'post_tag' ) );
+
+                $this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 21760
+         */
+        function test_get_term_by_slug_cache_update() {
+                global $wpdb;
+                $term_id = $this->factory->term->create( array( 'slug' => 'burrito', 'taxonomy' => 'post_tag' ) );
+
+                $queries = $wpdb->num_queries;
+                get_term_by( 'slug', 'burrito', 'post_tag' );
+                $initial = $queries + 1;
+                $this->assertEquals( $initial, $wpdb->num_queries );
+                $term = get_term_by( 'slug', 'burrito', 'post_tag' );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+
+                $this->assertEquals( $term, wp_cache_get( $term_id, 'post_tag' ) );
+
+                wp_update_term( $term_id, 'post_tag', array( 'name' => 'Taco' ) );
+                $this->assertNotEquals( $term, get_term( $term_id, 'post_tag' ) );
+                $after_queries = $wpdb->num_queries;
+                get_term_by( 'slug', 'burrito', 'post_tag' );
+                $this->assertEquals( $after_queries, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 21760
+         */
+        function test_get_term_by_name_cache() {
+                global $wpdb;
+                $term_id = $this->factory->term->create( array( 'name' => 'burrito', 'taxonomy' => 'post_tag' ) );
+
+                $queries = $wpdb->num_queries;
+                get_term_by( 'name', 'burrito', 'post_tag' );
+                $initial = $queries + 1;
+                $this->assertEquals( $initial, $wpdb->num_queries );
+                $term = get_term_by( 'name', 'burrito', 'post_tag' );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+
+                $this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 21760
+         */
+        function test_get_term_by_name_cache_update() {
+                global $wpdb;
+                $term_id = $this->factory->term->create( array( 'name' => 'burrito', 'taxonomy' => 'post_tag' ) );
+
+                $queries = $wpdb->num_queries;
+                get_term_by( 'name', 'burrito', 'post_tag' );
+                $initial = $queries + 1;
+                $this->assertEquals( $initial, $wpdb->num_queries );
+                $term = get_term_by( 'name', 'burrito', 'post_tag' );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+
+                wp_update_term( $term_id, 'post_tag', array( 'slug' => 'Taco' ) );
+                $this->assertNotEquals( $term, get_term( $term_id, 'post_tag' ) );
+                $after_queries = $wpdb->num_queries;
+                get_term_by( 'name', 'burrito', 'post_tag' );
+                $this->assertEquals( $after_queries, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 21760
+         */
+        function test_invalidating_term_caches_should_fail_when_invalidation_is_suspended() {
+                $slug = 'taco';
+                $name = 'Taco';
+                $taxonomy = 'post_tag';
+                $cache_key_slug = 'slug:' . $slug;
+                $cache_key_name = 'name:' . md5( $name );
+
+                $term_id = $this->factory->term->create( array( 'slug' => $slug, 'name' => $name, 'taxonomy' => $taxonomy ) );
+
+                $last_changed = wp_get_last_changed( 'terms' );
+                $group = $taxonomy . ':' . $last_changed;
+
+                $term = get_term_by( 'slug', $slug, $taxonomy );
+
+                // Verify the term is cached by ID, slug and name
+                $this->assertEquals( $term, wp_cache_get( $term_id, $taxonomy ) );
+                $this->assertEquals( $term_id, wp_cache_get( $cache_key_slug, $group ) );
+                $this->assertEquals( $term_id, wp_cache_get( $cache_key_name, $group ) );
+
+                wp_suspend_cache_invalidation();
+                clean_term_cache( $term_id, $taxonomy );
+
+                // Verify that the cached value still matches the correct value
+                $this->assertEquals( $term, wp_cache_get( $term_id, $taxonomy ) );
+                $this->assertEquals( $term_id, wp_cache_get( $cache_key_slug, $group ) );
+                $this->assertEquals( $term_id, wp_cache_get( $cache_key_name, $group ) );
+
+                // Verify that last changed has not been updated as part of an invalidation routine
+                $this->assertEquals( $last_changed, wp_get_last_changed( 'terms' ) );
+        }
 }
+ No newline at end of file