Merging platforms mixes baselines and targets into reported data

https://bugs.webkit.org/show_bug.cgi?id=135260

Reviewed by Andreas Kling.

When merging two platforms, move test configurations of a different type (baseline, target)
as well as of different metric (Time, Runs).

Also avoid fetching the entire table of runs just to see if there are no remaining runs.
It's sufficient to detect one such test_runs object.

* public/admin/platforms.php:
(merge_platforms):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172410 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index f385f4620fa92c49a1d8ba16a80efeef5d02f0a4..eaaaa84268a99616d2eaf059f36f4dcfaa987600 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,19 @@
+2014-08-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Merging platforms mixes baselines and targets into reported data
+        https://bugs.webkit.org/show_bug.cgi?id=135260
+
+        Reviewed by Andreas Kling.
+
+        When merging two platforms, move test configurations of a different type (baseline, target)
+        as well as of different metric (Time, Runs).
+
+        Also avoid fetching the entire table of runs just to see if there are no remaining runs.
+        It's sufficient to detect one such test_runs object.
+
+        * public/admin/platforms.php:
+        (merge_platforms):
+
 2014-07-30  Ryosuke Niwa  <rniwa@webkit.org>
 
         Merging platforms mixes baselines and targets into reported data

diff --git a/Websites/perf.webkit.org/public/admin/platforms.php b/Websites/perf.webkit.org/public/admin/platforms.php
index 2c676684970fd1379af7954423e090809edc8f30..4cc87ac6a1a58b80b474e8401f2a588feef5022c 100644 (file)
--- a/Websites/perf.webkit.org/public/admin/platforms.php
+++ b/Websites/perf.webkit.org/public/admin/platforms.php
@@ -22,13 +22,14 @@ function merge_platforms($platform_to_merge, $destination_platform) {
     // Then migrate test configurations that don't exist in the destination platform to the new platform
     // so that test runs associated with those configurations are moved to the destination.
     if ($db->query_and_get_affected_rows('UPDATE test_configurations SET config_platform = $2
-        WHERE config_platform = $1 AND config_metric NOT IN (SELECT config_metric FROM test_configurations WHERE config_platform = $2)',
+        WHERE config_platform = $1 AND (config_metric NOT IN (SELECT config_metric FROM test_configurations WHERE config_platform = $2)
+            OR config_type NOT IN (SELECT config_type FROM test_configurations WHERE config_platform = $2))',
         array($platform_to_merge, $destination_platform)) === FALSE) {
         $db->rollback_transaction();
         return notice("Failed to migrate test configurations for $platform_to_merge.");
     }
 
-    if ($db->query_and_fetch_all('SELECT * FROM test_runs, test_configurations WHERE run_config = config_id AND config_platform = $1', array($platform_to_merge))) {
+    if ($db->query_and_fetch_all('SELECT * FROM test_runs, test_configurations WHERE run_config = config_id AND config_platform = $1 LIMIT 1', array($platform_to_merge))) {
         // We should never reach here.
         $db->rollback_transaction();
         return notice('Failed to migrate all test runs.');