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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174718 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index 17047d73fdfed01bc504fc388a745d96d36014a1..b9db737a0a0c71c9a7c20dc845199eac74045d81 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,17 @@
+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:
+
 2014-10-13  Ryosuke Niwa  <rniwa@webkit.org>
 
         New perf dashboard should have an ability to search commits by a keyword

diff --git a/Websites/perf.webkit.org/init-database.sql b/Websites/perf.webkit.org/init-database.sql
index fb1f2443803ff21f1303e14eb7f96388411dc3ed..743f48d4c9555dd056f3cce0d6b5a3f28498a4da 100644 (file)
--- a/Websites/perf.webkit.org/init-database.sql
+++ b/Websites/perf.webkit.org/init-database.sql
@@ -11,7 +11,6 @@ DROP TABLE repositories CASCADE;
 DROP TABLE platforms CASCADE;
 DROP TABLE test_metrics CASCADE;
 DROP TABLE tests CASCADE;
-DROP TABLE jobs CASCADE;
 DROP TABLE reports CASCADE;
 DROP TABLE tracker_repositories CASCADE;
 DROP TABLE bug_trackers CASCADE;
@@ -119,17 +118,6 @@ CREATE TABLE run_iterations (
     iteration_relative_time float,
     PRIMARY KEY (iteration_run, iteration_order));
 
-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);
-
 CREATE TABLE reports (
     report_id serial PRIMARY KEY,
     report_builder integer NOT NULL REFERENCES builders ON DELETE RESTRICT,

diff --git a/Websites/perf.webkit.org/public/admin/jobs.php b/Websites/perf.webkit.org/public/admin/jobs.php
deleted file mode 100644 (file)
index d62d86c..0000000
--- a/Websites/perf.webkit.org/public/admin/jobs.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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');
-
-?>

diff --git a/Websites/perf.webkit.org/public/admin/tests.php b/Websites/perf.webkit.org/public/admin/tests.php
index 31f9d5e79935b6d461ed09d6701aa73ba15fb059..334cab047064cbfa5a3a4c1564e3c14b074d90d5 100644 (file)
--- a/Websites/perf.webkit.org/public/admin/tests.php
+++ b/Websites/perf.webkit.org/public/admin/tests.php
@@ -43,10 +43,8 @@ if ($action == 'dashboard') {
                 array('test' => $id, 'name' => $_POST['metric_name'], 'aggregator' => $aggregator));
             if (!$metric_id)
                 notice("Could not insert the new metric for test $id");
-            else {
-                add_job('aggregate', '{"metricIds": [ ' . $metric_id . ']}');
-                notice("Inserted the metric for test $id");
-            }
+            else
+                notice("Inserted the metric for test $id. Aggregation for $metric_id is needed.");
         }
     } else if (array_key_exists('metric_id', $_POST))
         regenerate_manifest();

diff --git a/Websites/perf.webkit.org/public/include/admin-header.php b/Websites/perf.webkit.org/public/include/admin-header.php
index 882d6647fdcd0347ccb405dd9bc43f745d958e5a..efd991d3446a63057f62c5c572b7820c9684a3de 100644 (file)
--- a/Websites/perf.webkit.org/public/include/admin-header.php
+++ b/Websites/perf.webkit.org/public/include/admin-header.php
@@ -16,7 +16,6 @@ require_once('manifest.php');
 <ul>
     <li><a href="/admin/platforms">Platforms</a></li>
     <li><a href="/admin/tests">Tests</a></li>
-    <li><a href="/admin/jobs">Jobs</a></li>
     <li><a href="/admin/aggregators">Aggregators</a></li>
     <li><a href="/admin/builders">Builders</a></li>
     <li><a href="/admin/repositories">Repositories</a></li>
@@ -92,15 +91,6 @@ function regenerate_manifest() {
     return TRUE;
 }
 
-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");
-}
-
 class AdministrativePage {
     private $table;
     private $prefix;