Changeset 30108

Timestamp:

10/30/2014 02:49:51 AM (10 years ago)

Author:

boonebgorges

Message:

Clean up get_term_by() caching.

• Fix cache key/group modification that was missed in [30073].
• Update unit tests to reflect new key/group format.

Props tollmanz.
Fixes #21760.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1296 +1296 @@
         if ( !$term = (int) $term )
             return null;
-        if ( ! $_term = wp_cache_get($term, $taxonomy) ) {
+        if ( ! $_term = wp_cache_get( $term, $taxonomy . ':terms:' . $incrementor ) ) {
             $_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 )

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

@@ -109 +109 @@
         $this->assertEquals( $initial, $wpdb->num_queries );
 
-        $this->assertEquals( $term, wp_cache_get( $term_id, 'post_tag' ) );
+        $this->assertEquals( $term, wp_cache_get( $term_id, 'post_tag:terms:' . wp_cache_get( 'last_changed', 'terms' ) ) );
 
         $this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
@@ -129 +129 @@
         $this->assertEquals( $initial, $wpdb->num_queries );
 
-        $this->assertEquals( $term, wp_cache_get( $term_id, 'post_tag' ) );
+        $this->assertEquals( $term, wp_cache_get( $term_id, 'post_tag:terms:' . wp_cache_get( 'last_changed', 'terms' ) ) );
 
         wp_update_term( $term_id, 'post_tag', array( 'name' => 'Taco' ) );
@@ -184 +184 @@
         $name = 'Taco';
         $taxonomy = 'post_tag';
-        $cache_key_slug = 'slug:' . $slug;
-        $cache_key_name = 'name:' . md5( $name );
+        $cache_key_slug = $slug;
+        $cache_key_name = $name;
 
         $term_id = $this->factory->term->create( array( 'slug' => $slug, 'name' => $name, 'taxonomy' => $taxonomy ) );
 
         $last_changed = wp_cache_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 ) );
+        $this->assertEquals( $term, wp_cache_get( $term_id, $taxonomy . ':terms:' . wp_cache_get( 'last_changed', 'terms' ) ) );
+        $this->assertSame( $term_id, wp_cache_get( $cache_key_slug, $taxonomy . ':slugs:' . wp_cache_get( 'last_changed', 'terms' ) ) );
+        $this->assertSame( $term_id, wp_cache_get( $cache_key_name, $taxonomy . ':names:' . wp_cache_get( 'last_changed', 'terms' ) ) );
 
         wp_suspend_cache_invalidation();
@@ -203 +202 @@
 
         // 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 ) );
+        $this->assertEquals( $term, wp_cache_get( $term_id, $taxonomy . ':terms:' . wp_cache_get( 'last_changed', 'terms' ) ) );
+        $this->assertSame( $term_id, wp_cache_get( $cache_key_slug, $taxonomy . ':slugs:' . wp_cache_get( 'last_changed', 'terms' ) ) );
+        $this->assertSame( $term_id, wp_cache_get( $cache_key_name, $taxonomy . ':names:' . wp_cache_get( 'last_changed', 'terms' ) ) );
 
         // Verify that last changed has not been updated as part of an invalidation routine
-        $this->assertEquals( $last_changed, wp_get_last_changed( 'terms' ) );
+        $this->assertSame( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
     }
 }