Changeset 9720 for sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php

Timestamp:

04/14/2020 04:55:52 AM (6 years ago)

Author:

dd32

Message:

Translate: Move the stats generation for /stats from the Stats screen router to the Custom Stats plugin, store the data in the project translation status table rather than the options.

This also avoids the query-timeout problems by running the query as a INSERT INTO ... SELECT FROM which should be more resiliant to timeouts.

See #3155.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php

@@ -13 +13 @@
  */
 class Stats extends GP_Route {
-
-        /**
-         * Cache some expensive queries to be run on a Cron task.
-         */
-        public function cache_waiting_strings() {
-                global $wpdb;
-
-                // Run the query on a primary DB server to avoid timing out.
-                if ( method_exists( $qpdb, 'send_reads_to_masters' ) ) {
-                        $wpdb->send_reads_to_masters();
-                }
-
-                $cached_projects = [
-                        GP::$project->by_path( 'wp-plugins' ),
-                        GP::$project->by_path( 'wp-themes' ),
-                ];
-                $sql = "SELECT
-                                locale, locale_slug,
-                                SUM( stats.waiting ) + SUM( stats.fuzzy ) as waiting_strings
-                        FROM {$wpdb->project_translation_status} stats
-                                LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
-                        WHERE
-                                p.parent_project_id = %d
-                                AND p.active = 1
-                        GROUP BY locale, locale_slug";
-
-                foreach ( $cached_projects as $project ) {
-                        $rows = $wpdb->get_results( $wpdb->prepare( $sql, $project->id ) );
-                        if ( ! $rows ) {
-                                continue;
-                        }
-
-                        $cached_data = [];
-                        foreach ( $rows as $set ) {
-                                $locale_key = $set->locale;
-                                if ( 'default' != $set->locale_slug ) {
-                                        $locale_key = $set->locale . '/' . $set->locale_slug;
-                                }
-        
-                                $cached_data[ $locale_key ] = (int) $set->waiting_strings;
-                        }
-                        $cached_data[ 'last_updated' ] = time();
-
-                        update_option( __CLASS__ . '_cached_waiting_' . $project->slug, $cached_data, false );
-                }
-
-        }
 
         public function get_stats_overview() {
@@ -100 +53 @@
                                 path, locale, locale_slug,
                                 (100 * stats.current/stats.all) as percent_complete,
-                                stats.waiting+stats.fuzzy as waiting_strings
+                                stats.waiting+stats.fuzzy as waiting_strings,
+                                stats.date_modified as last_modified
                         FROM {$wpdb->project_translation_status} stats
                                 LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
@@ -125 +79 @@
                         $translation_locale_statuses[ $locale_key ][ $set->path ] = $percent_complete;
 
+                        // Don't include these in the 'waiting' section, override the value to be waiting strings w/ Date Modified.
+                        if ( 'wp-plugins' === $set->path || 'wp-themes' === $set->path ) {
+                                $translation_locale_statuses[ $locale_key ][ $set->path ] = $set->waiting_strings;
+                                $projects[ $set->path ]->cache_last_updated = $set->last_modified;
+                                continue;
+                        }
+
                         if ( ! isset( $translation_locale_statuses[ $locale_key ]['waiting'] ) ) {
                                 $translation_locale_statuses[ $locale_key ]['waiting'] = 0;
@@ -131 +92 @@
                 }
                 unset( $rows, $locale_key, $set );
-
-                // Append the Plugins/Themes waiting strings
-                foreach ( [ 'wp-plugins', 'wp-themes' ] as $project_slug ) {
-                        $cached_data = get_option( __CLASS__ . '_cached_waiting_' . $project_slug, [] );
-                        $projects[ $project_slug ]->cache_last_updated = gmdate( 'Y-m-d H:i:s \U\T\C', $cached_data['last_updated'] );
-                        foreach ( $cached_data as $locale => $waiting ) {
-                                $translation_locale_statuses[ $locale ][ $project_slug ] = $waiting;
-                        }
-                }
 
                 // Calculate a list of [Locale] = % subtotals
                 $translation_locale_complete = array();
                 foreach ( $translation_locale_statuses as $locale => $sets ) {
-                        unset( $sets['waiting'] );
+                        unset( $sets['waiting'], $sets['wp-plugins'], $sets['wp-themes'] );
                         $sets_count = count( $sets );
                         if ( $sets_count ) {