IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33030 for trunk/ippTools/share


Ignore:
Timestamp:
Dec 27, 2011, 3:09:17 PM (15 years ago)
Author:
heather
Message:

crap. I don't know why it thinks some of these are modified, but diffing them
against a fresh checkout of the trunk shows no differences.

These are the merge of addstar changes into the trunk. This adds tables,
breaking apart minidvodbRun into 2 parts (building/relphot/addstar) and
(verify/merging), which will make it easier to rebuild dvodbs in the
future. There's some debugging of various tasks here (addstar.revert, for
example), and a lot of cleanup of code.

Location:
trunk
Files:
10 edited
11 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ippTools/share/Makefile.am

    r32962 r33030  
    310310        minidvodbtool_queue_minidvodb_id.sql \
    311311        minidvodbtool_revertminidvodbcopy.sql \
     312        mergetool_find_minidvodb_id.sql \
     313        mergetool_find_mergedvodbcopy.sql \
     314        mergetool_find_merge_id_dvo.sql \
     315        mergetool_find_pendingmergeprocess.sql \
     316        mergetool_find_pending_merge.sql \
     317        mergetool_find_processed.sql \
     318        mergetool_queue_mergecopy_id.sql \
     319        mergetool_queue_merge_id.sql \
     320        mergetool_revertmergedvodbcopy.sql \
     321        mergetool_revertmergedvodbprocessed.sql \
    312322        pstamptool_completedreq.sql \
    313323        pstamptool_datastore.sql \

  • trunk/ippTools/share/addtool_checkminidvodbaddrun.sql

    r28181 r33030  
    11-- this selects the minidvodbs that have complete addRuns
    2 SELECT minidvodb_id, minidvodb_name, minidvodb_path, mergedvodb_path, state, minidbg
     2SELECT minidvodb_id, minidvodb_name, minidvodb_path, state, minidbg
    33AS minidvodb_group, (cnt - cnt2) as not_full, cnt as addRun_count
    44FROM minidvodbRun

  • trunk/ippTools/share/addtool_find_minidvodbrun2.sql

    r28181 r33030  
    11-- this selects the minidvodbs that have complete addRuns
    2 SELECT minidvodb_name, minidvodb_path, mergedvodb_path, state, minidbg
     2SELECT minidvodb_name, minidvodb_path, state, minidbg
    33AS minidvodb_group
    44FROM minidvodbRun

  • trunk/ippTools/share/addtool_queue_minidvodbrun.sql

    r28181 r33030  
    44    minidvodb_name,
    55    minidvodb_path,
    6     mergedvodb_path,
    76    'new'
    87

  • trunk/ippTools/share/camtool_find_pendingimfile.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • trunk/ippTools/share/chiptool_setimfiletoupdate.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • trunk/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql

    r29528 r33030  
    11SELECT minidvodbRun.* FROM minidvodbRun
    22JOIN minidvodbProcessed USING(minidvodb_id)
    3 WHERE minidvodbRun.state = 'merged'
     3WHERE minidvodbRun.state = 'merged'     
     4      AND minidvodbProcessed.fault = 0
    45    AND minidvodb_id NOT IN (SELECT minidvodb_id
    56       FROM minidvodbCopy

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r32999 r33030  
    19641964       minidvodb_group VARCHAR(64) NOT NULL,
    19651965       minidvodb_path VARCHAR(255) NOT NULL,
    1966        mergedvodb_path VARCHAR(255) NOT NULL,
    19671966       state VARCHAR(64) NOT NULL,
    19681967       creation_date TIMESTAMP,
    … …  
    19721971CREATE TABLE minidvodbProcessed (
    19731972      minidvodb_id BIGINT,
    1974       merge_order BIGINT,
    19751973      dtime_resort FLOAT,
    19761974      dtime_relphot FLOAT,
    1977       dtime_verify FLOAT,
    1978       dtime_merge FLOAT,
    19791975      dtime_script FLOAT,
    19801976      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    1981       mergedvodb_path VARCHAR(255) NOT NULL,
    19821977      fault SMALLINT NOT NULL,
    19831978      UNIQUE KEY (minidvodb_id),
    … …  
    20001995    FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
    20011996) ENGINE=innodb DEFAULT CHARSET=latin1;
     1997
     1998CREATE TABLE mergedvodbRun (
     1999       merge_id BIGINT AUTO_INCREMENT,
     2000       minidvodb_id BIGINT,
     2001       mergedvodb VARCHAR(64) NOT NULL,
     2002       mergedvodb_path VARCHAR(255) NOT NULL,
     2003       state VARCHAR(64) NOT NULL,
     2004       creation_date TIMESTAMP,
     2005       PRIMARY KEY(merge_id), KEY(minidvodb_id), KEY(mergedvodb), INDEX(merge_id)
     2006) ENGINE=innodb DEFAULT CHARSET=latin1;
     2007
     2008CREATE TABLE mergedvodbProcessed (
     2009      merge_id BIGINT,
     2010      dtime_verify FLOAT,
     2011      dtime_merge FLOAT,
     2012      dtime_script FLOAT,
     2013      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     2014      fault SMALLINT NOT NULL,
     2015      UNIQUE KEY (merge_id),
     2016      KEY(merge_id),
     2017      FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
     2018) ENGINE=innodb DEFAULT CHARSET=latin1;
     2019
     2020CREATE TABLE mergedvodbCopy (
     2021    mergedvodbcopy_id     BIGINT AUTO_INCREMENT,
     2022    merge_id     BIGINT,
     2023    mergedvodb_rsync_path VARCHAR(255) NOT NULL,
     2024    destination_host VARCHAR(255) NOT NULL,
     2025    fault  SMALLINT NOT NULL,
     2026    state   VARCHAR(64) NOT NULL,
     2027    epoch TIMESTAMP,
     2028    dtime FLOAT,
     2029    PRIMARY KEY(mergedvodbcopy_id),
     2030    KEY(merge_id),
     2031    FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
     2032) ENGINE=innodb DEFAULT CHARSET=latin1;
     2033
    20022034CREATE TABLE vpRun (
    20032035    vp_id BIGINT AUTO_INCREMENT,

  • trunk/ippTools/share/warptool_towarped.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.