Changeset 27503

Timestamp:

Mar 29, 2010, 10:59:58 AM (16 years ago)

Author:

bills

Message:

Fix performance problem in warptool -towarped. This "fix" disables update processing

Location:

trunk/ippTools

Files:

• share/warptool_towarped.sql (modified) (2 diffs)
• src/warptool.c (modified) (2 diffs)

trunk/ippTools/share/warptool_towarped.sql

@@ -1 @@
-SELECT 
-    warp_id,
-    warp_skyfile_id,
-    skycell_id,
-    tess_id,
-    fake_id,
-    state,
-    reduction,
-    cam_id,
-    camera,
-    exp_tag,
-    workdir,
-    magicked
-FROM (
-    SELECT
+    SELECT DISTINCT
         warpSkyCellMap.warp_id,
         warpImfile.warp_skyfile_id,
@@ -59 +45 @@
         AND warpSkyCellMap.fault = 0
         -- where hook 1 %s
-    GROUP BY warp_id, skycell_id
-UNION
-    SELECT
-        warpSkyCellMap.warp_id,
-        warpImfile.warp_skyfile_id,
-        warpSkyCellMap.skycell_id,
-        warpSkyCellMap.tess_id,
-        warpRun.fake_id,
-        warpRun.state,
-        warpRun.reduction,
-        camRun.cam_id,
-        rawExp.camera,
-        rawExp.exp_tag,
-        warpRun.workdir,
-        MIN(chipProcessedImfile.magicked) AS magicked
-    FROM warpRun
-    JOIN warpSkyCellMap USING(warp_id)
-    JOIN warpImfile USING(warp_id, skycell_id)
-    JOIN warpSkyfile USING(warp_id, skycell_id)
-    JOIN fakeRun USING(fake_id)
-    JOIN camRun USING(cam_id)
-    JOIN chipRun USING(chip_id)
-    JOIN rawExp USING(exp_id)
-    LEFT JOIN chipProcessedImfile USING(chip_id, class_id)
-    WHERE warpRun.state = 'update'
-        AND warpSkyfile.data_state = 'update'
-        AND camRun.state = 'full'
-        AND chipProcessedImfile.data_state = 'full'
-        -- if warpSkyfile was magicked previously require inputs to be magicked
-        -- this blocks processing until all the chip inputs have been destreaked
-        AND (warpSkyfile.magicked = 0 OR chipProcessedImfile.magicked >= 0)
-        AND (warpSkyfile.magicked = 0 OR chipRun.magicked >= 0)
-        -- where hook 2 %s
-    GROUP BY warp_id, skycell_id
-    HAVING COUNT(warpSkyCellMap.class_id) = COUNT(chipProcessedImfile.class_id)
-) as towarped
-

trunk/ippTools/src/warptool.c

@@ -922 +922 @@
     }
 
+#ifdef TWO_WHERES
     if (!p_psDBRunQueryF(config->dbh, query, whereStr, whereStr)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -927 +928 @@
         return false;
     }
+#else
+    if (!p_psDBRunQueryF(config->dbh, query, whereStr)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+#endif
     psFree(whereStr);
     psFree(query);