<!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>[179037] 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/179037">179037</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-23 16:24:26 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Perf dashboard always assigns the result of A/B testing with build request 1
https://bugs.webkit.org/show_bug.cgi?id=140382
Reviewed by Darin Adler.
The bug was caused by the expression array_get($report, 'jobId') or array_get($report, 'buildRequest')
which always evaluated to 1 when the report contained jobId. Fixed the bug by cascading array_get instead.
Also fixed a typo as well as a bug that reports were never associated with builds.
* public/include/report-processor.php:
(ReportProcessor::process): Don't use "or" to find the non-null value since that always evaluates to 1
instead of the first non-null value.
(ReportProcessor::resolve_build_id): Fixed the typo by adding the missing "$this->".
(ReportProcessor::commit): Associate the report with the corresponding build as intended.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicincludereportprocessorphp">trunk/Websites/perf.webkit.org/public/include/report-processor.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 (179036 => 179037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2015-01-24 00:21:15 UTC (rev 179036)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-01-24 00:24:26 UTC (rev 179037)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-23 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Perf dashboard always assigns the result of A/B testing with build request 1
+ https://bugs.webkit.org/show_bug.cgi?id=140382
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by the expression array_get($report, 'jobId') or array_get($report, 'buildRequest')
+ which always evaluated to 1 when the report contained jobId. Fixed the bug by cascading array_get instead.
+
+ Also fixed a typo as well as a bug that reports were never associated with builds.
+
+ * public/include/report-processor.php:
+ (ReportProcessor::process): Don't use "or" to find the non-null value since that always evaluates to 1
+ instead of the first non-null value.
+ (ReportProcessor::resolve_build_id): Fixed the typo by adding the missing "$this->".
+ (ReportProcessor::commit): Associate the report with the corresponding build as intended.
+
+2015-01-23 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Unreviewed typo fix. The prefix in triggerable_configurations is "trigconfig", not "trigrepo".
</span><span class="cx">
</span><span class="cx"> * public/admin/tests.php:
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicincludereportprocessorphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/include/report-processor.php (179036 => 179037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/include/report-processor.php 2015-01-24 00:21:15 UTC (rev 179036)
+++ trunk/Websites/perf.webkit.org/public/include/report-processor.php 2015-01-24 00:24:26 UTC (rev 179037)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Deprecate and unsupport "jobId".
</span><span class="cx"> $build_id = $this->resolve_build_id($build_data, array_get($report, 'revisions', array()),
</span><del>- array_get($report, 'jobId') or array_get($report, 'buildRequest'));
</del><ins>+ array_get($report, 'jobId', array_get($report, 'buildRequest')));
</ins><span class="cx">
</span><span class="cx"> $this->runs->commit($platform_id, $build_id);
</span><span class="cx"> }
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> $this->exit_with_error('FailedToInsertBuild', $build_data);
</span><span class="cx">
</span><span class="cx"> if ($build_request_id) {
</span><del>- if ($db->update_row('build_requests', 'request', array('id' => $build_request_id), array('status' => 'completed', 'build' => $build_id))
</del><ins>+ if ($this->db->update_row('build_requests', 'request', array('id' => $build_request_id), array('status' => 'completed', 'build' => $build_id))
</ins><span class="cx"> != $build_request_id)
</span><span class="cx"> $this->exit_with_error('FailedToUpdateBuildRequest', array('buildRequest' => $build_request_id, 'build' => $build_id));
</span><span class="cx"> }
</span><span class="lines">@@ -439,8 +439,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->db->query_and_get_affected_rows("UPDATE reports SET report_committed_at = CURRENT_TIMESTAMP AT TIME ZONE 'UTC'
- WHERE report_id = $1", array($this->report_id));
</del><ins>+ $this->db->query_and_get_affected_rows("UPDATE reports
+ SET (report_committed_at, report_build) = (CURRENT_TIMESTAMP AT TIME ZONE 'UTC', $2)
+ WHERE report_id = $1", array($this->report_id, $build_id));
</ins><span class="cx">
</span><span class="cx"> $this->db->commit_transaction() or $this->exit_with_error('FailedToCommitTransaction');
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>