Changeset 6848

Timestamp:

08/09/2018 07:53:28 PM (6 years ago)

Author:

johnjamesjacoby

Message:

Tests: get all post type/status counts using bbp_get_child_counts().

• Fix a broken test, and improve a few others
• Update several count() instances that were doing expensive _ids() counts
• Strategically bust the bbpress_posts query cache group on updates

This change improves general performance and count reliability by ensuring the accuracy of forum/topic/reply relationship totals.

Location:

trunk

Files:

• src/includes/common/functions.php (modified) (1 diff)
• src/includes/forums/functions.php (modified) (8 diffs)
• src/includes/replies/functions.php (modified) (4 diffs)
• src/includes/topics/functions.php (modified) (3 diffs)
• tests/phpunit/testcases/admin/tools.php (modified) (1 diff)
• tests/phpunit/testcases/common/query.php (modified) (2 diffs)
• tests/phpunit/testcases/forums/functions/counts.php (modified) (2 diffs)

trunk/src/includes/common/functions.php

@@ -1729 +1729 @@
 
     // Bail if nothing passed
-    if ( empty( $parent_id ) || empty( $post_type ) ) {
+    if ( empty( $post_type ) ) {
         return false;
     }

trunk/src/includes/forums/functions.php

@@ -75 +75 @@
     // Update the forum and hierarchy
     bbp_update_forum( array(
-        'forum_id' => $forum_id
+        'forum_id'    => $forum_id,
+        'post_parent' => $forum_data['post_parent']
     ) );
 
@@ -99 +100 @@
      */
     do_action( 'bbp_insert_forum', (int) $forum_id );
+
+    // Bump the last changed cache
+    wp_cache_set( 'last_changed', microtime(), 'bbpress_posts' );
 
     // Return forum_id
@@ -1367 +1371 @@
 
     // Get the topic's replies.
-    $replies = bbp_get_public_child_ids( $topic_id, bbp_get_reply_post_type() );
-    $count   = count( $replies );
+    $count = bbp_get_public_child_count( $topic_id, bbp_get_reply_post_type() );
 
     // If we're unapproving, set count to negative.
@@ -1593 +1596 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
+    // Maybe query for counts
     if ( empty( $subforums ) ) {
-        $subforums = count( bbp_forum_query_subforum_ids( $forum_id ) );
+        $subforums = bbp_get_public_child_count( $forum_id, bbp_get_forum_post_type() );
     }
 
@@ -1629 +1633 @@
 
     // Get total topics for this forum
-    $topics = (int) count( bbp_forum_query_topic_ids( $forum_id ) );
+    $topics = bbp_get_public_child_count( $forum_id, bbp_get_topic_post_type() );
 
     // Calculate total topics in this forum
@@ -1729 +1733 @@
     $topic_ids   = bbp_forum_query_topic_ids( $forum_id );
     if ( ! empty( $topic_ids ) ) {
-        $query = new WP_Query( array(
-            'fields'          => 'ids',
-            'post_parent__in' => $topic_ids,
-            'post_status'     => bbp_get_public_status_id(),
-            'post_type'       => bbp_get_reply_post_type(),
-            'posts_per_page'  => -1,
-
-            // Performance
-            'nopaging'               => true,
-            'suppress_filters'       => true,
-            'update_post_term_cache' => false,
-            'update_post_meta_cache' => false,
-            'ignore_sticky_posts'    => true,
-            'no_found_rows'          => true
-        ) );
-        $reply_count = ! empty( $query->posts ) ? count( $query->posts ) : 0;
-        unset( $query );
+        $reply_count = bbp_get_public_child_count( $forum_id, bbp_get_reply_post_type() );
     }
 
@@ -1788 +1776 @@
     ), 'update_forum' );
 
+    // Update the forum parent
+    bbp_update_forum_id( $r['forum_id'], $r['post_parent'] );
+
     // Last topic and reply ID's
     bbp_update_forum_last_topic_id( $r['forum_id'], $r['last_topic_id'] );
@@ -1821 +1812 @@
         ) );
     }
+
+    // Bump the custom query cache
+    wp_cache_set( 'last_changed', microtime(), 'bbpress_posts' );
 }
 

trunk/src/includes/replies/functions.php

@@ -99 +99 @@
     if ( bbp_is_reply_published( $reply_id ) ) {
         bbp_increase_topic_reply_count( $topic_id );
-        bbp_increase_forum_reply_count( $reply_id );
+        bbp_increase_forum_reply_count( $forum_id );
 
     // If the reply isn't public only update the topic reply hidden count.
@@ -856 +856 @@
         bbp_update_reply_walker( $reply_id, $last_active_time, $forum_id, $topic_id, false );
     }
