<!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>[174718] 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/174718">174718</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-14 17:50:56 -0700 (Tue, 14 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused jobs table
https://bugs.webkit.org/show_bug.cgi?id=137724
Reviewed by Daniel Bates.
Removed jobs table in the database as well as related code.
* init-database.sql:
* public/admin/jobs.php: Removed.
* public/admin/tests.php:
* public/include/admin-header.php:</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="#trunkWebsitesperfwebkitorgpublicadmintestsphp">trunk/Websites/perf.webkit.org/public/admin/tests.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicincludeadminheaderphp">trunk/Websites/perf.webkit.org/public/include/admin-header.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgpublicadminjobsphp">trunk/Websites/perf.webkit.org/public/admin/jobs.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 (174717 => 174718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2014-10-15 00:44:36 UTC (rev 174717)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2014-10-15 00:50:56 UTC (rev 174718)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-10-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ Remove unused jobs table
+ https://bugs.webkit.org/show_bug.cgi?id=137724
+
+ Reviewed by Daniel Bates.
+
+ Removed jobs table in the database as well as related code.
+
+ * init-database.sql:
+ * public/admin/jobs.php: Removed.
+ * public/admin/tests.php:
+ * public/include/admin-header.php:
+
</ins><span class="cx"> 2014-10-13 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> New perf dashboard should have an ability to search commits by a keyword
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorginitdatabasesql"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/init-database.sql (174717 => 174718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/init-database.sql 2014-10-15 00:44:36 UTC (rev 174717)
+++ trunk/Websites/perf.webkit.org/init-database.sql 2014-10-15 00:50:56 UTC (rev 174718)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> DROP TABLE platforms CASCADE;
</span><span class="cx"> DROP TABLE test_metrics CASCADE;
</span><span class="cx"> DROP TABLE tests CASCADE;
</span><del>-DROP TABLE jobs CASCADE;
</del><span class="cx"> DROP TABLE reports CASCADE;
</span><span class="cx"> DROP TABLE tracker_repositories CASCADE;
</span><span class="cx"> DROP TABLE bug_trackers CASCADE;
</span><span class="lines">@@ -119,17 +118,6 @@
</span><span class="cx"> iteration_relative_time float,
</span><span class="cx"> PRIMARY KEY (iteration_run, iteration_order));
</span><span class="cx">
</span><del>-CREATE TABLE jobs (
- job_id serial PRIMARY KEY,
- job_type varchar(64) NOT NULL,
- job_created_at timestamp NOT NULL DEFAULT NOW(),
- job_started_at timestamp,
- job_started_by_pid integer,
- job_completed_at timestamp,
- job_attempts integer NOT NULL DEFAULT 0,
- job_payload text,
- job_log text);
-
</del><span class="cx"> CREATE TABLE reports (
</span><span class="cx"> report_id serial PRIMARY KEY,
</span><span class="cx"> report_builder integer NOT NULL REFERENCES builders ON DELETE RESTRICT,
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicadminjobsphp"></a>
<div class="delfile"><h4>Deleted: trunk/Websites/perf.webkit.org/public/admin/jobs.php (174717 => 174718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/admin/jobs.php 2014-10-15 00:44:36 UTC (rev 174717)
+++ trunk/Websites/perf.webkit.org/public/admin/jobs.php 2014-10-15 00:50:56 UTC (rev 174718)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-<?php
-
-require('../include/admin-header.php');
-
-if ($action == 'delete') {
- if (array_key_exists('id', $_POST)) {
- $job_id = intval($_POST['id']);
- execute_query_and_expect_one_row_to_be_affected('DELETE FROM jobs WHERE job_id = $1', array($job_id),
- "Deleted job $job_id", "Could not delete job $job_id");
- } else
- notice('Invalid ID.');
-} else if ($action == 'manifest') {
- execute_query_and_expect_one_row_to_be_affected('INSERT INTO jobs (job_type) VALUES (\'manifest\')', array(),
- 'Requested to regenerate the manifest.', 'Could not add a job');
-}
-
-if ($db) {
-
-?>
-<table>
-<thead>
- <tr><td>ID</td><td>Type</td><td>Created At</td><td>Started At</td><td>PID</td><td>Attempts</td><td>Payload</td><td>Log</td><td>Actions</td>
-</thead>
-<tbody>
-<?php
-
- function get_value_with_default($array, $key, $default) {
- $value = $array[$key];
- if (!$value)
- $value = $default;
- return $value;
- }
-
- # FIXME: Add a navigation bar for when there are more than 50 jobs.
- $uncompleted_jobs = $db->query_and_fetch_all('SELECT * FROM jobs WHERE job_completed_at IS NULL LIMIT 50');
- if ($uncompleted_jobs) {
- foreach ($uncompleted_jobs as $job) {
- $id = $job['job_id'];
- $started_at = get_value_with_default($job, 'job_started_at', '');
- $pid = get_value_with_default($job, 'job_started_by_pid', '');
- echo <<< EOF
- <tr>
- <td>$id</td>
- <td>{$job['job_type']}</td>
- <td>{$job['job_created_at']}</td>
- <td>$started_at</td><td>$pid</td>
- <td>{$job['job_attempts']}</td>
- <td><pre class="payload">{$job['job_payload']}</pre></td>
- <td><pre>{$job['job_log']}</pre></td>
- <td><form method='POST'><button type='submit' name='action' value='delete'>Delete</button><input type='hidden' name='id' value='$id'></form></td>
- </tr>
-EOF;
- }
- }
-
-?></tbody>
-</table>
-
-<script>
-
-var payloadPres = document.querySelectorAll('.payload');
-for (var i = 0; i < payloadPres.length; ++i) {
- var pre = payloadPres[i];
- try {
- pre.textContent = JSON.stringify(JSON.parse(pre.textContent), null, ' ');
- } catch (exception) { } // Ignore exceptions.
-}
-
-</script>
-
-<section class="action-field">
-<h2>New job</h2>
-<form method='POST'><button type='submit' name='action' value='manifest'>Re-generate manifest</button></form>
-</section>
-
-<?php
-
-}
-
-include('../include/admin-footer.php');
-
-?>
</del></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicadmintestsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/admin/tests.php (174717 => 174718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/admin/tests.php 2014-10-15 00:44:36 UTC (rev 174717)
+++ trunk/Websites/perf.webkit.org/public/admin/tests.php 2014-10-15 00:50:56 UTC (rev 174718)
</span><span class="lines">@@ -43,10 +43,8 @@
</span><span class="cx"> array('test' => $id, 'name' => $_POST['metric_name'], 'aggregator' => $aggregator));
</span><span class="cx"> if (!$metric_id)
</span><span class="cx"> notice("Could not insert the new metric for test $id");
</span><del>- else {
- add_job('aggregate', '{"metricIds": [ ' . $metric_id . ']}');
- notice("Inserted the metric for test $id");
- }
</del><ins>+ else
+ notice("Inserted the metric for test $id. Aggregation for $metric_id is needed.");
</ins><span class="cx"> }
</span><span class="cx"> } else if (array_key_exists('metric_id', $_POST))
</span><span class="cx"> regenerate_manifest();
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicincludeadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/include/admin-header.php (174717 => 174718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/include/admin-header.php 2014-10-15 00:44:36 UTC (rev 174717)
+++ trunk/Websites/perf.webkit.org/public/include/admin-header.php 2014-10-15 00:50:56 UTC (rev 174718)
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx"> <ul>
</span><span class="cx"> <li><a href="/admin/platforms">Platforms</a></li>
</span><span class="cx"> <li><a href="/admin/tests">Tests</a></li>
</span><del>- <li><a href="/admin/jobs">Jobs</a></li>
</del><span class="cx"> <li><a href="/admin/aggregators">Aggregators</a></li>
</span><span class="cx"> <li><a href="/admin/builders">Builders</a></li>
</span><span class="cx"> <li><a href="/admin/repositories">Repositories</a></li>
</span><span class="lines">@@ -92,15 +91,6 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function add_job($type, $payload = null) {
- global $db;
-
- if ($db->insert_row('jobs', 'job', array('type' => $type, 'payload' => $payload)))
- notice("Added a job of type $type");
- else
- notice("Failed to add job of type $type");
-}
-
</del><span class="cx"> class AdministrativePage {
</span><span class="cx"> private $table;
</span><span class="cx"> private $prefix;
</span></span></pre>
</div>
</div>
</body>
</html>