Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/share/disttool_toadvance.sql

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/disttool_toadvance.sql (modified) (7 diffs)

branches/cnb_branches/cnb_branch_20090301/ippTools/share

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

branches/cnb_branches/cnb_branch_20090301/ippTools/share/disttool_toadvance.sql

@@ -3 +3 @@
     stage,
     stage_id,
-    outroot
+    CONCAT_WS('.', outroot, CONVERT(dist_id, CHAR)) as outdir,
+    label,
+    clean
 FROM
     (
--- raw stage
-SELECT 
+-- raw stage not clean
+SELECT
     distRun.dist_id,
     stage,
     stage_id,
-    outroot
+    outroot,
+    label,
+    clean
     FROM distRun
     JOIN rawImfile ON stage_id = rawImfile.exp_id
@@ -19 +23 @@
     WHERE
         distRun.state = 'new'
+        AND distRun.clean = 0
         AND distRun.fault = 0
         AND distRun.stage = 'raw'
@@ -28 +33 @@
         AND SUM(distComponent.fault) = 0
 UNION
--- chip stage
-SELECT 
+-- clean distribution of raw files (dbinfo only) only 1 component
+SELECT
     distRun.dist_id,
     stage,
     stage_id,
-    outroot
+    outroot,
+    label,
+    clean
+    FROM distRun
+    LEFT JOIN distComponent
+        ON distRun.dist_id = distComponent.dist_id
+    WHERE
+        distRun.state = 'new'
+        AND distRun.clean
+        AND distRun.fault = 0
+        AND distRun.stage = 'raw'
+        AND distComponent.component IS NOT NULL
+        AND distComponent.fault = 0
+UNION
+-- chip stage
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    label,
+    clean
     FROM distRun
     JOIN chipProcessedImfile ON stage_id = chipProcessedImfile.chip_id
@@ -50 +76 @@
         AND SUM(distComponent.fault) = 0
 UNION
--- warp stage
-SELECT 
+-- camera stage
+SELECT distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    distRun.label,
+    clean
+    FROM distRun
+    JOIN camRun ON stage_id = cam_id
+    JOIN chipRun USING(chip_id)
+    LEFT JOIN distComponent  USING(dist_id)
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distComponent.fault = 0
+        AND distRun.stage = 'camera'
+--        AND ((chipRun.magicked AND camRun.state = 'full') OR distRun.no_magic)
+--        AND (camRun.state = 'full' OR (distRun.clean and camRun.state = 'cleaned'))
+UNION
+-- fake stage
+SELECT
     distRun.dist_id,
     stage,
     stage_id,
-    outroot
+    outroot,
+    label,
+    clean
+    FROM distRun
+    JOIN fakeProcessedImfile ON stage_id = fakeProcessedImfile.fake_id
+    LEFT JOIN distComponent
+        ON distComponent.dist_id = distRun.dist_id
+        AND distComponent.component = fakeProcessedImfile.class_id
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distRun.stage = 'fake'
+    GROUP BY
+        dist_id,
+        fakeProcessedImfile.fake_id
+    HAVING
+        COUNT(fakeProcessedImfile.class_id) = COUNT(distComponent.component)
+        AND SUM(distComponent.fault) = 0
+UNION
+-- warp stage
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    label,
+    clean
     FROM distRun
     JOIN warpSkyfile on stage_id = warp_id
@@ -66 +137 @@
         AND distRun.stage = 'warp'
 --        AND warpSkyfile.fault = 0
---        AND warpSkyfile.ignored = 0
+--        AND warpSkyfile.quality = 0
     GROUP BY
         distRun.dist_id,
@@ -75 +146 @@
 UNION
 -- diff stage
-SELECT DISTINCT
+SELECT
     distRun.dist_id,
     stage,
     stage_id,
-    outroot
+    outroot,
+    distRun.label,
+    clean
     FROM distRun
     JOIN diffSkyfile
-        ON distRun.dist_id = diffSkyfile.diff_id
+        ON stage_id = diffSkyfile.diff_id
     LEFT JOIN distComponent
         ON distRun.dist_id = distComponent.dist_id
@@ -99 +172 @@
 UNION
 -- stack stage
-SELECT 
+SELECT
     distRun.dist_id,
     stage,
     stage_id,
-    outroot
+    outroot,
+    label,
+    clean
     FROM distRun
     JOIN stackSumSkyfile on stage_id = stack_id

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql