Changeset 19558

Timestamp:

Sep 15, 2008, 2:21:00 PM (18 years ago)

Author:

bills

Message:

changes to support cleanup, purge, and update processing

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/fake.md (modified) (1 diff)
• ippTools/share/camtool_find_pendingexp.sql (modified) (1 diff)
• ippTools/share/difftool_todiffskyfile.sql (modified) (2 diffs)
• ippTools/share/faketool_pendingimfile.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/share/stacktool_tosum.sql (modified) (2 diffs)
• ippTools/share/warptool_towarped.sql (modified) (1 diff)
• ippTools/src/faketool.c (modified) (1 diff)

trunk/dbconfig/changes.txt

@@ -466 +466 @@
 UPDATE warpSkyfile SET data_state = 'full';
 
+ALTER TABLE fakeProcessedImfile add column data_state varchar(64) after path_base;
+update fakeProcessedImfile set data_state ='full';
+

trunk/dbconfig/fake.md

@@ -21 +21 @@
     hostname        STR     64
     path_base       STR     255
+    data_state      STR     64      # Key
     fault           S16     0       # Key NOT NULL
     epoch           UTC         0001-01-01T00:00:00Z

trunk/ippTools/share/camtool_find_pendingexp.sql

@@ -25 +25 @@
     WHERE
         chipRun.state = 'full'
-        AND camRun.state = 'new'
+        AND ((camRun.state = 'new' AND camProcessedExp.cam_id IS NULL)
+            OR camRun.state = 'update')
         AND camMask.label IS NULL
-        AND camProcessedExp.cam_id IS NULL
     ) as Foo

trunk/ippTools/share/difftool_todiffskyfile.sql

@@ -5 +5 @@
     diffRun.tess_id,
     diffRun.label,
+    diffRun.state,
     rawExp.camera
 FROM diffRun
@@ -26 +27 @@
     ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
 WHERE
-  diffRun.state = 'new'
-  AND warpRun.state = 'full'
-  AND fakeRun.state = 'full'
-  AND camRun.state = 'full'
-  AND chipRun.state = 'full'
-  AND diffSkyfile.diff_id IS NULL
+  ((diffRun.state = 'new'
+      AND warpRun.state = 'full'
+      AND fakeRun.state = 'full'
+      AND camRun.state = 'full'
+      AND chipRun.state = 'full'
+      AND diffSkyfile.diff_id IS NULL)
+  OR (diffRun.state = 'update'
+      AND diffSkyfile.data_state = 'cleaned')
+  )

trunk/ippTools/share/faketool_pendingimfile.sql

@@ -41 +41 @@
         ON fakeRun.label = fakeMask.label
     WHERE
-        fakeProcessedImfile.fake_id IS NULL
-        AND fakeProcessedImfile.class_id IS NULL
+        ((fakeRun.state = 'new'
+            AND fakeProcessedImfile.fake_id IS NULL
+            AND fakeProcessedImfile.class_id IS NULL
+        ) 
+        OR (fakeRun.state = 'update'
+            AND fakeProcessedImfile.data_state = 'cleaned')
+        )
         AND fakeMask.label IS NULL
     ) as fakePendingImfile

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -399 +399 @@
     hostname VARCHAR(64),
     path_base VARCHAR(255),
+    data_state VARCHAR(64),
     fault SMALLINT NOT NULL,
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,

trunk/ippTools/share/stacktool_tosum.sql

@@ -5 +5 @@
     stackRun.workdir,
     stackRun.label,
+    stackRun.state,
     rawExp.camera
 FROM stackRun
@@ -26 +27 @@
     USING(stack_id)
 WHERE
-    stackRun.state = 'new'
-    AND stackSumSkyfile.stack_id IS NULL
+    ((stackRun.state = 'new'
+        AND stackSumSkyfile.stack_id IS NULL)
+    OR
+    (stackRun.state = 'update' 
+        AND stackSumSkyfile.data_state = 'cleaned'))

trunk/ippTools/share/warptool_towarped.sql

@@ -29 +29 @@
     ON warpRun.label = warpMask.label
 WHERE
-    warpRun.state = 'new'
+    ((warpRun.state = 'new'
+        AND warpSkyfile.warp_id IS NULL
+        AND warpSkyfile.skycell_id IS NULL
+        AND warpSkyfile.tess_id IS NULL)
+    OR (warpRun.state = 'update'
+        AND warpSkyfile.data_state = 'cleaned')
+    )
     AND fakeRun.state = 'full'
     AND camRun.state = 'full'
     AND chipRun.state = 'full'
-    AND warpSkyfile.warp_id IS NULL
-    AND warpSkyfile.skycell_id IS NULL
-    AND warpSkyfile.tess_id IS NULL
+    AND warpMask.label IS NULL
     AND warpSkyCellMap.fault = 0
-    AND warpMask.label IS NULL

trunk/ippTools/src/faketool.c

@@ -499 +499 @@
                                    hostname,
                                    path_base,
+                                   "full",
                                    code,
                                    NULL         // epoch