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

Taxonomy: Fix caching issues in `WP_Term_Query` class. 

Introduced [52836] when passing `child_of` or `pad_counts` parameters to `get_terms` or `WP_Term_Query` class, the array of terms received by the query, was not correctly cached. This 
change simplifies the logic in `WP_Term_Query` and ensures terms are correctly cached. This change also, improves performance, by only caching an array of term ids where possible.  

Props denishua, spacedmonkey, oztaser, peterwilsoncc, SergeyBiryukov, georgestephanis, jnz31, knutsp, mukesh27, costdev.
Fixes #55837.


Built from https://develop.svn.wordpress.org/trunk@53496


git-svn-id: http://core.svn.wordpress.org/trunk@53085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
spacedmonkey 2022-06-14 11:43:13 +00:00
parent e3e0bb1183
commit 47a8b2f5de
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
wp-includes/class-wp-term-query.php
View File

@ -770,7 +770,7 @@ class WP_Term_Query {
// $args can be anything. Only use the args defined in defaults to compute the key. // $args can be anything. Only use the args defined in defaults to compute the key.
$cache_args = wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) ); $cache_args = wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) );
unset( $cache_args['pad_counts'], $cache_args['update_term_meta_cache'] ); unset( $cache_args['update_term_meta_cache'] );
if ( 'count' !== $_fields && 'all_with_object_id' !== $_fields ) { if ( 'count' !== $_fields && 'all_with_object_id' !== $_fields ) {
$cache_args['fields'] = 'all'; $cache_args['fields'] = 'all';
@ -783,10 +783,13 @@ class WP_Term_Query {
if ( false !== $cache ) { if ( false !== $cache ) {
if ( 'ids' === $_fields ) { if ( 'ids' === $_fields ) {
$term_ids = wp_list_pluck( $cache, 'term_id' ); $cache = array_map( 'intval', $cache );
$cache = array_map( 'intval', $term_ids );
} elseif ( 'count' !== $_fields ) { } elseif ( 'count' !== $_fields ) {
if ( ( 'all_with_object_id' === $_fields && ! empty( $args['object_ids'] ) ) || ( 'all' === $_fields && $args['pad_counts'] ) ) {
$term_ids = wp_list_pluck( $cache, 'term_id' ); $term_ids = wp_list_pluck( $cache, 'term_id' );
} else {
$term_ids = array_map( 'intval', $cache );
}
_prime_term_caches( $term_ids, $args['update_term_meta_cache'] ); _prime_term_caches( $term_ids, $args['update_term_meta_cache'] );
$term_objects = $this->populate_terms( $cache ); $term_objects = $this->populate_terms( $cache );
$cache = $this->format_terms( $term_objects, $_fields ); $cache = $this->format_terms( $term_objects, $_fields );
@ -849,34 +852,11 @@ class WP_Term_Query {
} }
} }
/*
* When querying for terms connected to objects, we may get
* duplicate results. The duplicates should be preserved if
* `$fields` is 'all_with_object_id', but should otherwise be
* removed.
*/
if ( ! empty( $args['object_ids'] ) && 'all_with_object_id' !== $_fields ) {
$_tt_ids = array();
$_terms = array();
foreach ( $terms as $term ) {
if ( isset( $_tt_ids[ $term->term_id ] ) ) {
continue;
}
$_tt_ids[ $term->term_id ] = 1;
$_terms[] = $term;
}
$terms = $_terms;
}
// Hierarchical queries are not limited, so 'offset' and 'number' must be handled now. // Hierarchical queries are not limited, so 'offset' and 'number' must be handled now.
if ( $hierarchical && $number && is_array( $terms ) ) { if ( $hierarchical && $number && is_array( $term_objects ) ) {
if ( $offset >= count( $terms ) ) { if ( $offset >= count( $term_objects ) ) {
$terms = array();
$term_objects = array(); $term_objects = array();
} else { } else {
$terms = array_slice( $terms, $offset, $number, true );
$term_objects = array_slice( $term_objects, $offset, $number, true ); $term_objects = array_slice( $term_objects, $offset, $number, true );
} }
} }
@ -887,10 +867,28 @@ class WP_Term_Query {
update_termmeta_cache( $term_ids ); update_termmeta_cache( $term_ids );
} }
wp_cache_add( $cache_key, $terms, 'terms' ); if ( 'all_with_object_id' === $_fields && ! empty( $args['object_ids'] ) ) {
$terms = $this->format_terms( $term_objects, $_fields ); $term_cache = array();
foreach ( $term_objects as $term ) {
$object = new stdClass();
$object->term_id = $term->term_id;
$object->object_id = $term->object_id;
$term_cache[] = $object;
}
} elseif ( 'all' === $_fields && $args['pad_counts'] ) {
$term_cache = array();
foreach ( $term_objects as $term ) {
$object = new stdClass();
$object->term_id = $term->term_id;
$object->count = $term->count;
$term_cache[] = $object;
}
} else {
$term_cache = wp_list_pluck( $term_objects, 'term_id' );
}
wp_cache_add( $cache_key, $term_cache, 'terms' );
$this->terms = $this->format_terms( $term_objects, $_fields );
$this->terms = $terms;
return $this->terms; return $this->terms;
} }
@ -1119,6 +1117,9 @@ class WP_Term_Query {
if ( property_exists( $term_data, 'object_id' ) ) { if ( property_exists( $term_data, 'object_id' ) ) {
$term->object_id = (int) $term_data->object_id; $term->object_id = (int) $term_data->object_id;
} }
if ( property_exists( $term_data, 'count' ) ) {
$term->count = (int) $term_data->count;
}
} else { } else {
$term = get_term( $term_data ); $term = get_term( $term_data );
} }

4
wp-includes/version.php
View File

@ -16,14 +16,14 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-alpha-53495'; $wp_version = '6.1-alpha-53496';
/** /**
* 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.
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 51917; $wp_db_version = 53496;
/** /**
* Holds the TinyMCE version. * Holds the TinyMCE version.