IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 21308 for trunk/ippTools/share


Ignore:
Timestamp:
Feb 5, 2009, 9:35:41 AM (17 years ago)
Author:
bills
Message:

Changed the way image ids are handled. For chip and warp new tables are
added the sole purpose of which are to create the image ids before
the images are created. For diff the id is added to diffInputSkyfile

Location:
trunk/ippTools/share
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/chiptool_pendingimfile.sql

    r20934 r21308  
    11SELECT
    22    chipRun.*,
    3     0 as chip_imfile_id,
     3    chipImfile.chip_imfile_id,
    44    rawImfile.class_id,
    55    rawImfile.uri,
    … …  
    99    rawExp.telescope,
    1010    rawExp.filelevel
    11 FROM chipRun
     11FROM chipImfile
     12JOIN chipRun
     13    USING(chip_id)
    1214JOIN rawExp
    1315    USING(exp_id)

  • trunk/ippTools/share/chiptool_processedimfile.sql

    r18948 r21308  
    11SELECT DISTINCT
     2    chipProcessedImfile.chip_id,
     3    chipImfile.chip_imfile_id,
    24    chipProcessedImfile.class_id,
    35    chipProcessedImfile.uri,
    … …  
    1416    rawExp.filelevel
    1517FROM chipRun
     18JOIN chipImfile
     19    USING(chip_id)
    1620JOIN chipProcessedImfile
    1721    USING(chip_id)
    1822JOIN rawExp
    1923    ON chipProcessedImfile.exp_id = rawExp.exp_id
    20 WHERE
    21 -- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
    22     chipProcessedImfile.exp_id is NOT NULL
    23 

  • trunk/ippTools/share/difftool_definebyquery_part2.sql

    r21237 r21308  
    22INSERT INTO skycellsToDiff
    33    SELECT
    4         0,              -- diff_id
     4        0,                      -- diff_id
    55        warpSkyfile.skycell_id,
    6         warp_id,        -- warp1
    7         NULL,           -- stack1
    8         NULL,           -- warp2
    9         max_stack_id,   -- stack2
    10         warpSkyfile.tess_id
     6        warpSkyfile.warp_id,    -- warp1
     7        NULL,                   -- stack1
     8        NULL,                   -- warp2
     9        max_stack_id,           -- stack2
     10        warpSkyfile.tess_id,
     11        0
    1112        FROM warpSkyfile
    1213        JOIN warpRun USING(warp_id)
    … …  
    2829        USING(skycell_id)
    2930        WHERE
    30             warp_id = %lld
     31            warpSkyfile.warp_id = %lld
    3132            AND ignored = 0
    3233            AND filter = '%s'

  • trunk/ippTools/share/difftool_definebyquery_temp_create.sql

    r20973 r21308  
    66warp2 BIGINT,
    77stack2 BIGINT,
    8 tess_id VARCHAR(64)
     8tess_id VARCHAR(64),
     9diff_skycell_id BIGINT
    910) ENGINE=MEMORY;

  • trunk/ippTools/share/difftool_skyfile.sql

    r21189 r21308  
    11SELECT
    22    diffSkyfile.*,
     3    diffInputSkyfile.diff_skyfile_id,
    34    diffRun.tess_id,
    45    diffRun.state,

  • trunk/ippTools/share/difftool_todiffskyfile.sql

    r20973 r21308  
    44SELECT DISTINCT
    55    diffRun.diff_id,
    6     0 as diff_skyfile_id,
     6    diffInputSkyfile.diff_skyfile_id,
    77    diffRun.workdir,
    88    diffInputSkyfile.skycell_id,

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r20973 r21308  
    275275ENGINE=innodb DEFAULT CHARSET=latin1;
    276276
     277CREATE TABLE chipImfile (
     278    chip_id BIGINT,
     279    class_id VARCHAR(64),
     280    chip_imfile_id BIGINT AUTO_INCREMENT,
     281    PRIMARY KEY(chip_id, class_id),
     282    KEY(chip_imfile_id),
     283    FOREIGN KEY (chip_id) REFERENCES  chipRun(chip_id))
     284ENGINE=innodb DEFAULT CHARSET=latin1;
     285
    277286CREATE TABLE chipProcessedImfile (
    278287    chip_id BIGINT,
    … …  
    333342    path_base VARCHAR(255),
    334343    fault SMALLINT NOT NULL,
    335     chip_image_id BIGINT AUTO_INCREMENT,
    336344    magicked BIGINT,
    337345    PRIMARY KEY(chip_id, exp_id, class_id),
    338346    KEY(data_state),
    339347    KEY(fault),
    340     KEY(chip_image_id),
    341348    FOREIGN KEY (chip_id, exp_id)
    342349        REFERENCES  chipRun(chip_id, exp_id),
    … …  
    846853) ENGINE=innodb DEFAULT CHARSET=latin1;
    847854
     855CREATE TABLE warpImfile (
     856    warp_id BIGINT,
     857    skycell_id VARCHAR(64),
     858    warp_skyfile_id BIGINT AUTO_INCREMENT,
     859    PRIMARY KEY(warp_id, skycell_id),
     860    KEY(warp_skyfile_id),
     861    FOREIGN KEY (warp_id) REFERENCES  warpRun(warp_id))
     862ENGINE=innodb DEFAULT CHARSET=latin1;
     863
     864
    848865CREATE TABLE warpSkyfile (
    849866    warp_id BIGINT,
    … …  
    865882    ignored TINYINT,
    866883    fault SMALLINT,
    867     warp_image_id BIGINT AUTO_INCREMENT,
    868884    magicked TINYINT,
    869885    PRIMARY KEY(warp_id, skycell_id, tess_id),
    870886    KEY(good_frac),
    871887    KEY(ignored), KEY(fault),
    872     KEY(warp_image_id),
    873888    FOREIGN KEY (warp_id, skycell_id, tess_id)
    874889        REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id)
    … …  
    965980        stack2 BIGINT,
    966981        tess_id VARCHAR(64),
    967         PRIMARY KEY(diff_id, skycell_id),
     982        diff_skyfile_id BIGINT AUTO_INCREMENT,
     983        KEY(diff_id, skycell_id),
     984        KEY(diff_skyfile_id),
    968985        KEY(warp1),
    969986        KEY(warp2),
    … …  
    10041021        good_frac FLOAT,
    10051022        fault SMALLINT,
    1006         diff_image_id BIGINT AUTO_INCREMENT,
    10071023        magicked TINYINT,
    10081024        PRIMARY KEY(diff_id, skycell_id),
    10091025        KEY(good_frac),
    10101026        KEY(fault),
    1011         KEY(diff_image_id),
    10121027        FOREIGN KEY (diff_id)  REFERENCES  diffRun(diff_id)
    10131028) ENGINE=innodb DEFAULT CHARSET=latin1;

  • trunk/ippTools/share/pxadmin_drop_tables.sql

    r20786 r21308  
    1212DROP TABLE IF EXISTS chipRun;
    1313DROP TABLE IF EXISTS chipProcessedImfile;
     14DROP TABLE IF EXISTS chipImfile;
    1415DROP TABLE IF EXISTS chipMask;
    1516DROP TABLE IF EXISTS camRun;
    … …  
    3334DROP TABLE IF EXISTS warpRun;
    3435DROP TABLE IF EXISTS warpSkyCellMap;
     36DROP TABLE IF EXISTS warpImfile;
    3537DROP TABLE IF EXISTS warpSkyfile;
    3638DROP TABLE IF EXISTS warpMask;

  • trunk/ippTools/share/warptool_towarped.sql

    r20934 r21308  
    11SELECT DISTINCT
    22    warpSkyCellMap.warp_id,
    3     0 as warp_skyfile_id,
     3    warpImfile.warp_skyfile_id,
    44    warpSkyCellMap.skycell_id,
    55    warpSkyCellMap.tess_id,
    … …  
    1313JOIN warpSkyCellMap
    1414    USING(warp_id)
     15JOIN warpImfile
     16    ON warpSkyCellMap.warp_id = warpImfile.warp_id
     17    AND warpSkyCellMap.skycell_id = warpImfile.skycell_id
    1518JOIN fakeRun
    1619    USING(fake_id)
Note: See TracChangeset for help on using the changeset viewer.