+
+    // Bump the custom query cache
+    wp_cache_set( 'last_changed', microtime(), 'bbpress_posts' );
 }
 
@@ -1002 +1005 @@
 
     // Update the forum ID
-    $forum_id = bbp_update_forum_id( $reply_id, $forum_id );
+    $retval = bbp_update_forum_id( $reply_id, $forum_id );
 
     // Filter & return
-    return (int) apply_filters( 'bbp_update_reply_forum_id', $forum_id, $reply_id );
+    return (int) apply_filters( 'bbp_update_reply_forum_id', $retval, $reply_id, $forum_id );
 }
 
@@ -1045 +1048 @@
 
     // Update the topic ID
-    $topic_id = bbp_update_topic_id( $reply_id, $topic_id );
+    $retval = bbp_update_topic_id( $reply_id, $topic_id );
 
     // Filter & return
-    return (int) apply_filters( 'bbp_update_reply_topic_id', $topic_id, $reply_id );
+    return (int) apply_filters( 'bbp_update_reply_topic_id', $retval, $reply_id, $topic_id );
 }
 

trunk/src/includes/topics/functions.php

@@ -833 +833 @@
         bbp_update_topic_walker( $topic_id, $last_active, $forum_id, 0, false );
     }
+
+    // Bump the custom query cache
+    wp_cache_set( 'last_changed', microtime(), 'bbpress_posts' );
 }
 
@@ -888 +891 @@
             if ( bbp_is_forum( $ancestor ) ) {
 
+                // Get the forum
+                $forum = bbp_get_forum( $ancestor );
+
                 // Update the forum
                 bbp_update_forum( array(
-                    'forum_id'           => $ancestor,
+                    'forum_id'           => $forum->ID,
+                    'post_parent'        => $forum->post_parent,
                     'last_topic_id'      => $topic_id,
                     'last_reply_id'      => $reply_id,
@@ -984 +991 @@
 
     // Get reply count.
-    $public_reply_count = count( bbp_get_public_child_ids( $topic_id, bbp_get_reply_post_type() ) );
+    $public_reply_count = bbp_get_public_child_count( $topic_id, bbp_get_reply_post_type() );
 
     // Topic status.

trunk/tests/phpunit/testcases/admin/tools.php

@@ -642 +642 @@
         ) );
 
-        // Forums should NOT have a _bbp_forum_id meta key
-        $this->assertEquals( array(), get_post_meta( $f, '_bbp_forum_id', false ) );
+        // Forums should have an empty _bbp_forum_id meta key
+        $this->assertEquals( array( 0 => '0' ), get_post_meta( $f, '_bbp_forum_id', false ) );
 
         // Topics should have a _bbp_forum_id meta key

trunk/tests/phpunit/testcases/common/query.php

@@ -50 +50 @@
 
     /**
-     * @group  counts
+     * @group  jjj
      * @covers ::bbp_get_public_child_count
      */
     public function test_bbp_get_public_child_count() {
+
+        /* Empty Forum ********************************************************/
+
         $f = $this->factory->forum->create();
 
-        // Test initial forum public child counts
+        // Test initial zero forum public child counts
         $count = bbp_get_public_child_count( $f, bbp_get_forum_post_type() );
         $this->assertSame( 0, $count );
@@ -65 +68 @@
         /* Sub-Forums *********************************************************/
 
+        // 3 public sub-forums
         $this->factory->forum->create_many( 3, array(
             'post_parent' => $f,
         ) );
 
+        // 1 private sub-forum
         $this->factory->forum->create( array(
             'post_parent' => $f,

trunk/tests/phpunit/testcases/forums/functions/counts.php

@@ -415 +415 @@
         $f1 = $this->factory->forum->create();
 
+        $count = bbp_get_forum_subforum_count( $f1, true );
+        $this->assertSame( 0, $count );
+
         $f2 = $this->factory->forum->create_many( 3, array(
             'post_parent' => $f1,
@@ -420 +423 @@
 
         $count = bbp_get_forum_subforum_count( $f1, true );
-        $this->assertSame( 0, $count );
+        $this->assertSame( 3, $count );
+
+        bbp_update_forum_subforum_count( $f1, 10 );
+
+        $count = bbp_get_forum_subforum_count( $f1, true );
+        $this->assertSame( 10, $count );
 
         bbp_update_forum_subforum_count( $f1 );