Index: trunk/ippTools/src/pstamptool.c =================================================================== --- trunk/ippTools/src/pstamptool.c (revision 27739) +++ trunk/ippTools/src/pstamptool.c (revision 27740) @@ -51,4 +51,5 @@ static bool pendingdependentMode(pxConfig *config); static bool updatedependentMode(pxConfig *config); +static bool revertdependentMode(pxConfig *config); # define MODECASE(caseName, func) \ @@ -91,4 +92,5 @@ MODECASE(PSTAMPTOOL_MODE_PENDINGDEPENDENT, pendingdependentMode); MODECASE(PSTAMPTOOL_MODE_UPDATEDEPENDENT, updatedependentMode); + MODECASE(PSTAMPTOOL_MODE_REVERTDEPENDENT, revertdependentMode); default: psAbort("invalid option (this should not happen)"); @@ -464,5 +466,5 @@ PXOPT_LOOKUP_STR(state, config->args, "-state", false, false); PXOPT_LOOKUP_STR(outProduct, config->args, "-outProduct", false, false); - PXOPT_LOOKUP_STR(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); PXOPT_LOOKUP_STR(name, config->args, "-name", false, false); @@ -482,5 +484,5 @@ } if (fault) { - psStringAppend(&query, "%c fault = %s", c, fault); + psStringAppend(&query, "%c fault = %d", c, fault); c = ','; } @@ -763,7 +765,18 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_S64(job_id, config->args, "-job_id", true, false); + PXOPT_LOOKUP_S64(job_id, config->args, "-job_id", false, false); + PXOPT_LOOKUP_S64(dep_id, config->args, "-dep_id", false, false); + + if (!job_id && !dep_id) { + psError(PS_ERR_UNKNOWN, true, "at least -job_id or -dep_id is required"); + return false; + } PXOPT_LOOKUP_STR(state, config->args, "-state", true, false); - PXOPT_LOOKUP_STR(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_S32(fault, config->args, "-fault", false, false); + + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "=="); + PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "=="); psString faultStr = NULL; @@ -771,12 +784,15 @@ faultStr = psStringCopy(""); } else { - psStringAppend(&faultStr, ", fault = '%s'", fault); - } - - char *query ="UPDATE pstampJob" - " SET state = '%s' %s" - " WHERE job_id = %" PRId64; - - if (!p_psDBRunQueryF(config->dbh, query, state, faultStr, job_id)) { + psStringAppend(&faultStr, "\n, pstampJob.fault = %d", fault); + } + + psString query = pxDataGet("pstamptool_updatejob.sql"); + + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " WHERE %s", whereClause); + psFree(whereClause); + psFree(where); + + if (!p_psDBRunQueryF(config->dbh, query, state, faultStr)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); @@ -784,11 +800,8 @@ } psFree(faultStr); + psFree(query); psU64 affected = psDBAffectedRows(config->dbh); - if (affected != 1) { - psError(PS_ERR_UNKNOWN, false, "should have affected one row but %" - PRIu64 " rows were modified", affected); - return false; - } + psLogMsg("pstamptool", PS_LOG_INFO, "Updated %" PRIu64 " pstampJobs", affected); return true; @@ -952,7 +965,8 @@ PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false); PXOPT_LOOKUP_S64(stage_id, config->args, "-stage_id", true, false); + PXOPT_LOOKUP_STR(component, config->args, "-component", true, false); PXOPT_LOOKUP_STR(imagedb, config->args, "-imagedb", true, false); PXOPT_LOOKUP_STR(rlabel, config->args, "-rlabel", false, false); - PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false); + PXOPT_LOOKUP_BOOL(need_magic, config->args, "-need_magic", false); PXOPT_LOOKUP_BOOL(no_create, config->args, "-no_create", false); @@ -961,4 +975,5 @@ PXOPT_COPY_STR(config->args, where, "-imagedb", "imagedb", "=="); PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "=="); + PXOPT_COPY_STR(config->args, where, "-component", "component", "=="); // start a transaction eraly so it will contain any row level locks @@ -973,10 +988,10 @@ return false; } - psString whereClause = psDBGenerateWhereSQL(where, "WHERE"); + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); if (!no_create) { // This will lock the row until the transaction is committed - psStringAppend(&query, " %s FOR UPDATE", whereClause); + psStringAppend(&query, " AND %s FOR UPDATE", whereClause); } else { - psStringAppend(&query, " %s", whereClause); + psStringAppend(&query, " AND %s", whereClause); } psFree(whereClause); @@ -1027,7 +1042,9 @@ stage, stage_id, + component, imagedb, rlabel, - no_magic + need_magic, + 0 // fault )) { if (!psDBRollback(config->dbh)) { @@ -1038,4 +1055,14 @@ } + // if we try and get this after commit zero is returned + psS64 dep_id = psDBLastInsertID(config->dbh); + if (!dep_id) { + psError(PS_ERR_UNKNOWN, false, "psDBLastInsertID returned NULL"); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + if (!psDBCommit(config->dbh)) { // rollback @@ -1047,5 +1074,4 @@ } - psS64 dep_id = psDBLastInsertID(config->dbh); printf("%" PRId64 "\n", dep_id); @@ -1058,4 +1084,9 @@ psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-stage", "stage", "=="); + PXOPT_COPY_STR(config->args, where, "-imagedb", "imagedb", "=="); + PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "=="); + PXOPT_COPY_STR(config->args, where, "-rlabel", "rlabel", "=="); + pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -1069,5 +1100,5 @@ if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, "pstampDependent"); + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -1116,11 +1147,24 @@ PXOPT_LOOKUP_S64(dep_id, config->args, "-dep_id", true, false); - PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); - - char *query ="UPDATE pstampDependent" - " SET state = '%s'" - " WHERE dep_id = %" PRId64; - - if (!p_psDBRunQueryF(config->dbh, query, state, dep_id)) { + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); + + if (!fault && !state) { + psError(PS_ERR_UNKNOWN, true, "at least one of -set_state or fault is required"); + return false; + } + psString query = psStringCopy("UPDATE pstampDependent SET"); + bool needComma = false; + if (state) { + psStringAppend(&query, " state = '%s'", state); + needComma = true; + } + if (fault) { + psStringAppend(&query, "%s fault = %d", needComma ? ", " : "", fault); + needComma = true; + } + psStringAppend(&query, " WHERE dep_id = %" PRId64, dep_id); + + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); @@ -1137,2 +1181,35 @@ return true; } +static bool revertdependentMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-fault", "req_id", "=="); + PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "=="); + pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "=="); + + if (!psListLength(where->list)) { + psFree(where); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } + psString query = pxDataGet("pstamptool_revertdependent.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + psString whereClause = psDBGenerateWhereSQL(where, NULL); + psStringAppend(&query, " %s", whereClause); + psFree(whereClause); + psFree(where); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + + return true; +} Index: trunk/ippTools/src/pstamptool.h =================================================================== --- trunk/ippTools/src/pstamptool.h (revision 27739) +++ trunk/ippTools/src/pstamptool.h (revision 27740) @@ -46,4 +46,5 @@ PSTAMPTOOL_MODE_PENDINGDEPENDENT, PSTAMPTOOL_MODE_UPDATEDEPENDENT, + PSTAMPTOOL_MODE_REVERTDEPENDENT, } pstamptoolMode; Index: trunk/ippTools/src/pstamptoolConfig.c =================================================================== --- trunk/ippTools/src/pstamptoolConfig.c (revision 27739) +++ trunk/ippTools/src/pstamptoolConfig.c (revision 27740) @@ -101,5 +101,5 @@ psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-outProduct", 0, "define request outProduct", NULL); - psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-fault", 0, "define request fault code", NULL); + psMetadataAddS16(updatereqArgs, PS_LIST_TAIL, "-fault", 0, "define request fault code", 0); psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-uri", 0, "define the uri", NULL); psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-name", 0, "define the name", NULL); @@ -144,6 +144,7 @@ psMetadata *updatejobArgs = psMetadataAlloc(); psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0, "req_id for which to change state", 0); + psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-dep_id", 0, "dep_id for which to change state", 0); psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); - psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-fault", 0, "new result", NULL); + psMetadataAddS16(updatejobArgs, PS_LIST_TAIL, "-fault", 0, "new result", 0); // -revertjob @@ -159,24 +160,31 @@ // -getdependent psMetadata *getdependentArgs = psMetadataAlloc(); - psMetadataAddS64(getdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define id for dependent run (required)", 0); - psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-stage", 0, "define stage for dependent run (required)", NULL); - psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-imagedb", 0, "define imagedb for depenent run (required)", NULL); - psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-rlabel", 0, "define label for dependent run", NULL); - psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-no_magic", 0, "define no_magic", false); - psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-no_create", 0, "if no run exists do not create one", false); + psMetadataAddS64(getdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define id for dependent (required)", 0); + psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-stage", 0, "define stage for dependent (required)", NULL); + psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-component", 0, "define component for depenent (required)", NULL); + psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-imagedb", 0, "define imagedb for depenent (required)", NULL); + psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-rlabel", 0, "define label for dependent ", NULL); + psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-need_magic", 0, "define need_magic", false); + psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-no_create", 0, "if no matching dependent do not create one", false); // -updatedependent psMetadata *updatedependentArgs = psMetadataAlloc(); - psMetadataAddS64(updatedependentArgs, PS_LIST_TAIL, "-dep_id", 0, "define id for dependent run (required)", 0); - psMetadataAddStr(updatedependentArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state (required)", NULL); + psMetadataAddS64(updatedependentArgs, PS_LIST_TAIL, "-dep_id", 0, "define id for dependent (required)", 0); + psMetadataAddStr(updatedependentArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state", NULL); + psMetadataAddS16(updatedependentArgs, PS_LIST_TAIL, "-fault", 0, "new value for fault", 0); + + // -revertdependent + psMetadata *revertdependentArgs = psMetadataAlloc(); + psMetadataAddS64(revertdependentArgs, PS_LIST_TAIL, "-dep_id", 0, "define id for dependent", 0); + psMetadataAddS16(revertdependentArgs, PS_LIST_TAIL, "-fault", 0, "new value for fault", 0); // -pendingdependent psMetadata *pendingdependentArgs = psMetadataAlloc(); - psMetadataAddS64(pendingdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define id for dependent run", 0); - psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-stage", 0, "define stage for dependent run", NULL); - psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-imagedb", 0, "define imagedb for depenent run", NULL); - psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-rlabel", 0, "define label for dependent run", NULL); - psMetadataAddBool(pendingdependentArgs,PS_LIST_TAIL, "-no_magic", 0, "define no_magic", false); - psMetadataAddBool(pendingdependentArgs,PS_LIST_TAIL, "-no_create", 0, "if no run exists do not create one", false); + psMetadataAddS64(pendingdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define id for dependent", 0); + psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-stage", 0, "define stage for dependent", NULL); + psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-component", 0, "define component for dependent", NULL); + psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label for pstampRequest", NULL); + psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-rlabel", 0, "define label for dependent", NULL); + psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-imagedb", 0, "define imagedb for depenent", NULL); psMetadataAddU64(pendingdependentArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(pendingdependentArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -230,4 +238,5 @@ PXOPT_ADD_MODE("-updatedependent", "", PSTAMPTOOL_MODE_UPDATEDEPENDENT, updatedependentArgs); PXOPT_ADD_MODE("-pendingdependent","", PSTAMPTOOL_MODE_PENDINGDEPENDENT, pendingdependentArgs); + PXOPT_ADD_MODE("-revertdependent","", PSTAMPTOOL_MODE_REVERTDEPENDENT, revertdependentArgs); PXOPT_ADD_MODE("-addproject", "", PSTAMPTOOL_MODE_ADDPROJECT, addprojectArgs);