Index: branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c =================================================================== --- branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c (revision 29440) +++ branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c (revision 29441) @@ -32,5 +32,4 @@ static bool definebyqueryMode(pxConfig *config); -static bool addminidvodbcopyMode(pxConfig *config); static bool listminidvodbcopyMode(pxConfig *config); static bool revertminidvodbcopyMode(pxConfig *config); @@ -58,5 +57,4 @@ switch (config->mode) { MODECASE(ADDTOOL_MODE_DEFINEBYQUERY, definebyqueryMode); - MODECASE(ADDTOOL_MODE_ADDMINIDVODBCOPY, addminidvodbcopyMode); MODECASE(ADDTOOL_MODE_LISTMINIDVODBCOPY, listminidvodbcopyMode); MODECASE(ADDTOOL_MODE_REVERTMINIDVODBCOPY, revertminidvodbcopyMode); @@ -252,197 +250,9 @@ -static bool addminidvodbcopyMode(pxConfig *config) { - - PS_ASSERT_PTR_NON_NULL(config, false); - - // required - PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); - PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-mergedvodb_path", true, false); - PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false); - - // optional - PXOPT_LOOKUP_U64(merge_order, config->args, "-merge_order", false, false); - PXOPT_LOOKUP_F32(dtime_relphot, config->args, "-dtime_relphot", false, false); - PXOPT_LOOKUP_F32(dtime_resort, config->args, "-dtime_resort", false, false); - PXOPT_LOOKUP_F32(dtime_merge, config->args, "-dtime_merge", false, false); - PXOPT_LOOKUP_TIME(epoch, config->args, "-epoch", false, false); - PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); - //generate restrictions - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbRun.minidvodb_id", "=="); - - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - - psString query = pxDataGet("addtool_find_pendingmergeprocess.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - // use psDBGenerateWhereSQL because the SQL yields an intermediate table - if (psListLength(where->list)) { - psString whereClaus = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClaus); - psFree(whereClaus); - } - psFree(where); - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("addtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - /* - minidvodbRunRow *pendingRow = minidvodbRunObjectFromMetadata(output->data[0]); - psFree(output); */ - /* minidvodbCopyRow *row = minidvodbCopyRowAlloc( - pendingRow->minidvodb_id, - merge_order, - dtime_resort, - dtime_relphot, - dtime_merge, - epoch, - mergedvodb_path, - fault - ); - - if (!minidvodbCopyInsertObject(config->dbh, row)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(row); - psFree(pendingRow); - return false; - } - - - */ - /* - //this finds the # of merged things (for the merge order) - psString query3 = NULL; - psStringAppend(&query3, "select count(*) from minidvodbRun join minidvodbCopy using (minidvodb_id) where state = 'merged' and minidvodb_group = '%s';", minidvodb_group); - - if (!p_psDBRunQuery(config->dbh, query3)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query3); - return false; - } - psArray *output2 = p_psDBFetchResult(config->dbh); - if (!output2) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output2)) { - psTrace("addtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - bool status; - psS64 m_order = psMetadataLookupS64(&status, output2->data[0], "count(*)"); - if (!status) { - - psAbort("failed to lookup value for count column"); - return false; - } - psString final = NULL; - psStringAppend(&final, "%" PRIu64, m_order); - //return false; - psFree(query3); - psFree(output2); - - - - //update the merge_order - - psString query4 = NULL; - psStringAppend(&query4, "update minidvodbCopy set merge_order = %"PRIu64,m_order); - psStringAppend(&query4," where minidvodb_id = %" PRIu64, minidvodb_id); - printf("%s", query4); - if (!p_psDBRunQuery(config->dbh, query4)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query4); - return false; - } - // -psFree(query4); - - - -// since there is only one exp per 'new' set mindvodbRun.state = 'merged' - - psString query2 = NULL ; - psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merged' WHERE minidvodb_id = %'" PRIu64, row->minidvodb_id); - - if (!p_psDBRunQuery(config->dbh, query2)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query2); - return false; - } - - - - - - - - - psFree(row); - psFree(pendingRow); - - - - - - //commit the changes - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - - //print the merge_order (why not!) - printf("%s", final); - psFree(final); - */ - return true; -} - - - static bool listminidvodbcopyMode(pxConfig *config) { psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbCopy.minidvodb_id", "=="); - PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbCopy.minidvodb_name", "=="); - PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodbCopy.minidvodb_group", "=="); + PXOPT_COPY_STR(config->args, where, "-minidvodbcopy_id", "minidvodbCopy.minidvodbcopy_id", "=="); + PXOPT_COPY_STR(config->args, where, "-destination_host", "minidvodbCopy.destination_host", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -454,5 +264,5 @@ } - psString query = pxDataGet("addtool_find_minidvodbcopy.sql"); + psString query = pxDataGet("minidvodbtool_find_minidvodbcopy.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); @@ -486,5 +296,5 @@ // order by epoch - psStringAppend(&query, " ORDER BY minidvodb_id"); + psStringAppend(&query, " ORDER BY minidvodbcopy_id"); // treat limit == 0 as "no limit" @@ -496,5 +306,5 @@ if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error "); + psError(PS_ERR_UNKNOWN, false, "database error %s ", query); psFree(query); return false; @@ -531,5 +341,6 @@ PS_ASSERT_PTR_NON_NULL(config, false); PXOPT_COPY_S64(config->args, where, "-minidvodbcopy_id", "minidvodbCopy.minidvodbcopy_id", "=="); - PXOPT_COPY_STR(config->args, where, "-destination_host", "destination host", "=="); + PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbCopy.minidvodb_id", "=="); + PXOPT_COPY_STR(config->args, where, "-destination_host", "destination_host", "=="); if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { @@ -546,5 +357,5 @@ { - psString query = pxDataGet("addtool_revertminidvodbcopy.sql"); + psString query = pxDataGet("minidvodbtool_revertminidvodbcopy.sql"); if (!query) { // rollback @@ -567,7 +378,7 @@ // rollback if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + psError(PS_ERR_UNKNOWN, false, "database error %s", query); } - psError(PS_ERR_UNKNOWN, false, "database error"); + psError(PS_ERR_UNKNOWN, false, "database error %s", query ); psFree(query); psFree(where); @@ -621,5 +432,5 @@ psString comma = ","; if (set_fault) { - psStringAppend(&query, " fault = %d", set_fault); + psStringAppend(&query, " minidvodbCopy.fault = %d", set_fault); cnt++; } @@ -630,5 +441,5 @@ } - psStringAppend(&query, " minidvodb_rsync_path = %s" , set_rsync_path); + psStringAppend(&query, " minidvodbCopy.minidvodb_rsync_path = '%s'" , set_rsync_path); cnt++; } @@ -639,5 +450,5 @@ } - psStringAppend(&query, " destination_host = %s" , set_host); + psStringAppend(&query, " minidvodbCopy.destination_host = '%s'" , set_host); cnt++; } @@ -649,5 +460,5 @@ } - psStringAppend(&query, " state = %s" , set_state); + psStringAppend(&query, " minidvodbCopy.state = '%s'" , set_state); cnt++; } @@ -657,5 +468,5 @@ psStringAppend(&query, "%s", comma); } - psStringAppend(&query, " dtime = %f", dtime); + psStringAppend(&query, " minidvodbCopy.dtime = %f", dtime); cnt++; } @@ -667,5 +478,5 @@ if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + psError(PS_ERR_UNKNOWN, false, "database error %s", query); psFree(query); return false; Index: branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.h =================================================================== --- branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.h (revision 29440) +++ branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.h (revision 29441) @@ -26,5 +26,4 @@ ADDTOOL_MODE_NONE = 0x0, ADDTOOL_MODE_DEFINEBYQUERY, - ADDTOOL_MODE_ADDMINIDVODBCOPY, ADDTOOL_MODE_LISTMINIDVODBCOPY, ADDTOOL_MODE_REVERTMINIDVODBCOPY, Index: branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtoolConfig.c =================================================================== --- branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtoolConfig.c (revision 29440) +++ branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtoolConfig.c (revision 29441) @@ -60,19 +60,8 @@ psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadata *addminidvodbcopyArgs = psMetadataAlloc(); - psMetadataAddU64(addminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "define minidvodb_id (required)", 0); - psMetadataAddU64(addminidvodbcopyArgs, PS_LIST_TAIL, "-merge_order", 0, "define merge order", 0); - psMetadataAddF32(addminidvodbcopyArgs, PS_LIST_TAIL, "-dtime_relphot", 0, "define elapsed time for relphot (seconds)", NAN); - psMetadataAddF32(addminidvodbcopyArgs, PS_LIST_TAIL, "-dtime_resort", 0, "define elapsed time for resort (seconds)", NAN); - psMetadataAddF32(addminidvodbcopyArgs, PS_LIST_TAIL, "-dtime_merge", 0, "define elapsed time for DVO merge (seconds)", NAN); - psMetadataAddTime(addminidvodbcopyArgs, PS_LIST_TAIL, "-epoch", 0, "time merge is finished", NULL); - psMetadataAddStr(addminidvodbcopyArgs, PS_LIST_TAIL, "-mergedvodb_path",0, "path of merged dvodb", NULL); - psMetadataAddStr(addminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_group",0, "minidvodb_group", NULL); - psMetadataAddS16(addminidvodbcopyArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); - psMetadata *listminidvodbcopyArgs = psMetadataAlloc(); psMetadataAddU64(listminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id", 0); - psMetadataAddStr(listminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name", NULL); - psMetadataAddStr(listminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb.minidvodb_group", NULL); + psMetadataAddStr(listminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodbcopy_id", 0, "search by minidvodb_name", NULL); + psMetadataAddStr(listminidvodbcopyArgs, PS_LIST_TAIL, "-destination_host", 0, "search by minidvodb.minidvodb_group", NULL); psMetadataAddU64(listminidvodbcopyArgs, PS_LIST_TAIL, "-limit", 0, "limit to N items", 0); psMetadataAddBool(listminidvodbcopyArgs, PS_LIST_TAIL, "-simple", 0, "simple output", false); @@ -81,5 +70,6 @@ psMetadata *revertminidvodbcopyArgs = psMetadataAlloc(); psMetadataAddU64(revertminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodbcopy_id", 0, "search by minidvodbcopy_id", 0); - psMetadataAddStr(revertminidvodbcopyArgs, PS_LIST_TAIL, "-destination host", 0, "search by destination_host", NULL); + psMetadataAddU64(revertminidvodbcopyArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id", 0); + psMetadataAddStr(revertminidvodbcopyArgs, PS_LIST_TAIL, "-destination_host", 0, "search by destination_host", NULL); psMetadata *updateminidvodbcopyArgs = psMetadataAlloc(); @@ -103,6 +93,5 @@ PXOPT_ADD_MODE("-definebyquery", "create runs from cam stage", ADDTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); - PXOPT_ADD_MODE("-addminidvodbcopy","add a copy minidvodb", ADDTOOL_MODE_ADDMINIDVODBCOPY, addminidvodbcopyArgs); - PXOPT_ADD_MODE("-listminidvodbcopy","list copy minidvodbs", ADDTOOL_MODE_LISTMINIDVODBCOPY, listminidvodbcopyArgs); + PXOPT_ADD_MODE("-listminidvodbcopy","list copy minidvodbs", ADDTOOL_MODE_LISTMINIDVODBCOPY, listminidvodbcopyArgs); PXOPT_ADD_MODE("-revertminidvodbcopy","revert copy minidvobs", ADDTOOL_MODE_REVERTMINIDVODBCOPY, revertminidvodbcopyArgs); PXOPT_ADD_MODE("-updateminidvodbcopy","change minidvodb copy properties",ADDTOOL_MODE_UPDATEMINIDVODBCOPY, updateminidvodbcopyArgs);