Changeset 6532

Timestamp:

01/01/2008 05:03:52 PM (17 years ago)

Author:

ryan

Message:

Defer comment counting. Props tellyworth. fixes #5557

Location:

trunk

Files:

• wp-admin/import/wordpress.php (modified) (6 diffs)
• wp-includes/comment.php (modified) (1 diff)

trunk/wp-admin/import/wordpress.php

@@ -377 +377 @@
         }
 
-        if ($post_id = post_exists($post_title, '', $post_date)) {
+        $post_exists = post_exists($post_title, '', $post_date);
+        
+        if ( $post_exists ) {
             echo '<li>';
             printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
@@ -476 +478 @@
             $comment_parent       = $this->get_tag( $comment, 'wp:comment_parent');
 
-            if ( !comment_exists($comment_author, $comment_date) ) {
+            // if this is a new post we can skip the comment_exists() check
+            if ( !$post_exists || !comment_exists($comment_author, $comment_date) ) {
                 $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent');
                 wp_insert_comment($commentdata);
@@ -649 +652 @@
     }
     
+    function import_start() {
+        wp_defer_term_counting(true);
+        wp_defer_comment_counting(true);
+        do_action('import_start');
+    }
+    
+    function import_end() {
+        do_action('import_end');
+        
+        // clear the caches after backfilling
+        foreach ($this->post_ids_processed as $post_id)
+            clean_post_cache($post_id);
+        
+        wp_defer_term_counting(false);
+        wp_defer_comment_counting(false);
+    }
 
     function import($id, $fetch_attachments = false) {
@@ -655 +674 @@
 
         add_filter('import_post_meta_key', array($this, 'is_valid_meta_key'));
-        do_action('import_start');
         $file = get_attached_file($this->id);
         $this->import_file($file);
-        do_action('import_end');
     }
         
@@ -664 +681 @@
         $this->file = $file;
         
+        $this->import_start();
         $this->get_authors_from_post();
-        wp_defer_term_counting(true);
         $this->get_entries();
         $this->process_categories();
@@ -672 +689 @@
         $this->backfill_parents();
         $this->backfill_attachment_urls();
-        
-        // clear the caches after backfilling
-        foreach ($this->post_ids_processed as $post_id)
-            clean_post_cache($post_id);
-        
-        wp_defer_term_counting(false);
+        $this->import_end();
+        
         if ( is_wp_error( $result ) )
             return $result;

trunk/wp-includes/comment.php

@@ -492 +492 @@
 }
 
-
-function wp_update_comment_count($post_id) {
+function wp_defer_comment_counting($defer=NULL) {
+    static $_defer = false;
+    
+    if ( is_bool($defer) ) {
+        $_defer = $defer;
+        // flush any deferred counts
+        if ( !$defer )
+            wp_update_comment_count( NULL, true );
+    }
+    
+    return $_defer;
+}
+
+function wp_update_comment_count($post_id, $do_deferred=false) {
+    static $_deferred = array();
+    
+    if ( $do_deferred ) {
+        $_deferred = array_unique($_deferred);
+        foreach ( $_deferred as $i => $_post_id ) {
+            wp_update_comment_count_now($_post_id);
+            unset( $_deferred[$i] );
+        }
+    }
+    
+    if ( wp_defer_comment_counting() ) {
+        $_deferred[] = $post_id;
+        return true;
+    }
+    elseif ( $post_id ) {
+        return wp_update_comment_count_now($post_id);
+    }
+        
+}
+
+function wp_update_comment_count_now($post_id) {
     global $wpdb;
     $post_id = (int) $post_id;