Changeset 11371

Timestamp:

12/15/2021 02:47:05 AM (2 years ago)

Author:

dd32

Message:

SVN Watcher: Some performance improvements for the admin view & reports.

This reduces the queries by removing oEmbed processing of commit messages, caching users in bulk, avoiding PHP Notices, documenting some things, skipping the UI if revisions/props aren't imported for a SVN.

See #5978.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher

Files:

• admin/list-table.php (modified) (1 diff)
• admin/reports-page.php (modified) (1 diff)
• admin/ui.php (modified) (3 diffs)
• svn.php (modified) (3 diffs)
• trac-watch.php (modified) (3 diffs)
• trac.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/list-table.php

@@ -125 +125 @@
             ORDER BY user_id IS NULL DESC, LENGTH(prop_name) DESC"
         );
+
+        // Fill user caches, some commits have a lot of props, yay! :)
+        $unique_user_ids = array_map( 'intval', array_filter( array_unique( wp_list_pluck( $props_list, 'user_id' ) ) ) );
+        if ( $unique_user_ids ) {
+            cache_users( $unique_user_ids );
+        }
 
         foreach ( $this->items as $i => $details ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php

@@ -13 +13 @@
     // Default to the latest version for core.
     if ( $is_core && is_null( $version ) ) {
-        $version = sprintf( '%.1f', WP_CORE_LATEST_RELEASE + 0.1 );
+        $version = sprintf( '%.1f', floatval( WP_CORE_LATEST_RELEASE ) + 0.1 );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/ui.php

@@ -22 +22 @@
 
     foreach ( $svns as $slug => $details ) {
+        // No point showing this UI if we're not importing Props.
+        if ( empty( $details['props_table'] ) ) {
+            continue;
+        }
+
         $name = sprintf( "%s Props", $details['name'] );
         $hook = add_menu_page(
@@ -36 +41 @@
         $hook = add_submenu_page(
             'props-edit-' . $slug,
-            'Reports', 'Reports',
+            'Reports',
+            'Reports',
             'edit_posts',
             'props-reports-' . $slug,
@@ -58 +64 @@
 
     // Run the import upon loading the page if it hasn't run recently.
-    if ( wp_next_scheduled( 'import_revisions_from_svn' ) < time() + 5*MINUTE_IN_SECONDS ) {
-        ob_start();
+    if ( get_site_transient( 'import_revisions_from_svn' ) < time() - 5*MINUTE_IN_SECONDS ) {
         do_action( 'import_revisions_from_svn' );
-        ob_end_clean();
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/svn.php

@@ -7 +7 @@
 
 add_action( 'import_revisions_from_svn', function() {
+    set_site_transient( 'import_revisions_from_svn', time() );
+
     foreach ( get_svns() as $svn ) {
         import_revisions( $svn );
@@ -38 +40 @@
     $svn_url     = $svn['url'];
     $slug        = $svn['slug'];
-    $db_table    = $svn['rev_table'];
+    $db_table    = $svn['rev_table'] ?? false;
     $props_table = $svn['props_table'] ?? false;
+
+    // If this SVN doesn't have a rev_table defined, it's not being imported currently.
+    if ( ! $db_table ) {
+        return false;
+    }
 
     $last_revision = $wpdb->get_var( "SELECT max(id) FROM {$db_table}" );
@@ -74 +81 @@
             continue;
         }
-
-        echo "Importing {$id} \n";
 
         $paths  = (array) $change->paths->path;

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/trac-watch.php

@@ -3 +3 @@
 /**
  * Plugin Name: WordPress.org Trac & SVN Watcher.
+ * Description: This plugin imports Trac activity & SVN activity into WordPress.org databases. Trac actions for Profiles, and SVN activity for reporting, profiles, and make.w.org/* reporting.
+ * Version: 1.0
+ * Author: Dion Hulse
  */
 
@@ -60 +63 @@
         KEY `category` (`category`),
         KEY `username` (`username`)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"; // UTF8, but treated as latin1, due to historical profiles reasons.
 
     $revisions_table = "CREATE TABLE IF NOT EXISTS `%s` (
@@ -86 +89 @@
     ) ENGINE=InnoDB DEFAULT CHARSET=latin1;";
 
-    return; // TODO
     foreach ( SVN\get_svns() as $prefix => $info ) {
         $wpdb->query( sprintf( $trac_table, 'trac_' . $prefix ) );

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/trac.php

@@ -8 +8 @@
 function format_trac_markup( $message ) {
     $message = esc_html( $message );
+
+    // Convert some Trac markdown to HTML.
     $message = preg_replace( '!`(.*?)`!i', '<code>$1</code>', $message );
     $message = preg_replace( '!{{{(.*?)}}}!sm', '<code>$1</code>', $message );
-
     $message = preg_replace( '!\[([^] ]+) ([^]]+)\]!i', '<a href="$1">$2</a>', $message );
 
-    // Escape shortcodes, but that takes out changesets..
-    // $message = str_replace( [ '[', ']'], [ '[[', ']]' ], $message );
+    // Mark up the text, using functions we want, rather than `the_content` as it has many filters that don't strictly apply.
+    $message = wptexturize( $message );
+    $message = wpautop( $message );
+    $message = make_clickable( $message );
 
-    // Might need to disable this, or escape more things prior to it.
-    $message = apply_filters( 'the_content', $message );
-    $message = make_clickable( $message );
+    // Link tickets and changesets.
+    if ( function_exists( 'markup_wporg_links' ) ) {
+        $message = markup_wporg_links( $message );
+    }
+
+    // Ensure nothing funny is in the output.
+    $message = wp_kses_post( $message );
 
     return $message;