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

Multisite: improve `sites_pre_query` and `networks_pre_query` filters, avoiding db queries. 

Improve the `pre_query` filters in multisite classes introduced in r44983. Return (non null) values immediately,
avoiding the database queries entirely, similar to other `pre_query` filters.

Props spacedmonkey, SergeyBiryukov, felipeelia.
Fixes #47599.


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


git-svn-id: http://core.svn.wordpress.org/trunk@45912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Adam Silverstein 2019-09-12 22:17:55 +00:00
parent c148f0aa55
commit 67fd6e281f
3 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
wp-includes/class-wp-network-query.php
View File

@ -197,50 +197,57 @@ class WP_Network_Query {
*/ */
do_action_ref_array( 'pre_get_networks', array( &$this ) ); do_action_ref_array( 'pre_get_networks', array( &$this ) );
$network_ids = null; $network_data = null;
/** /**
* Filter the sites array before the query takes place. * Filter the network data before the query takes place.
* *
* Return a non-null value to bypass WordPress's default site queries. * Return a non-null value to bypass WordPress's default network queries.
*
* The expected return type from this filter depends on the value passed in the request query_vars.
* When `$this->query_vars['count']` is set, the filter should return the network count as an int.
* When `'ids' === $this->query_vars['fields']`, the filter should return an array of network ids.
* Otherwise the filter should return an array of WP_Network objects.
* *
* @since 5.2.0 * @since 5.2.0
* *
* @param array|null $site_ids Return an array of site data to short-circuit WP's site query, * @param array|null $network_data Return an array of network data to short-circuit WP's network query,
* or null to allow WP to run its normal queries. * the network count as an integer if `$this->query_vars['count']` is set,
* @param WP_Network_Query $this The WP_Network_Query instance, passed by reference. * or null to allow WP to run its normal queries.
* @param WP_Network_Query $this The WP_Network_Query instance, passed by reference.
*/ */
$network_ids = apply_filters_ref_array( 'networks_pre_query', array( $network_ids, &$this ) ); $network_data = apply_filters_ref_array( 'networks_pre_query', array( $network_data, &$this ) );
if ( null === $network_ids ) { if ( null !== $network_data ) {
return $network_data;
}
// $args can include anything. Only use the args defined in the query_var_defaults to compute the key. // $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 ) ); $_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. // Ignore the $fields argument as the queried result will be the same regardless.
unset( $_args['fields'] ); unset( $_args['fields'] );
$key = md5( serialize( $_args ) ); $key = md5( serialize( $_args ) );
$last_changed = wp_cache_get_last_changed( 'networks' ); $last_changed = wp_cache_get_last_changed( 'networks' );
$cache_key = "get_network_ids:$key:$last_changed"; $cache_key = "get_network_ids:$key:$last_changed";
$cache_value = wp_cache_get( $cache_key, 'networks' ); $cache_value = wp_cache_get( $cache_key, 'networks' );
if ( false === $cache_value ) { if ( false === $cache_value ) {
$network_ids = $this->get_network_ids(); $network_ids = $this->get_network_ids();
if ( $network_ids ) { if ( $network_ids ) {
$this->set_found_networks(); $this->set_found_networks();
}
$cache_value = array(
'network_ids' => $network_ids,
'found_networks' => $this->found_networks,
);
wp_cache_add( $cache_key, $cache_value, 'networks' );
} else {
$network_ids = $cache_value['network_ids'];
$this->found_networks = $cache_value['found_networks'];
} }
$cache_value = array(
'network_ids' => $network_ids,
'found_networks' => $this->found_networks,
);
wp_cache_add( $cache_key, $cache_value, 'networks' );
} else {
$network_ids = $cache_value['network_ids'];
$this->found_networks = $cache_value['found_networks'];
} }
if ( $this->found_networks && $this->query_vars['number'] ) { if ( $this->found_networks && $this->query_vars['number'] ) {

65
wp-includes/class-wp-site-query.php
View File

@ -288,50 +288,57 @@ class WP_Site_Query {
$this->meta_query_clauses = $this->meta_query->get_sql( 'blog', $wpdb->blogs, 'blog_id', $this ); $this->meta_query_clauses = $this->meta_query->get_sql( 'blog', $wpdb->blogs, 'blog_id', $this );
} }
$site_ids = null; $site_data = null;
/** /**
* Filter the sites array before the query takes place. * Filter the site data before the get_sites query takes place.
* *
* Return a non-null value to bypass WordPress's default site queries. * Return a non-null value to bypass WordPress's default site queries.
* *
* The expected return type from this filter depends on the value passed in the request query_vars:
* When `$this->query_vars['count']` is set, the filter should return the site count as an int.
* When `'ids' == $this->query_vars['fields']`, the filter should return an array of site ids.
* Otherwise the filter should return an array of WP_Site objects.
*
* @since 5.2.0 * @since 5.2.0
* *
* @param array|null $site_ids Return an array of site data to short-circuit WP's site query, * @param array|int|null $site_data Return an array of site data to short-circuit WP's site query,
* or null to allow WP to run its normal queries. * the site count as an integer if `$this->query_vars['count']` is set,
* @param WP_Site_Query $this The WP_Site_Query instance, passed by reference. * or null to run the normal queries.
* @param WP_Site_Query $this The WP_Site_Query instance, passed by reference.
*/ */
$site_ids = apply_filters_ref_array( 'sites_pre_query', array( $site_ids, &$this ) ); $site_data = apply_filters_ref_array( 'sites_pre_query', array( $site_data, &$this ) );
if ( null === $site_ids ) { if ( null !== $site_data ) {
return $site_data;
}
// $args can include anything. Only use the args defined in the query_var_defaults to compute the key. // $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 ) ); $_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. // Ignore the $fields argument as the queried result will be the same regardless.
unset( $_args['fields'] ); unset( $_args['fields'] );
$key = md5( serialize( $_args ) ); $key = md5( serialize( $_args ) );
$last_changed = wp_cache_get_last_changed( 'sites' ); $last_changed = wp_cache_get_last_changed( 'sites' );
$cache_key = "get_sites:$key:$last_changed"; $cache_key = "get_sites:$key:$last_changed";
$cache_value = wp_cache_get( $cache_key, 'sites' ); $cache_value = wp_cache_get( $cache_key, 'sites' );
if ( false === $cache_value ) { if ( false === $cache_value ) {
$site_ids = $this->get_site_ids(); $site_ids = $this->get_site_ids();
if ( $site_ids ) { if ( $site_ids ) {
$this->set_found_sites(); $this->set_found_sites();
}
$cache_value = array(
'site_ids' => $site_ids,
'found_sites' => $this->found_sites,
);
wp_cache_add( $cache_key, $cache_value, 'sites' );
} else {
$site_ids = $cache_value['site_ids'];
$this->found_sites = $cache_value['found_sites'];
} }
$cache_value = array(
'site_ids' => $site_ids,
'found_sites' => $this->found_sites,
);
wp_cache_add( $cache_key, $cache_value, 'sites' );
} else {
$site_ids = $cache_value['site_ids'];
$this->found_sites = $cache_value['found_sites'];
} }
if ( $this->found_sites && $this->query_vars['number'] ) { if ( $this->found_sites && $this->query_vars['number'] ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-46099'; $wp_version = '5.3-alpha-46100';
/** /**
* 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.