Changeset 20964 for branches/bills_081204/ippTools/share/magicdstool_todestreak.sql

Timestamp:

Dec 11, 2008, 5:22:00 PM (18 years ago)

Author:

bills

Message:

changes to adapt the magic to the re-worked difference stage

File:

• branches/bills_081204/ippTools/share/magicdstool_todestreak.sql (modified) (2 diffs)

branches/bills_081204/ippTools/share/magicdstool_todestreak.sql

@@ -106 +106 @@
     magicMask.uri as streaks_uri,
     stage,
-    diff_id as stage_id,
-    diffInputSkyfile.skycell_id as component,
+    magicRun.diff_id as stage_id,
+    diffSkyfile.skycell_id as component,
     diffSkyfile.uri,
     diffSkyfile.path_base,
@@ -120 +120 @@
 JOIN magicDSRun USING(magic_id)
 JOIN magicInputSkyfile USING(magic_id)
-JOIN diffRun USING(diff_id)
-JOIN diffSkyfile USING(diff_id)
-JOIN diffInputSkyfile USING(diff_id)
+JOIN diffSkyfile
+    ON  magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    AND magicInputSkyfile.node = diffSkyfile.skycell_id
 LEFT JOIN magicDSFile
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
-    AND magicDSFile.component = diffInputSkyfile.skycell_id
+    AND magicDSFile.component = diffSkyfile.skycell_id
 WHERE
     magicDSRun.state = 'run'
     AND magicDSRun.stage = 'diff'
-    AND diffRun.state = 'full'
     AND diffSkyfile.fault = 0
     AND magicDSFile.component IS NULL