Changeset 32337 for branches/eam_branches/ipp-20110710/ippTools/share

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• dettool_toresidimfile.sql (modified) (1 diff)
• difftool_pendingcleanuprun.sql (modified) (5 diffs)
• dqstatstool_definebyquery.sql (modified) (1 diff)
• magictool_definebyquery_select_multidiff.sql (copied) (copied from trunk/ippTools/share/magictool_definebyquery_select_multidiff.sql )
• pubtool_definerun.sql (modified) (2 diffs)
• pxadmin_create_tables.sql (modified) (4 diffs, 1 prop)

branches/eam_branches/ipp-20110710/ippTools/share/Makefile.am

@@ -244 +244 @@
         magictool_definebyquery_insert.sql \
         magictool_definebyquery_select.sql \
+        magictool_definebyquery_select_multidiff.sql \
         magictool_inputs.sql \
         magictool_inputskyfile.sql \

branches/eam_branches/ipp-20110710/ippTools/share/dettool_toresidimfile.sql

@@ -101 +101 @@
  AND detResidImfile.exp_id IS NULL
  AND detResidImfile.class_id IS NULL
+UNION
+SELECT
+    detRun.det_id,
+    detRun.iteration,
+    detRun.det_type,
+    detRun.mode,
+    detRun.workdir,
+    detRun.reduction,
+    detProcessedImfile.exp_id,
+    detProcessedImfile.class_id,
+    detProcessedImfile.uri,
+    detRegisteredImfile.uri AS det_uri,
+    detRun.ref_det_id,
+    detRun.ref_iter,
+    rawExp.camera,
+    rawExp.exp_tag
+FROM detRun
+JOIN detRun AS detRunRef
+  ON detRunRef.det_id = detRun.ref_det_id
+JOIN detInputExp
+  ON detInputExp.det_id    = detRun.det_id
+ AND detInputExp.iteration = detRun.iteration
+JOIN rawExp
+  ON rawExp.exp_id = detInputExp.exp_id
+JOIN detProcessedImfile
+  ON detProcessedImfile.det_id    = detRun.det_id
+ AND detProcessedImfile.exp_id    = detInputExp.exp_id
+JOIN detRegisteredImfile
+  ON detRegisteredImfile.det_id    = detRun.ref_det_id
+ AND detRegisteredImfile.iteration = detRun.ref_iter
+ AND detRegisteredImfile.class_id  = detProcessedImfile.class_id
+LEFT JOIN detResidImfile
+  ON detResidImfile.det_id    = detRun.det_id      
+ AND detResidImfile.iteration = detRun.iteration   
+ AND detResidImfile.exp_id    = detProcessedImfile.exp_id   
+ AND detResidImfile.class_id  = detProcessedImfile.class_id 
+WHERE
+ detRun.state = 'run'
+ AND detRun.mode = 'verify'
+ AND detRunRef.state = 'stop'
+ AND detRegisteredImfile.fault = 0
+ AND detProcessedImfile.fault = 0
+ AND detResidImfile.det_id IS NULL
+ AND detResidImfile.iteration IS NULL
+ AND detResidImfile.exp_id IS NULL
+ AND detResidImfile.class_id IS NULL
 ORDER BY exp_id

branches/eam_branches/ipp-20110710/ippTools/share/difftool_pendingcleanuprun.sql

@@ -2 +2 @@
 -- all of this is just to get the camera used for the diff run
 SELECT DISTINCT * FROM 
