Modified: trunk/Websites/perf.webkit.org/public/api/measurement-set.php (210952 => 210953)
--- trunk/Websites/perf.webkit.org/public/api/measurement-set.php 2017-01-20 05:11:01 UTC (rev 210952)
+++ trunk/Websites/perf.webkit.org/public/api/measurement-set.php 2017-01-20 06:42:43 UTC (rev 210953)
@@ -171,7 +171,7 @@
return $this->db->query('
SELECT test_runs.*, build_id, build_number, build_builder, build_time,
array_agg((commit_id, commit_repository, commit_revision, extract(epoch from commit_time at time zone \'utc\') * 1000)) AS revisions,
- extract(epoch from max(commit_time at time zone \'utc\')) * 1000 AS revision_time, max(commit_order) AS revision_order
+ extract(epoch from max(commit_time at time zone \'utc\')) * 1000 AS revision_time
FROM builds
LEFT OUTER JOIN build_commits ON commit_build = build_id
LEFT OUTER JOIN commits ON build_commit = commit_id, test_runs
@@ -178,7 +178,7 @@
WHERE run_build = build_id AND run_config = $1 AND NOT EXISTS (SELECT * FROM build_requests WHERE request_build = build_id)
GROUP BY build_id, build_builder, build_number, build_time, build_latest_revision, build_slave,
run_id, run_config, run_build, run_iteration_count_cache, run_mean_cache, run_sum_cache, run_square_sum_cache, run_marked_outlier
- ORDER BY revision_time, revision_order, build_time', array($config_id));
+ ORDER BY revision_time, build_time', array($config_id));
}
static function format_map()
Modified: trunk/Websites/perf.webkit.org/server-tests/api-measurement-set-tests.js (210952 => 210953)
--- trunk/Websites/perf.webkit.org/server-tests/api-measurement-set-tests.js 2017-01-20 05:11:01 UTC (rev 210952)
+++ trunk/Websites/perf.webkit.org/server-tests/api-measurement-set-tests.js 2017-01-20 06:42:43 UTC (rev 210953)
@@ -372,6 +372,75 @@
}).catch(done);
});
+ it("should order results by build time when commit times are missing", function (done) {
+ const remote = TestServer.remoteAPI();
+ let repositoryId;
+ addBuilderForReport(reportWithBuildTime[0]).then(() => {
+ const db = TestServer.database();
+ return Promise.all([
+ db.insert('repositories', {'id': 1, 'name': 'macOS'}),
+ db.insert('commits', {'id': 2, 'repository': 1, 'revision': 'macOS 16A323', 'order': 0}),
+ db.insert('commits', {'id': 3, 'repository': 1, 'revision': 'macOS 16C68', 'order': 1}),
+ ]);
+ }).then(() => {
+ return remote.postJSON('/api/report/', [{
+ "buildNumber": "1001",
+ "buildTime": '2017-01-19 15:28:01',
+ "revisions": {
+ "macOS": {
+ "revision": "macOS 16C68",
+ },
+ },
+ "builderName": "someBuilder",
+ "builderPassword": "somePassword",
+ "platform": "Sierra",
+ "tests": { "Test": {"metrics": {"Time": { "baseline": [1, 2, 3, 4, 5] } } } },
+ }]);
+ }).then(function () {
+ return remote.postJSON('/api/report/', [{
+ "buildNumber": "1002",
+ "buildTime": '2017-01-19 19:46:37',
+ "revisions": {
+ "macOS": {
+ "revision": "macOS 16A323",
+ },
+ },
+ "builderName": "someBuilder",
+ "builderPassword": "somePassword",
+ "platform": "Sierra",
+ "tests": { "Test": {"metrics": {"Time": { "baseline": [5, 6, 7, 8, 9] } } } },
+ }]);
+ }).then(function () {
+ return queryPlatformAndMetricWithRepository('Sierra', 'Time', 'macOS');
+ }).then(function (result) {
+ return remote.getJSONWithStatus(`/api/measurement-set/?platform=${result.platformId}&metric=${result.metricId}`);
+ }).then(function (response) {
+ const currentRows = response['configurations']['baseline'];
+ assert.equal(currentRows.length, 2);
+ assert.deepEqual(format(response['formatMap'], currentRows[0]), {
+ mean: 3,
+ iterationCount: 5,
+ sum: 15,
+ squareSum: 55,
+ markedOutlier: false,
+ revisions: [[3, 1, 'macOS 16C68', 0]],
+ commitTime: +Date.UTC(2017, 0, 19, 15, 28, 1),
+ buildTime: +Date.UTC(2017, 0, 19, 15, 28, 1),
+ buildNumber: '1001' });
+ assert.deepEqual(format(response['formatMap'], currentRows[1]), {
+ mean: 7,
+ iterationCount: 5,
+ sum: 35,
+ squareSum: 255,
+ markedOutlier: false,
+ revisions: [[2, 1, 'macOS 16A323', 0]],
+ commitTime: +Date.UTC(2017, 0, 19, 19, 46, 37),
+ buildTime: +Date.UTC(2017, 0, 19, 19, 46, 37),
+ buildNumber: '1002' });
+ done();
+ }).catch(done);
+ });
+
function buildNumbers(parsedResult, config)
{
return parsedResult['configurations'][config].map(function (row) {
@@ -417,7 +486,6 @@
}).catch(done);
});
-
it("should create cached results", function (done) {
const remote = TestServer.remoteAPI();
let cachePrefix;
