<!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>[194085] trunk/Websites/perf.webkit.org</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 { 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">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194085">194085</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-14 18:59:36 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Perf dashboard can't merge when the destination platform is missing baseline/target
https://bugs.webkit.org/show_bug.cgi?id=152286
Reviewed by Stephanie Lewis.
The bug was caused by the query to migrate test configurations to new platform checking
configuration type and metric separately; that is, it assumes the configuration exists
only if either the same type or the same metric exists in the destination.
Fixed the bug by checking both conditions simultaneously for each configuration.
* public/admin/platforms.php:
* tests/admin-platforms.js: Added a test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicadminplatformsphp">trunk/Websites/perf.webkit.org/public/admin/platforms.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtestsadminplatformsjs">trunk/Websites/perf.webkit.org/tests/admin-platforms.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (194084 => 194085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2015-12-15 02:15:06 UTC (rev 194084)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-12-15 02:59:36 UTC (rev 194085)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ Perf dashboard can't merge when the destination platform is missing baseline/target
+ https://bugs.webkit.org/show_bug.cgi?id=152286
+
+ Reviewed by Stephanie Lewis.
+
+ The bug was caused by the query to migrate test configurations to new platform checking
+ configuration type and metric separately; that is, it assumes the configuration exists
+ only if either the same type or the same metric exists in the destination.
+
+ Fixed the bug by checking both conditions simultaneously for each configuration.
+
+ * public/admin/platforms.php:
+ * tests/admin-platforms.js: Added a test.
+
</ins><span class="cx"> 2015-12-11 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Perf dashboard's buildbot sync config JSON duplicates too much information
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicadminplatformsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/admin/platforms.php (194084 => 194085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/admin/platforms.php 2015-12-15 02:15:06 UTC (rev 194084)
+++ trunk/Websites/perf.webkit.org/public/admin/platforms.php 2015-12-15 02:59:36 UTC (rev 194085)
</span><span class="lines">@@ -21,9 +21,11 @@
</span><span class="cx">
</span><span class="cx"> // Then migrate test configurations that don't exist in the destination platform to the new platform
</span><span class="cx"> // so that test runs associated with those configurations are moved to the destination.
</span><del>- 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)
- OR config_type NOT IN (SELECT config_type FROM test_configurations WHERE config_platform = $2))',
</del><ins>+ if ($db->query_and_get_affected_rows('UPDATE test_configurations as merged SET config_platform = $2
+ WHERE config_platform = $1 AND NOT EXISTS (SELECT * FROM test_configurations as destination WHERE
+ merged.config_platform = $1 AND destination.config_platform = $2
+ AND destination.config_type = merged.config_type
+ AND destination.config_metric = merged.config_metric)',
</ins><span class="cx"> array($platform_to_merge, $destination_platform)) === FALSE) {
</span><span class="cx"> $db->rollback_transaction();
</span><span class="cx"> return notice("Failed to migrate test configurations for $platform_to_merge.");
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtestsadminplatformsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tests/admin-platforms.js (194084 => 194085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tests/admin-platforms.js 2015-12-15 02:15:06 UTC (rev 194084)
+++ trunk/Websites/perf.webkit.org/tests/admin-platforms.js 2015-12-15 02:59:36 UTC (rev 194085)
</span><span class="lines">@@ -89,4 +89,34 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ it("should move test configurations from the merged platform to the destination platform", function () {
+ reportsForDifferentPlatforms[0]['tests'] = {"test": { "metrics": {"FrameRate": { "baseline": [[1, 1, 1], [1, 1, 1]] } } } };
+ submitReport(reportsForDifferentPlatforms, function () {
+ var queryForConfig = 'SELECT * from test_configurations, platforms, test_metrics'
+ + ' where config_platform = platform_id and config_metric = metric_id and platform_name in ($1, $2) order by config_id';
+ queryAndFetchAll(queryForConfig, [reportsForDifferentPlatforms[0]['platform'], reportsForDifferentPlatforms[2]['platform']], function (configs) {
+ assert.equal(configs.length, 2);
+ assert.equal(configs[0]['platform_name'], reportsForDifferentPlatforms[0]['platform']);
+ assert.equal(configs[0]['metric_name'], 'FrameRate');
+ assert.equal(configs[0]['config_type'], 'baseline');
+ assert.equal(configs[1]['platform_name'], reportsForDifferentPlatforms[2]['platform']);
+ assert.equal(configs[1]['metric_name'], 'FrameRate');
+ assert.equal(configs[1]['config_type'], 'current');
+ httpPost('/admin/platforms.php', {'action': 'merge', 'id': configs[0]['platform_id'], 'destination': configs[1]['platform_id']}, function (response) {
+ assert.equal(response.statusCode, 200);
+ queryAndFetchAll(queryForConfig, [reportsForDifferentPlatforms[0]['platform'], reportsForDifferentPlatforms[2]['platform']], function (newConfigs) {
+ assert.equal(newConfigs.length, 2);
+ assert.equal(newConfigs[0]['platform_name'], reportsForDifferentPlatforms[2]['platform']);
+ assert.equal(newConfigs[0]['metric_name'], 'FrameRate');
+ assert.equal(newConfigs[0]['config_type'], 'baseline');
+ assert.equal(newConfigs[1]['platform_name'], reportsForDifferentPlatforms[2]['platform']);
+ assert.equal(newConfigs[1]['metric_name'], 'FrameRate');
+ assert.equal(newConfigs[1]['config_type'], 'current');
+ notifyDone();
+ });
+ });
+ });
+ });
+ });
+
</ins><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>