-   (SELECT 
+   (SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -29 +29 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
      UNION
-     SELECT
+     SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -57 +58 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
      UNION
-     SELECT
+     SELECT DISTINCT 
             diffRun.diff_id,
             rawExp.camera,
@@ -85 +87 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
      UNION
-     SELECT
+     SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -113 +116 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
         ) as Foo
         WHERE 1

branches/eam_branches/ipp-20110710/ippTools/share/dqstatstool_definebyquery.sql

@@ -1 +1 @@
 -- query to identify unique data to bundle
 
-SELECT DISTINCT exp_id,chip_id,cam_id,warp_id,invalid from rawExp 
+SELECT DISTINCT exp_id,chip_id,cam_id,warpRun.warp_id,invalid from rawExp 
         JOIN chipRun USING(exp_id) 
         JOIN camRun USING(chip_id) 
+        JOIN camProcessedExp USING(cam_id)
         LEFT OUTER JOIN fakeRun USING(cam_id) 
         LEFT OUTER JOIN warpRun USING(fake_id)
-        LEFT OUTER JOIN dqstatsContent USING (exp_id,chip_id,cam_id,warp_id)
+        LEFT OUTER JOIN dqstatsContent USING (exp_id,chip_id,cam_id)
 WHERE camRun.state = 'full'

branches/eam_branches/ipp-20110710/ippTools/share/pubtool_definerun.sql

@@ -1 @@
--- Get runs to publish
+-- Get runs to publish 
 SELECT DISTINCT
     client_id,
@@ -20 +20 @@
     JOIN chipRun USING(chip_id)
     JOIN rawExp USING(exp_id)
+    LEFT JOIN magicDSRun ON magicDSRun.stage = 'diff' AND magicDSRun.stage_id = diff_id
     WHERE publishClient.stage = 'diff'
         AND publishClient.active = 1
         AND diffRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (diffRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
+        AND ( diffRun.diff_mode = 4
+           OR (publishClient.magicked AND diffRun.magicked != 0)
+           OR (publishClient.magicked = 0 AND 
+                (diffRun.magicked = 0 OR (diffRun.magicked != 0 AND magic_ds_id IS NOT NULL))
+              )
+           )
     -- WHERE hook %s
     UNION

branches/eam_branches/ipp-20110710/ippTools/share/pxadmin_create_tables.sql

@@ -533 +533 @@
 CREATE TABLE addRun (
     add_id BIGINT AUTO_INCREMENT,
-    cam_id BIGINT,
+    stage VARCHAR(64),
+    stage_id BIGINT,
     state VARCHAR(64),
     workdir VARCHAR(255),
@@ -543 +544 @@
     note  VARCHAR(255),
     image_only TINYINT,
+    minidvodb TINYINT, 
+    minidvodb_group VARCHAR(64),
+    minidvodb_name VARCHAR(64),
     PRIMARY KEY(add_id),
     KEY(add_id),
-    KEY(cam_id),
+    KEY(stage_id),
+    KEY(stage),
     KEY(state),
     KEY(workdir_state),
     KEY(label),
     KEY(data_group),
-    INDEX(add_id, cam_id),
-    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+    INDEX(add_id, cam_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -558 +562 @@
     dtime_addstar FLOAT,
     path_base VARCHAR(255),
+    dvodb_path VARCHAR(255),
     fault SMALLINT NOT NULL,
     PRIMARY KEY(add_id),
@@ -1946 +1951 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;    
 
+CREATE TABLE minidvodbRun (
+minidvodb_id BIGINT AUTO_INCREMENT,
+       minidvodb_name VARCHAR(64),
+       minidvodb_group VARCHAR(64) NOT NULL,
+       minidvodb_path VARCHAR(255) NOT NULL,
+       mergedvodb_path VARCHAR(255) NOT NULL,
+       state VARCHAR(64) NOT NULL,
+       creation_date TIMESTAMP,
+       PRIMARY KEY(minidvodb_id), KEY(minidvodb_name), INDEX(minidvodb_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE minidvodbProcessed (
+      minidvodb_id BIGINT,
+      merge_order BIGINT,
+      dtime_resort FLOAT,
+      dtime_relphot FLOAT,
+      dtime_verify FLOAT,
+      dtime_merge FLOAT,
+      dtime_script,
+      epoch 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)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE minidvodbCopy (
+    minidvodbcopy_id     BIGINT AUTO_INCREMENT,
+    minidvodb_id     BIGINT,
+    minidvodb_rsync_path VARCHAR(255) NOT NULL,
+    destination_host VARCHAR(255) NOT NULL,
+    fault  SMALLINT NOT NULL,
+    state   VARCHAR(64) NOT NULL,
+    epoch TIMESTAMP,
+    dtime FLOAT,
+    PRIMARY KEY(minidvodbcopy_id),
+    KEY(minidvodb_id),
+    FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+
+
 -- This comment line is here to avoid empty query error.
 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.