Modified: trunk/Websites/perf.webkit.org/public/include/commit-log-fetcher.php (221310 => 221311)
--- trunk/Websites/perf.webkit.org/public/include/commit-log-fetcher.php 2017-08-29 21:00:32 UTC (rev 221310)
+++ trunk/Websites/perf.webkit.org/public/include/commit-log-fetcher.php 2017-08-29 21:18:49 UTC (rev 221311)
@@ -6,6 +6,22 @@
$this->db = $db;
}
+ static function find_commit_id_by_revision($db, $repository_id, $revision)
+ {
+ if (!ctype_alnum($revision))
+ return NULL;
+ $commit_rows = $db->query_and_fetch_all('SELECT commit_id FROM commits WHERE commit_repository = $1 AND commit_revision = $2', array($repository_id, $revision));
+ if ($commit_rows)
+ return $commit_rows[0]['commit_id'];
+
+ $commit_rows = $db->query_and_fetch_all('SELECT commit_id FROM commits WHERE commit_repository = $1 AND commit_revision LIKE $2 LIMIT 2', array($repository_id, Database::escape_for_like($revision) . '%'));
+ if (!$commit_rows)
+ return NULL;
+ if (count($commit_rows) > 1)
+ return -1; // There are more than one matches.
+ return $commit_rows[0]['commit_id'];
+ }
+
function fetch_for_tasks($task_id_list, $task_by_id)
{
$commit_rows = $this->db->query_and_fetch_all('SELECT task_commits.*, commits.*, committers.*
Modified: trunk/Websites/perf.webkit.org/public/privileged-api/associate-commit.php (221310 => 221311)
--- trunk/Websites/perf.webkit.org/public/privileged-api/associate-commit.php 2017-08-29 21:00:32 UTC (rev 221310)
+++ trunk/Websites/perf.webkit.org/public/privileged-api/associate-commit.php 2017-08-29 21:18:49 UTC (rev 221311)
@@ -1,6 +1,7 @@
<?php
require_once('../include/json-header.php');
+require_once('../include/commit-log-fetcher.php');
function main() {
$data = ""
@@ -29,18 +30,15 @@
require_format('Kind', $kind, '/^(cause|fix)$/');
$commit_info = array('repository' => $repository_id, 'revision' => $revision);
- $commit_rows = $db->query_and_fetch_all('SELECT commit_id FROM commits WHERE commit_repository = $1 AND commit_revision LIKE $2 LIMIT 2',
- array($repository_id, '%' . Database::escape_for_like($revision) . '%'));
- if (count($commit_rows) > 1) {
+ $commit_id = CommitLogFetcher::find_commit_id_by_revision($db, $repository_id, $revision);
+ if ($commit_id < 0) {
$db->rollback_transaction();
exit_with_error('AmbiguousRevision', $commit_info);
- } else if (!$commit_rows) {
+ } else if (!$commit_id) {
$db->rollback_transaction();
exit_with_error('CommitNotFound', $commit_info);
}
- $commit_id = $commit_rows[0]['commit_id'];
-
$association = array('task' => $analysis_task_id, 'commit' => $commit_id, 'is_fix' => Database::to_database_boolean($kind == 'fix'));
$commit_id = $db->update_or_insert_row('task_commits', 'taskcommit',
array('task' => $analysis_task_id, 'commit' => $commit_id), $association, 'commit');
Modified: trunk/Websites/perf.webkit.org/public/privileged-api/create-test-group.php (221310 => 221311)
--- trunk/Websites/perf.webkit.org/public/privileged-api/create-test-group.php 2017-08-29 21:00:32 UTC (rev 221310)
+++ trunk/Websites/perf.webkit.org/public/privileged-api/create-test-group.php 2017-08-29 21:18:49 UTC (rev 221311)
@@ -1,6 +1,7 @@
<?php
require_once('../include/json-header.php');
+require_once('../include/commit-log-fetcher.php');
require_once('../include/repository-group-finder.php');
function main()
@@ -184,9 +185,10 @@
$revision = array_get($data, 'revision');
if (!$revision)
exit_with_error('InvalidRevision', array('repository' => $repository_id, 'data' => $data));
- $commit = $db->select_first_row('commits', 'commit',
- array('repository' => intval($repository_id), 'revision' => $revision));
- if (!$commit)
+ $commit_id = CommitLogFetcher::find_commit_id_by_revision($db, $repository_id, $revision);
+ if ($commit_id < 0)
+ exit_with_error('AmbigiousRevision', array('repository' => $repository_id, 'revision' => $revision));
+ if (!$commit_id)
exit_with_error('RevisionNotFound', array('repository' => $repository_id, 'revision' => $revision));
$patch_file_id = array_get($data, 'patch');
@@ -196,7 +198,7 @@
array_push($repository_with_patch, $repository_id);
}
- array_push($commit_set, array('commit' => $commit['commit_id'], 'patch_file' => $patch_file_id));
+ array_push($commit_set, array('commit' => $commit_id, 'patch_file' => $patch_file_id));
array_push($repository_list, $repository_id);
}
Modified: trunk/Websites/perf.webkit.org/server-tests/privileged-api-create-test-group-tests.js (221310 => 221311)
--- trunk/Websites/perf.webkit.org/server-tests/privileged-api-create-test-group-tests.js 2017-08-29 21:00:32 UTC (rev 221310)
+++ trunk/Websites/perf.webkit.org/server-tests/privileged-api-create-test-group-tests.js 2017-08-29 21:18:49 UTC (rev 221311)
@@ -8,7 +8,7 @@
const addSlaveForReport = require('./resources/common-operations.js').addSlaveForReport;
const prepareServerTest = require('./resources/common-operations.js').prepareServerTest;
-function createAnalysisTask(name)
+function createAnalysisTask(name, webkitRevisions = ["191622", "191623"])
{
const reportWithRevision = [{
"buildNumber": "124",
@@ -15,7 +15,7 @@
"buildTime": "2015-10-27T15:34:51",
"revisions": {
"WebKit": {
- "revision": "191622",
+ "revision": webkitRevisions[0],
"timestamp": '2015-10-27T11:36:56.878473Z',
},
"macOS": {
@@ -44,7 +44,7 @@
"buildTime": "2015-10-27T17:27:41",
"revisions": {
"WebKit": {
- "revision": "191623",
+ "revision": webkitRevisions[1],
"timestamp": '2015-10-27T16:38:10.768995Z',
},
"macOS": {
@@ -92,7 +92,7 @@
}).then((content) => content['taskId']);
}
-function addTriggerableAndCreateTask(name)
+function addTriggerableAndCreateTask(name, webkitRevisions)
{
const report = {
'slaveName': 'anotherSlave',
@@ -120,7 +120,7 @@
}).then(() => {
return TestServer.remoteAPI().postJSON('/api/update-triggerable/', report);
}).then(() => {
- return createAnalysisTask(name);
+ return createAnalysisTask(name, webkitRevisions);
});
}
@@ -265,7 +265,7 @@
it('should return "RevisionNotFound" when revision sets contains an invalid revision', () => {
return addTriggerableAndCreateTask('some task').then((taskId) => {
const webkit = Repository.all().find((repository) => repository.name() == 'WebKit');
- const revisionSets = [{[webkit.id()]: {revision: '191622'}}, {[webkit.id()]: {revision: '1'}}];
+ const revisionSets = [{[webkit.id()]: {revision: '191622'}}, {[webkit.id()]: {revision: '1a'}}];
return PrivilegedAPI.sendRequest('create-test-group', {name: 'test', task: taskId, revisionSets}).then((content) => {
assert(false, 'should never be reached');
}, (error) => {
@@ -274,6 +274,30 @@
});
});
+ it('should return "AmbigiousRevision" when there are multiple commits that match the specified revision string', () => {
+ return addTriggerableAndCreateTask('some task', ['2ceda45d3cd63cde58d0dbf5767714e03d902e43', '2c71a8ddc1f661663ccfd1a29c633ba57e879533']).then((taskId) => {
+ const webkit = Repository.all().find((repository) => repository.name() == 'WebKit');
+ const revisionSets = [{[webkit.id()]: {revision: '2ceda'}}, {[webkit.id()]: {revision: '2c'}}];
+ return PrivilegedAPI.sendRequest('create-test-group', {name: 'test', task: taskId, revisionSets}).then((content) => {
+ assert(false, 'should never be reached');
+ }, (error) => {
+ assert.equal(error, 'AmbigiousRevision');
+ });
+ });
+ });
+
+ it('should return "RevisionNotFound" when the end of a Git hash is specified', () => {
+ return addTriggerableAndCreateTask('some task', ['2ceda45d3cd63cde58d0dbf5767714e03d902e43', '5471a8ddc1f661663ccfd1a29c633ba57e879533']).then((taskId) => {
+ const webkit = Repository.all().find((repository) => repository.name() == 'WebKit');
+ const revisionSets = [{[webkit.id()]: {revision: '2ceda45d3cd63cde58d0dbf5767714e03d902e43'}}, {[webkit.id()]: {revision: '57e879533'}}];
+ return PrivilegedAPI.sendRequest('create-test-group', {name: 'test', task: taskId, revisionSets}).then((content) => {
+ assert(false, 'should never be reached');
+ }, (error) => {
+ assert.equal(error, 'RevisionNotFound');
+ });
+ });
+ });
+
it('should return "InvalidUploadedFile" when revision sets contains an invalid file ID', () => {
return addTriggerableAndCreateTask('some task').then((taskId) => {
const webkit = Repository.all().find((repository) => repository.name() == 'WebKit');
@@ -429,6 +453,47 @@
});
});
+ it('should create a test group using Git partial hashes', () => {
+ let webkit;
+ let macos;
+ return addTriggerableAndCreateTask('some task', ['2ceda45d3cd63cde58d0dbf5767714e03d902e43', '5471a8ddc1f661663ccfd1a29c633ba57e879533']).then((taskId) => {
+ webkit = Repository.findById(MockData.webkitRepositoryId());
+ macos = Repository.findById(MockData.macosRepositoryId());
+ const revisionSets = [{[macos.id()]: {revision: '15A284'}, [webkit.id()]: {revision: '2ceda'}},
+ {[macos.id()]: {revision: '15A284'}, [webkit.id()]: {revision: '5471a'}}];
+ const params = {name: 'test', task: taskId, repetitionCount: 2, revisionSets};
+ let insertedGroupId;
+ return PrivilegedAPI.sendRequest('create-test-group', params).then((content) => {
+ insertedGroupId = content['testGroupId'];
+ return TestGroup.fetchForTask(taskId, true);
+ }).then((testGroups) => {
+ assert.equal(testGroups.length, 1);
+ const group = testGroups[0];
+ assert.equal(group.id(), insertedGroupId);
+ assert.equal(group.repetitionCount(), 2);
+ const requests = group.buildRequests();
+ assert.equal(requests.length, 4);
+
+ const set0 = requests[0].commitSet();
+ const set1 = requests[1].commitSet();
+ assert.deepEqual(Repository.sortByNamePreferringOnesWithURL(set0.repositories()), [webkit, macos]);
+ assert.deepEqual(Repository.sortByNamePreferringOnesWithURL(set1.repositories()), [webkit, macos]);
+ assert.equal(set0.revisionForRepository(webkit), '2ceda45d3cd63cde58d0dbf5767714e03d902e43');
+ assert.equal(set0.revisionForRepository(macos), '15A284');
+ assert.equal(set1.revisionForRepository(webkit), '5471a8ddc1f661663ccfd1a29c633ba57e879533');
+ assert.equal(set1.revisionForRepository(macos), '15A284');
+
+ const repositoryGroup0 = requests[0].repositoryGroup();
+ assert.equal(repositoryGroup0.name(), 'system-and-webkit');
+ assert.equal(repositoryGroup0, requests[2].repositoryGroup());
+ const repositoryGroup1 = requests[1].repositoryGroup();
+ assert.equal(repositoryGroup1, repositoryGroup0);
+ assert(repositoryGroup0.accepts(set0));
+ assert(repositoryGroup0.accepts(set1));
+ });
+ });
+ });
+
it('should create a test group using different repository groups if needed', () => {
let webkit;
let macos;
