Changeset 31687

Timestamp:

Jun 22, 2011, 4:12:33 PM (15 years ago)

Author:

bills

Message:

Only add the group by data_group when requested by the user. Use differernt sql
depending on that option.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/staticskytool_definebyquery_select.sql (modified) (4 diffs)
• share/staticskytool_definebyquery_select_by_dg.sql (added)
• src/staticskytool.c (modified) (4 diffs)
• src/staticskytoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -371 +371 @@
         stacktool_addsummary.sql \
         staticskytool_definebyquery_select.sql \
+        staticskytool_definebyquery_select_by_dg.sql \
         staticskytool_definebyquery_inputs.sql \
         staticskytool_export_run.sql \

trunk/ippTools/share/staticskytool_definebyquery_select.sql

@@ -1 @@
-SELECT 
+SELECT DISTINCT
        tess_id, 
        skycell_id,
-       data_group,
-       label,
        num_filter 
 FROM (
@@ -9 +7 @@
       tess_id,
       skycell_id,
-      label,
-      data_group,
       COUNT(DISTINCT filter) AS num_filter
   FROM stackRun
@@ -18 +14 @@
       AND stackSumSkyfile.quality = 0
   -- WHERE hook 1 %s 
-  -- restrict by stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label
+  -- restrict by selected filters, stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label
   GROUP BY
       tess_id,
-      skycell_id,
-      data_group
-  ) AS TMP
+      skycell_id
+  ) AS Stacks
 LEFT JOIN (
   SELECT DISTINCT sky_id,
     stackRun.skycell_id,
-    stackRun.label,
+    stackRun.tess_id,
     stackRun.data_group,
     COUNT(stack_id) AS num_filter
@@ -35 +30 @@
     JOIN stackSumSkyfile USING(stack_id)
     WHERE 1
+    -- restrict by selected filters, stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label
+    -- and unless -rerun is supplied that no existing staticskyRun exists
     -- WHERE hook 2 %s
   GROUP BY sky_id
- ) AS oldRuns
-USING(label, data_group, num_filter, skycell_id)
+ ) AS ExistingRunsInputs
+USING(tess_id, skycell_id, num_filter)
 WHERE num_filter = %d
 -- WHERE hook 3 %s

trunk/ippTools/src/staticskytool.c

@@ -102 +102 @@
 
     // optional
-    PXOPT_LOOKUP_STR(label,       config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(label,       config->args, "-set_label", true, false);
     PXOPT_LOOKUP_STR(data_group,  config->args, "-set_data_group", false, false);
     PXOPT_LOOKUP_STR(dist_group,  config->args, "-set_dist_group", false, false);
@@ -125 +125 @@
     int num_filter = filters->data.list->n;
 
+    PXOPT_LOOKUP_BOOL(group_by_data_group, config->args, "-group_by_data_group", false);
+    PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     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");
+
+    psString select;
+    if (group_by_data_group) {
+        select = pxDataGet("staticskytool_definebyquery_select_by_dg.sql");
+    } else {
+        select = pxDataGet("staticskytool_definebyquery_select.sql");
+    }
     if (!select) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -150 +156 @@
     psFree(whereMD);
 
+    psString where2 = NULL;
     psString make_unique = NULL;
     if (!rerun) {
+        psStringAppend(&where2, "\n %s\nAND staticskyRun.label = '%s'", where, label);
         psStringAppend(&make_unique, "\nAND sky_id IS NULL");
     }
 
-    if (!p_psDBRunQueryF(config->dbh, select, where, where, num_filter, make_unique ? make_unique : "")) {
+    if (!p_psDBRunQueryF(config->dbh, select, where, where2 ? where2 : where, num_filter, make_unique ? make_unique : "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(select);
@@ -161 +169 @@
     }
     psFree(select);
+    psFree(where2);
     psFree(make_unique);
 

trunk/ippTools/src/staticskytoolConfig.c

@@ -53 +53 @@
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_label", PS_META_DUPLICATE_OK, "search by stackRun label (LIKE comparison, multiple OK)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
-    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiplei OK)", NULL);
+    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
-    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label", NULL);
+    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label (required)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_data_group", 0, "define data group", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_dist_group", 0, "define dist group", NULL);
@@ -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, "-group_by_data_group",  0, "queue unique run for each data_group", false);
     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);