Changeset 60697 for trunk/src/wp-includes/class-wp-query.php

Timestamp:

08/31/2025 09:41:54 PM (6 months ago)

Author:

spacedmonkey

Message:

Caching API: Use consistent cache keys for query groups.

Query-based caches are now improved by reusing cache keys. Previously, cache keys for query caches were generated using the last_changed value as part of the key. This meant that whenever last_changed was updated, all the previously cached values for the group became unreachable.

The new approach allows WordPress to replace previously cached results that are known to be stale. The previous approach relied on the object cache backend evicting stale keys which is done at various levels of efficiency.

To address this, the following new helper functions have been introduced:

• wp_cache_get_salted
• wp_cache_set_salted
• wp_cache_get_multiple_salted
• wp_cache_set_multiple_salted

These functions provide a consistent way to get/set query caches. Instead of using the last_changed value as part of the cache key, it is now stored inside the cache value as a "salt". This allows cache keys to be reused, with values updated in place rather than relying on eviction of outdated entries.

Props spacedmonkey, peterwilsoncc, flixos90, sanchothefat, tillkruess, rmccue, mukesh27, adamsilverstein, owi, nickchomey.

File:

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

trunk/src/wp-includes/class-wp-query.php

@@ -2883 +2883 @@
 
             $key          = md5( $comments_request );
-            $last_changed = wp_cache_get_last_changed( 'comment' ) . ':' . wp_cache_get_last_changed( 'posts' );
-
-            $cache_key   = "comment_feed:$key:$last_changed";
-            $comment_ids = wp_cache_get( $cache_key, 'comment-queries' );
+            $last_changed = array(
+                wp_cache_get_last_changed( 'comment' ),
+                wp_cache_get_last_changed( 'posts' ),
+            );
+
+            $cache_key   = "comment_feed:$key";
+            $comment_ids = wp_cache_get_salted( $cache_key, 'comment-queries', $last_changed );
             if ( false === $comment_ids ) {
                 $comment_ids = $wpdb->get_col( $comments_request );
-                wp_cache_add( $cache_key, $comment_ids, 'comment-queries' );
+                wp_cache_set_salted( $cache_key, $comment_ids, 'comment-queries', $last_changed );
             }
             _prime_comment_caches( $comment_ids );
@@ -3247 +3250 @@
         }
 
+        $last_changed = (array) wp_cache_get_last_changed( 'posts' );
+        if ( ! empty( $this->tax_query->queries ) ) {
+            $last_changed[] = wp_cache_get_last_changed( 'terms' );
+        }
+
         if ( $q['cache_results'] && $id_query_is_cacheable ) {
             $new_request = str_replace( $fields, "{$wpdb->posts}.*", $this->request );
@@ -3253 +3261 @@
             $cache_found = false;
             if ( null === $this->posts ) {
-                $cached_results = wp_cache_get( $cache_key, 'post-queries', false, $cache_found );
+                $cached_results = wp_cache_get_salted( $cache_key, 'post-queries', $last_changed );
 
                 if ( $cached_results ) {
+                    $cache_found = true;
                     /** @var int[] */
                     $post_ids = array_map( 'intval', $cached_results['posts'] );
@@ -3313 +3322 @@
                 );
 
-                wp_cache_set( $cache_key, $cache_value, 'post-queries' );
+                wp_cache_set_salted( $cache_key, $cache_value, 'post-queries', $last_changed );
             }
 
@@ -3351 +3360 @@
                 );
 
-                wp_cache_set( $cache_key, $cache_value, 'post-queries' );
+                wp_cache_set_salted( $cache_key, $cache_value, 'post-queries', $last_changed );
             }
 
@@ -3449 +3458 @@
             );
 
-            wp_cache_set( $cache_key, $cache_value, 'post-queries' );
+            wp_cache_set_salted( $cache_key, $cache_value, 'post-queries', $last_changed );
         }
 
@@ -3487 +3496 @@
             $comment_last_changed = wp_cache_get_last_changed( 'comment' );
 
-            $comment_cache_key = "comment_feed:$comment_key:$comment_last_changed";
-            $comment_ids       = wp_cache_get( $comment_cache_key, 'comment-queries' );
+            $comment_cache_key = "comment_feed:$comment_key";
+            $comment_ids       = wp_cache_get_salted( $comment_cache_key, 'comment-queries', $comment_last_changed );
             if ( false === $comment_ids ) {
                 $comment_ids = $wpdb->get_col( $comments_request );
-                wp_cache_add( $comment_cache_key, $comment_ids, 'comment-queries' );
+                wp_cache_set_salted( $comment_cache_key, $comment_ids, 'comment-queries', $comment_last_changed );
             }
             _prime_comment_caches( $comment_ids );
@@ -5063 +5072 @@
         $key = md5( serialize( $args ) . $sql );
 
-        $last_changed = wp_cache_get_last_changed( 'posts' );
-        if ( ! empty( $this->tax_query->queries ) ) {
-            $last_changed .= wp_cache_get_last_changed( 'terms' );
-        }
-
-        $this->query_cache_key = "wp_query:$key:$last_changed";
+        $this->query_cache_key = "wp_query:$key";
         return $this->query_cache_key;
     }