Changeset 6340

Timestamp:

03/02/2017 03:57:04 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Engagements: Improve efficiency of upgrade & repair tools.

Props thebrandonallen. See #3068.

Location:

trunk/src/includes/admin/tools

Files:

• repair.php (modified) (3 diffs)
• upgrades.php (modified) (3 diffs)

trunk/src/includes/admin/tools/repair.php

@@ -244 +244 @@
     $cps = bbp_get_closed_status_id();
 
-    $voice_id_sql = $bbp_db->prepare( "INSERT INTO {$bbp_db->postmeta} (post_id, meta_key, meta_value) (
+    $engagements_sql = $bbp_db->prepare( "INSERT INTO {$bbp_db->postmeta} (post_id, meta_key, meta_value) (
         SELECT postmeta.meta_value, '_bbp_engagement', posts.post_author
             FROM {$bbp_db->posts} AS posts
@@ -251 +251 @@
                 AND postmeta.meta_key = '_bbp_topic_id'
             WHERE posts.post_type IN (%s, %s)
-                AND posts.post_status IN (%s, %s))", $tpt, $rpt, $pps, $cps );
-
-    if ( is_wp_error( $bbp_db->query( $voice_id_sql ) ) ) {
+                AND posts.post_status IN (%s, %s)
+            GROUP BY postmeta.meta_value, posts.post_author)", $tpt, $rpt, $pps, $cps );
+
+    if ( is_wp_error( $bbp_db->query( $engagements_sql ) ) ) {
         return array( 2, sprintf( $statement, $result ) );
     }
@@ -261 +262 @@
             FROM {$bbp_db->postmeta}
             WHERE meta_key = '_bbp_engagement'
-            GROUP BY post_id ORDER BY post_id)";
+            GROUP BY post_id)";
 
     if ( is_wp_error( $bbp_db->query( $voice_count_sql ) ) ) {

trunk/src/includes/admin/tools/upgrades.php

@@ -168 +168 @@
     $statement = __( 'Upgrading user engagements … %s', 'bbpress' );
     $result    = __( 'No engagements to upgrade.',             'bbpress' );
-    $total     = 0;
 
     // Delete previous engagements
@@ -181 +180 @@
     $pps = bbp_get_public_status_id();
     $cps = bbp_get_closed_status_id();
-    $sql = $bbp_db->prepare( "SELECT postmeta.meta_value, '_bbp_engagement', posts.post_author
-            FROM {$bbp_db->posts} AS posts
-            LEFT JOIN {$bbp_db->postmeta} AS postmeta
-                ON posts.ID = postmeta.post_id
-                AND postmeta.meta_key = '_bbp_topic_id'
-            WHERE posts.post_type IN (%s, %s)
-                AND posts.post_status IN (%s, %s)", $tpt, $rpt, $pps, $cps );
-
-    $engagements = $bbp_db->get_results( $sql );
+    $sql = $bbp_db->prepare( "INSERT INTO {$bbp_db->postmeta} (post_id, meta_key, meta_value) (
+            SELECT postmeta.meta_value, '_bbp_engagement', posts.post_author
+                FROM {$bbp_db->posts} AS posts
+                LEFT JOIN {$bbp_db->postmeta} AS postmeta
+                    ON posts.ID = postmeta.post_id
+                    AND postmeta.meta_key = '_bbp_topic_id'
+                WHERE posts.post_type IN (%s, %s)
+                    AND posts.post_status IN (%s, %s)
+                GROUP BY postmeta.meta_value, posts.post_author)", $tpt, $rpt, $pps, $cps );
+
+    $engagements = $bbp_db->query( $sql );
 
     // Bail if no closed topics found
@@ -196 +197 @@
     }
 
-    // Loop through each user's engagements
-    foreach ( $engagements as $meta ) {
-
-        // Skip if already exists
-        if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT * FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d LIMIT 1", $meta->meta_value, '_bbp_engagement', $meta->post_author ) ) ) {
-            continue;
-        }
-
-        // Add the post meta
-        $added = add_post_meta( $meta->meta_value, '_bbp_engagement', $meta->post_author, false );
-
-        // Bump counts if successfully added
-        if ( ! empty( $added ) ) {
-            ++$total;
-        }
-    }
-
-    // Cleanup
-    unset( $engagements, $added );
-
-    // Complete results
-    $result = sprintf( _n( 'Complete! %d engagements upgraded.', 'Complete! %d engagements upgraded.', $total, 'bbpress' ), $total );
+    // Complete results
+    $result = sprintf( _n( 'Complete! %d engagements upgraded.', 'Complete! %d engagements upgraded.', $engagements, 'bbpress' ), $engagements );
 
     return array( 0, sprintf( $statement, $result ) );