Changeset 37067 for branches/eam_branches/ipp-ops-20130712/dbconfig

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/dbconfig

Files:

• . (modified) (1 prop)
• README (modified) (1 diff)
• cam.md (modified) (1 prop)
• changes.txt (modified) (3 diffs, 1 prop)
• ff.md (copied) (copied from trunk/dbconfig/ff.md )
• ipp.m4 (modified) (1 diff)
• remote.md (copied) (copied from trunk/dbconfig/remote.md )

branches/eam_branches/ipp-ops-20130712/dbconfig/README

@@ -10 +10 @@
    edit the oldtable.md
 
-2. figure out what changes are needed to get the gpc1/isp up to the current
-schema.  Add those changes at the bottom of changes.txt, and modify gpc1/isp.
+2. figure out what changes are needed to get the gpc1/isp/uip/ssp up
+   to the current schema.  Add those changes at the bottom of
+   changes.txt, and modify gpc1/isp/uip/ssp.
 
 3. edit ippTools/share/pxadmin_create_tables.sql.  This is the sql that creates
-an empty database.
+   an empty database.
+
+

branches/eam_branches/ipp-ops-20130712/dbconfig/changes.txt

@@ -2392 +2392 @@
     state   VARCHAR(16),
     label   VARCHAR(654),
-    registered TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+    registered TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     fault   SMALLINT,
     PRIMARY KEY(seq_id, projection_cell),
@@ -2412 +2412 @@
 -- unique keys for the release tables
 
-alter table relStack  add unique key (rel_id, tess_id, skycell_id, filter, stack_type, mjd_obs)
+alter table relStack  add unique key (rel_id, tess_id, skycell_id, filter, stack_type, mjd_obs);
 alter table relExp add UNIQUE KEY(rel_id, exp_id);
 alter table ippRelease add unique key (surveyID, release_name);
@@ -2432 +2432 @@
 UPDATE dbversion set schema_version = '1.1.77', updated= CURRENT_TIMESTAMP();
 
+--
+
+CREATE TABLE fullForceRun (
+    ff_id           BIGINT NOT NULL AUTO_INCREMENT,
+    skycal_id       BIGINT,
+    sources_path_base VARCHAR(255),
+    state           VARCHAR(64),
+    workdir         VARCHAR(255),
+    label           VARCHAR(64),
+    data_group      VARCHAR(64),
+    dist_group      VARCHAR(64),
+    note            VARCHAR(255),
+    reduction       VARCHAR(64),
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+    PRIMARY KEY(ff_id),
+    KEY(state),
+    KEY(label),
+    KEY(data_group),
+    KEY(skycal_id),
+    FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fullForceInput (
+    ff_id           BIGINT,
+    warp_id         BIGINT,
+    PRIMARY KEY(ff_id, warp_id),
+    FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id),
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fullForceResult (
+    ff_id           BIGINT,
+    warp_id         BIGINT,
+    path_base       VARCHAR(255) NOT NULL,
+    dtime_script    FLOAT,
+    quality         SMALLINT NOT NULL,
+    hostname        VARCHAR(64) NOT NULL,
+    software_ver    VARCHAR(16),
+    fault           SMALLINT NOT NULL,
+    PRIMARY KEY(ff_id, warp_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id),
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fullForceSummary (
+    ff_id           BIGINT,
+    path_base       VARCHAR(255) NOT NULL,
+    dtime_script    FLOAT,
+    quality         SMALLINT NOT NULL,
+    hostname        VARCHAR(64) NOT NULL,
+    software_ver    VARCHAR(16),
+    fault           SMALLINT NOT NULL,
+    PRIMARY KEY(ff_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+UPDATE dbversion set schema_version = '1.1.78', updated= CURRENT_TIMESTAMP();
+
+--
+
+CREATE TABLE remoteRun (
+    remote_id BIGINT NOT NULL AUTO_INCREMENT,
+    state     VARCHAR(64) NOT NULL,
+    stage     VARCHAR(64) NOT NULL,
+    label     VARCHAR(64) NOT NULL,
+    path_base VARCHAR(255) NOT NULL,
+    job_id    BIGINT,
+    last_poll TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fault     SMALLINT NOT NULL,
+    PRIMARY KEY (remote_id),
+    KEY (state),
+    KEY (stage),
+    KEY (label),
+    KEY (job_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;    
+
+CREATE TABLE remoteComponent (
+    remote_id BIGINT,
+    stage_id  BIGINT,
+    KEY (stage_id),
+    FOREIGN KEY (remote_id) REFERENCES remoteRun(remote_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;    
+
+UPDATE dbversion set schema_version = '1.1.79', updated= CURRENT_TIMESTAMP();
+
+ALTER TABLE camProcessedExp ADD COLUMN astrom_chips BIGINT;
+UPDATE dbversion set schema_version = '1.1.79', updated= CURRENT_TIMESTAMP();
+
+

branches/eam_branches/ipp-ops-20130712/dbconfig/ipp.m4

@@ -40 +40 @@
 include(skycell.md)
 include(release.md)
+include(ff.md)
+include(remote.md)