<!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>[194088] 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/194088">194088</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-14 20:06:44 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Using fake timestamp in OS version make some results invisible
https://bugs.webkit.org/show_bug.cgi?id=152289
Reviewed by Stephanie Lewis.
Added commit_order column to explicitly order OS versions. This fixes the bug whereby which
baseline results reported with only OS versions are shown with x coordinate set to 10 years ago.
To migrate the existing database, run:
ALTER TABLE commits ADD COLUMN commit_order integer;
CREATE INDEX commit_order_index ON commits(commit_order);
Then for each repository $1,
UPDATE commits SET (commit_time, commit_order) = (NULL, CAST(EXTRACT(epoch from commit_time) as integer))
WHERE commit_repository = $1;
* init-database.sql: Added the column.
* public/api/commits.php:
(fetch_commits_between): Use commit_order to order commits when commit_time is missing.
* public/api/report-commits.php:
(main): Set commit_order.
* tools/pull-os-versions.py:
(OSBuildFetcher.fetch_and_report_new_builds):
(OSBuildFetcher._assign_order): Renamed from _assign_fake_timestamps. Set the order instead of a fake timestmap.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorginitdatabasesql">trunk/Websites/perf.webkit.org/init-database.sql</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicapicommitsphp">trunk/Websites/perf.webkit.org/public/api/commits.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicapireportcommitsphp">trunk/Websites/perf.webkit.org/public/api/report-commits.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolspullosversionspy">trunk/Websites/perf.webkit.org/tools/pull-os-versions.py</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 (194087 => 194088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2015-12-15 03:51:42 UTC (rev 194087)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-12-15 04:06:44 UTC (rev 194088)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-12-14 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Using fake timestamp in OS version make some results invisible
+ https://bugs.webkit.org/show_bug.cgi?id=152289
+
+ Reviewed by Stephanie Lewis.
+
+ Added commit_order column to explicitly order OS versions. This fixes the bug whereby which
+ baseline results reported with only OS versions are shown with x coordinate set to 10 years ago.
+
+ To migrate the existing database, run:
+ ALTER TABLE commits ADD COLUMN commit_order integer;
+ CREATE INDEX commit_order_index ON commits(commit_order);
+
+ Then for each repository $1,
+ UPDATE commits SET (commit_time, commit_order) = (NULL, CAST(EXTRACT(epoch from commit_time) as integer))
+ WHERE commit_repository = $1;
+
+
+ * init-database.sql: Added the column.
+ * public/api/commits.php:
+ (fetch_commits_between): Use commit_order to order commits when commit_time is missing.
+ * public/api/report-commits.php:
+ (main): Set commit_order.
+ * tools/pull-os-versions.py:
+ (OSBuildFetcher.fetch_and_report_new_builds):
+ (OSBuildFetcher._assign_order): Renamed from _assign_fake_timestamps. Set the order instead of a fake timestmap.
+
+2015-12-14 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Perf dashboard can't merge when the destination platform is missing baseline/target
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152286
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorginitdatabasesql"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/init-database.sql (194087 => 194088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/init-database.sql 2015-12-15 03:51:42 UTC (rev 194087)
+++ trunk/Websites/perf.webkit.org/init-database.sql 2015-12-15 04:06:44 UTC (rev 194088)
</span><span class="lines">@@ -87,11 +87,13 @@
</span><span class="cx"> commit_revision varchar(64) NOT NULL,
</span><span class="cx"> commit_parent integer REFERENCES commits ON DELETE CASCADE,
</span><span class="cx"> commit_time timestamp,
</span><ins>+ commit_order integer,
</ins><span class="cx"> commit_committer integer REFERENCES committers ON DELETE CASCADE,
</span><span class="cx"> commit_message text,
</span><span class="cx"> commit_reported boolean NOT NULL DEFAULT FALSE,
</span><span class="cx"> CONSTRAINT commit_in_repository_must_be_unique UNIQUE(commit_repository, commit_revision));
</span><span class="cx"> CREATE INDEX commit_time_index ON commits(commit_time);
</span><ins>+CREATE INDEX commit_order_index ON commits(commit_order);
</ins><span class="cx">
</span><span class="cx"> CREATE TABLE build_commits (
</span><span class="cx"> commit_build integer NOT NULL REFERENCES builds ON DELETE CASCADE,
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapicommitsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/api/commits.php (194087 => 194088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/commits.php 2015-12-15 03:51:42 UTC (rev 194087)
+++ trunk/Websites/perf.webkit.org/public/api/commits.php 2015-12-15 04:06:44 UTC (rev 194088)
</span><span class="lines">@@ -79,11 +79,18 @@
</span><span class="cx"> $second_commit = commit_from_revision($db, $repository_id, $second);
</span><span class="cx"> $first = $first_commit['commit_time'];
</span><span class="cx"> $second = $second_commit['commit_time'];
</span><ins>+ $column_name = 'commit_time';
+ if (!$first || !$second) {
+ $first = $first_commit['commit_order'];
+ $second = $second_commit['commit_order'];
+ $column_name = 'commit_order';
+ }
+
</ins><span class="cx"> $in_order = $first < $second;
</span><span class="cx"> array_push($values, $in_order ? $first : $second);
</span><del>- $statements .= ' AND commit_time >= $' . count($values);
</del><ins>+ $statements .= ' AND ' . $column_name . ' >= $' . count($values);
</ins><span class="cx"> array_push($values, $in_order ? $second : $first);
</span><del>- $statements .= ' AND commit_time <= $' . count($values);
</del><ins>+ $statements .= ' AND ' . $column_name . ' <= $' . count($values);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($keyword) {
</span><span class="lines">@@ -95,7 +102,7 @@
</span><span class="cx"> AND ((committer_name LIKE $keyword_index OR committer_account LIKE $keyword_index) OR commit_revision = $revision_index)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $commits = $db->query_and_fetch_all($statements . ' ORDER BY commit_time', $values);
</del><ins>+ $commits = $db->query_and_fetch_all($statements . ' ORDER BY commit_time, commit_order', $values);
</ins><span class="cx"> if (!is_array($commits))
</span><span class="cx"> exit_with_error('FailedToFetchCommits', array('repository' => $repository_id, 'first' => $first, 'second' => $second));
</span><span class="cx"> foreach ($commits as &$commit)
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapireportcommitsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/api/report-commits.php (194087 => 194088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/report-commits.php 2015-12-15 03:51:42 UTC (rev 194087)
+++ trunk/Websites/perf.webkit.org/public/api/report-commits.php 2015-12-15 04:06:44 UTC (rev 194088)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> 'repository' => $repository_id,
</span><span class="cx"> 'revision' => $commit_info['revision'],
</span><span class="cx"> 'parent' => $parent_id,
</span><ins>+ 'order' => array_get($commit_info, 'order'),
</ins><span class="cx"> 'time' => array_get($commit_info, 'time'),
</span><span class="cx"> 'committer' => $committer_id,
</span><span class="cx"> 'message' => array_get($commit_info, 'message'),
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolspullosversionspy"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/pull-os-versions.py (194087 => 194088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/pull-os-versions.py 2015-12-15 03:51:42 UTC (rev 194087)
+++ trunk/Websites/perf.webkit.org/tools/pull-os-versions.py 2015-12-15 04:06:44 UTC (rev 194088)
</span><span class="lines">@@ -64,14 +64,14 @@
</span><span class="cx"> print 'Found %d builds' % len(available_builds)
</span><span class="cx">
</span><span class="cx"> available_builds = filter(lambda commit: commit['revision'] not in reported_revisions, available_builds)
</span><del>- self._assign_fake_timestamps(available_builds)
</del><ins>+ self._assign_order(available_builds)
</ins><span class="cx">
</span><span class="cx"> print "Submitting %d builds" % len(available_builds)
</span><span class="cx"> submit_commits(available_builds, server_config['server']['url'], server_config['slave']['name'], server_config['slave']['password'])
</span><span class="cx"> reported_revisions |= set(map(lambda commit: commit['revision'], available_builds))
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><del>- def _assign_fake_timestamps(builds):
</del><ins>+ def _assign_order(builds):
</ins><span class="cx"> build_name_regex = re.compile(r'(?P<major>\d+)(?P<kind>\w)(?P<minor>\d+)(?P<variant>\w*)')
</span><span class="cx"> for commit in builds:
</span><span class="cx"> match = build_name_regex.search(commit['revision'])
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> variant = ord(match.group('variant').upper()) - ord('A') + 1 if match.group('variant') else 0
</span><span class="cx"> # These fake times won't conflict with real commit time since even 99Z9999z is still in Feb 1973
</span><span class="cx"> fake_time = datetime.utcfromtimestamp((major * 100 + kind) * 10000 + minor + float(variant) / 100)
</span><del>- commit['time'] = fake_time.isoformat()
</del><ins>+ commit['order'] = fake_time.isoformat()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def available_builds_from_command(repository_name, command, lines_to_ignore):
</span></span></pre>
</div>
</div>
</body>
</html>