Changeset 25013 for trunk/ippTools/share/magicdstool_definebyquery_diff.sql

Timestamp:

Aug 7, 2009, 10:51:43 AM (17 years ago)

Author:

bills

Message:

handle bothways (warp-warp) diffs separate from not bothways

File:

• trunk/ippTools/share/magicdstool_definebyquery_diff.sql (modified) (3 diffs)

trunk/ippTools/share/magicdstool_definebyquery_diff.sql

@@ +1 @@
+SELECT *
+FROM (
 SELECT
     magicRun.magic_id,
@@ -6 +8 @@
     0 AS cam_id,
     magicRun.label,
-    magicRun.workdir
+    magicRun.workdir,
+    CAST(NULL AS SIGNED) AS inv_magic_id,
+    CAST(NULL AS SIGNED) AS inv_exp_id
 FROM magicRun
     JOIN magicMask USING(magic_id)
@@ -15 +19 @@
     AND ( -- rerun HOOK magicdstool sends "\n1 " if rerun else "\n0 " %s
         OR magicDSRun.magic_ds_id IS NULL)
+    AND diffRun.bothways = 0
     AND diffRun.magicked  = 0
     AND diffRun.state = 'full'
+    -- WHERE hook %s
+UNION
+SELECT
+    forwardRun.magic_id,
+    forwardRun.exp_id,
+    'diff' AS stage,
+    forwardRun.diff_id AS stage_id,
+    0 AS cam_id,
+    forwardRun.label,
+    forwardRun.workdir,
+    inverseRun.magic_id AS inv_magic_id,
+    inverseRun.exp_id AS inv_exp_id
+FROM (
+    SELECT
+        magicRun.magic_id,
+        exp_id,
+        diff_id,
+        magicRun.label,
+        magicRun.workdir
+    FROM magicRun
+        JOIN magicMask USING(magic_id)
+        JOIN diffRun USING(diff_id)
+        LEFT JOIN magicDSRun ON magicRun.magic_id = magicDSRun.magic_id
+                             AND magicDSRun.stage  = 'diff'
+    WHERE magicRun.state = 'full'
+        AND magicRun.inverse = 0
+        AND ( -- rerun HOOK magicdstool sends "\n1 " if rerun else "\n0 " %s
+            OR magicDSRun.magic_ds_id IS NULL)
+        AND diffRun.state = 'full'
+        AND diffRun.bothways
+        AND diffRun.magicked  = 0
+        -- WHERE hook %s
+) AS forwardRun
+JOIN (
+    SELECT
+        magic_id,
+        exp_id,
+        diff_id
+    FROM magicRun
+        JOIN magicMask USING(magic_id)
+    WHERE magicRun.state = 'full'
+        AND magicRun.inverse = 1
+) AS inverseRun USING(diff_id)
 
+) AS Foo