Changeset 37272

Timestamp:

Aug 20, 2014, 12:05:13 PM (12 years ago)

Author:

eugene

Message:

failure to affect rows may not be an error

File:

• tags/ipp-pv3-20140717/ippTools/src/remotetool.c (modified) (25 diffs)

tags/ipp-pv3-20140717/ippTools/src/remotetool.c

@@ -92 +92 @@
   PXOPT_LOOKUP_BOOL(simple,    config->args, "-simple",       false);
   PXOPT_LOOKUP_BOOL(pretend,   config->args, "-pretend",      false);
-  
+
   set_label = set_label ? set_label : label;
 
@@ -105 +105 @@
       return(false);
     }
-    
+
     if (label) {
       psStringAppend(&whereOption, "\n AND (label = '%s')", label);
@@ -116 +116 @@
       return(false);
     }
-    
+
     if (label) {
       psStringAppend(&whereOption, "\n AND (label = '%s')", label);
     }
-  }    
+  }
   else if (!strcmp(stage,"warp")) {
     query = pxDataGet("remotetool_definebyquery_warp.sql");
@@ -127 +127 @@
       return(false);
     }
-    
+
     if (label) {
       // Because warp has to check to see if something other than the state is set correctly, I have to use this wonky way to pass the label in.
@@ -133 +133 @@
       psStringAppend(&whereOption, "\n AND (label = '%s')", label);
     }
-  }    
+  }
   else if (!strcmp(stage,"stack")) {
     query = pxDataGet("remotetool_definebyquery_stack.sql");
@@ -140 +140 @@
       return(false);
     }
-    
+
     if (label) {
       psStringAppend(&whereOption, "\n AND (label = '%s')", label);
     }
-  }    
+  }
   else {
     psError(PS_ERR_UNKNOWN, true, "unknown value for stage: %s", stage);
@@ -191 +191 @@
   // Insert the top level run object
   remoteRunRow *run = remoteRunRowAlloc(0, // remote_id
-                                        "new", // state
-                                        stage,
-                                        set_label,
-                                        path_base,
-                                        -1, // job_id
-                                        NULL, // last_poll
-                                        0   // fault
-                                          );
+                                        "new", // state
+                                        stage,
+                                        set_label,
+                                        path_base,
+                                        -1, // job_id
+                                        NULL, // last_poll
+                                        0   // fault
+                                          );
   if (!run) {
     psError(PS_ERR_UNKNOWN, false, "failed to alloc lapRun object");
     return(true);
   }
-  
+
   if (!remoteRunInsertObject(config->dbh, run)) {
     if (!psDBRollback(config->dbh)) {
@@ -213 +213 @@
   }
   psS64 remote_id = psDBLastInsertID(config->dbh);
-  
+
   psArray *list = psArrayAllocEmpty(limit);
   for (long i=0; i < psArrayLength(output); i++) {
@@ -220 +220 @@
 
     remoteComponentRow *comp = remoteComponentRowAlloc(remote_id,
-                                                       stage_id);
+                                                       stage_id);
     if (!comp) {
       psError(PS_ERR_UNKNOWN, false, "failed to alloc lapRun object");
       return(true);
     }
-    
+
     if (!remoteComponentInsertObject(config->dbh, comp)) {
       if (!psDBRollback(config->dbh)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+        psError(PS_ERR_UNKNOWN, false, "database error");
       }
       psError(PS_ERR_UNKNOWN, false, "database error");
@@ -237 +237 @@
     psArrayAdd(list, list->n, comp);
     psFree(comp);
-    
+
   }
   psFree(run);
@@ -245 +245 @@
     return false;
   }
-  
+
   if (!remoteComponentPrintObjects(stdout, list, !simple)) {
     if (!psDBRollback(config->dbh)) {
@@ -254 +254 @@
     return false;
   }
-  
+
   psFree(list);
   psFree(output);
-                                        
+
   return true;
 }
@@ -265 +265 @@
 {
   psMetadata *where = psMetadataAlloc();
-  
+
   PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
@@ -274 +274 @@
   PXOPT_COPY_TIME(config->args, where, "-poll_begin", "last_poll", ">=");
   PXOPT_COPY_TIME(config->args, where, "-poll_end", "last_poll", "<=");
-  
+
   PXOPT_COPY_S16(config->args, where, "-fault", "fault", "==");
 
   PXOPT_LOOKUP_S16(limit,   config->args, "-limit",  false, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-  
+
 
   psArray *remRuns = NULL;
   remRuns = psDBSelectRows(config->dbh, "remoteRun", where, limit);
-  
+
   if (!ippdbPrintMetadatas(stdout, remRuns, "remoteRun", !simple)) {
     psError(PS_ERR_UNKNOWN, false, "failed to print array");
@@ -300 +300 @@
   PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-  
+
   psArray *remComps = NULL;
   remComps = psDBSelectRows(config->dbh, "remoteComponent", where, 0);
-  
+
   if (!ippdbPrintMetadatas(stdout, remComps, "remoteComponent", !simple)) {
     psError(PS_ERR_UNKNOWN, false, "failed to print array");
@@ -329 +329 @@
     return false;
   }
-  
+
   if (!psDBTransaction(config->dbh)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
@@ -341 +341 @@
   }
   psFree(query);
-  
-  
+
+
 
   // point of no return
@@ -349 +349 @@
     return false;
   }
-  
+
   return true;
 }
@@ -364 +364 @@
   // Wheres
   PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
-  
+
   // Values to set
   PXOPT_COPY_STR(config->args, values, "-set_label", "label", "==");
@@ -375 +375 @@
 
   if (rows < 1) {
-    psError(PS_ERR_UNKNOWN,false, "no rows affected");
-    return(false);
-  }
-  
+      fprintf (stderr, "no rows changed (run may already be in desired state)\n");
+  }
   return(true);
 }
@@ -393 +391 @@
   psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
   psFree(where);
-  
+
   psString query = NULL;
   query = pxDataGet("remotetool_updatepoll.sql");
@@ -412 +410 @@
   return(true);
 }
-  
-
-  
+
+
+
 
 static bool revertrunMode(pxConfig *config)
@@ -426 +424 @@
   PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
-  
+
   // Value to set
   PXOPT_COPY_S16(config->args, values, "-fault", "fault", "==");
@@ -451 +449 @@
   PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
-  psMetadataAddStr(where, PS_LIST_TAIL, "state", 0, "==", "auth"); 
+  psMetadataAddStr(where, PS_LIST_TAIL, "state", 0, "==", "auth");
 
   // Value to set
   psMetadataAddStr(values, PS_LIST_TAIL, "state", 0, "==", "run");
-  
+
   long rows = psDBUpdateRows(config->dbh, "remoteRun", where, values);
   psFree(values);
@@ -466 +464 @@
   return(true);
 }
-    
+