Changeset 29561 for trunk/ippTools/share

Timestamp:

Oct 26, 2010, 8:39:32 AM (16 years ago)

Author:

bills

Message:

Change the destreak cleanup to preserve the rows in the magicDSFile table

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (2 diffs)
• chiptool_setimfiletoupdate.sql (modified) (1 diff)
• magicdstool_change_file_data_state.sql (added)
• magicdstool_change_run_state.sql (added)
• magicdstool_revertupdated.sql (added)
• magicdstool_setfiletoupdate.sql (added)
• magicdstool_todestreak_camera.sql (modified) (1 diff)
• magicdstool_todestreak_chip.sql (modified) (2 diffs)
• magicdstool_todestreak_diff.sql (modified) (2 diffs)
• magicdstool_todestreak_raw.sql (modified) (1 diff)
• magicdstool_todestreak_warp.sql (modified) (1 diff)
• magicdstool_torevert_chip.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -238 +238 @@
         magictool_exposure.sql \
         magicdstool_clearstatefaults.sql \
+        magicdstool_change_file_data_state.sql \
+        magicdstool_change_run_state.sql \
         magicdstool_completed_runs.sql \
         magicdstool_completedrevert.sql \
@@ -252 +254 @@
         magicdstool_getskycells.sql \
         magicdstool_revertdestreakedfile.sql \
+        magicdstool_revertupdated.sql \
+        magicdstool_setfiletoupdate.sql \
         magicdstool_tocleanup.sql \
         magicdstool_todestreak_camera.sql \

trunk/ippTools/share/chiptool_setimfiletoupdate.sql

@@ -11 +11 @@
     AND (chipRun.state = 'cleaned' OR chipRun.state = 'update')
     AND (chipProcessedImfile.data_state = 'cleaned')
-    -- don't queue update if the associated magicDSFile exists
+    -- don't queue update if the associated magicDSFile exists and isn't cleaned
     AND (chipRun.magicked = 0 
-      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
-            AND magicDSFile.component IS NULL)
+      OR ((magicDSRun.state = 'cleaned' OR magicDSRun.state = 'update')
+            AND (magicDSFile.data_state = 'cleaned`' OR magicDSFile.data_state = 'update'))
+    )

trunk/ippTools/share/magicdstool_todestreak_camera.sql

@@ -2 +2 @@
     magicDSRun.magic_ds_id,
     magicDSRun.magic_id,
+    magicDSRun.state,
     chipRun.exp_id,
     camRun.magicked,

trunk/ippTools/share/magicdstool_todestreak_chip.sql

@@ -2 +2 @@
     magicDSRun.magic_ds_id,
     magicDSRun.magic_id,
+    magicDSRun.state,
     chipRun.exp_id,
     chipRun.magicked,
@@ -37 +38 @@
     ON magicDSRun.label = Label.label
 WHERE
-    magicDSRun.state = 'new'
+    ((magicDSRun.state = 'new' AND magicDSFile.component IS NULL)
+     OR (magicDSRun.state = 'update' AND magicDSFile.data_state = 'update'
+         AND magicDSFile.fault = 0))
     AND magicDSRun.stage = 'chip'
     AND (chipRun.state = 'full' OR (chipRun.state = 'update' and chipProcessedImfile.data_state = 'full'))
     AND chipProcessedImfile.fault = 0
     AND chipProcessedImfile.quality = 0
-    AND magicDSFile.component IS NULL
     AND (Label.active OR Label.active IS NULL)

trunk/ippTools/share/magicdstool_todestreak_diff.sql

@@ -3 +3 @@
     magicDSRun.magic_ds_id,
     magicRun.magic_id,
+    magicDSRun.state,
     magicRun.exp_id,
     magicDSRun.label,
@@ -50 +51 @@
     magicDSRun.magic_ds_id,
     magicRun.magic_id,
+    magicDSRun.state,
     magicRun.exp_id,
     magicDSRun.label,

trunk/ippTools/share/magicdstool_todestreak_raw.sql

@@ -2 +2 @@
     magicDSRun.magic_ds_id,
     magicRun.magic_id,
+    magicDSRun.state,
     magicRun.exp_id,
     magicDSRun.label,

trunk/ippTools/share/magicdstool_todestreak_warp.sql

@@ -2 +2 @@
     magicDSRun.magic_ds_id,
     magicRun.magic_id,
+    magicDSRun.state,
     magicRun.exp_id,
     magicDSRun.label,

trunk/ippTools/share/magicdstool_torevert_chip.sql

@@ -22 +22 @@
     JOIN rawExp ON chipRun.exp_id = rawExp.exp_id
 WHERE magicDSRun.stage = 'chip'
-    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+    AND (((magicDSRun.state = 'new' OR (magicDSRun.state = 'update'))
+            AND magicDSFile.fault > 0)
+            -- why don't we require a fault for these states?
          OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
               AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))