<!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>[185574] 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/185574">185574</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-15 18:40:56 -0700 (Mon, 15 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Analysis task should show all possible revisions for A/B testing
https://bugs.webkit.org/show_bug.cgi?id=145996

Reviewed by Chris Dumez.

* public/api/commits.php:
(fetch_commits_between): When the time stamp is not available for commits, use revision numbers
to find revisions between two ranges. This is necessary for OS X and iOS versions since they don't
have a &quot;commit time&quot;.

* public/v2/app.js:
(App.AnalysisTaskController.updateRootConfigurations): Fetch commits between two end points.
(App.AnalysisTaskController._createConfiguration): Extracted from updateRootConfigurations. List
the fetched list of commits if available.
(App.AnalysisTaskController._serializeNumbersSkippingConsecutiveEntries): Added. Serializes an list
of numbers intelligently. For example, [1, 2, 4, 5] turns into &quot;1-2, 4-5&quot;. Without this, some lists
of points shown in the A/B testing configurations become too long. 

* public/v2/commits-viewer.js:
(App.CommitsViewerComponent.commitsChanged):

* public/v2/data.js:
(CommitLogs.fetchCommits): Renamed from fetchForTimeRange.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicapicommitsphp">trunk/Websites/perf.webkit.org/public/api/commits.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv2appjs">trunk/Websites/perf.webkit.org/public/v2/app.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv2commitsviewerjs">trunk/Websites/perf.webkit.org/public/v2/commits-viewer.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv2datajs">trunk/Websites/perf.webkit.org/public/v2/data.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 (185573 => 185574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog        2015-06-16 00:40:29 UTC (rev 185573)
+++ trunk/Websites/perf.webkit.org/ChangeLog        2015-06-16 01:40:56 UTC (rev 185574)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-06-15  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        Analysis task should show all possible revisions for A/B testing
+        https://bugs.webkit.org/show_bug.cgi?id=145996
+
+        Reviewed by Chris Dumez.
+
+        * public/api/commits.php:
+        (fetch_commits_between): When the time stamp is not available for commits, use revision numbers
+        to find revisions between two ranges. This is necessary for OS X and iOS versions since they don't
+        have a &quot;commit time&quot;.
+
+        * public/v2/app.js:
+        (App.AnalysisTaskController.updateRootConfigurations): Fetch commits between two end points.
+        (App.AnalysisTaskController._createConfiguration): Extracted from updateRootConfigurations. List
+        the fetched list of commits if available.
+        (App.AnalysisTaskController._serializeNumbersSkippingConsecutiveEntries): Added. Serializes an list
+        of numbers intelligently. For example, [1, 2, 4, 5] turns into &quot;1-2, 4-5&quot;. Without this, some lists
+        of points shown in the A/B testing configurations become too long. 
+
+        * public/v2/commits-viewer.js:
+        (App.CommitsViewerComponent.commitsChanged):
+
+        * public/v2/data.js:
+        (CommitLogs.fetchCommits): Renamed from fetchForTimeRange.
+
</ins><span class="cx"> 2015-06-13  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a script to post new OS X builds to perf dashboard
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapicommitsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/api/commits.php (185573 => 185574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/commits.php        2015-06-16 00:40:29 UTC (rev 185573)
+++ trunk/Websites/perf.webkit.org/public/api/commits.php        2015-06-16 01:40:56 UTC (rev 185574)
</span><span class="lines">@@ -70,20 +70,26 @@
</span><span class="cx">         committer_name as &quot;authorName&quot;,
</span><span class="cx">         committer_account as &quot;authorEmail&quot;,
</span><span class="cx">         commit_message as &quot;message&quot;
</span><del>-        FROM commits JOIN committers ON commit_committer = committer_id
</del><ins>+        FROM commits LEFT OUTER JOIN committers ON commit_committer = committer_id
</ins><span class="cx">         WHERE commit_repository = $1 AND commit_reported = true';
</span><span class="cx">     $values = array($repository_id);
</span><span class="cx"> 
</span><span class="cx">     if ($first &amp;&amp; $second) {
</span><del>-        $fitrt_commit = commit_from_revision($db, $repository_id, $first);
</del><ins>+        $first_commit = commit_from_revision($db, $repository_id, $first);
</ins><span class="cx">         $second_commit = commit_from_revision($db, $repository_id, $second);
</span><del>-        $first = $fitrt_commit['commit_time'];
</del><ins>+        $first = $first_commit['commit_time'];
</ins><span class="cx">         $second = $second_commit['commit_time'];
</span><ins>+        $column = 'commit_time';
+        if (!$first &amp;&amp; !$second) {
+            $first = $first_commit['commit_revision'];
+            $second = $second_commit['commit_revision'];
+            $column = 'commit_revision';
+        }
</ins><span class="cx">         $in_order = $first &lt; $second;
</span><span class="cx">         array_push($values, $in_order ? $first : $second);
</span><del>-        $statements .= ' AND commit_time &gt;= $' . count($values);
</del><ins>+        $statements .= ' AND ' . $column . ' &gt;= $' . count($values);
</ins><span class="cx">         array_push($values, $in_order ? $second : $first);
</span><del>-        $statements .= ' AND commit_time &lt;= $' . count($values);
</del><ins>+        $statements .= ' AND ' . $column . ' &lt;= $' . count($values);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if ($keyword) {
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv2appjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v2/app.js (185573 => 185574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v2/app.js        2015-06-16 00:40:29 UTC (rev 185573)
+++ trunk/Websites/perf.webkit.org/public/v2/app.js        2015-06-16 01:40:56 UTC (rev 185574)
</span><span class="lines">@@ -1250,43 +1250,92 @@
</span><span class="cx">             var revisions = point.measurement.formattedRevisions();
</span><span class="cx">             for (var repositoryId in revisions) {
</span><span class="cx">                 if (!repositoryToRevisions[repositoryId])
</span><del>-                    repositoryToRevisions[repositoryId] = new Array(analysisPoints.length);
</del><ins>+                    repositoryToRevisions[repositoryId] = {commits: null, revisions: []};
</ins><span class="cx">                 var revision = revisions[repositoryId];
</span><del>-                repositoryToRevisions[repositoryId][pointIndex] = {
</del><ins>+                repositoryToRevisions[repositoryId].revisions[pointIndex] = {
</ins><span class="cx">                     label: point.label + ': ' + revision.label,
</span><span class="cx">                     value: revision.currentRevision,
</span><span class="cx">                 };
</span><span class="cx">             }
</span><span class="cx">         });
</span><span class="cx"> 
</span><ins>+        var commitsPromises = [];
+        var repositoryToIndex = {};
+        for (var repositoryId in repositoryToRevisions) {
+            var revisions = repositoryToRevisions[repositoryId].revisions;
+            repositoryToIndex[repositoryId] = commitsPromises.length;
+            console.log(repositoryId)
+            commitsPromises.push(CommitLogs.fetchCommits(repositoryId, revisions[0].value, revisions[revisions.length - 1].value));
+        }
+
</ins><span class="cx">         var self = this;
</span><span class="cx">         this.get('model').get('triggerable').then(function (triggerable) {
</span><span class="cx">             if (!triggerable)
</span><span class="cx">                 return;
</span><del>-
-            self.set('configurations', ['A', 'B']);
-            self.set('rootConfigurations', triggerable.get('acceptedRepositories').map(function (repository) {
-                var repositoryId = repository.get('id');
-                var options = [{label: 'None'}].concat((repositoryToRevisions[repositoryId] || []).map(function (option, index) {
-                    if (!option || !option['value'])
-                        return {value: '', label: analysisPoints[index].label + ': None'}; 
-                    return option;
</del><ins>+            Ember.RSVP.Promise.all(commitsPromises).then(function (commitsList) {
+                self.set('configurations', ['A', 'B']);
+                self.set('rootConfigurations', triggerable.get('acceptedRepositories').map(function (repository) {
+                    return self._createConfiguration(repository, commitsList[repositoryToIndex[repository.get('id')]], analysisPoints);
</ins><span class="cx">                 }));
</span><del>-                return Ember.Object.create({
-                    repository: repository,
-                    name: repository.get('name'),
-                    sets: [
-                        Ember.Object.create({name: 'A[' + repositoryId + ']',
-                            options: options,
-                            selection: options[1]}),
-                        Ember.Object.create({name: 'B[' + repositoryId + ']',
-                            options: options,
-                            selection: options[options.length - 1]}),
-                    ],
-                });
-            }));
</del><ins>+            });
</ins><span class="cx">         });
</span><span class="cx">     }.observes('analysisPoints'),
</span><ins>+    _createConfiguration: function(repository, commits, analysisPoints) {
+        var repositoryId = repository.get('id');
+
+        var options = [{label: 'None'}];
+        var revisionToPoints = {};
+        analysisPoints.forEach(function (point, pointIndex) {
+            var revision = point.measurement.revisionForRepository(repositoryId);
+            if (!revision)
+                return;
+            if (!revisionToPoints[revision])
+                revisionToPoints[revision] = [];
+            revisionToPoints[revision].push(pointIndex);
+        });
+
+        if (!commits || !commits.length) {
+            commits = [];
+            for (var revision in revisionToPoints)
+                commits.push({revision: revision});
+        }
+
+        for (var commit of commits) {
+            var revision = commit.revision;
+            var label = Measurement.formatRevisionRange(revision).label;
+            var points = revisionToPoints[revision];
+            if (points) {
+                var serializedPoints = this._serializeNumbersSkippingConsecutiveEntries(revisionToPoints[revision]);
+                label += ' ' + ['(', points.length &gt; 1 ? 'points' : 'point', serializedPoints, ')'].join(' ');
+            }
+            options.push({value: revision, label: label});
+        }
+
+        return Ember.Object.create({
+            repository: repository,
+            name: repository.get('name'),
+            sets: [
+                Ember.Object.create({name: 'A[' + repositoryId + ']',
+                    options: options,
+                    selection: options[1]}),
+                Ember.Object.create({name: 'B[' + repositoryId + ']',
+                    options: options,
+                    selection: options[options.length - 1]}),
+            ]});
+    },
+    _serializeNumbersSkippingConsecutiveEntries: function (numbers) {
+        var result = numbers[0];
+        for (var i = 1; i &lt; numbers.length; i++) {
+            if (numbers[i - 1] + 1 == numbers[i]) {
+                while (numbers[i] + 1 == numbers[i + 1])
+                    i++;
+                result += '-' + numbers[i];
+                continue;
+            }
+            result += ', ' + numbers[i]
+        }
+        return result;
+    },
</ins><span class="cx">     actions: {
</span><span class="cx">         addBug: function (bugTracker, bugNumber)
</span><span class="cx">         {
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv2commitsviewerjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v2/commits-viewer.js (185573 => 185574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v2/commits-viewer.js        2015-06-16 00:40:29 UTC (rev 185573)
+++ trunk/Websites/perf.webkit.org/public/v2/commits-viewer.js        2015-06-16 01:40:56 UTC (rev 185574)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         var self = this;
</span><del>-        CommitLogs.fetchForTimeRange(repository.get('id'), from, to).then(function (commits) {
</del><ins>+        CommitLogs.fetchCommits(repository.get('id'), from, to).then(function (commits) {
</ins><span class="cx">             if (self.isDestroyed)
</span><span class="cx">                 return;
</span><span class="cx">             self.set('commits', commits.map(function (commit) {
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv2datajs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v2/data.js (185573 => 185574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v2/data.js        2015-06-16 00:40:29 UTC (rev 185573)
+++ trunk/Websites/perf.webkit.org/public/v2/data.js        2015-06-16 01:40:56 UTC (rev 185574)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">     _cachedCommitsByRepository: {}
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-CommitLogs.fetchForTimeRange = function (repository, from, to, keyword)
</del><ins>+CommitLogs.fetchCommits = function (repository, from, to, keyword)
</ins><span class="cx"> {
</span><span class="cx">     var params = [];
</span><span class="cx">     if (from &amp;&amp; to) {
</span></span></pre>
</div>
</div>

</body>
</html>