Changeset 28959 for trunk/ippTools/share

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/share

Files:

• Makefile.am (modified) (3 diffs)
• disttool_definebyquery_sky.sql (added)
• disttool_pending_sky.sql (added)
• disttool_toadvance.sql (modified) (1 diff)
• staticskytool_export_input.sql (added)
• staticskytool_export_result.sql (added)
• staticskytool_export_run.sql (added)
• staticskytool_result.sql (modified) (1 diff)

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)