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

Comments: Cache results of `SELECT FOUND_ROWS()` query. 

When comment IDs are fetched from the cache rather than the database,
the subsequent `SELECT FOUND_ROWS()` query will not return the correct value.
To avoid unnecessary queries, we cache the results of the `found_comments`
query alongside the comment IDs.

Props spacedmonkey.
Fixes #37184.
Built from https://develop.svn.wordpress.org/trunk@38001


git-svn-id: http://core.svn.wordpress.org/trunk@37942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2016-07-07 14:27:38 +00:00
parent 1630c97795
commit c6d5f78241
2 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
wp-includes/class-wp-comment-query.php
View File

@ -394,12 +394,27 @@ class WP_Comment_Query {
$last_changed = microtime(); $last_changed = microtime();
wp_cache_set( 'last_changed', $last_changed, 'comment' ); wp_cache_set( 'last_changed', $last_changed, 'comment' );
} }
$cache_key = "get_comment_ids:$key:$last_changed";
$comment_ids = wp_cache_get( $cache_key, 'comment' ); $cache_key = "get_comments:$key:$last_changed";
if ( false === $comment_ids ) { $cache_value = wp_cache_get( $cache_key, 'comment' );
if ( false === $cache_value ) {
$comment_ids = $this->get_comment_ids(); $comment_ids = $this->get_comment_ids();
wp_cache_add( $cache_key, $comment_ids, 'comment' ); if ( $comment_ids ) {
$this->set_found_comments();
}
$cache_value = array(
'comment_ids' => $comment_ids,
'found_comments' => $this->found_comments,
);
wp_cache_add( $cache_key, $cache_value, 'comment' );
} else {
$comment_ids = $cache_value['comment_ids'];
$this->found_comments = $cache_value['found_comments'];
}
if ( $this->found_comments && $this->query_vars['number'] ) {
$this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
} }
// If querying for a count only, there's nothing more to do. // If querying for a count only, there's nothing more to do.
@ -410,21 +425,6 @@ class WP_Comment_Query {
$comment_ids = array_map( 'intval', $comment_ids ); $comment_ids = array_map( 'intval', $comment_ids );
if ( $comment_ids && $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
/**
* Filters the query used to retrieve found comment count.
*
* @since 4.4.0
*
* @param string $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
* @param WP_Comment_Query $comment_query The `WP_Comment_Query` instance.
*/
$found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
$this->found_comments = (int) $wpdb->get_var( $found_comments_query );
$this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
}
if ( 'ids' == $this->query_vars['fields'] ) { if ( 'ids' == $this->query_vars['fields'] ) {
$this->comments = $comment_ids; $this->comments = $comment_ids;
return $this->comments; return $this->comments;
@ -900,6 +900,32 @@ class WP_Comment_Query {
} }
} }
/**
* Populates found_comments and max_num_pages properties for the current query if the limit clause was used.
*
* @since 4.6.0
* @access private
*
* @global wpdb $wpdb WordPress database abstraction object.
*/
private function set_found_comments() {
global $wpdb;
if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
/**
* Filters the query used to retrieve found comment count.
*
* @since 4.4.0
*
* @param string $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
* @param WP_Comment_Query $comment_query The `WP_Comment_Query` instance.
*/
$found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
$this->found_comments = (int) $wpdb->get_var( $found_comments_query );
}
}
/** /**
* Fetch descendants for located comments. * Fetch descendants for located comments.
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-beta2-37999'; $wp_version = '4.6-beta2-38001';
/** /**
* 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.