Changeset 26854

Timestamp:

Feb 10, 2010, 3:47:37 PM (16 years ago)

Author:

eugene

Message:

updates from trunk (added dqstats, small changes to magic.md, receive.md, dist.md, summitcopy.md

Location:

branches/eam_branches/20091201/dbconfig

Files:

• changes.txt (modified) (1 diff)
• config.md (modified) (1 diff)
• dist.md (modified) (1 diff)
• dqstats.md (copied) (copied from trunk/dbconfig/dqstats.md )
• ipp.m4 (modified) (1 diff)
• magic.md (modified) (1 diff)
• receive.md (modified) (1 diff)
• summitcopy.md (modified) (1 diff)

branches/eam_branches/20091201/dbconfig/changes.txt

@@ -1434 +1434 @@
 UPDATE dbversion set schema_version = '1.1.57',  updated= CURRENT_TIMESTAMP();
 
+
 -- Vesion 1.1.58
 -- UPDATE dbversion set schema_version = '1.1.58',  updated= CURRENT_TIMESTAMP();
+
+-- Version 1.1.59
+-- Include tables for data quality statistics.
+
+CREATE TABLE dqstatsRun (
+      dqstats_id BIGINT AUTO_INCREMENT,
+      state VARCHAR(64),
+      registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+      PRIMARY KEY(dqstats_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE dqstatsContent (
+      dqstats_id BIGINT,
+      exp_id BIGINT,
+      chip_id BIGINT,
+      cam_id BIGINT,
+      warp_id BIGINT,
+      invalid TINYINT,
+      KEY(dqstats_id),
+      KEY (exp_id),
+      KEY (chip_id), 
+      KEY (cam_id),
+      KEY (warp_id), 
+      FOREIGN KEY (dqstats_id) REFERENCES dqstatsRun(dqstats_id),
+      FOREIGN KEY (exp_id) REFERENCES rawExp(exp_id),
+      FOREIGN KEY (chip_id) REFERENCES chipRun(chip_id),
+      FOREIGN KEY (cam_id) REFERENCES camRun(cam_id),
+      FOREIGN KEY (warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Version 1.1.60
+
+ALTER TABLE dqstatsRun ADD COLUMN label VARCHAR(64) AFTER registered;
+ALTER TABLE dqstatsRun ADD KEY(label);
+
+ALTER TABLE dqstatsRun ADD COLUMN fault SMALLINT NOT NULL AFTER label;
+ALTER TABLE dqstatsRun ADD KEY(fault);
+
+-- Version 1.1.61
+
+ALTER TABLE pzDataStore ADD COLUMN use_compress SMALLINT NOT NULL AFTER epoch;
+
+UPDATE dbversion set schema_version = '1.1.61',  updated= CURRENT_TIMESTAMP();
+
+-- Version 1.1.62
+
+ALTER TABLE magicDSFile ADD COLUMN streak_frac FLOAT AFTER recovery_path_base;
+ALTER TABLE magicDSFile ADD COLUMN run_time FLOAT AFTER streak_frac;
+
+ALTER TABLE receiveSource ADD COLUMN state VARCHAR(64) AFTER workdir;
+UPDATE receiveSource SET state = 'enabled';
+
+UPDATE dbversion set schema_version = '1.1.62',  updated= CURRENT_TIMESTAMP();
+
+-- Version 1.1.63
+ALTER TABLE distRun ADD COLUMN data_group VARCHAR(64) AFTER fault;
+UPDATE distRun, chipRun SET distRun.data_group = chipRun.data_group 
+    WHERE distRun.stage = 'chip' AND stage_id = chip_id;
+UPDATE distRun, camRun SET distRun.data_group = camRun.data_group 
+    WHERE distRun.stage = 'camera' AND stage_id = cam_id;
+UPDATE distRun, fakeRun SET distRun.data_group = fakeRun.data_group 
+    WHERE distRun.stage = 'fake' AND stage_id = fake_id;
+UPDATE distRun, warpRun SET distRun.data_group = warpRun.data_group 
+    WHERE distRun.stage = 'warp' AND stage_id = warp_id;
+UPDATE distRun, diffRun SET distRun.data_group = diffRun.data_group 
+    WHERE distRun.stage = 'diff' AND stage_id = diff_id;
+UPDATE distRun, stackRun SET distRun.data_group = stackRun.data_group 
+    WHERE distRun.stage = 'stack' AND stage_id = stack_id;
+-- all of these runs are old so using label is fine (rawExp doesn't have
+-- data_group in distRun it inherit's chipRun.data_group
+UPDATE distRun SET distRun.data_group = label where stage = 'raw';
+
+UPDATE dbversion set schema_version = '1.1.63',  updated= CURRENT_TIMESTAMP();
+
+-- Version 1.1.64

branches/eam_branches/20091201/dbconfig/config.md

@@ -2 +2 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.57
+    pkg_version     STR     1.1.63
 END

branches/eam_branches/20091201/dbconfig/dist.md

@@ -23 +23 @@
     time_stamp  UTC         0001-01-01T00:00:00Z
     fault       S16         0
+    data_group  STR         64
     note        STR         255
 END

branches/eam_branches/20091201/dbconfig/ipp.m4

@@ -24 +24 @@
 include(calibration.md)
 include(flatcorr.md)
+include(dqstats.md)
 include(pstamp.md)
 include(dist.md)

branches/eam_branches/20091201/dbconfig/magic.md

@@ -69 +69 @@
     backup_path_base  STR         255
     recovery_path_base STR        255
+    streak_frac F32         0
+    run_time    F32         0
     fault       S16         0
     data_state  STR        64     # Key

branches/eam_branches/20091201/dbconfig/receive.md

@@ -6 +6 @@
         product         STR     64      # Key
         workdir         STR     255
+        state           STR     64
         comment         STR     255     # Key
         fileset_last    STR     128

branches/eam_branches/20091201/dbconfig/summitcopy.md

@@ -4 +4 @@
     uri         STR         255
     epoch       UTC         0001-01-01T00:00:00Z
+    use_compress S16        0
 END