Changeset 11087 for trunk/src/bp-groups/classes/class-bp-groups-member.php

Timestamp:

09/13/2016 04:05:07 AM (10 years ago)

Author:

boonebgorges

Message:

Groups: Improve query efficiency for 'admins' and 'mods' properties of group objects.

Previously, the 'admins' and 'mods' property of BP_Groups_Group
objects were only populated when setting the 'populate_extras' flag.
Even then, the query used to populate these properties was uncached,
and required a join against a global table.

This changeset reworks the way that the 'admins' and 'mods' properties
are accessed and set. The properties are now marked protected, and
are accessible by magic __get(). When requested, the cache for the
both properties is set by a single pair of queries: one to fetch
membership data from the BP table, and one to get user objects from
WordPress. The BP table query is cached, and neither query takes place
if the property is never accessed.

This moves us a step closer to eliminating the populate_extras flag
on BP_Groups_Group objects.

See #5451.

File:

• trunk/src/bp-groups/classes/class-bp-groups-member.php (modified) (4 diffs)

trunk/src/bp-groups/classes/class-bp-groups-member.php

@@ -1044 +1044 @@
 
         if ( false === $group_admins ) {
-            self::prime_group_administrator_ids_cache( array( $group_id ) );
+            self::prime_group_admins_mods_cache( array( $group_id ) );
             $group_admins = wp_cache_get( $group_id, 'bp_group_admins' );
         }
@@ -1064 +1064 @@
      * @return bool True on success.
      */
-    public static function prime_group_administrator_ids_cache( $group_ids ) {
+    public static function prime_group_admins_mods_cache( $group_ids ) {
         global $wpdb;
 
@@ -1072 +1072 @@
             $bp = buddypress();
             $uncached_sql = implode( ',', array_map( 'intval', $uncached ) );
-            $group_admins = $wpdb->get_results( "SELECT user_id, group_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id IN ({$uncached_sql}) AND is_admin = 1 AND is_banned = 0" );
-
-            $groups = array();
-            if ( $group_admins ) {
-                foreach ( $group_admins as $group_admin ) {
-                    $admin_obj = new stdClass();
-                    $admin_obj->user_id = $group_admin->user_id;
-                    $admin_obj->date_modified = $group_admin->date_modified;
-                    $groups[ $group_admin->group_id ][] = $admin_obj;
-                }
-
-                foreach ( $groups as $this_group_id => $this_group_admins ) {
-                    wp_cache_set( $this_group_id, $this_group_admins, 'bp_group_admins' );
+            $group_admin_mods = $wpdb->get_results( "SELECT user_id, group_id, date_modified, is_admin, is_mod FROM {$bp->groups->table_name_members} WHERE group_id IN ({$uncached_sql}) AND ( is_admin = 1 OR is_mod = 1 ) AND is_banned = 0" );
+
+            $admins = $mods = array();
+            if ( $group_admin_mods ) {
+                foreach ( $group_admin_mods as $group_admin_mod ) {
+                    $obj = new stdClass();
+                    $obj->user_id = $group_admin_mod->user_id;
+                    $obj->date_modified = $group_admin_mod->date_modified;
+
+                    if ( $group_admin_mod->is_admin ) {
+                        $admins[ $group_admin_mod->group_id ][] = $obj;
+                    } else {
+                        $mods[ $group_admin_mod->group_id ][] = $obj;
+                    }
                 }
             }
+
+            // Prime cache for all groups, even those with no matches.
+            foreach ( $uncached as $group_id ) {
+                $group_admins = isset( $admins[ $group_id ] ) ? $admins[ $group_id ] : array();
+                wp_cache_set( $group_id, $group_admins, 'bp_group_admins' );
+
+                $group_mods = isset( $mods[ $group_id ] ) ? $mods[ $group_id ] : array();
+                wp_cache_set( $group_id, $group_mods, 'bp_group_mods' );
+            }
         }
     }
@@ -1101 +1111 @@
         global $wpdb;
 
-        $bp = buddypress();
-
-        $group_mods = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_mod = 1 AND is_banned = 0", $group_id ) );
+        $group_mods = wp_cache_get( $group_id, 'bp_group_mods' );
+
+        if ( false === $group_mods ) {
+            self::prime_group_admins_mods_cache( array( $group_id ) );
+            $group_mods = wp_cache_get( $group_id, 'bp_group_mods' );
+        }
 
         // Integer casting.