Changeset 8558

Timestamp:

03/30/2019 10:12:10 AM (7 years ago)

Author:

ocean90

Message:

Translate: Query variants of a locale in a more performant way.

Instead of querying for a specific list of projects, use the main WordPress core project (wp/dev) which is the canonical source for all available and active locales.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• wporg-gp-customizations/templates/locale-project.php (modified) (1 diff)
• wporg-gp-routes/inc/routes/class-locale.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php

@@ -117 +117 @@
         } else {
                 $stable_project_slug = in_array( 'stable', $sub_project_slugs, true ) ? 'stable' : 'dev';
-                $stable_project_name = 'stable' === $stable_project_slug ? 'Stable (latest release) ' : 'Development (trunk) ';
+                $stable_project_name = 'stable' === $stable_project_slug ? 'Stable (latest release)' : 'Development (trunk)';
                 $status              = $sub_project_statuses[ $stable_project_slug ];
                 ?>

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

@@ -134 +134 @@
                 }
 
-                $variants = $this->get_locale_variants( $locale_slug, $project_ids );
+                $variants = $this->get_locale_variants( $locale_slug );
                 // If there were no results for the current variant in the current project branch, it should still show it.
                 if ( ! in_array( $set_slug, $variants, true ) ) {
@@ -188 +188 @@
                 }
 
-                $sub_projects = $this->get_active_sub_projects( $sub_project, true );
-                $sub_project_slugs = array();
+                $sub_project_statuses = array();
+                $sub_projects         = $this->get_active_sub_projects( $sub_project, true );
                 if ( $sub_projects ) {
-                        $sub_project_ids      = array();
-                        $sub_project_statuses = array();
                         foreach ( $sub_projects as $key => $_sub_project ) {
-                                $sub_project_slugs[] = $_sub_project->slug;
-                                $status = $this->get_project_status( $_sub_project, $locale_slug, $set_slug, null, false );
-
-                                $sub_project_ids[] = $_sub_project->id;
-
-                                $sub_project_statuses[ $_sub_project->slug ] = $status;
-                        }
-
-                        $variants = $this->get_locale_variants( $locale_slug, $sub_project_ids );
-
-                        unset( $sub_project_ids );
-                } else {
-                        $variants = $this->get_locale_variants( $locale_slug, array( $sub_project->id ) );
-                }
+                                $sub_project_statuses[ $_sub_project->slug ] = $this->get_project_status(
+                                        $_sub_project,
+                                        $locale_slug,
+                                        $set_slug,
+                                        null,
+                                        false
+                                );
+                        }
+                }
+
+                $sub_project_slugs = array_keys( $sub_project_statuses );
+
+                $variants = $this->get_locale_variants( $locale_slug );
 
                 $locale_contributors = $this->get_locale_contributors( $sub_project, $locale_slug, $set_slug );
@@ -221 +218 @@
          * Whether a translation set slug exists for a locale.
          *
+         * For performance reasons, this checks the wp/dev project which is the canonical
+         * source for all available and active locales.
+         *
          * @param \GP_Locale $locale The locale.
          * @param string     $slug   The slug of a translation set.
@@ -226 +226 @@
          */
         private function translation_set_slug_exists( $locale, $slug ) {
-                /*$cache_key = "translation_set_slugs:{$locale->slug}";
-                $slugs = wp_cache_get( $cache_key, $this->cache_group );
-
-                if ( false === $slugs ) {
-                        global $wpdb;
-                        $slugs = $wpdb->get_col( $wpdb->prepare(
-                                "SELECT DISTINCT(slug) FROM {$wpdb->gp_translation_sets} WHERE locale = %s",
-                                $locale->slug
-                        ) );
-
-                        wp_cache_set( $cache_key, $slugs, $this->cache_group, DAY_IN_SECONDS );
-                }*/
-
-                // Hardcoded list because the query above doesn't perform well due to a missing index.
-                $slugs = [
-                        'default' => [
-                                'default',
-                        ],
-                        'ca' => [
-                                'default',
-                                'valencia',
-                        ],
-                        'de' => [
-                                'default',
-                                'formal',
-                        ],
-                        'de-ch' => [
-                                'default',
-                                'informal',
-                        ],
-                        'nl' => [
-                                'default',
-                                'formal',
-                        ],
-                        'pt' => [
-                                'default',
-                                'informal',
-                                'ao90',
-                        ],
-                ];
-
-                if ( isset( $slugs[ $locale->slug ] ) ) {
-                        return in_array( $slug, $slugs[ $locale->slug ], true );
-                }
-
-                return in_array( $slug, $slugs['default'], true );
+                global $wpdb;
+
+                $id = $wpdb->get_var( $wpdb->prepare(
+                        "SELECT id FROM {$wpdb->gp_translation_sets} WHERE locale = %s AND slug = %s AND project_id = %d",
+                        $locale->slug,
+                        $slug,
+                        2 // wp/dev
+                ) );
+
+                return null !== $id;
         }
 
@@ -346 +310 @@
 
         /**
-         * Retrieves non-default slugs of translation sets for a list of
-         * project IDs.
-         *
-         * @param string $locale     Slug of a GlotPress locale.
-         * @param array $project_ids List of project IDs.
-         * @return array List of non-default slugs.
-         */
-        private function get_locale_variants( $locale, $project_ids ) {
+         * Retrieves all slugs of translation sets for a locale.
+         *
+         * For performance reasons, this checks the wp/dev project which is the canonical
+         * source for all available and active locales.
+         *
+         * @param string $locale Slug of a GlotPress locale.
+         * @return array List of translation set slugs.
+         */
+        private function get_locale_variants( $locale ) {
                 global $wpdb;
 
-                $project_ids = implode( ',', $project_ids );
-                $slugs = $wpdb->get_col( $wpdb->prepare( "
-                        SELECT DISTINCT slug
-                        FROM {$wpdb->gp_translation_sets}
-                        WHERE
-                                project_id IN( $project_ids )
-                                AND locale = %s
-                ", $locale ) );
-
-                return $slugs;
+                return $wpdb->get_col( $wpdb->prepare(
+                        "SELECT slug FROM {$wpdb->gp_translation_sets} WHERE locale = %s AND project_id = %d",
+                        $locale,
+                        2 // wp/dev
+                ) );
         }