Changeset 23661 for trunk/ippTools

Timestamp:

Apr 1, 2009, 3:22:25 PM (17 years ago)

Author:

bills

Message:

various changes to disttool

Location:

trunk/ippTools

Files:

• share/disttool_pendingcomponent.sql (modified) (6 diffs)
• src/disttool.c (modified) (5 diffs)
• src/disttoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/disttool_pendingcomponent.sql

@@ -16 +16 @@
 FROM distRun
 JOIN rawExp ON exp_id = stage_id
-JOIN (                      -- find the last magicked chip run 
+JOIN (                      -- find the last satisfactory chip run 
+                            -- note this requires that a chip run have been completed even when 
+                            -- magic is not required for the run
     SELECT
         exp_id,
         MAX(chip_id) AS chip_id
     FROM chipRun
+    JOIN distRun ON stage_id = exp_id AND stage = 'raw'
     WHERE 
         chipRun.state = 'full'
         AND chipRun.exp_id = exp_id
-        --   AND chipRun.magicked
-        -- magicked hook 1 %s
+        AND (chipRun.magicked OR distRun.no_magic)
         GROUP BY exp_id
     ) AS bestChipRun 
@@ -39 +41 @@
     AND distRun.stage = 'raw'
     AND distComponent.dist_id IS NULL
-    -- if magicked add AND rawImfile.magicked here
+    AND (rawExp.magicked OR distRun.no_magic)
     -- where hook 1 %s
 
@@ -69 +71 @@
     AND distRun.stage = 'chip'
     AND distComponent.dist_id IS NULL
+    AND (distRun.clean OR chipRun.magicked OR distRun.no_magic)
     -- where hook 2 %s
 UNION
@@ -98 +101 @@
     AND distRun.stage = 'camera'
     AND distComponent.dist_id IS NULL
+    AND (distRun.clean OR chipRun.magicked OR distRun.no_magic)
     -- where hook 3 %s
 UNION
@@ -157 +161 @@
     AND distRun.stage = 'warp'
     AND distComponent.dist_id IS NULL
+    AND (distRun.clean OR warpRun.magicked OR distRun.no_magic)
     -- where hook 5 %s
 UNION
@@ -186 +191 @@
     AND distRun.stage = 'diff'
     AND distComponent.dist_id IS NULL
+    AND (distRun.clean OR diffRun.magicked OR distRun.no_magic)
     -- where hook 6 %s
 UNION

trunk/ippTools/src/disttool.c

@@ -92 +92 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // required
     PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
     PXOPT_LOOKUP_S64(stage_id, config->args, "-stage_id",  true, false);
     PXOPT_LOOKUP_STR(outroot, config->args, "-outroot", true, false);
+    // optional
+    PXOPT_LOOKUP_S64(target_id, config->args, "-target_id",  false, false);
     PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
+    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
     PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false);
 
@@ -101 +105 @@
     // XXX: all of the following concerns will be managed properly by definebyquery
 
-    // TODO: check that stage_id actually exists for stage
+    // TODO: should we check that stage_id actually exists for stage
     // in magicdstool we queue off of a magic_id so the stage_id, exp_id, and cam_id get looked up 
     // when the run is queued
-    // Should we also check here that the run is full or cleaned and that all of the images
-    // are magicked. We need to do that at run time as well since the run and magic state can
-    // change between the time that it is queued.
-
-    if (!distRunInsert(config->dbh, 0, stage, stage_id, set_label, outroot, clean, "new", NULL, 0)) {
+
+    if (!distRunInsert(config->dbh,
+            0,          // dist_id
+            target_id,
+            stage,
+            stage_id,
+            set_label,
+            outroot,
+            clean,
+            no_magic,
+            "new",
+            NULL,       // time_stamp
+            0           // fault
+            )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -296 +309 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-    PXOPT_LOOKUP_BOOL(need_magic, config->args, "-need_magic", false);
 
     // look for "inputs" that need to processed
@@ -319 +331 @@
     }
 
-    psString    chip_magic = "";
+    // the query has where hooks for each stage.
+    // right now we aren't using them.
+    // XXX: I think that I want to change the query from a union of selects on the various
+    // stages to separate queries. As it is pending data at the later stages of the pipline
+    // will get blocked by pending earlier stages
     psString    raw_where = "";
     psString    chip_where = "";
@@ -328 +344 @@
     psString    stack_where = "";
 
-    if (need_magic) {
-        chip_magic = psStringCopy("\nAND chipRun.magicked");
-        raw_where  = psStringCopy("\nAND rawExp.magicked");
-        chip_where = psStringCopy("\nAND (distRun.clean OR chipRun.magicked)");
-        // chipRun must be magicked to allow release camera level masks
-        camera_where = psStringCopy("\nAND (distRun.clean OR chipRun.magicked)");
-        warp_where = psStringCopy("\nAND (distRun.clean OR warpRun.magicked)");
-        diff_where = psStringCopy("\nAND (distRun.clean OR diffRun.magicked)");
-    }
-
     if (!p_psDBRunQueryF(config->dbh,
             query,
-            chip_magic,
             raw_where,
             chip_where,

trunk/ippTools/src/disttoolConfig.c

@@ -48 +48 @@
     psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-stage_id", 0, "define stage_id (required)", 0); 
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-outroot",  0, "define output destination (required)", NULL);
+    psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-target_id", 0, "define stage_id", 0); 
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-clean", 0,   "build clean distribution bundle", false);
+    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-no_magic", 0, "magic is not needed", false);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-set_label",    0, "define label for run", NULL);
     
@@ -75 +77 @@
     psMetadataAddS64(pendingcomponentArgs, PS_LIST_TAIL, "-dist_id", 0, "define dist_id", 0); 
     psMetadataAddStr(pendingcomponentArgs, PS_LIST_TAIL, "-stage",    0, "limit results to runs for stage", NULL);
-    psMetadataAddBool(pendingcomponentArgs, PS_LIST_TAIL, "-need_magic", 0, "magic is needed", false);
     psMetadataAddStr(pendingcomponentArgs, PS_LIST_TAIL, "-label",    0, "limit results to label", NULL);
     psMetadataAddU64(pendingcomponentArgs, PS_LIST_TAIL, "-limit",  0,  "limit result set to N items", 0);