IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 20973 for trunk/dbconfig


Ignore:
Timestamp:
Dec 13, 2008, 10:17:34 AM (18 years ago)
Author:
bills
Message:

Rework the diff stage to process the skycells from an exposure in a single
diffRun

Location:
trunk/dbconfig
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/dbconfig/changes.txt

    r20855 r20973  
    717717alter table magicDSRun add column cam_id BIGINT after stage_id;
    718718
     719--  Version: 1.1.47
     720
     721-- WARNING WARNING WARNING
     722-- Updating a database which has populated diffRun's requires editing
     723-- the contents of the tables in a way that cannot be expresed here.
     724-- The script tools/collapsdiffinputs.pl does the appropriate edits
     725-- and should be run at the spot indicated below
     726
     727-- fix order of workdir to match pxadmin_create_tables.sql
     728ALTER TABLE diffRun CHANGE COLUMN workdir workdir VARCHAR(255) AFTER state;
     729
     730-- add exposure id to diffRun
     731ALTER TABLE diffRun ADD COLUMN exp_id BIGINT;
     732ALTER TABLE diffRun ADD FOREIGN KEY (exp_id) REFERENCES rawExp(exp_id);
     733ALTER TABLE diffRun DROP COLUMN skycell_id;
     734
     735
     736-- drop exiting foreign key constraints
     737ALTER TABLE diffInputSkyfile drop FOREIGN KEY diffInputSkyfile_ibfk_1;
     738ALTER TABLE diffInputSkyfile drop FOREIGN KEY diffInputSkyfile_ibfk_2;
     739ALTER TABLE diffInputSkyfile drop FOREIGN KEY diffInputSkyfile_ibfk_3;
     740
     741ALTER TABLE diffInputSkyfile DROP COLUMN kind;
     742ALTER TABLE diffInputSkyfile CHANGE COLUMN skycell_id skycell_id VARCHAR(64) AFTER diff_id;
     743
     744-- WARNING WARNING
     745-- If you have existing diff runs they must be converted
     746
     747-- run the script collapse_diffinputs.pl here.
     748--        collapse_diffinputs.pl dbname dbuser dbpass dbhost
     749
     750DELETE FROM diffInputSkyfile where template = 1;
     751
     752ALTER TABLE diffInputSkyfile DROP PRIMARY KEY;
     753ALTER TABLE diffInputSkyfile ADD PRIMARY KEY (diff_id, skycell_id);
     754ALTER TABLE diffInputSkyfile DROP COLUMN template;
     755
     756ALTER TABLE diffInputSkyfile CHANGE COLUMN warp_id warp1 BIGINT;
     757ALTER TABLE diffInputSkyfile ADD COLUMN stack1 BIGINT AFTER warp1, ADD KEY(stack1);
     758ALTER TABLE diffInputSkyfile ADD COLUMN warp2 BIGINT AFTER stack1, ADD KEY(warp2);
     759ALTER TABLE diffInputSkyfile CHANGE COLUMN stack_id stack2 BIGINT AFTER warp2;
     760ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id);
     761
     762# need to check these
     763ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (warp1, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id);
     764ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (warp2, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id);
     765
     766ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (stack1) REFERENCES stackRun(stack_id);
     767ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (stack2) REFERENCES stackRun(stack_id);
     768
     769-- add unique ids for each image and flags that indicate whether the image has been
     770-- magic destreaked
     771ALTER TABLE diffSkyfile ADD COLUMN skycell_id VARCHAR(64) AFTER diff_id;
     772ALTER TABLE diffSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY (diff_id, skycell_id);
     773ALTER TABLE diffSkyfile ADD COLUMN diff_image_id BIGINT NOT NULL AUTO_INCREMENT, ADD KEY(diff_image_id);
     774ALTER TABLE diffSkyfile ADD COLUMN magicked TINYINT;
     775
     776ALTER TABLE warpRun DROP COLUMN magiced;
     777
     778ALTER TABLE warpSkyfile ADD COLUMN warp_image_id BIGINT NOT NULL AUTO_INCREMENT, ADD KEY(warp_image_id);
     779ALTER TABLE warpSkyfile ADD COLUMN magicked TINYINT;
     780
     781ALTER TABLE chipProcessedImfile ADD COLUMN chip_image_id BIGINT NOT NULL AUTO_INCREMENT, ADD KEY(chip_image_id);
     782ALTER TABLE chipProcessedImfile ADD COLUMN magicked TINYINT;
     783
     784ALTER TABLE rawImfile ADD COLUMN raw_image_id BIGINT NOT NULL AUTO_INCREMENT, ADD KEY(raw_image_id);
     785ALTER TABLE rawImfile ADD COLUMN magicked TINYINT;
     786
     787-- magic adaptations to diff reorginization
     788ALTER TABLE magicRun ADD COLUMN diff_id BIGINT AFTER exp_id;
     789ALTER TABLE magicRun ADD CONSTRAINT FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id);
     790ALTER TABLE magicRun ADD CONSTRAINT FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id);
     791ALTER TABLE magicInputSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY(magic_id, diff_id, node);
     792
  • trunk/dbconfig/chip.md

    r20240 r20973  
    8181    path_base       STR     255
    8282    fault           S16     0       # Key NOT NULL
     83    chip_image_id   S64     0       # Key AUTO_INCREMENT
     84    magicked        BOOL    f
    8385END
    8486
  • trunk/dbconfig/config.md

    r20275 r20973  
    22    pkg_name        STR     ippdb
    33    pkg_namespace   STR     ippdb
    4     pkg_version     STR     1.1.46
     4    pkg_version     STR     1.1.47
    55END
  • trunk/dbconfig/diff.md

    r20061 r20973  
    1 # $Id: diff.md,v 1.14 2008-10-11 02:33:40 price Exp $
     1# $Id: diff.md,v 1.15 2008-12-13 20:17:34 bills Exp $
    22
    33diffRun METADATA
    44    diff_id     S64         0       # Primary Key AUTO_INCREMENT
    55    state       STR         64      # Key
     6    workdir     STR         255
    67    label       STR         64      # Key
    78    reduction   STR         64      # Reduction class
    8     workdir     STR         255
    99    dvodb       STR         255
    1010    registered  TAI         NULL
    11     skycell_id  STR         64      # Key
    1211    tess_id     STR         64      # Key
     12    exp_id      S64         0       # fkey(exp_id) ref rawExp(exp_id)
    1313END
    1414
     
    1717#
    1818
    19 # only ever 2 per run - one template / one not
    2019diffInputSkyfile METADATA
    2120    diff_id     S64         0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
    22     template    BOOL        f       # Primary Key
    23     stack_id    S64         0       # fkey(stack_id) ref stackSumSkyfile(stack_id)
    24     warp_id     S64         0       # fkey(warp_id, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
    25     skycell_id  STR         64      # Key
     21    skycell_id  STR         64      # Primary Key
     22    warp1       S64         0       # fkey(warp1, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
     23    stack1      S64         0       # fkey(stack1) ref stackSumSkyfile(stack_id)
     24    warp2       S64         0       # fkey(warp2, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
     25    stack2      S64         0       # fkey(stack2) ref stackSumSkyfile(stack_id)
    2626    tess_id     STR         64      # Key
    27 # either a input or a template
    28     kind        STR         64      # Key
    2927END
    3028
    3129diffSkyfile METADATA
    3230    diff_id      S64        0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
     31    skycell_id   STR        64      #
    3332    uri          STR        255
    3433    path_base    STR        255
     
    5352    good_frac    F32        0.0     # Key
    5453    fault        S16        0       # Key
     54    diff_image_id S64       0       # Key NOT NULL AUTO_INCREMENT
     55    magicked     BOOL       f
    5556END
  • trunk/dbconfig/magic.md

    r20841 r20973  
    1 # $Id: magic.md,v 1.12 2008-11-26 03:21:13 bills Exp $
     1# $Id: magic.md,v 1.13 2008-12-13 20:17:34 bills Exp $
    22
    33### Fault in magicRun indicates that the processing tree failed
     
    55    magic_id    S64         0       # Primary Key AUTO_INCREMENT
    66    exp_id      S64         0       # Key
     7    diff_id     S64         0       # Key
    78    state       STR         64      # Key
    89    workdir     STR         255
  • trunk/dbconfig/tasks.md

    r20608 r20973  
    1 # $Id: tasks.md,v 1.158 2008-11-09 23:51:01 price Exp $
     1# $Id: tasks.md,v 1.159 2008-12-13 20:17:34 bills Exp $
    22
    33# this table records all exposure ID ever seen from the summit
     
    239239    fault       S16         0       # Key NOT NULL
    240240    epoch       UTC         0001-01-01T00:00:00Z
    241 END
     241    magicked    BOOL        f
     242END
  • trunk/dbconfig/warp.md

    r19930 r20973  
    1 # $Id: warp.md,v 1.19 2008-10-07 00:01:28 price Exp $
     1# $Id: warp.md,v 1.20 2008-12-13 20:17:34 bills Exp $
    22
    33#
     
    1111warpRun METADATA
    1212    warp_id     S64         0       # Primary Key AUTO_INCREMENT
    13     fake_id      S64         0       # Key INDEX(warp_id, fake_id) fkey(fake_id) ref camProcessedExp(fake_id)
     13    fake_id     S64         0       # Key INDEX(warp_id, fake_id) fkey(fake_id) ref camProcessedExp(fake_id)
    1414    mode        STR         64      # Key
    1515    state       STR         64      # Key
     
    2222    registered  TAI         NULL
    2323# if magic is T then look for the exp_id in the magic output tables
    24     magiced     BOOL        f       # Key
    2524END
    2625
     
    5251    ignored        BOOL     f       # Key
    5352    fault          S16      0       # Key
     53    warp_image_id  S64      0       # Key AUTO_INCREMENT
     54    magicked       BOOL     f
    5455END
    5556
Note: See TracChangeset for help on using the changeset viewer.