Changeset 24186

Timestamp:

May 14, 2009, 3:33:15 PM (17 years ago)

Author:

bills

Message:

fix some bugs in the pending cleanup queries. (Mostly that label was ambiguous)

Location:

trunk/ippTools

Files:

• share/difftool_pendingcleanuprun.sql (modified) (2 diffs)
• share/difftool_pendingcleanupskyfile.sql (modified) (1 diff)
• share/stacktool_pendingcleanuprun.sql (modified) (1 diff)
• share/stacktool_pendingcleanupskyfile.sql (modified) (1 diff)
• share/warptool_pendingcleanupskyfile.sql (modified) (1 diff)
• src/difftool.c (modified) (2 diffs)
• src/faketool.c (modified) (1 diff)
• src/stacktool.c (modified) (2 diffs)
• src/warptool.c (modified) (2 diffs)

trunk/ippTools/share/difftool_pendingcleanuprun.sql

@@ -9 +9 @@
     USING(diff_id)
 JOIN warpSkyfile
-    ON  diffInputSkyfile.warp_id    = warpSkyfile.warp_id
+    ON  diffInputSkyfile.warp1    = warpSkyfile.warp_id
     AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
     AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id
@@ -23 +23 @@
     USING(exp_id)
 WHERE
-    diffRun.state = 'goto_cleaned'
+    (diffRun.state = 'goto_cleaned' OR diffRun.state = 'goto_scrubbed' OR diffRun.state = 'goto_purged')

trunk/ippTools/share/difftool_pendingcleanupskyfile.sql

@@ -9 +9 @@
     USING(diff_id)
 WHERE
-    diffRun.state = 'goto_cleaned'
-    AND diffSkyfile.data_state = 'full'
+   ((diffRun.state = 'goto_cleaned'  AND diffSkyfile.data_state = 'full')
+    OR
+    (diffRun.state = 'goto_scrubbed' AND diffSkyfile.data_state != 'scrubbed')
+    OR
+    (diffRun.state = 'goto_purged'   AND diffSkyfile.data_state != 'purged'))

trunk/ippTools/share/stacktool_pendingcleanuprun.sql

@@ -27 +27 @@
      USING (exp_id)
 WHERE
-    stackRun.state = 'goto_cleaned'
+    (stackRun.state = 'goto_cleaned' OR stackRun.state = 'goto_scrubbed' OR stackRun.state = 'goto_purged')

trunk/ippTools/share/stacktool_pendingcleanupskyfile.sql

@@ -4 +4 @@
     stackRun.workdir,
     stackRun.dvodb,
-    stackRun.tess_id
+    stackRun.tess_id,
+    stackRun.skycell_id
 FROM stackRun
 JOIN stackSumSkyfile
     USING(stack_id)
 WHERE
-    stackRun.state = 'goto_cleaned'
+    (stackRun.state = 'goto_cleaned' OR stackRun.state = 'goto_scrubbed' OR stackRun.state = 'goto_purged')

trunk/ippTools/share/warptool_pendingcleanupskyfile.sql

@@ -12 +12 @@
    ((warpRun.state = 'goto_cleaned'  AND warpSkyfile.data_state = 'full')
     OR
-    (warpRun.state = 'goto_scrubbed' AND warpSkyfile.data_state = 'full')
+    (warpRun.state = 'goto_scrubbed' AND warpSkyfile.data_state != 'scrubbed')
     OR
     (warpRun.state = 'goto_purged'   AND warpSkyfile.data_state != 'purged'))

trunk/ippTools/src/difftool.c

@@ -1575 +1575 @@
 
     psMetadata *where = psMetadataAlloc();
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "==");
 
     psString query = pxDataGet("difftool_pendingcleanuprun.sql");
@@ -1640 +1640 @@
         PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "==");
     }
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "==");
 
     psString query = pxDataGet("difftool_pendingcleanupskyfile.sql");

trunk/ippTools/src/faketool.c

@@ -895 +895 @@
 
     psMetadata *where = psMetadataAlloc();
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "fakeRun.label", "==");
 
     psString query = pxDataGet("faketool_pendingcleanuprun.sql");

trunk/ippTools/src/stacktool.c

@@ -991 +991 @@
 
     psMetadata *where = psMetadataAlloc();
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "==");
 
     psString query = pxDataGet("stacktool_pendingcleanuprun.sql");
@@ -1055 +1055 @@
         PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
     }
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "==");
 
     psString query = pxDataGet("stacktool_pendingcleanupskyfile.sql");

trunk/ippTools/src/warptool.c

@@ -1394 +1394 @@
 
     psMetadata *where = psMetadataAlloc();
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "warpRun.label", "==");
 
     psString query = pxDataGet("warptool_pendingcleanuprun.sql");
@@ -1457 +1457 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "warpRun.label", "==");
 
     psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");