Changeset 33415 for branches/meh_branches/ppstack_test/dbconfig/changes.txt

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• dbconfig/changes.txt (modified) (1 diff)

branches/meh_branches/ppstack_test/dbconfig/changes.txt

@@ -2135 +2135 @@
 
 alter table addRun add key(stage), add key (stage_id);
+
+CREATE TABLE vpRun (
+    vp_id BIGINT AUTO_INCREMENT,
+    exp_id BIGINT,
+    state VARCHAR(64),
+    label VARCHAR(64),
+    data_group VARCHAR(64),
+    workdir VARCHAR(255),
+    note VARCHAR(255),
+    dest_id BIGINT,
+    outroot VARCHAR(255),
+    dtime_script FLOAT,
+    hostname VARCHAR(64),
+    fault SMALLINT NOT NULL DEFAULT 0,
+    PRIMARY KEY(vp_id),
+    KEY(exp_id),
+    KEY(state),
+    KEY(label),
+    KEY(data_group),
+    KEY(fault),
+    INDEX(vp_id, exp_id),
+    FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE vpProcessedCell (
+    vp_id BIGINT,
+    class_id VARCHAR(64),
+    cell_id VARCHAR(64),
+    dtime_photom FLOAT,
+    quality SMALLINT NOT NULL DEFAULT 0,
+    path_base VARCHAR(255),
+    fault SMALLINT NOT NULL DEFAULT 0,
+    KEY(quality),
+    KEY(fault),
+    FOREIGN KEY(vp_id) REFERENCES vpRun(vp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- changes to prevent repeatedly queueing diffRuns for warps with no overlaps
+ALTER TABLE diffInputSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY(diff_skyfile_id);
+ALTER TABLE diffInputSkyfile CHANGE COLUMN skycell_id  skycell_id VARCHAR(64) DEFAULT NULL;
+
+UPDATE dbversion set schema_version = '1.1.71', updated= CURRENT_TIMESTAMP();
+
+
+-- this is to stuff extra stage related information. 
+-- example - multi filter staticsky stage - this allows selection of 
+-- each filter of cmf staticsky.  
+
+alter table addRun add column stage_extra1 int after stage_id;
+
+
+-- This adds new features to addRun, first add the tables:
+
+CREATE TABLE mergedvodbRun (
+       merge_id BIGINT AUTO_INCREMENT,
+       minidvodb_id BIGINT,
+       mergedvodb VARCHAR(64) NOT NULL,
+       mergedvodb_path VARCHAR(255) NOT NULL,
+       state VARCHAR(64) NOT NULL,
+       creation_date TIMESTAMP,
+       PRIMARY KEY(merge_id), KEY(minidvodb_id), KEY(mergedvodb), INDEX(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE mergedvodbProcessed (
+      merge_id BIGINT,
+      dtime_verify FLOAT,
+      dtime_merge FLOAT,
+      dtime_script FLOAT,
+      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+      fault SMALLINT NOT NULL,
+      UNIQUE KEY (merge_id),
+      KEY(merge_id),
+      FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbCopy (
+    mergedvodbcopy_id     BIGINT AUTO_INCREMENT,
+    merge_id     BIGINT,
+    mergedvodb_rsync_path VARCHAR(255) NOT NULL,
+    destination_host VARCHAR(255) NOT NULL,
+    fault  SMALLINT NOT NULL,
+    state   VARCHAR(64) NOT NULL,
+    epoch TIMESTAMP,
+    dtime FLOAT,
+    PRIMARY KEY(mergedvodbcopy_id),
+    KEY(merge_id),
+    FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+alter table mergedvodbProcessed add column merge_order BIGINT after merge_id;
+
+-- then copy over the info into the 2 tables:
+ insert into mergedvodbRun ( minidvodb_id, mergedvodb,mergedvodb_path,
+   state, creation_date)  select minidvodb_id, minidvodb_group,mergedvodb_path,
+minidvodbRun.state,
+   minidvodbRun.creation_date from minidvodbRun where minidvodb_id >= 0;
+
+insert into mergedvodbProcessed (merge_id, merge_order, dtime_verify,
+dtime_merge, dtime_script, epoch, fault) select merge_id, merge_order,
+minidvodbProcessed.dtime_verify, minidvodbProcessed.dtime_merge,
+minidvodbProcessed.dtime_script, minidvodbProcessed.epoch,
+minidvodbProcessed.fault from minidvodbProcessed join mergedvodbRun using
+(minidvodb_id) where merge_id > -1 ;
+
+--then clean up the tables:
+-- once the tables have had the columns migrated over, then and only then do this:
+
+alter table minidvodbRun drop column mergedvodb_path;
+alter table minidvodbProcessed drop column dtime_verify;
+alter table minidvodbProcessed drop column merge_order;
+alter table minidvodbProcessed drop column dtime_merge;
+alter table minidvodbProcessed drop column mergedvodb_path;
+
+
+--then to keep compatible with old camruns (stage_extra1 = negative means it used a destreaked smf)
+
+--it's commented out as it only needs to be run once (and only on gpc1)
+--update addRun set stage_extra1 = -1 where stage = 'cam' <= 483624; 
+