Changeset 30073

Timestamp:

10/28/2014 09:04:52 PM (12 years ago)

Author:

wonderboymusic

Message:

Adjust caching for get_term_by() calls:

• Remove md5 hashes for term name cache keys
• Remove the namespace for the keys for names and slugs and add them to the group names
• Remove wp_get_last_changed(), which @nacin hated

Props tollmanz.
Fixes #21760.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• taxonomy.php (modified) (8 diffs)

trunk/src/wp-includes/functions.php

@@ -4743 +4743 @@
         return (bool) $var;
 }
-
-/**
- * Helper function to retrieve an incrementer identified by $group
- *
- * @since 4.1.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;
-}

trunk/src/wp-includes/taxonomy.php

@@ -1292 +1292 @@
         }
 
-        $group = $taxonomy . ':' . wp_get_last_changed( 'terms' );
+        $incrementor = wp_cache_get( 'last_changed', 'terms' );
         if ( is_object($term) && empty($term->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 );
+                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 );
                 $_term = $term;
         } else {
@@ -1307 +1307 @@
                         if ( ! $_term )
                                 return null;
-                        wp_cache_add( $term, $_term, $taxonomy );
-                        wp_cache_add( "slug:{$_term->slug}", $term, $group );
-                        wp_cache_add( "name:" . md5( $_term->name ), $term, $group );
+                        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 );
                 }
         }
@@ -1382 +1382 @@
 
         $cache = false;
-        $group = $taxonomy . ':' . wp_get_last_changed( 'terms' );
+        $incrementor = wp_cache_get( 'last_changed', 'terms' );
         if ( 'slug' == $field ) {
                 $field = 't.slug';
@@ -1389 +1389 @@
                         return false;
 
-                $term_id = wp_cache_get( "slug:{$value}", $group );
+                $term_id = wp_cache_get( $value, $taxonomy . ':slugs:' . $incrementor );
                 if ( $term_id ) {
                         $value = $term_id;
@@ -1398 +1398 @@
                 $value = wp_unslash($value);
                 $field = 't.name';
-                $term_id = wp_cache_get( "name:" . md5( $value ), $group );
+                $term_id = wp_cache_get( $value, $taxonomy . ':names:' . $incrementor  );
                 if ( $term_id ) {
                         $value = $term_id;
@@ -1430 +1430 @@
         $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 );
+        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 ) {
@@ -3671 +3671 @@
         }
 
-        wp_get_last_changed( 'terms', true );
+        wp_cache_set( 'last_changed', microtime(), 'terms' );
 }
 
@@ -3777 +3777 @@
                         $term_taxonomy = $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 );
+                $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 );
         }
 }