Changeset 31681

Timestamp:

Jun 22, 2011, 2:29:09 PM (15 years ago)

Author:

bills

Message:

Change staticskytool -definebyquery to only queue a run if an existing run for the stacks with
given label and data_group does not exist. This allows it to work properly for single filter
staticskyRuns for nightly stacks and to support use in a survey task. Add a -rerun flag to override
that restriction

Location:

trunk/ippTools

Files:

• share/staticskytool_definebyquery_select.sql (modified) (3 diffs)
• src/staticskytool.c (modified) (3 diffs)
• src/staticskytoolConfig.c (modified) (1 diff)

trunk/ippTools/share/staticskytool_definebyquery_select.sql

@@ -1 +1 @@
 SELECT 
        tess_id, 
-       skycell_id, 
+       skycell_id,
+       data_group,
+       label,
        num_filter 
 FROM (
@@ -7 +9 @@
       tess_id,
       skycell_id,
+      label,
+      data_group,
       COUNT(DISTINCT filter) AS num_filter
   FROM stackRun
@@ -17 +21 @@
   GROUP BY
       tess_id,
-      skycell_id
+      skycell_id,
+      data_group
   ) AS TMP
+LEFT JOIN (
+  SELECT DISTINCT sky_id,
+    stackRun.skycell_id,
+    stackRun.label,
+    stackRun.data_group,
+    COUNT(stack_id) AS num_filter
+  FROM staticskyRun
+    JOIN staticskyInput USING(sky_id)
+    JOIN stackRun USING(stack_id)
+    JOIN stackSumSkyfile USING(stack_id)
+    WHERE 1
+    -- WHERE hook 2 %s
+  GROUP BY sky_id
+ ) AS oldRuns
+USING(label, data_group, num_filter, skycell_id)
 WHERE num_filter = %d
-
+-- WHERE hook 3 %s

trunk/ippTools/src/staticskytool.c

@@ -128 +128 @@
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
     PXOPT_LOOKUP_BOOL(check_inputs, config->args, "-check_inputs", false);
+    PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
 
     psString select = pxDataGet("staticskytool_definebyquery_select.sql");
@@ -149 +150 @@
     psFree(whereMD);
 
-    if (!p_psDBRunQueryF(config->dbh, select, where, num_filter)) {
+    psString make_unique = NULL;
+    if (!rerun) {
+        psStringAppend(&make_unique, "\nAND sky_id IS NULL");
+    }
+
+    if (!p_psDBRunQueryF(config->dbh, select, where, where, num_filter, make_unique ? make_unique : "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(select);
@@ -155 +161 @@
     }
     psFree(select);
+    psFree(make_unique);
 
     // we now have a list of (tess_id, skycell_id) that (potentially) meet out needs

trunk/ippTools/src/staticskytoolConfig.c

@@ -61 +61 @@
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_reduction", 0, "define reduction", NULL);
     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-set_registered", 0, "time detrend run was registered", now);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun",  0, "queue new run even if one already exists for inputs", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0, "do not actually modify the database", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-check_inputs",  0, "list inputs, do not modify database", false);