<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[9720] sites/trunk/wordpress.org/public_html/wp-content/plugins: 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.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9720">9720</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9720","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-04-14 04:55:52 +0000 (Tue, 14 Apr 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://meta.trac.wordpress.org/ticket/3155">#3155</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomstatsstatsprojectphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats/stats/project.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclassstatsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomstatsstatsprojectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats/stats/project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats/stats/project.php 2020-04-14 04:46:34 UTC (rev 9719)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats/stats/project.php 2020-04-14 04:55:52 UTC (rev 9720)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The datbase update is delayed until shutdown to bulk-update the database during imports.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * NOTE: The counts includes all sub-projects in the count, as that's more useful for querying (top-level projects excluded)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * for example, wp-plugins won't exist, but wp-plugins/akismet will include wp-plugins/akismet/stable wp-plugins/akismet/stable-readme
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * for example, wp-plugins/akismet will include wp-plugins/akismet/stable and wp-plugins/akismet/stable-readme
+ * wp-plugins and wp-themes are special top-level projects which are included here, where their string counts are updated
+ * on a twice-daily cron task.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @author dd32
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +28,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // DB Writes are delayed until shutdown to bulk-update the stats during imports
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'shutdown', array( $this, 'shutdown' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cron task to cache the wp-themes/wp-plugins string counts.
+ if ( ! wp_next_scheduled ( 'wporg_gp_stats_cache_waiting_strings' ) ) {
+ wp_schedule_event( time(), 'twicedaily', 'wporg_gp_stats_cache_waiting_strings' );
+ }
+ add_action( 'wporg_gp_stats_cache_waiting_strings', [ $this, 'cache_wp_themes_wp_plugins_strings' ] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->project_translation_status = $gp_table_prefix . 'project_translation_status';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Counts up all the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Count up all the strings
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_project_translation_counts( $project_id, $locale, $locale_slug, &$counts = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $counts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $counts = array( 'all' => 0, 'current' => 0, 'waiting' => 0, 'fuzzy' => 0, 'warnings' => 0, 'untranslated' => 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,6 +84,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $counts;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Cron task to cache the string counts for the wp-themes and wp-plugins parent categories.
+ *
+ * These don't have any translation sets, but we need to be able to query the waiting strings for them.
+ */
+ public function cache_wp_themes_wp_plugins_strings() {
+ global $wpdb;
+
+ $cached_projects = [
+ GP::$project->by_path( 'wp-plugins' ),
+ GP::$project->by_path( 'wp-themes' ),
+ ];
+
+ // Store the counts for these parent projects as the sum of their children.
+ $sql = "INSERT INTO {$wpdb->project_translation_status} ( `project_id`, `locale`, `locale_slug`, `all`, `current`, `waiting`, `fuzzy`, `warnings`, `untranslated`, `date_added`, `date_modified`)
+ SELECT
+ p.parent_project_id as project_id,
+ locale, locale_slug,
+ SUM( stats.all ) as `all`, SUM( stats.current ) as `current`, SUM( stats.waiting ) as `waiting`,
+ SUM( stats.fuzzy ) as `fuzzy`, SUM( stats.warnings ) as `warnings`, SUM( stats.untranslated ) as `untranslated`,
+ NOW() as `date_added`, NOW() as `date_modified`
+ 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
+ ON DUPLICATE KEY UPDATE
+ `all` = VALUES(`all`), `current` = VALUES(`current`),
+ `waiting` = VALUES(`waiting`), `fuzzy` = VALUES(`fuzzy`),
+ `warnings` = VALUES(`warnings`), `untranslated` = VALUES(`untranslated`),
+ `date_modified` = VALUES(`date_modified`);
+ ";
+
+ foreach ( $cached_projects as $project ) {
+ $wpdb->query( $wpdb->prepare( $sql, $project->id ) );
+ }
+
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function shutdown() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $values = array();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php 2020-04-14 04:46:34 UTC (rev 9719)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php 2020-04-14 04:55:52 UTC (rev 9720)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,8 +46,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gp_locale_glossary_path_prefix', [ $this, 'set_locale_glossary_path_prefix' ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', [ $this, 'respect_robots_txt' ], 9 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- add_action( 'init', [ $this, 'cron_tasks' ] );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,16 +60,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Some pages rely upon a regular cron task to update the stats rather than live updates.
- */
- function cron_tasks() {
- if ( ! wp_next_scheduled ( 'wporg_gp_stats_cache_waiting_strings' ) ) {
- wp_schedule_event( time(), 'twicedaily', 'wporg_gp_stats_cache_waiting_strings' );
- }
- add_action( 'wporg_gp_stats_cache_waiting_strings', [ __NAMESPACE__ . '\Routes\Stats', 'cache_waiting_strings' ] );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Changes the path prefix for a locale glossary to '/locale'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string '/locale'
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclassstatsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php 2020-04-14 04:46:34 UTC (rev 9719)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php 2020-04-14 04:55:52 UTC (rev 9720)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,53 +13,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Stats extends GP_Route {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * 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 );
- }
-
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function get_stats_overview() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = "SELECT
</span><span class="cx" style="display: block; padding: 0 10px"> path, locale, locale_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> (100 * stats.current/stats.all) as percent_complete,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- stats.waiting+stats.fuzzy as waiting_strings
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ stats.waiting+stats.fuzzy as waiting_strings,
+ stats.date_modified as last_modified
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->project_translation_status} stats
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +78,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $percent_complete = ( $percent_complete > 50 ) ? floor( $percent_complete ) : ceil( $percent_complete );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_locale_statuses[ $locale_key ][ $set->path ] = $percent_complete;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $translation_locale_statuses[ $locale_key ]['waiting'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_locale_statuses[ $locale_key ]['waiting'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,19 +92,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $rows, $locale_key, $set );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Calculate a list of [Locale] = % subtotals
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_locale_complete = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $translation_locale_statuses as $locale => $sets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $sets['waiting'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $sets['waiting'], $sets['wp-plugins'], $sets['wp-themes'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $sets_count = count( $sets );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $sets_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_locale_complete[ $locale ] = round( array_sum( $sets ) / $sets_count, 3 );
</span></span></pre>
</div>
</div>
</body>
</html>