IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 26519


Ignore:
Timestamp:
Jan 5, 2010, 11:59:46 AM (16 years ago)
Author:
bills
Message:

Add dist_group to distRun. It is needed for the data store and joining
back to the original Run's data_group is too complicated

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/dbconfig/changes.txt

    r26448 r26519  
    14931493
    14941494-- Version 1.1.63
     1495ALTER TABLE distRun ADD COLUMN data_group VARCHAR(64) AFTER fault;
     1496UPDATE distRun, chipRun SET distRun.data_group = chipRun.data_group
     1497    WHERE distRun.stage = 'chip' AND stage_id = chip_id;
     1498UPDATE distRun, camRun SET distRun.data_group = camRun.data_group
     1499    WHERE distRun.stage = 'camera' AND stage_id = cam_id;
     1500UPDATE distRun, fakeRun SET distRun.data_group = fakeRun.data_group
     1501    WHERE distRun.stage = 'fake' AND stage_id = fake_id;
     1502UPDATE distRun, warpRun SET distRun.data_group = warpRun.data_group
     1503    WHERE distRun.stage = 'warp' AND stage_id = warp_id;
     1504UPDATE distRun, diffRun SET distRun.data_group = diffRun.data_group
     1505    WHERE distRun.stage = 'diff' AND stage_id = diff_id;
     1506UPDATE distRun, stackRun SET distRun.data_group = stackRun.data_group
     1507    WHERE distRun.stage = 'stack' AND stage_id = stack_id;
     1508-- all of these runs are old so using label is fine (rawExp doesn't have
     1509-- data_group in distRun it inherit's chipRun.data_group
     1510UPDATE distRun SET distRun.data_group = label where stage = 'raw';
     1511
     1512UPDATE dbversion set schema_version = '1.1.63',  updated= CURRENT_TIMESTAMP();
     1513
     1514-- Version 1.1.64

  • trunk/dbconfig/config.md

    r26194 r26519  
    22    pkg_name        STR     ippdb
    33    pkg_namespace   STR     ippdb
    4     pkg_version     STR     1.1.57
     4    pkg_version     STR     1.1.63
    55END

  • trunk/dbconfig/dist.md

    r26015 r26519  
    2323    time_stamp  UTC         0001-01-01T00:00:00Z
    2424    fault       S16         0
     25    data_group  STR         64
    2526    note        STR         255
    2627END

  • trunk/ippTools/share/disttool_definebyquery_camera.sql

    r26189 r26519  
    55    camRun.magicked,
    66    camRun.label,
     7    camRun.data_group,
    78    distTarget.dist_group,
    89    distTarget.target_id,

  • trunk/ippTools/share/disttool_definebyquery_chip.sql

    r26189 r26519  
    55    rawExp.exp_name as run_tag,
    66    chipRun.label,
     7    chipRun.data_group,
    78    chipRun.dist_group,
    89    distTarget.target_id,

  • trunk/ippTools/share/disttool_definebyquery_diff.sql

    r26188 r26519  
    55    rawExp.exp_name as run_tag,
    66    diffRun.label,
     7    diffRun.data_group,
    78    distTarget.dist_group,
    89    distTarget.target_id,

  • trunk/ippTools/share/disttool_definebyquery_fake.sql

    r26189 r26519  
    55    rawExp.exp_name as run_tag,
    66    fakeRun.label,
     7    fakeRun.data_group,
    78    distTarget.dist_group,
    89    distTarget.target_id,

  • trunk/ippTools/share/disttool_definebyquery_raw.sql

    r26189 r26519  
    55    rawExp.magicked,
    66    chipRun.label,
     7    chipRun.data_group,
    78    distTarget.dist_group,
    89    distTarget.target_id,

  • trunk/ippTools/share/disttool_definebyquery_stack.sql

    r26189 r26519  
    66    CONCAT_WS('.', 'stack', stackRun.skycell_id, convert(stackRun.stack_id, CHAR)) as run_tag,
    77    stackRun.label,
     8    stackRun.data_group,
    89    distTarget.dist_group,
    910    distTarget.target_id,

  • trunk/ippTools/share/disttool_definebyquery_warp.sql

    r26189 r26519  
    55    rawExp.exp_name as run_tag,
    66    warpRun.label,
     7    warpRun.data_group,
    78    distTarget.dist_group,
    89    distTarget.target_id,

  • trunk/ippTools/share/disttool_pendingfileset.sql

    r26170 r26519  
    55    distRun.outdir as dist_dir,
    66    stage_id,
    7     -- we need to get data_group here but we don't have
    8     -- the right tables joined. Perhaps we need to add that column to distRun
    9     distRun.label as data_group,
     7    distRun.data_group,
    108    distTarget.filter,
    119    rcDestination.name AS product_name,

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r26446 r26519  
    13521352    time_stamp  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    13531353    fault       SMALLINT,
     1354    data_group  VARCHAR(64),
    13541355    note        VARCHAR(255),
    13551356    PRIMARY KEY(dist_id),

  • trunk/ippTools/src/disttool.c

    r26337 r26519  
    358358        psS64 target_id = psMetadataLookupS64(NULL, md, "target_id");
    359359        psString stage_label = psMetadataLookupStr(NULL, md, "label");
     360        psString data_group = psMetadataLookupStr(NULL, md, "data_group");
    360361        bool clean = psMetadataLookupBool(NULL, md, "clean");
    361362
    … …  
    383384                NULL,    // time_stamp
    384385                0,       // fault
     386                data_group,
    385387                set_note // note does not propagate
    386388                );
Note: See TracChangeset for help on using the changeset viewer.