<!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>[185523] 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/185523">185523</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-12 15:49:21 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed build fix for merging platforms.
* public/admin/platforms.php:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (185522 => 185523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2015-06-12 22:08:46 UTC (rev 185522)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-06-12 22:49:21 UTC (rev 185523)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2015-06-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ Unreviewed build fix for merging platforms.
+
+ * public/admin/platforms.php:
+
</ins><span class="cx"> 2015-06-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix. Some builder names are really long.
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicadminplatformsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/admin/platforms.php (185522 => 185523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/admin/platforms.php 2015-06-12 22:08:46 UTC (rev 185522)
+++ trunk/Websites/perf.webkit.org/public/admin/platforms.php 2015-06-12 22:49:21 UTC (rev 185523)
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx">
</span><span class="cx"> // First, move all test runs to the test configurations in the destination for all test configurations that
</span><span class="cx"> // exist in both the original platform and the platform into which we're merging.
</span><del>- if (!$db->query_and_get_affected_rows('UPDATE test_runs SET run_config = destination.config_id
</del><ins>+ if ($db->query_and_get_affected_rows('UPDATE test_runs SET run_config = destination.config_id
</ins><span class="cx"> FROM test_configurations as merged, test_configurations as destination
</span><span class="cx"> WHERE merged.config_platform = $1 AND destination.config_platform = $2
</span><span class="cx"> AND run_config = merged.config_id
</span><span class="cx"> AND destination.config_type = merged.config_type
</span><del>- AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform))) {
</del><ins>+ AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform)) === FALSE) {
</ins><span class="cx"> $db->rollback_transaction();
</span><span class="cx"> return notice("Failed to migrate test runs for $platform_to_merge that have test configurations in $destination_platform.");
</span><span class="cx"> }
</span><span class="lines">@@ -35,6 +35,21 @@
</span><span class="cx"> return notice('Failed to migrate all test runs.');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ($db->query_and_get_affected_rows('UPDATE analysis_tasks SET task_platform = $1 WHERE task_platform = $2',
+ array($destination_platform, $platform_to_merge)) === FALSE) {
+ $db->rollback_transaction();
+ return notice('Failed to migrate analysis tasks.');
+ }
+
+ $db->query_and_get_affected_rows('DELETE FROM triggerable_configurations WHERE trigconfig_platform = $1',
+ array($platform_to_merge));
+
+ if ($db->query_and_get_affected_rows('UPDATE build_requests SET request_platform = $1 WHERE request_platform = $2',
+ array($destination_platform, $platform_to_merge)) === FALSE) {
+ $db->rollback_transaction();
+ return notice('Failed to migrate build requests.');
+ }
+
</ins><span class="cx"> $db->query_and_get_affected_rows('DELETE FROM platforms WHERE platform_id = $1', array($platform_to_merge));
</span><span class="cx"> $db->commit_transaction();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>