Changeset 5666

Timestamp:

06/08/2007 12:20:22 AM (18 years ago)

Author:

ryan

Message:

Comment caching. Reduce queries on edit-comments.php page. Add non-persistent cache groups. Hat tip to hovenko. fixes #4387

Location:

trunk

Files:

• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-includes/cache.php (modified) (2 diffs)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/comment.php (modified) (7 diffs)

trunk/wp-admin/edit-comments.php

@@ -152 +152 @@
 </thead>';
         foreach ($comments as $comment) {
-        $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
+        $post = get_post($comment->comment_post_ID);
+        $authordata = get_userdata($post->post_author);
         $comment_status = wp_get_comment_status($comment->comment_ID);
         $class = ('alternate' == $class) ? '' : 'alternate';

trunk/wp-admin/includes/template.php

@@ -251 +251 @@
     }
 
+    update_comment_cache($comments);
+
     $total = $wpdb->get_var( "SELECT FOUND_ROWS()" );
 
@@ -261 +263 @@
     $comment =& get_comment( $id );
     $class = '';
-    $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
+    $post = get_post($comment->comment_post_ID);
+    $authordata = get_userdata($post->post_author);
     $comment_status = wp_get_comment_status($comment->comment_ID);
     if ( 'unapproved' == $comment_status )

trunk/wp-includes/cache.php

@@ -64 +64 @@
     var $non_existant_objects = array ();
     var $global_groups = array ('users', 'userlogins', 'usermeta');
+    var $non_persistent_groups = array('comment');
     var $blog_id;
     var $cold_cache_hits = 0;
@@ -309 +310 @@
         $errors = 0;
         foreach ($this->dirty_objects as $group => $ids) {
+            if ( in_array($group, $this->non_persistent_groups) )
+                continue;
+
             $group_dir = $this->make_group_dir($group, $dir_perms);
 

trunk/wp-includes/comment-template.php

@@ -302 +302 @@
     $comments = $wp_query->comments = apply_filters( 'comments_array', $comments, $post->ID );
     $wp_query->comment_count = count($wp_query->comments);
+    update_comment_cache($comments);
 
     define('COMMENTS_TEMPLATE', true);

trunk/wp-includes/comment.php

@@ -72 +72 @@
 // Handles comment caching.
 function &get_comment(&$comment, $output = OBJECT) {
-    global $comment_cache, $wpdb;
+    global $wpdb;
 
     if ( empty($comment) ) {
@@ -80 +80 @@
             $_comment = null;
     } elseif ( is_object($comment) ) {
-        if ( !isset($comment_cache[$comment->comment_ID]) )
-            $comment_cache[$comment->comment_ID] = &$comment;
-        $_comment = & $comment_cache[$comment->comment_ID];
+        wp_cache_add($comment->comment_ID, $comment, 'comment');
+        $_comment = $comment;
     } else {
         $comment = (int) $comment;
         if ( isset($GLOBALS['comment']) && ($GLOBALS['comment']->comment_ID == $comment) ) {
             $_comment = & $GLOBALS['comment'];
-        } elseif ( !isset($comment_cache[$comment]) ) {
+        } elseif ( ! $_comment = wp_cache_get($comment, 'comment') ) {
             $_comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment' LIMIT 1");
-            $comment_cache[$comment->comment_ID] = & $_comment;
-        } else {
-            $_comment = & $comment_cache[$comment];
-        }
-    }
+            wp_cache_add($_comment->comment_ID, $_comment, 'comment');
+        }
+    }
+
+    $_comment = apply_filters('get_comment', $_comment);
 
     if ( $output == OBJECT ) {
@@ -286 +285 @@
         wp_update_comment_count($post_id);
 
+    clean_comment_cache($comment_id);
+
     do_action('wp_set_comment_status', $comment_id, 'delete');
     return true;
@@ -294 +295 @@
     global $wpdb;
 
-    $result = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
-
-    if ( $result == NULL )
+    $comment = get_comment($comment_id);
+    if ( !$comment )
+        return false;
+
+    $approved = $comment->comment_approved;
+
+    if ( $approved == NULL )
         return 'deleted';
-    elseif ( $result == '1' )
+    elseif ( $approved == '1' )
         return 'approved';
-    elseif ( $result == '0' )
+    elseif ( $approved == '0' )
         return 'unapproved';
-    elseif ( $result == 'spam' )
+    elseif ( $approved == 'spam' )
         return 'spam';
     else
@@ -439 +444 @@
         return false;
 
+    clean_comment_cache($comment_id);
+
     do_action('wp_set_comment_status', $comment_id, $comment_status);
     $comment = get_comment($comment_id);
     wp_update_comment_count($comment->comment_post_ID);
+
     return true;
 }
@@ -480 +488 @@
 
     $rval = $wpdb->rows_affected;
+
+    clean_comment_cache($comment_ID);
     wp_update_comment_count($comment_post_ID);
     do_action('edit_comment', $comment_ID);
@@ -794 +804 @@
 }
 
+//
+// Cache
+//
+
+function clean_comment_cache($id) {
+    wp_cache_delete($id, 'comment');
+}
+
+function update_comment_cache($comments) {
+    foreach ( $comments as $comment )
+        wp_cache_add($comment->comment_ID, $comment, 'comment');
+}
+
 ?>