Changeset 27795 for trunk/ippTools

Timestamp:

Apr 28, 2010, 2:18:01 PM (16 years ago)

Author:

bills

Message:

first crack at queuing automatic updates for diffSkyfiles. Various bug fixes found in testing

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (2 diffs)
• share/pstamptool_getdependent.sql (added)
• share/pstamptool_pendingdependent.sql (modified) (1 diff)
• share/pstamptool_revertdependent.sql (modified) (1 diff)
• src/pstamptool.c (modified) (5 diffs)
• src/pstamptoolConfig.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -114 +114 @@
      difftool_pendingcleanupskyfile.sql \
      difftool_revertdiffskyfile_delete.sql \
-     difftool_revertdiffskyfile_update.sql \
+     difftool_revertdiffskyfile_updated.sql \
+     difftool_setskyfiletoupdate.sql \
      difftool_skyfile.sql \
      difftool_todiffskyfile.sql \
@@ -223 +224 @@
      pstamptool_completedreq.sql \
      pstamptool_datastore.sql \
+     pstamptool_getdependent.sql \
      pstamptool_listjob.sql \
      pstamptool_pendingdependent.sql \

trunk/ippTools/share/pstamptool_pendingdependent.sql

@@ -4 +4 @@
 JOIN pstampRequest USING(req_id)
 WHERE pstampDependent.state = 'new'
+    AND pstampDependent.fault = 0
     AND pstampJob.state = 'run'
+    AND pstampRequest.state = 'run'

trunk/ippTools/share/pstamptool_revertdependent.sql

@@ -3 +3 @@
     JOIN pstampRequest USING(req_id)
 SET pstampDependent.fault = 0
+WHERE pstampDependent.state = 'new'

trunk/ippTools/src/pstamptool.c

@@ -530 +530 @@
 
     PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-fault", "req_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-fault", "fault", "==");
     PXOPT_COPY_STR(config->args, where, "-state", "pstampRequest.state", "==");
     pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "LIKE");
@@ -967 +967 @@
     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_STR(rlabel,      config->args, "-rlabel",  true, false);
     PXOPT_LOOKUP_BOOL(need_magic, config->args, "-need_magic", false);
     PXOPT_LOOKUP_BOOL(no_create,  config->args, "-no_create", false);
@@ -983 +983 @@
     }
 
-    psString query = pxDataGet("pstamptool_pendingdependent.sql");
+    psString query = pxDataGet("pstamptool_getdependent.sql");
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -1186 +1186 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-fault", "req_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-fault", "pstampDependent.fault", "==");
     PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "==");
     pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "==");
@@ -1201 +1201 @@
     }
 
-    psString whereClause = psDBGenerateWhereSQL(where, NULL);
-    psStringAppend(&query, " %s", whereClause);
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringAppend(&query, " AND %s", whereClause);
     psFree(whereClause);
     psFree(where);

trunk/ippTools/src/pstamptoolConfig.c

@@ -177 +177 @@
     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);
+    psMetadataAddStr(revertdependentArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK,   "define label for dependent ", NULL);
+    psMetadataAddS16(revertdependentArgs, PS_LIST_TAIL, "-fault",  0,   "define fault", 0);
 
     // -pendingdependent