Changeset 36555 for trunk/ippTools/share

Timestamp:

Feb 25, 2014, 2:12:24 PM (12 years ago)

Author:

bills

Message:

updates from ipp/tags/ipp-20140114

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (4 diffs)
• ippTools/share/disttool_definebyquery_ff.sql (copied) (copied from tags/ipp-20140114/ippTools/share/disttool_definebyquery_ff.sql )
• ippTools/share/disttool_pending_ff.sql (copied) (copied from tags/ipp-20140114/ippTools/share/disttool_pending_ff.sql )
• ippTools/share/disttool_toadvance.sql (modified) (1 diff)
• ippTools/share/fftool_export_input.sql (copied) (copied from tags/ipp-20140114/ippTools/share/fftool_export_input.sql )
• ippTools/share/fftool_export_result.sql (copied) (copied from tags/ipp-20140114/ippTools/share/fftool_export_result.sql )
• ippTools/share/fftool_export_run.sql (copied) (copied from tags/ipp-20140114/ippTools/share/fftool_export_run.sql )
• ippTools/share/fftool_export_summary.sql (copied) (copied from tags/ipp-20140114/ippTools/share/fftool_export_summary.sql )
• ippTools/share/fftool_result.sql (modified) (1 diff)
• ippTools/share/fftool_summary.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -190 +190 @@
         disttool_definebyquery_diff.sql \
         disttool_definebyquery_fake.sql \
+        disttool_definebyquery_ff.sql \
         disttool_definebyquery_raw.sql \
         disttool_definebyquery_raw_no_magic.sql \
@@ -207 +208 @@
         disttool_pending_diff.sql \
         disttool_pending_fake.sql \
+        disttool_pending_ff.sql \
         disttool_pending_raw.sql \
         disttool_pending_sky.sql \
@@ -498 +500 @@
         fftool_todo.sql \
         fftool_toadvance.sql \
+        fftool_export_run.sql \
+        fftool_export_input.sql \
+        fftool_export_result.sql \
+        fftool_export_summary.sql \
         remotetool_definebyquery_chip.sql \
         remotetool_definebyquery_cam.sql \
@@ -503 +509 @@
         remotetool_definebyquery_stack.sql \
         remotetool_updatepoll.sql
-
-
-

trunk/ippTools/share/disttool_toadvance.sql

@@ -308 +308 @@
         COUNT(diffSkyfile.skycell_id) = COUNT(distComponent.component)
         AND SUM(distComponent.fault) = 0
+UNION
+-- ff stage
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    distRun.label,
+    clean
+    -- ,COUNT(warp_id)
+    -- ,COUNT(ff_id)
+    FROM distRun
+    JOIN fullForceRun ON stage_id = ff_id
+    JOIN fullForceResult USING(ff_id)
+    JOIN skycalRun USING(skycal_id)
+    JOIN stackRun USING(stack_id)
+    LEFT JOIN distComponent
+        ON distRun.dist_id = distComponent.dist_id
+        AND distComponent.component = CONCAT_WS('.', warp_id, stackRun.skycell_id) 
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distRun.stage = 'ff'
+    GROUP BY
+        distRun.dist_id,
+        ff_id
+    HAVING
+        -- number of dist components is the number of warps plus 1 (for the summary component)
+        COUNT(fullForceResult.ff_id) = COUNT(distComponent.component)
+        AND SUM(distComponent.fault) = 0
 ) as Foo

trunk/ippTools/share/fftool_result.sql

@@ -1 +1 @@
 SELECT
     fullForceResult.*,
-    fullForceRun.skycal_id,
+    fullForceRun.state,
     fullForceRun.label,
     fullForceRun.data_group,
+    fullForceRun.skycal_id,
+    fullForceRun.workdir,
+    CONCAT_WS('.', warp_id, skycell_id) AS dist_component,
     stackRun.tess_id,
     stackRun.skycell_id,

trunk/ippTools/share/fftool_summary.sql

@@ -5 +5 @@
     fullForceRun.data_group,
     fullForceRun.skycal_id,
+    fullForceRun.workdir,
+    'summary' AS dist_component,
     stackRun.tess_id,
     stackRun.skycell_id,