Changeset 25766 for branches/eam_branches/20090820/ippTools/share/pxadmin_create_tables.sql

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (10 diffs)

branches/eam_branches/20090820/ippTools/share/pxadmin_create_tables.sql

@@ -58 +58 @@
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     hostname VARCHAR(64),
+    bytes INT,
+    md5sum VARCHAR(32),
     PRIMARY KEY(exp_name, camera, telescope, class, class_id),
     KEY(fault),
@@ -94 +96 @@
     uri VARCHAR(255),
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    bytes INT,
+    md5sum VARCHAR(32),
     PRIMARY KEY(exp_id, tmp_class_id),
     FOREIGN KEY(exp_id) REFERENCES newExp(exp_id)
@@ -237 +241 @@
     raw_image_id BIGINT AUTO_INCREMENT,
     magicked BIGINT,
+    bytes INT,
+    md5sum VARCHAR(32),
+    burntool_state SMALLINT,
     PRIMARY KEY(exp_id, class_id),
     KEY(tmp_class_id),
@@ -451 +458 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE addRun (
+    add_id BIGINT AUTO_INCREMENT,
+    cam_id BIGINT,
+    state VARCHAR(64),
+    workdir VARCHAR(255),
+    workdir_state VARCHAR(64),
+    label VARCHAR(64),
+    dvodb VARCHAR(255),
+    magicked BIGINT,
+    PRIMARY KEY(add_id),
+    KEY(add_id),
+    KEY(cam_id),
+    KEY(state),
+    KEY(workdir_state),
+    KEY(label),
+    INDEX(add_id, cam_id),
+    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE addProcessedExp (
+    add_id BIGINT AUTO_INCREMENT,
+    dtime_addstar FLOAT,
+    n_stars INT,
+    path_base VARCHAR(255),
+    fault SMALLINT NOT NULL,
+    PRIMARY KEY(add_id),
+    FOREIGN KEY(add_id) REFERENCES addRun(add_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE addMask (
+    label VARCHAR(64),
+    PRIMARY KEY(label)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 CREATE TABLE fakeRun (
     fake_id BIGINT AUTO_INCREMENT,
@@ -1191 +1232 @@
         name VARCHAR(64) UNIQUE,
         reqType VARCHAR(16),
+        label VARCHAR(64),
         outProduct VARCHAR(64),
         uri VARCHAR(255),
@@ -1207 +1249 @@
         exp_id BIGINT,
         outputBase VARCHAR(255),
+        options BIGINT,
         PRIMARY KEY(job_id, req_id),
         KEY(job_id),
@@ -1229 +1272 @@
     stage       VARCHAR(64),
     stage_id    BIGINT,
+    magic_ds_id BIGINT,
     label       VARCHAR(64),
     outroot     VARCHAR(255),
@@ -1256 +1300 @@
 
 
-CREATE TABLE rcDSProduct (
-    prod_id     BIGINT AUTO_INCREMENT,
-    name        VARCHAR(64),
-    dbname      VARCHAR(64),
-    dbhost      VARCHAR(64),
-    PRIMARY KEY(prod_id)
-)  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 CREATE TABLE rcDestination (
     dest_id     BIGINT AUTO_INCREMENT,
-    prod_id     BIGINT,
     name        VARCHAR(64),
     status_uri  VARCHAR(255),
     comment     VARCHAR(255),
     last_fileset VARCHAR(255),
+    dbname      VARCHAR(64),
+    dbhost      VARCHAR(64),
     state       VARCHAR(64),
-    PRIMARY KEY(dest_id),
-    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
+    PRIMARY KEY(dest_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 
 CREATE TABLE rcInterest (
@@ -1291 +1326 @@
     fs_id       BIGINT AUTO_INCREMENT,
     dist_id     BIGINT,
-    prod_id     BIGINT,
+    dest_id     BIGINT,
     name        VARCHAR(255),
     state       VARCHAR(64),
     registered  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     fault       SMALLINT DEFAULT 0,
-    PRIMARY KEY(dist_id, prod_id),
+    PRIMARY KEY(dist_id, dest_id),
     KEY(fs_id),
     FOREIGN KEY(dist_id) REFERENCES distRun(dist_id),
-    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
---    KEY(dist_id, prod_id)
+    FOREIGN KEY(dest_id) REFERENCES rcDestination(dest_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1407 +1441 @@
     pub_id BIGINT AUTO_INCREMENT, -- link to publishRun
     path_base VARCHAR(255),     -- base path of output
+    hostname VARCHAR(64),       -- name of host
+    dtime_script FLOAT,         -- run time for script
     fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
     PRIMARY KEY(pub_id),