Changeset 15875

Timestamp:

10/20/2010 08:22:14 PM (14 years ago)

Author:

ryan

Message:

Update network-wide active user and blog counts via a cron job to avoid costly count queries. see #15170

Location:

trunk/wp-includes

Files:

• ms-default-filters.php (modified) (2 diffs)
• ms-functions.php (modified) (5 diffs)

trunk/wp-includes/ms-default-filters.php

@@ -40 +40 @@
 add_action( 'publish_phone', 'wpmu_update_blogs_date' );
 add_action( 'publish_post', 'wpmu_update_blogs_date' );
+add_action( 'admin_init', 'wp_schedule_update_network_counts');
+add_action( 'update_network_counts', 'wp_update_network_counts');
 
 // Files
@@ -58 +60 @@
 add_filter( 'force_filtered_html_on_import', '__return_true' );
 
-
 // WP_HOME and WP_SITEURL should not have any effect in MS
 remove_filter( 'option_siteurl', '_config_wp_siteurl' );

trunk/wp-includes/ms-functions.php

@@ -149 +149 @@
  * The number of active users in your installation.
  *
- * This function also saves the count as a site option,
- * which speeds up future lookups.
+ * The count is cached and updated twice daily. This is not a live count.
  *
  * @since MU 2.7
@@ -158 +157 @@
  */
 function get_user_count() {
-    global $wpdb;
-
-    $count_ts = get_site_option( 'user_count_ts' );
-    if ( time() - $count_ts > 3600 ) {
-        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'") );
-        update_site_option( 'user_count', $count );
-        update_site_option( 'user_count_ts', time() );
-    }
-
-    $count = get_site_option( 'user_count' );
-
-    return $count;
+    return get_site_option( 'user_count' );
 }
 
@@ -175 +163 @@
  * The number of active sites on your installation.
  *
- * This function also saves the count as a site option,
- * which speeds up future lookups.
+ * The count is cached and updated twice daily. This is not a live count.
  *
  * @since MU 1.0
@@ -185 +172 @@
  */
 function get_blog_count( $id = 0 ) {
-    global $wpdb;
-
-    if ( $id == 0 )
-        $id = $wpdb->siteid;
-
-    $count_ts = get_site_option( 'blog_count_ts' );
-    if ( time() - $count_ts > 3600 ) {
-        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $id) );
-        update_site_option( 'blog_count', $count );
-        update_site_option( 'blog_count_ts', time() );
-    }
-
-    $count = get_site_option( 'blog_count' );
-
-    return $count;
+    return get_site_option( 'blog_count' );
 }
 
@@ -1534 +1507 @@
 }
 
+/**
+ * Schedule update of the network-wide counts for the current network.
+ *
+ * @since 3.1.0
+ */
+function wp_schedule_update_network_counts() {
+    if ( !is_main_site() )
+        return;
+
+    if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') )
+        wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+}
+
+/**
+ *  Update the network-wide counts for the current network.
+ *
+ *  @since 3.1.0
+ */
+function wp_update_network_counts() {
+    global $wpdb;
+
+    $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
+    update_site_option( 'blog_count', $count );
+
+    $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'") );
+    update_site_option( 'user_count', $count );
+}
+
 ?>