Add state and last_simulated_tick to experiment, remove queued_experiments

2 files changed, 6 insertions, 16 deletions

diff --git a/database/schema.sql b/database/schema.sql
index ab9fd3a0..5604d419 100644
--- a/database/schema.sql
+++ b/database/schema.sql
@@ -74,6 +74,8 @@ CREATE TABLE IF NOT EXISTS experiments (
     trace_id                INTEGER                 NOT NULL,
     scheduler_name          TEXT                    NOT NULL,
     name                    TEXT                    NOT NULL,
+	state					TEXT					NOT NULL,
+	last_simulated_tick		INTEGER					NOT NULL DEFAULT 0 CHECK (last_simulated_tick >= 0),
 
     FOREIGN KEY (simulation_id) REFERENCES simulations (id) ON DELETE CASCADE ON UPDATE CASCADE
     FOREIGN KEY (path_id) REFERENCES paths (id) ON DELETE CASCADE ON UPDATE CASCADE
@@ -81,13 +83,6 @@ CREATE TABLE IF NOT EXISTS experiments (
     FOREIGN KEY (scheduler_name) REFERENCES schedulers (name) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
--- Queued experiments are ready to be run by the simulator
-CREATE TABLE IF NOT EXISTS queued_experiments (
-    experiment_id           INTEGER                 NOT NULL,
-
-    FOREIGN KEY (experiment_id) REFERENCES experiments (id) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
 /*
 *   A Simulation has several Paths, which each contain Sections. A Section details which Datacenter topology to use
 *   starting at which point in time (known internally as a "tick"). So, combining the several Sections in a Path
diff --git a/database/test.sql b/database/test.sql
index 775ff584..69304767 100644
--- a/database/test.sql
+++ b/database/test.sql
@@ -46,10 +46,10 @@ INSERT INTO tasks (start_tick, total_flop_count, trace_id) VALUES (26, 10000, 1)
 INSERT INTO tasks (start_tick, total_flop_count, trace_id, task_dependency_id) VALUES (80, 200000, 1, 1);
 
 -- Experiments
-INSERT INTO experiments (simulation_id, path_id, trace_id, scheduler_name, name)
-    VALUES (1, 1, 1, 'DEFAULT', 'Experiment 1');
-INSERT INTO experiments (simulation_id, path_id, trace_id, scheduler_name, name)
-    VALUES (1, 2, 1, 'DEFAULT', 'Experiment 2');
+INSERT INTO experiments (simulation_id, path_id, trace_id, scheduler_name, name, state, last_simulated_tick)
+    VALUES (1, 1, 1, 'DEFAULT', 'Experiment 1', 'QUEUED', 0);
+INSERT INTO experiments (simulation_id, path_id, trace_id, scheduler_name, name, state, last_simulated_tick)
+    VALUES (1, 2, 1, 'DEFAULT', 'Experiment 2', 'QUEUED', 0);
 
 -- Rooms
 INSERT INTO rooms (name, datacenter_id, type) VALUES ('room 1', 1, 'SERVER');
@@ -224,8 +224,3 @@ INSERT INTO memories (manufacturer, family, generation, model, speed_mb_per_s, s
 
 INSERT INTO storages (manufacturer, family, generation, model, speed_mb_per_s, size_mb, energy_consumption_w, 
 	failure_model_id) VALUES ('samsung', 'EVO', '2016', 'SATA III', 6000, 250000, 10, 1);
-
--- Simulation queue
-INSERT INTO queued_experiments (experiment_id) VALUES (1);
-INSERT INTO queued_experiments (experiment_id) VALUES (2);
-