Changeset 23391

Timestamp:

Mar 18, 2009, 10:20:53 AM (17 years ago)

Author:

bills

Message:

update database version
add rawExp.magicked

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (2 diffs)
• dbconfig/config.md (modified) (1 diff)
• dbconfig/ipp.m4 (modified) (1 diff)
• dbconfig/tasks.md (modified) (2 diffs)
• ippTools/configure.ac (modified) (1 diff)

trunk/dbconfig/changes.txt

@@ -740 +740 @@
 ALTER TABLE diffSkyfile ADD COLUMN magicked TINYINT;
 
--- drop exiting foreign key constraints
+-- drop existing foreign key constraints
 ALTER TABLE diffInputSkyfile drop FOREIGN KEY diffInputSkyfile_ibfk_1;
 ALTER TABLE diffInputSkyfile drop FOREIGN KEY diffInputSkyfile_ibfk_2;
@@ -836 +836 @@
 show create table detResidImfile;
 alter table detResidImfile drop foreign key detResidImfile_ibfk_3;
+
+
+-- Version: 1.1.50  magic and distribution changes
+
+ALTER TABLE magicDSRun ADD COLUMN label VARCHAR(64) after cam_id;
+ALTER TABLE magicDSRun ADD KEY(label);
+
+-- replace null values for magicked flags with zero
+UPDATE rawImfile SET magicked = 0 WHERE magicked IS NULL;
+UPDATE chipProcessedImfile SET magicked = 0 WHERE magicked IS NULL;
+UPDATE warpSkyfile SET magicked = 0 WHERE magicked IS NULL;
+UPDATE diffSkyfile SET magicked = 0 WHERE magicked IS NULL;
+
+CREATE TABLE distRun (
+    dist_id     BIGINT AUTO_INCREMENT,
+    stage       VARCHAR(64),
+    stage_id    BIGINT,
+    label       VARCHAR(64),
+    outroot     VARCHAR(255),
+    clean       TINYINT,
+    state       VARCHAR(64),
+    fault       SMALLINT,
+    PRIMARY KEY(dist_id),
+    KEY(state),
+    KEY(label)
+)  ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE distComponent (
+    dist_id     BIGINT, 
+    component   VARCHAR(64),
+    bytes       INT,
+    md5sum      VARCHAR(32),
+    state       VARCHAR(64),
+    name        VARCHAR(255),
+    fault       SMALLINT,
+    PRIMARY KEY(dist_id, component),
+    KEY(state),
+    FOREIGN KEY(dist_id) REFERENCES distRun(dist_id)
+)  ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+-- change state fields to match the rest of the system
+UPDATE magicRun SET state = 'new' WHERE state = 'run';
+UPDATE magicRun SET state = 'full' WHERE state = 'stop';
+UPDATE magicDSRun SET state = 'new' WHERE state = 'run';
+UPDATE magicDSRun SET state = 'full' WHERE state = 'stop';
+
+ALTER TABLE rawExp ADD COLUMN magicked TINYINT;
+ALTER TABLE chipRun ADD COLUMN magicked TINYINT;
+ALTER TABLE warpRun ADD COLUMN magicked TINYINT;
+ALTER TABLE diffRun ADD COLUMN magicked TINYINT;
+
+update rawExp  SET magicked = 0;
+update chipRun SET magicked = 0;
+update warpRun SET magicked = 0;
+update diffRun SET magicked = 0;
+
+-- The following only applies to the gpc1 database (and recent copies)
+update chipRun SET magicked = 1 where chip_id = 11955;
+

trunk/dbconfig/config.md

@@ -2 +2 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.49
+    pkg_version     STR     1.1.50
 END

trunk/dbconfig/ipp.m4

@@ -22 +22 @@
 include(flatcorr.md)
 include(pstamp.md)
+include(dist.md)

trunk/dbconfig/tasks.md

@@ -171 +171 @@
     fault       S16         0       # Key NOT NULL
     epoch       UTC         0001-01-01T00:00:00Z
+    magicked    BOOL        f
 END
 
@@ -235 +236 @@
     moon_alt    F32         0.0
     moon_phase  F32         0.0
-    ignored     BOOL        FALSE
+    ignored     BOOL        f
     hostname    STR         64
     fault       S16         0       # Key NOT NULL

trunk/ippTools/configure.ac

@@ -18 +18 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.48]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.50]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"