Changeset 28959

Timestamp:

Aug 18, 2010, 7:42:49 PM (16 years ago)

Author:

bills

Message:

Changes to support distribution of the "sky" stage (short for staticsky)

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (3 diffs)
• share/disttool_definebyquery_sky.sql (added)
• share/disttool_pending_sky.sql (added)
• share/disttool_toadvance.sql (modified) (1 diff)
• share/staticskytool_export_input.sql (added)
• share/staticskytool_export_result.sql (added)
• share/staticskytool_export_run.sql (added)
• share/staticskytool_result.sql (modified) (1 diff)
• src/disttool.c (modified) (1 diff)
• src/staticskytool.c (modified) (5 diffs)

trunk/ippTools/share/Makefile.am

@@ -153 +153 @@
         disttool_definebyquery_fake.sql \
         disttool_definebyquery_raw.sql \
+        disttool_definebyquery_sky.sql \
         disttool_definebyquery_stack.sql \
         disttool_definebyquery_warp.sql \
@@ -166 +167 @@
         disttool_pending_fake.sql \
         disttool_pending_raw.sql \
+        disttool_pending_sky.sql \
         disttool_pending_stack.sql \
         disttool_pending_warp.sql \
@@ -328 +330 @@
         staticskytool_definebyquery_select.sql \
         staticskytool_definebyquery_inputs.sql \
+        staticskytool_export_run.sql \
+        staticskytool_export_input.sql \
+        staticskytool_export_result.sql \
         staticskytool_inputs.sql \
         staticskytool_todo.sql \

trunk/ippTools/share/disttool_toadvance.sql

@@ -240 +240 @@
         AND distComponent.fault = 0
 UNION
+-- staticsky stage
+-- NOTE this assumes that there is only one component per staticskyRun
+-- (one skycell)
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    label,
+    clean
+    FROM distRun
+    JOIN staticskyResult on stage_id = sky_id
+    LEFT JOIN distComponent
+        ON distRun.dist_id = distComponent.dist_id
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distRun.stage = 'sky'
+        AND distComponent.component IS NOT NULL
+        AND distComponent.fault = 0
+UNION
 -- SSdiff stage
 SELECT

trunk/ippTools/share/staticskytool_result.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     staticskyResult.*,
     staticskyRun.state,
-    staticskyRun.tess_id,
-    staticskyRun.skycell_id,
-    staticskyRun.filter,
     staticskyRun.workdir,
     staticskyRun.label,
+    stackRun.tess_id,
+    stackRun.skycell_id,
+    stackRun.filter
 FROM staticskyRun
-JOIN staticskyResult
-USING(stack_id)
+JOIN staticskyResult USING(sky_id)
+JOIN staticskyInput USING(sky_id)
+JOIN stackRun using(stack_id)

trunk/ippTools/src/disttool.c

@@ -329 +329 @@
         // stack stage doesn't require magic
         no_magic = true;
+    } else if (!strcmp(stage, "sky")) {
+        magicRunType = "staticskyRun";
+        query = pxDataGet("disttool_definebyquery_sky.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        if (label) {
+            psStringAppend(&query, " AND (staticskyRun.label = '%s')", label);
+        }
+        if (dist_group) {
+            psStringAppend(&query, " AND (sticskyRun.dist_group = '%s')", dist_group);
+        }
+        // (static)sky stage doesn't require magic
+        no_magic = true;
     } else if (!strcmp(stage, "SSdiff")) {
       magicRunType = "diffRun";

trunk/ippTools/src/staticskytool.c

@@ -727 +727 @@
 bool exportrunMode(pxConfig *config)
 {
-# if (0)
   typedef struct ExportTable {
     char tableName[80];
@@ -737 +736 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
+  PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
@@ -753 +752 @@
   }
   psMetadata *where = psMetadataAlloc();
-  PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-sky_id", "sky_id", "==");
 
   ExportTable tables [] = {
-    {"stackRun", "staticskytool_export_run.sql"},
-    {"stackInputSkyfile", "staticskytool_export_input_skyfile.sql"},
-    {"stackSumSkyfile", "staticskytool_export_sum_skyfile.sql"},
+    {"staticskyRun", "staticskytool_export_run.sql"},
+    {"staticskyInput", "staticskytool_export_input.sql"},
+    {"staticskyResult", "staticskytool_export_result.sql"},
   };
 
@@ -800 +799 @@
 
     if (clean) {
-        if (!strcmp(tables[i].tableName, "stackRun")) {
-            if (!pxSetStateCleaned("stackRun", "state", output)) {
+        if (!strcmp(tables[i].tableName, "staticskyRun")) {
+            if (!pxSetStateCleaned("staticskyRun", "state", output)) {
                 psFree(output);
                 psError(PS_ERR_UNKNOWN, false, "pxSetStateClean failed for table %s",  tables[i].tableName);
@@ -821 +820 @@
     fclose (f);
 
-# endif
     return true;
 }