WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Query: Save excessive cache add and sets in `WP_Query`. 

In [53941] database query caching was added to `WP_Query`. However on sites with persistent object caching enabled, this resulted in a high number of unnecessary cache set and adds being run on every request. Caches are not set, if the query cache already exists and is cached. Replace usage of `update_post_caches` with `_prime_post_caches` to ensure that only posts that are not in cache are primed. 

Props spacedmonkey, peterwilsoncc, mukesh27.
See #22176.
Built from https://develop.svn.wordpress.org/trunk@54352


git-svn-id: http://core.svn.wordpress.org/trunk@53911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
spacedmonkey 2022-09-29 10:09:11 +00:00
parent 70f3a062db
commit 3b58a4828d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/class-wp-query.php
View File

@ -3099,10 +3099,10 @@ class WP_Query {
$last_changed .= wp_cache_get_last_changed( 'terms' ); $last_changed .= wp_cache_get_last_changed( 'terms' );
} }
$cache_key = "wp_query:$key:$last_changed"; $cache_key = "wp_query:$key:$last_changed";
$cache_found = false;
if ( null === $this->posts ) { if ( null === $this->posts ) {
$cached_results = wp_cache_get( $cache_key, 'posts' ); $cached_results = wp_cache_get( $cache_key, 'posts', false, $cache_found );
if ( $cached_results ) { if ( $cached_results ) {
if ( 'ids' === $q['fields'] ) { if ( 'ids' === $q['fields'] ) {
@ -3256,7 +3256,7 @@ class WP_Query {
$this->posts = array_map( 'get_post', $this->posts ); $this->posts = array_map( 'get_post', $this->posts );
} }
if ( $q['cache_results'] && $id_query_is_cacheable ) { if ( $q['cache_results'] && $id_query_is_cacheable && ! $cache_found ) {
$post_ids = wp_list_pluck( $this->posts, 'ID' ); $post_ids = wp_list_pluck( $this->posts, 'ID' );
$cache_value = array( $cache_value = array(
@ -3455,7 +3455,8 @@ class WP_Query {
$this->posts = array_map( 'get_post', $this->posts ); $this->posts = array_map( 'get_post', $this->posts );
if ( $q['cache_results'] ) { if ( $q['cache_results'] ) {
update_post_caches( $this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache'] ); $post_ids = wp_list_pluck( $this->posts, 'ID' );
_prime_post_caches( $post_ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
} }
/** @var WP_Post */ /** @var WP_Post */

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-beta2-54351'; $wp_version = '6.1-beta2-54352';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.