Changeset 32702

Timestamp:

Nov 17, 2011, 3:18:56 PM (15 years ago)

Author:

bills

Message:

Fix queuing of distribution runs for staticsky stage

Location:

tags/ipp-20111110

Files:

• ippScripts/scripts/dist_defineruns.pl (modified) (1 diff, 1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/disttool_definebyquery_sky.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_sky_singlefilter.sql (copied) (copied from trunk/ippTools/share/disttool_definebyquery_sky_singlefilter.sql )
• ippTools/src/disttool.c (modified) (3 diffs, 1 prop)
• ippTools/src/disttoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-20111110/ippScripts/scripts/dist_defineruns.pl

@@ -88 +88 @@
     push @stages, $stage;
 } else {
-    @stages = qw(chip chip_bg camera fake warp warp_bg diff stack SSdiff sky);
+    @stages = qw(chip chip_bg camera fake warp warp_bg diff stack SSdiff sky skysingle);
 }
 
 foreach my $stage (@stages) {
     foreach my $label (@labels) {
-        my $command = "$disttool -definebyquery -stage $stage -workdir $workdir -label $label";
+        my $single;
+        my $cmdstage;
+        if ($stage eq "skysingle") {
+            $cmdstage = "sky";
+            $single = 1;
+        } else {
+            $cmdstage = $stage;
+        }
+        my $command = "$disttool -definebyquery -stage $cmdstage -workdir $workdir -label $label";
+        $command .= " -singlefilter" if $single;
         $command .= " -no_magic" if $no_magic;
         $command .= " -pretend" if $no_update;

tags/ipp-20111110/ippTools/share/Makefile.am

@@ -181 +181 @@
         disttool_definebyquery_raw_no_magic.sql \
         disttool_definebyquery_sky.sql \
+        disttool_definebyquery_sky_singlefilter.sql \
         disttool_definebyquery_stack.sql \
         disttool_definebyquery_warp.sql \

tags/ipp-20111110/ippTools/share/disttool_definebyquery_sky.sql

@@ -22 +22 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
+    AND distTarget.filter = 'multi'
     AND distRun.dist_id IS NULL
     AND ((staticskyRun.state = 'full') OR (distTarget.clean AND staticskyRun.state = 'cleaned'))

tags/ipp-20111110/ippTools/src/disttool.c

@@ -164 +164 @@
     PXOPT_LOOKUP_STR(dist_group, config->args, "-dist_group", false, false);
 
+    PXOPT_LOOKUP_BOOL(single, config->args, "-singlefilter", false);
+
     if (use_alternate) {
         if (strcmp(stage, "raw")) {
@@ -354 +356 @@
     } else if (!strcmp(stage, "sky")) {
         magicRunType = "staticskyRun";
-        query = pxDataGet("disttool_definebyquery_sky.sql");
+        if (single) {
+            query = pxDataGet("disttool_definebyquery_sky_singlefilter.sql");
+        } else {
+            query = pxDataGet("disttool_definebyquery_sky.sql");
+        }
         if (!query) {
             psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -411 +417 @@
     if (!no_magic) {
         psStringAppend(&query, " AND (%s.magicked > 0)", magicRunType);
+    }
+
+    if (!strcmp(stage, "sky") && single) {
+        psStringAppend(&query, "\nGROUP BY sky_id HAVING count(stack_id) = 1");
     }
 

tags/ipp-20111110/ippTools/src/disttoolConfig.c

@@ -63 +63 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label",         0, "select by run label", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dist_group",    0, "select by dist_group", NULL);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-singlefilter", 0, "select single filter runs (sky stage only)", false);
 
     psMetadataAddU64(definebyqueryArgs, PS_LIST_TAIL, "-limit",  0,  "limit result set to N items", 0);