IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 7, 2009, 4:08:25 PM (17 years ago)
Author:
Paul Price
Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:
branches/pap
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/pap

  • branches/pap/dbconfig/changes.txt

    r23940 r25027  
    10851085
    10861086ALTER TABLE diffSkyfile ADD COLUMN deconv_max FLOAT AFTER kernel_yy;
     1087
     1088-- This key makes it faster to find the ccd_temp for XY24
     1089ALTER TABLE rawImfile ADD KEY(dateobs);
     1090
     1091ALTER TABLE receiveSource ADD COLUMN status_product VARCHAR(64);
     1092ALTER TABLE receiveSource ADD COLUMN ds_dbname VARCHAR(64);
     1093ALTER TABLE receiveSource ADD COLUMN ds_dbhost VARCHAR(64);
     1094
     1095ALTER TABLE receiveFileset ADD COLUMN state VARCHAR(64);
     1096ALTER TABLE receiveFileset ADD COLUMN dbinfo_uri VARCHAR(255);
     1097ALTER TABLE receiveFileset ADD COLUMN fault SMALLINT NOT NULL DEFAULT 0;
     1098
     1099ALTER TABLE receiveFile ADD COLUMN bytes BIGINT;
     1100ALTER TABLE receiveFile ADD COLUMN md5sum VARCHAR(255);
     1101ALTER TABLE receiveFile ADD COLUMN file_type VARCHAR(64);
     1102ALTER TABLE receiveFile ADD COLUMN component VARCHAR(64);
     1103
     1104ALTER TABLE receiveFileset CHANGE COLUMN dbinfo_uri dbinfo VARCHAR(255);
     1105ALTER TABLE receiveFileset ADD COLUMN dirinfo VARCHAR(255) AFTER state;
     1106
     1107-- Playing with the diffs for warp-warp
     1108ALTER TABLE diffRun ADD COLUMN bothways TINYINT DEFAULT 0 AFTER tess_id;
     1109UPDATE diffRun SET bothways = 1 WHERE reduction = 'WARPWARP';
     1110ALTER TABLE diffRun DROP FOREIGN KEY diffRun_ibfk_1;
     1111ALTER TABLE diffRun DROP COLUMN exp_id;
     1112ALTER TABLE diffRun ADD KEY(label);
     1113ALTER TABLE diffRun ADD COLUMN exposure TINYINT DEFAULT 0 AFTER bothways;
     1114UPDATE diffRun, diffInputSkyfile SET diffRun.exposure = 1 WHERE diffRun.diff_id = diffInputSkyfile.diff_id and diffInputSkyfile.warp1 IS NOT NULL;
     1115ALTER TABLE stackRun ADD KEY(label);
     1116
     1117ALTER TABLE magicRun ADD COLUMN inverse TINYINT NOT NULL DEFAULT 0 AFTER diff_id;
     1118ALTER TABLE diffSkyfile DROP COLUMN uri;
     1119
     1120DROP TABLE IF EXISTS magicSkyfileMask;
     1121ALTER TABLE magicInputSkyfile DROP FOREIGN KEY magicInputSkyfile_ibfk_2;
     1122ALTER TABLE magicInputSkyfile DROP KEY diff_id;
     1123ALTER TABLE magicInputSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY(magic_id,node);
     1124ALTER TABLE magicInputSkyfile DROP COLUMN diff_id;
     1125ALTER TABLE magicNodeResult CHANGE COLUMN uri path_base VARCHAR(255);
     1126
     1127-- Version 1.1.53
     1128
     1129ALTER TABLE warpRun ADD COLUMN reduction VARCHAR(64) AFTER tess_id;
     1130
     1131-- Tables to support publishing of detections to a Science Client
     1132-- Clients to which we send stuff
     1133CREATE TABLE publishClient (
     1134    client_id BIGINT AUTO_INCREMENT, -- unique identifier
     1135    product VARCHAR(64),             -- product name
     1136    stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
     1137    workdir VARCHAR(255) NOT NULL, -- working directory
     1138    comment VARCHAR(255),            -- for human memory
     1139    PRIMARY KEY(client_id)
     1140) ENGINE=innodb DEFAULT CHARSET=latin1;
     1141-- Publishing a set of data (e.g., a specific diffRun)
     1142CREATE TABLE publishRun (
     1143    pub_id BIGINT AUTO_INCREMENT, -- unique identifier
     1144    client_id BIGINT NOT NULL,  -- link to publishClient
     1145    stage_id BIGINT NOT NULL,   -- link to various stage tables
     1146    label VARCHAR(64),          -- label for run
     1147    state VARCHAR(64),          -- state of run (new, full, etc.)
     1148    PRIMARY KEY(pub_id),
     1149    KEY(client_id),
     1150    KEY(stage_id),
     1151    KEY(label),
     1152    KEY(state),
     1153    FOREIGN KEY(client_id) REFERENCES publishClient(client_id)
     1154) ENGINE=innodb DEFAULT CHARSET=latin1;
     1155-- Publishing a file within a set
     1156CREATE TABLE publishDone (
     1157    pub_id BIGINT AUTO_INCREMENT, -- link to publishRun
     1158    path_base VARCHAR(255),     -- base path of output
     1159    fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
     1160    PRIMARY KEY(pub_id),
     1161    KEY(fault),
     1162    FOREIGN KEY(pub_id) REFERENCES publishRun(pub_id)
     1163) ENGINE=innodb DEFAULT CHARSET=latin1;
     1164
     1165-- Version 1.1.54
     1166
     1167-- changed magicked from a flag to a BIGINT
     1168-- The value is the magic_ds_id of the magicDSRun that destreaked the file/run
     1169
     1170ALTER TABLE magicDSFile ADD COLUMN data_state VARCHAR(64);
     1171ALTER TABLE magicDSFile ADD KEY(data_state);
     1172UPDATE magicDSFile SET data_state = 'full' WHERE data_state IS NULL;
     1173
     1174ALTER TABLE rawImfile CHANGE COLUMN magicked  magicked BIGINT;
     1175ALTER TABLE rawExp CHANGE COLUMN magicked  magicked BIGINT;
     1176
     1177ALTER TABLE chipProcessedImfile CHANGE COLUMN magicked  magicked BIGINT;
     1178ALTER TABLE chipRun CHANGE COLUMN magicked  magicked BIGINT;
     1179
     1180-- so far only chipRuns have been magicked in product
     1181UPDATE chipProcessedImfile JOIN magicDSRun ON stage = 'chip' AND chip_id = stage_id
     1182    SET chipProcessedImfile.magicked = magic_ds_id
     1183    WHERE magicDSRun.re_place
     1184    AND chipProcessedImfile.magicked > 0;
     1185
     1186UPDATE chipRun JOIN magicDSRun ON stage = 'chip' AND chip_id = stage_id
     1187    SET chipRun.magicked = magic_ds_id
     1188    WHERE magicDSRun.re_place
     1189    AND chipRun.magicked > 0;
     1190
     1191ALTER TABLE warpSkyfile CHANGE COLUMN magicked  magicked BIGINT;
     1192ALTER TABLE warpRun CHANGE COLUMN magicked  magicked BIGINT;
     1193
     1194ALTER TABLE diffSkyfile CHANGE COLUMN magicked  magicked BIGINT;
     1195ALTER TABLE diffRun CHANGE COLUMN magicked  magicked BIGINT;
     1196
     1197ALTER TABLE camRun ADD COLUMN magicked BIGINT;
     1198
     1199ALTER TABLE distTarget CHANGE COLUMN obs_mode label VARCHAR(64);
     1200ALTER TABLE distTarget ADD COLUMN filter VARCHAR(64) AFTER label;
     1201ALTER TABLE distTarget DROP KEY clean;
     1202ALTER TABLE distTarget ADD CONSTRAINT UNIQUE(label, filter, stage, clean);
     1203
     1204ALTER TABLE pstampJob DROP COLUMN args;
     1205ALTER TABLE pstampJob DROP COLUMN uri;
     1206ALTER TABLE magicDSRun ADD COLUMN inv_magic_id BIGINT AFTER magic_id;
     1207ALTER TABLE magicDSRun ADD FOREIGN KEY (inv_magic_id) REFERENCES magicRun(magic_id);
Note: See TracChangeset for help on using the changeset viewer.