Skip to content

Add caching to comment feeds #2194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
spacedmonkey wants to merge 16 commits into from
Closed

Add caching to comment feeds #2194

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f2a72b5
Add caching to comment feeds
spacedmonkey Jan 17, 2022
c345ebb
Add unit tests
spacedmonkey Jan 20, 2022
295b89c
Fix lints.
spacedmonkey Jan 20, 2022
2f9e17d
Break off into it's own method.
spacedmonkey Feb 1, 2022
108ff23
Improve comments.
spacedmonkey Feb 4, 2022
bba3fab
Improved logic.
spacedmonkey Mar 15, 2022
f65d588
Fix lint
spacedmonkey Mar 15, 2022
e51b35f
Remove un-needed variables.
spacedmonkey Mar 15, 2022
d484ab9
Fix number queries.
spacedmonkey Mar 15, 2022
ece6c30
Merge branch 'trunk' into fix/comments-cache
spacedmonkey Mar 16, 2022
ff1fc0f
Tweak test.
spacedmonkey Mar 16, 2022
e7e08b2
Merge branch 'trunk' into fix/comments-cache
spacedmonkey Mar 29, 2022
d261900
Revert dry.
spacedmonkey Mar 29, 2022
436af7a
Feedback
spacedmonkey Mar 29, 2022
1aaec71
Use get_col
spacedmonkey Mar 29, 2022
3e9cc15
Merge branch 'trunk' into fix/comments-cache
peterwilsoncc Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Break off into it's own method.
  • Loading branch information
@spacedmonkey
spacedmonkey committed Feb 1, 2022
commit 2f9e17dd0c1bd1fad5d0aca9a0c5fd51a1cd6c52
75 changes: 38 additions & 37 deletions src/wp-includes/class-wp-query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,42 @@ public function parse_tax_query( &$q ) {
do_action( 'parse_tax_query', $this );
}


/**
* Generates SQL for the WHERE clause based on passed search terms.
*
* @since 3.7.0
*
* @global wpdb $wpdb WordPress database abstraction object.
*
* @param string $comments_request SQL to run.
* @return array Array of comments.
*/
protected function get_comments( $comments_request ) {
global $wpdb;

$key = md5( $comments_request );
$last_changed = wp_cache_get_last_changed( 'comment' ) . wp_cache_get_last_changed( 'posts' );

$cache_key = "comment_feed:$key:$last_changed";
$comment_ids = wp_cache_get( $cache_key, 'comment' );
if ( ! $comment_ids ) {
$comments = (array) $wpdb->get_results( $comments_request );
// Convert to WP_Comment.
/** @var WP_Comment[] */
$comments = array_map( 'get_comment', $comments );
$comment_ids = wp_list_pluck( $comments, 'comment_ID' );
wp_cache_add( $cache_key, $comment_ids, 'comment' );
} else {
_prime_comment_caches( $comment_ids, false );
// Convert to WP_Comment.
/** @var WP_Comment[] */
$comments = array_map( 'get_comment', $comment_ids );
}

return $comments;
}

/**
* Generates SQL for the WHERE clause based on passed search terms.
*
Expand Down Expand Up @@ -2721,25 +2757,7 @@ public function get_posts() {
$climits = ( ! empty( $climits ) ) ? $climits : '';

$comments_request = "SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";

$key = md5( $comments_request );
$last_changed = wp_cache_get_last_changed( 'comment' ) . wp_cache_get_last_changed( 'posts' );

$cache_key = "comment_feed:$key:$last_changed";
$comment_ids = wp_cache_get( $cache_key, 'comment' );
if ( ! $comment_ids ) {
$comments = (array) $wpdb->get_results( $comments_request );
// Convert to WP_Comment.
/** @var WP_Comment[] */
$comments = array_map( 'get_comment', $comments );
$comment_ids = wp_list_pluck( $comments, 'comment_ID' );
wp_cache_add( $cache_key, $comment_ids, 'comment' );
} else {
_prime_comment_caches( $comment_ids, false );
// Convert to WP_Comment.
/** @var WP_Comment[] */
$comments = array_map( 'get_comment', $comment_ids );
}
$comments = $this->get_comments( $comments_request );

$this->comments = $comments;
$this->comment_count = count( $this->comments );
Expand Down Expand Up @@ -3168,24 +3186,7 @@ public function get_posts() {
$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option( 'posts_per_rss' ), &$this ) );

$comments_request = "SELECT {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";
$key = md5( $comments_request );
$last_changed = wp_cache_get_last_changed( 'comment' );

$cache_key = "comment_feed:$key:$last_changed";
$comment_ids = wp_cache_get( $cache_key, 'comment' );
if ( ! $comment_ids ) {
$comments = (array) $wpdb->get_results( $comments_request );
// Convert to WP_Comment.
/** @var WP_Comment[] */
$comments = array_map( 'get_comment', $comments );
$comment_ids = wp_list_pluck( $comments, 'comment_ID' );
wp_cache_add( $cache_key, $comment_ids, 'comment' );
} else {
_prime_comment_caches( $comment_ids, false );
// Convert to WP_Comment.
/** @var WP_Comment[] */
$comments = array_map( 'get_comment', $comment_ids );
}
$comments = $this->get_comments( $comments_request );

$this->comments = $comments;
$this->comment_count = count( $this->comments );
Expand Down