Changeset 13146 for trunk/src/bp-activity/classes/class-bp-activity-activity.php

Timestamp:

11/13/2021 03:16:36 PM (3 years ago)

Author:

imath

Message:

Add a new param to bp_activity_get() to only get the number of items

Using the count_total_only parameter with bp_activity_get() will only run the query to count the number of activity items. Using this new parameter into the Activity WP Admin Screen improves the performance of the query to get the total number of activities.

Props oztaser

Fixes #8591

File:

• trunk/src/bp-activity/classes/class-bp-activity-activity.php (modified) (10 diffs)

trunk/src/bp-activity/classes/class-bp-activity-activity.php

@@ -342 +342 @@
      * @since 2.4.0 Introduced the `$fields` parameter.
      * @since 2.9.0 Introduced the `$order_by` parameter.
+     * @since 10.0.0 Introduced the `$count_total_only` parameter.
      *
      * @see BP_Activity_Activity::get_filter_sql() for a description of the
@@ -373 +374 @@
      *     @type string|bool  $count_total       If true, an additional DB query is run to count the total activity items
      *                                           for the query. Default: false.
+     *     @type bool         $count_total_only  If true, only the DB query to count the total activity items is run.
+     *                                           Default: false.
      * }
      * @return array The array returned has two keys:
@@ -436 +439 @@
                 'update_meta_cache' => true,            // Whether or not to update meta cache.
                 'count_total'       => false,           // Whether or not to use count_total.
+                'count_total_only'  => false,           // Whether to only get the total count.
             )
         );
@@ -630 +634 @@
         );
 
+        // Init the activity list.
+        $activities     = array();
+        $only_get_count = (bool) $r['count_total_only'];
+
         /**
          * Filters if BuddyPress should use legacy query structure over current structure for version 2.0+.
@@ -641 +649 @@
          * @param array                $r     Parsed arguments passed into method.
          */
-        if ( apply_filters( 'bp_use_legacy_activity_query', false, __METHOD__, $r ) ) {
+        if ( ! $only_get_count && apply_filters( 'bp_use_legacy_activity_query', false, __METHOD__, $r ) ) {
 
             // Legacy queries joined against the user table.
@@ -693 +701 @@
             }
 
-        } else {
+        } elseif ( ! $only_get_count ) {
             // Query first for activity IDs.
             $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY {$order_by} {$sort}, a.id {$sort}";
@@ -746 +754 @@
         }
 
-        if ( 'ids' !== $r['fields'] ) {
+        if ( $activities && 'ids' !== $r['fields'] ) {
             // Get the fullnames of users so we don't have to query in the loop.
             $activities = self::append_user_fullnames( $activities );
@@ -773 +781 @@
         $retval['activities'] = $activities;
 
-        // If $max is set, only return up to the max results.
-        if ( ! empty( $r['count_total'] ) ) {
-
+        // Only query the count total if requested.
+        if ( ! empty( $r['count_total'] ) || $only_get_count ) {
             /**
              * Filters the total activities MySQL statement.
@@ -786 +793 @@
              */
             $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$join_sql} {$where_sql}", $where_sql, $sort );
+
+            /*
+             * Queries that include 'last_activity' are cached separately,
+             * since they are generally much less long-lived.
+             */
+            if ( preg_match( '/a\.type NOT IN \([^\)]*\'last_activity\'[^\)]*\)/', $total_activities_sql ) ) {
+                $cache_group = 'bp_activity';
+            } else {
+                $cache_group = 'bp_activity_with_last_activity';
+            }
+
             $cached = bp_core_get_incremented_cache( $total_activities_sql, $cache_group );
             if ( false === $cached ) {
@@ -794 +812 @@
             }
 
-            if ( !empty( $r['max'] ) ) {
+            // If $max is set, only return up to the max results.
+            if ( ! empty( $r['max'] ) ) {
                 if ( (int) $total_activities > (int) $r['max'] ) {
                     $total_activities = $r['max'];