IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 29440


Ignore:
Timestamp:
Oct 15, 2010, 6:39:07 PM (16 years ago)
Author:
heather
Message:

minidvodbtool -update and -defineby work

Location:
branches/haf_branches/ipp.rsync.20101015
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/haf_branches/ipp.rsync.20101015/dbconfig/changes.txt

    r28873 r29440  
    19451945ALTER TABLE diffSummary DROP PRIMARY KEY, ADD PRIMARY KEY (diff_id, projection_cell);
    19461946ALTER TABLE stackSummary DROP PRIMARY KEY, ADD PRIMARY KEY (sass_id, projection_cell);
     1947
     1948
     1949-- minidvodb copy table (for tracking copying of minidvodbs to other machines
     1950
     1951
     1952CREATE TABLE minidvodbCopy (
     1953    minidvodbcopy_id     BIGINT AUTO_INCREMENT,
     1954    minidvodb_id     BIGINT,
     1955    minidvodb_rsync_path VARCHAR(255) NOT NULL,
     1956    destination_host VARCHAR(255) NOT NULL,
     1957    fault  SMALLINT NOT NULL,
     1958    state   VARCHAR(64) NOT NULL,
     1959    epoch TIMESTAMP,
     1960    dtime FLOAT,
     1961    PRIMARY KEY(minidvodbcopy_id),
     1962    KEY(minidvodb_id),
     1963    FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
     1964) ENGINE=innodb DEFAULT CHARSET=latin1;

  • branches/haf_branches/ipp.rsync.20101015/dbconfig/minidvodb.md

    r29435 r29440  
    2121
    2222minidvodbCopy METADATA
     23    minidvodbcopy_id    S64 0
    2324    minidvodb_id    S64    0
    2425    minidvodb_rsync_path   STR    255
     26    destination_host       STR    255
    2527    fault           S16    0
    2628    state           STR    64

  • branches/haf_branches/ipp.rsync.20101015/ippTools/share/Makefile.am

    r29415 r29440  
    264264        magicdstool_torevert_warp.sql \
    265265        magicdstool_torevert_diff.sql \
     266        minidvodbtool_find_minidvodb_id_dvo.sql \
     267        minidvodbtool_revertminidvodbcopy.sql \
    266268        pstamptool_completedreq.sql \
    267269        pstamptool_datastore.sql \

  • branches/haf_branches/ipp.rsync.20101015/ippTools/src/Makefile.am

    r29435 r29440  
    4040        pxdqstats.h
    4141        pxmagic.h \
     42        pxminidvodb.h \
    4243        pxregister.h \
    4344        pxspace.h \
    … …  
    9293        pxdqstats.c \
    9394        pxmagic.c \
     95        pxminidvodb.c \
    9496        pxregister.c \
    9597        pxspace.c \

  • branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c

    r29435 r29440  
    2828#include "pxtools.h"
    2929#include "pxadd.h"
     30#include "pxminidvodb.h"
    3031#include "minidvodbtool.h"
    3132
    … …  
    9091    psMetadata *where = psMetadataAlloc();
    9192    pxcamGetSearchArgs (config, where);
    92     PXOPT_COPY_S64(config->args, where,  "-cam_id",    "camRun.cam_id", "==");
    93     pxAddLabelSearchArgs (config, where, "-label",     "camRun.label", "=="); // define using camRun label
    94     pxAddLabelSearchArgs (config, where, "-data_group","camRun.data_group", "=="); // define using camRun label
    95     PXOPT_COPY_STR(config->args, where,  "-reduction", "camRun.reduction", "==");
     93    PXOPT_COPY_S64(config->args, where,  "-minidvodb_id",    "minidvodbRun.minidvodbRun_id", "==");
     94    pxAddLabelSearchArgs (config, where, "-minidvodb_group",     "minidvodbRun.minidvodb_group", "=="); // define using camRun label
     95   
    9696
    9797
    … …  
    102102    }
    103103
    104     PXOPT_LOOKUP_STR(workdir,     config->args, "-set_workdir", false, false);
    105     PXOPT_LOOKUP_STR(dvodb,       config->args, "-set_dvodb", false, false);
    106     PXOPT_LOOKUP_STR(label,       config->args, "-set_label", false, false);
    107     PXOPT_LOOKUP_STR(data_group,  config->args, "-set_data_group", false, false);
    108     PXOPT_LOOKUP_STR(reduction,   config->args, "-set_reduction", false, false);
    109     PXOPT_LOOKUP_STR(note,        config->args, "-set_note", false, false);
    110     PXOPT_LOOKUP_STR(minidvodb_name,  config->args, "-set_minidvodb_name", false, false);
    111     PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", false, false);
    112     PXOPT_LOOKUP_BOOL(image_only, config->args, "-image_only", false);
    113     PXOPT_LOOKUP_BOOL(minidvodb,  config->args, "-set_minidvodb", false);
    114     PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false);
     104    PXOPT_LOOKUP_STR(destination_host,     config->args, "-set_destination_host", false, false);
     105    PXOPT_LOOKUP_STR(minidvodb_rsync_path, config->args, "-set_minidvodb_rsync_path", false, false);
    115106    PXOPT_LOOKUP_BOOL(pretend,    config->args, "-pretend", false);
    116107    PXOPT_LOOKUP_BOOL(simple,     config->args, "-simple", false);
    … …  
    120111    psString dvodb_string = NULL;
    121112    psString bare_query = NULL;
    122     if (dvodb) {
    123       psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_cam_id_dvo.sql\n", dvodb);
     113    if (destination_host) {
     114      psTrace("minidvodbtool.c", PS_LOG_INFO, "destination_host argument found (%s) using minidvodbtool_find_minidvodb_id_dvo.sql\n", destination_host);
    124115        // find the cam_id of all the exposures that we want to queue up.
    125         bare_query = pxDataGet("addtool_find_cam_id_dvo.sql");
     116        bare_query = pxDataGet("minidvodbtool_find_minidvodb_id_dvo.sql");
    126117        // user supplied dvodb
    127         psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb);
     118        psStringAppend(&dvodb_string, "minidvodbCopy.destination_host = '%s'", destination_host);
    128119    } else {
    129         psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_cam_id.sql\n");
    130         // find the cam_id of all the exposures that we want to queue up.
    131         bare_query = pxDataGet("addtool_find_cam_id.sql");
    132         // inherit dvodb from camRun, avoid matching NULL
    133         psStringAppend(&dvodb_string, "(camRun.dvodb IS NOT NULL AND previous_dvodb = camRun.dvodb)");
    134     }
     120      psError(PS_ERR_UNKNOWN, false, "cannot queue minidvodbcopy run without a defined destination_host");
     121       
     122            return false;
     123         }
    135124    if (!bare_query) {
    136125        psError(PXTOOLS_ERR_SYS, false, "failed to retrieve SQL statement");
    … …  
    155144    psFree(where);
    156145
    157     if (destreaked) {
    158         psStringAppend(&query, " AND (camRun.magicked > 0)");
    159     }
    160 
    161     if (!p_psDBRunQuery(config->dbh, query)) {
     146   if (!p_psDBRunQuery(config->dbh, query)) {
    162147        psError(PS_ERR_UNKNOWN, false, "database error");
    163148        psFree(query);
    … …  
    179164    if (pretend) {
    180165        // negative simple so the default is true
    181         if (!ippdbPrintMetadatas(stdout, output, "addRun", !simple)) {
     166        if (!ippdbPrintMetadatas(stdout, output, "minidvodbCopy", !simple)) {
    182167            psError(PS_ERR_UNKNOWN, false, "failed to print array");
    183168            psFree(output);
    … …  
    192177        psMetadata *md = output->data[i];
    193178
    194         camRunRow *row = camRunObjectFromMetadata(md);
     179        minidvodbRunRow *row = minidvodbRunObjectFromMetadata(md);
    195180        if (!row) {
    196             psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun");
     181            psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into minidvodbRun");
    197182            psFree(output);
    198183            return false;
    199184        }
    200185
    201         if (!dvodb && !row->dvodb) {
    202             psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, cam_id %" PRId64, row->label, row->cam_id);
     186        if (!minidvodb_rsync_path) {
     187            psError(PS_ERR_UNKNOWN, false, "cannot queue minidvodbcopy run without a defined minidvodb_rsync_path: minidvodb_id %" PRId64, row->minidvodb_id);
    203188            psFree(output);
    204189            return false;
    205190        }
    206         if (!workdir && !row->workdir) {
    207             psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, cam_id %" PRId64, row->label, row->cam_id);
     191        if (!destination_host) {
     192            psError(PS_ERR_UNKNOWN, false, "cannot queue minidvodbcopy run without a defined destination_host: minidvodb_id %" PRId64, row->minidvodb_id);
    208193            psFree(output);
    209194            return false;
    … …  
    230215        psMetadata *md = output->data[i];
    231216
    232         camRunRow *row = camRunObjectFromMetadata(md);
     217        minidvodbRunRow *row = minidvodbRunObjectFromMetadata(md);
    233218        if (!row) {
    234219            psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun");
    … …  
    238223
    239224        // queue the exp
    240         if (!pxaddQueueByCamID(config,
    241                                row->cam_id,
    242                                workdir     ? workdir   : row->workdir,
    243                                reduction   ? reduction : row->reduction,
    244                                label       ? label     : row->label,
    245                                data_group  ? data_group : (row->data_group ? row->data_group :  (label ? label : row->label)),
    246                                dvodb       ? dvodb     : row->dvodb,
    247                                note        ? note      : NULL,
    248                                image_only,
    249                                minidvodb,
    250                                minidvodb_group,
    251                                minidvodb_name
     225        if (!pxaddQueueByMinidvodbID(config,
     226                               row->minidvodb_id,
     227                                     destination_host ? destination_host : "NULL",
     228                                     minidvodb_rsync_path ?minidvodb_rsync_path : "NULL"
    252229        )) {
    253230            if (!psDBRollback(config->dbh)) {
    … …  
    255232            }
    256233            psError(PS_ERR_UNKNOWN, false,
    257                     "failed to trying to queue chip_id: %" PRId64, row->cam_id);
     234                    "failed to trying to queue minidvodb_id: %" PRId64, row->minidvodb_id);
    258235            psFree(row);
    259236            psFree(output);
    … …  
    553530  psMetadata *where = psMetadataAlloc();
    554531  PS_ASSERT_PTR_NON_NULL(config, false);
    555   PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbCopy.minidvodb_id", "==");
    556   PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "addRun.minidvodb_group", "==");
     532  PXOPT_COPY_S64(config->args, where, "-minidvodbcopy_id", "minidvodbCopy.minidvodbcopy_id", "==");
     533  PXOPT_COPY_STR(config->args, where, "-destination_host", "destination host", "==");
    557534
    558535  if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
    … …  
    614591  PS_ASSERT_PTR_NON_NULL(config, false);
    615592  psMetadata *where = psMetadataAlloc();
    616 
    617   PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", true, false);
    618   PXOPT_LOOKUP_U64(merge_order,  config->args, "-set_merge_order", false, false);
    619   PXOPT_LOOKUP_S16(fault,  config->args, "-set_fault", false, false);
    620   PXOPT_LOOKUP_F32(dtime_relphot,  config->args, "-set_dtime_relphot", false, false);
    621   PXOPT_LOOKUP_F32(dtime_resort,  config->args, "-set_dtime_resort", false, false);
    622   PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
    623 
     593  PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
     594  PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
     595  PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
     596  PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
     597  PXOPT_LOOKUP_STR(rsync_path,  config->args, "-minidvodb_rsync_path", false, false);
     598  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
     599 
     600  PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);
     601  PXOPT_LOOKUP_STR(set_rsync_path,  config->args, "-set_minidvodb_rsync_path", false, false);
     602  PXOPT_LOOKUP_STR(set_host,  config->args, "-set_destination_host", false, false);
     603  PXOPT_LOOKUP_STR(set_state,  config->args, "-set_state", false, false);
     604  PXOPT_LOOKUP_F32(dtime,  config->args, "-set_dtime", false, false);
     605  PXOPT_COPY_S64(config->args, where, "-minidvodbcopy_id",     "minidvodbCopy.minidvodbcopy_id", "==");
    624606  PXOPT_COPY_S64(config->args, where, "-minidvodb_id",     "minidvodbCopy.minidvodb_id", "==");
    625   PXOPT_COPY_STR(config->args, where, "-minidvodb_name",     "minidvodbRun.minidvodb_name", "==");
     607 
     608  PXOPT_COPY_STR(config->args, where, "-state",     "minidvodbCopy.state", "==");
     609  PXOPT_COPY_STR(config->args, where, "-host",     "minidvodbCopy.destination_host", "==");
     610  PXOPT_COPY_STR(config->args, where, "-minidvodb_rsync_path",     "minidvodbCopy.minidvodb_rsync_path", "==");
    626611
    627612
    … …  
    635620  int cnt = 0;
    636621  psString comma = ",";
    637   if (fault) {
    638     psStringAppend(&query, " fault = %d", fault);
     622  if (set_fault) {
     623    psStringAppend(&query, " fault = %d", set_fault);
    639624  cnt++;
    640625  }
    641626
    642   if (merge_order) {
     627  if (set_rsync_path) {
    643628    if (cnt) {
    644629      psStringAppend(&query, "%s", comma);
    645630    }
    646631
    647     psStringAppend(&query, " merge_order = %" PRId64, merge_order);
     632    psStringAppend(&query, " minidvodb_rsync_path = %s" , set_rsync_path);
    648633    cnt++;
    649634  }
    650635
    651   if (dtime_relphot) {
     636  if (set_host) {
    652637    if (cnt) {
    653638      psStringAppend(&query, "%s", comma);
    654639    }
    655     psStringAppend(&query, " dtime_relphot = %f", dtime_relphot);
     640
     641    psStringAppend(&query, " destination_host = %s" , set_host);
    656642    cnt++;
    657643  }
    658644
    659   if (dtime_resort) {
     645
     646  if (set_state) {
    660647    if (cnt) {
    661648      psStringAppend(&query, "%s", comma);
    662649    }
    663     psStringAppend(&query, " dtime_resort = %f", dtime_resort);
     650
     651    psStringAppend(&query, " state = %s" , set_state);
    664652    cnt++;
    665653  }
    666654
    667   if (dtime_merge) {
     655  if (dtime) {
    668656    if (cnt) {
    669657      psStringAppend(&query, "%s", comma);
    670658    }
    671     psStringAppend(&query, " dtime_merge = %f", dtime_merge);
     659    psStringAppend(&query, " dtime = %f", dtime);
    672660    cnt++;
    673  }
     661  }
     662
     663 
    674664
    675665  psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);

  • branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtoolConfig.c

    r29435 r29440  
    22 * addtoolConfig.c
    33 *
    4  * Copyright (C) 2009  Joshua Hoblitt, Chris Waters
    54 *
    65 * This program is free software; you can redistribute it and/or modify it
    … …  
    2928#include "pxtools.h"
    3029#include "pxadd.h"
     30#include "pxminidvodb.h"
    3131#include "minidvodbtool.h"
    3232
    … …  
    4949    // -definebyquery
    5050    psMetadata *definebyqueryArgs = psMetadataAlloc();
    51     psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id",             0, "search by cam_id", 0);
     51    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-minidvodb_id",             0, "search by cam_id", 0);
    5252    pxcamSetSearchArgs(definebyqueryArgs);
    53     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL);
    54     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group", NULL);
    55     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",          0, "search by camRun reduction class", NULL);
    56     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked",           0, "only queue destreaked runs", false);
     53       psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-minidvodb_group", PS_META_DUPLICATE_OK, "search by camRun data_group", NULL);
    5754
    58     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",        0, "define workdir", NULL);
    59     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",          0, "define label", NULL);
     55       
     56    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_rsync_path",        0, "define workdir", NULL);
     57    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_destination_host",          0, "define label", NULL);
    6058    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction",      0, "define reduction class", NULL);
    61     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb",          0, "define DVO db", NULL);
    62     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-image_only",        0, "addstar image metadata but not detections", false);
    63     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",           0, "do not actually modify the database", false);
     59   psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",           0, "do not actually modify the database", false);
    6460    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",            0, "use the simple output format", false);
    65     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb",            0, "use minidvodb", false);
    66     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0,   "define minidvodb_group", NULL);
    67     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0,   "define minidvodb_bname", NULL);
    68     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_data_group", 0,   "define new data_group", NULL);
    69     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group", 0,   "define new dist_group", NULL);
    70     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_note", 0,         "define new note", NULL);
    71 
     61   
    7262    psMetadata *addminidvodbcopyArgs = psMetadataAlloc();
    7363    psMetadataAddU64(addminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_id", 0,    "define minidvodb_id (required)", 0);
    … …  
    9080
    9181    psMetadata *revertminidvodbcopyArgs = psMetadataAlloc();
    92     psMetadataAddU64(revertminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_id",        0, "search by minidvodb_id", 0);
    93     psMetadataAddStr(revertminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_group",        0, "search by addRun.minidvodb_group", NULL);
     82    psMetadataAddU64(revertminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodbcopy_id",        0, "search by minidvodbcopy_id", 0);
     83    psMetadataAddStr(revertminidvodbcopyArgs, PS_LIST_TAIL, "-destination host",        0, "search by destination_host", NULL);
    9484
    9585    psMetadata *updateminidvodbcopyArgs = psMetadataAlloc();
     86    psMetadataAddU64(updateminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodbcopy_id",        0, "search by minidvodbcopy_id", 0);
    9687    psMetadataAddU64(updateminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_id",        0, "search by minidvodb_id", 0);
    97     psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_name",        0, "search by minidvodb_name", NULL);
     88    psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-state",        0, "search by state", NULL);
     89    psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-host",        0, "search by host", NULL);
     90    psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_rsync_path",        0, "search by rsync", NULL);
     91    psMetadataAddS16(updateminidvodbcopyArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
     92 
     93
    9894    psMetadataAddS16(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_fault",  0,            "set fault code", 0);
    99     psMetadataAddU64(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_merge_order",    0,    "define merge order", 0);
    100     psMetadataAddF32(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_dtime_relphot",  0,    "define elapsed time for relphot (seconds)", 0);
    101     psMetadataAddF32(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_dtime_resort", 0,    "define elapsed time for resort (seconds)", 0);
    102     psMetadataAddF32(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_dtime_merge",    0,    "define elapsed time for DVO merge (seconds)", 0);
    103    
     95 
     96    psMetadataAddF32(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_dtime",  0,    "set elapsed time for transfer", 0);
     97    psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_minidvodb_rsync_path",        0, "change the minidvodb_rsync_path", NULL);
     98    psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_destination_host",        0, "change the host", NULL);
     99    psMetadataAddStr(updateminidvodbcopyArgs, PS_LIST_TAIL, "-set_state",        0, "change the state", NULL);
     100
    104101    psMetadata *argSets = psMetadataAlloc();
    105102    psMetadata *modes = psMetadataAlloc();
Note: See TracChangeset for help on using the changeset viewer.