Index: branches/eam_branches/ipp-ops-20130712/dbconfig/README =================================================================== --- branches/eam_branches/ipp-ops-20130712/dbconfig/README (revision 37064) +++ branches/eam_branches/ipp-ops-20130712/dbconfig/README (revision 37067) @@ -10,7 +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. + + Index: branches/eam_branches/ipp-ops-20130712/dbconfig/changes.txt =================================================================== --- branches/eam_branches/ipp-ops-20130712/dbconfig/changes.txt (revision 37064) +++ branches/eam_branches/ipp-ops-20130712/dbconfig/changes.txt (revision 37067) @@ -2392,5 +2392,5 @@ 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,5 +2412,5 @@ -- 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,2 +2432,95 @@ 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(); + + Index: branches/eam_branches/ipp-ops-20130712/dbconfig/ff.md =================================================================== --- branches/eam_branches/ipp-ops-20130712/dbconfig/ff.md (revision 37067) +++ branches/eam_branches/ipp-ops-20130712/dbconfig/ff.md (revision 37067) @@ -0,0 +1,41 @@ + +fullForceRun METADATA + ff_id S64 0 + skycal_id S64 0 + sources_path_base STR 255 + state STR 64 + workdir STR 255 + label STR 64 + data_group STR 64 + dist_group STR 64 + note STR 255 + reduction STR 64 + registered TAI NULL +END + +fullForceInput METADATA + ff_id S64 0 + warp_id S64 0 +END + +fullForceResult METADATA + ff_id S64 0 + warp_id S64 0 + path_base STR 255 + dtime_script F32 0.0 + quality S16 0 + hostname STR 64 + software_ver STR 16 + fault S16 0 +END + +fullForceSummary METADATA + ff_id S64 0 + path_base STR 255 + dtime_script F32 0.0 + quality S16 0 + hostname STR 64 + software_ver STR 16 + fault S16 0 +END + Index: branches/eam_branches/ipp-ops-20130712/dbconfig/ipp.m4 =================================================================== --- branches/eam_branches/ipp-ops-20130712/dbconfig/ipp.m4 (revision 37064) +++ branches/eam_branches/ipp-ops-20130712/dbconfig/ipp.m4 (revision 37067) @@ -40,2 +40,4 @@ include(skycell.md) include(release.md) +include(ff.md) +include(remote.md) Index: branches/eam_branches/ipp-ops-20130712/dbconfig/remote.md =================================================================== --- branches/eam_branches/ipp-ops-20130712/dbconfig/remote.md (revision 37067) +++ branches/eam_branches/ipp-ops-20130712/dbconfig/remote.md (revision 37067) @@ -0,0 +1,15 @@ +remoteRun METADATA + remote_id S64 0 # Primary Key AUTO_INCREMENT + state STR 64 + stage STR 64 + label STR 64 + path_base STR 255 + job_id S64 0 + last_poll TAI NULL # DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP + fault S16 0 # Key +END + +remoteComponent METADATA + remote_id S64 0 # Primary Key fkey (remote_id) ref remoteRun(remote_id) + stage_id S64 0 # Key +END