vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Networks and Sites: Improve cache key generation in WP_Network_Query class.

Browse Source 
Improve cache key generation in the `WP_Network_Query` class by removing `update_network_cache` element in the array used to generate the cache key.  This 
element does not affect that cache and by removing it, it improves the likelihood of reusing an existing cache. 

Props Spacedmonkey, furi3r, johnbillion, johnjamesjacoby, flixos90.
Fixes #55461.



git-svn-id: https://develop.svn.wordpress.org/trunk@53098 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonny Harris
2022-04-07 17:57:59 +00:00
parent 4b177da5da
commit 761fb95954
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/class-wp-network-query.php
View File

@@ -242,8 +242,8 @@ class WP_Network_Query {
// $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
$_args = wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) );
// Ignore the $fields argument as the queried result will be the same regardless.
unset( $_args['fields'] );
// Ignore the $fields, $update_network_cache arguments as the queried result will be the same regardless.
unset( $_args['fields'], $_args['update_network_cache'] );
$key = md5( serialize( $_args ) );
$last_changed = wp_cache_get_last_changed( 'networks' );

54
tests/phpunit/tests/multisite/wpNetworkQuery.php
View File

@@ -509,6 +509,60 @@ if ( is_multisite() ) :
$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
}
/**
* @ticket 55461
*/
public function test_wp_network_query_cache_with_same_fields_same_cache_field() {
$q = new WP_Network_Query();
$query_1 = $q->query(
array(
'fields' => 'all',
'number' => 3,
'order' => 'ASC',
'update_network_cache' => true,
)
);
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
'fields' => 'all',
'number' => 3,
'order' => 'ASC',
'update_network_cache' => true,
)
);
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
* @ticket 55461
*/
public function test_wp_network_query_cache_with_same_fields_different_cache_field() {
$q = new WP_Network_Query();
$query_1 = $q->query(
array(
'fields' => 'all',
'number' => 3,
'order' => 'ASC',
'update_network_cache' => true,
)
);
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
'fields' => 'all',
'number' => 3,
'order' => 'ASC',
'update_network_cache' => false,
)
);
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
* @ticket 45749
* @ticket 47599