Changeset 32609 for trunk/ippTools/share

Timestamp:

Nov 3, 2011, 2:50:40 PM (15 years ago)

Author:

bills

Message:

Change PRIMARY KEY for diffInputSkyfile from (diff_id, skycell_id) to diff_skyfile_id.
This allows skycell_id to be NULL which we use in diftool -definewarpwarp to handle
the case where a pair of warps gets selected when there are actually no overlapping skycells.
We insert a diffInputSkyfile with the two warp_ids and skycell_id NULL. Then we set the
run to 'full'.
Change pubtool -definerun to not attempt to queue publishRuns for diffs in this state and
also fix the bug where publishRuns get queued even if all skycells for a diff have bad
quality

Location:

trunk/ippTools/share

Files:

• pubtool_definerun.sql (modified) (2 diffs)
• pxadmin_create_tables.sql (modified) (3 diffs)

trunk/ippTools/share/pubtool_definerun.sql

@@ -15 +15 @@
     JOIN diffRun
     JOIN diffInputSkyfile USING(diff_id)
+    JOIN diffSkyfile using(diff_id)
     JOIN warpRun ON warpRun.warp_id = diffInputSkyfile.warp1 -- Only JOINing input, not reference!
     JOIN fakeRun USING(fake_id)
@@ -30 +31 @@
               )
            )
+        AND diffSkyfile.quality = 0
     -- WHERE hook %s
     UNION

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -554 +554 @@
     KEY(workdir_state),
     KEY(label),
-    KEY(data_group),
-    INDEX(add_id, cam_id)
+    KEY(data_group)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1157 +1156 @@
         tess_id VARCHAR(64),
         diff_skyfile_id BIGINT AUTO_INCREMENT,
+        PRIMARY KEY(diff_skyfile_id),
         KEY(diff_id, skycell_id),
-        KEY(diff_skyfile_id),
         KEY(warp1),
         KEY(warp2),
@@ -1969 +1968 @@
       dtime_verify FLOAT,
       dtime_merge FLOAT,
-      dtime_script,
-      epoch TIMESTAMP,
+      dtime_script FLOAT,
+      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
       mergedvodb_path VARCHAR(255) NOT NULL,
       fault SMALLINT NOT NULL,
-       KEY(minidvodb_id), CONSTRAINT UNIQUE(minidvodb_id), FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun (minidvodb_id)
+      UNIQUE KEY (minidvodb_id),
+      KEY(minidvodb_id),
+      FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;