Changeset 35352 for branches/eam_branches/ipp-20130307/ippToPsps/jython/dvo.py

Timestamp:

Apr 3, 2013, 12:52:33 PM (13 years ago)

Author:

eugene

Message:

changed dvoDetectionFull mysql engine to 'MEMORY' to improve ingest speed

handle errrors in calls to dvopsps (only in detectionbatch.py)

removed a lot of excess verbosity used for debugging / testing

determine the mysql major version number via mysql query

added test option -realgpc to use test ipptopsps databases with a real gpc1 dataset

add version-dependent call to 'set session old_alter_table' to allow
the ALTER IGNORE statements to work on mysql v5.5 machines (like our
desktops).

raise an exception in case the load infile operations fail

remove unneeded 'killLastConnectionID'

extend logging time to milliseconds

allow an exposure to be skipped without aborting loader

check that a P2 image exists in the dvoImage table (otherwise skip the chip)

change the mysql floating point types for the dvoDetection table to use FLOAT/DOUBLE instead of REAL/FLOAT

remove the old test for valid astrometry of a chip (NASTRO >= 50)

this test was crude and not really the right test. it was also used
to verify that an image should / should not be included. now we check
against dvoImages to see if the chip should be loaded or not (DVO
rejects input images for bad astrometry)

skip an exposure if too many detections have been rejected. this is a sign of a problem and should require more attention

File:

• branches/eam_branches/ipp-20130307/ippToPsps/jython/dvo.py (modified) (4 diffs)

branches/eam_branches/ipp-20130307/ippToPsps/jython/dvo.py

@@ -591 +591 @@
     def nativeIngestDetections(self, boxId, boxDim):
 
-        # XXX put the chunk below in a separate method 
-        # blow away existing dvoDetection table
-
         # clear the 'ingested' field for all boxes owned by this host
         self.ippToPspsDb.clearIngestedBoxes(self.scratchDb.dbHost)
@@ -607 +604 @@
         ##     raise
 
-        # drop detections table
-        self.logger.infoPair("Dropping table", self.scratchDb.dvoDetectionTable)
-        self.scratchDb.dropTable(self.scratchDb.dvoDetectionTable)
-        
-        # create detections table
-        self.logger.infoPair("Creating table", self.scratchDb.dvoDetectionTable)
-        sql = "CREATE TABLE " + self.scratchDb.dvoDetectionTable + " LIKE dvoDetection"
-        try: self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("Unable to create table", self.scratchDb.dvoDetectionTable)
+        # blow away existing dvoDetection table & re-crate
+        if not self.scratchDb.resetDvoDetectionTable():
+            self.logger.errorPair("Unable to reset scratch table", "DvoDetectionFull")
             return False
-        self.scratchDb.changeEngineToInnoDB(self.scratchDb.dvoDetectionTable)
-        
-        # add fileID column
-        sql = "ALTER TABLE " + self.scratchDb.dvoDetectionTable + " ADD fileID INT NOT NULL"
-        try: self.scratchDb.execute(sql)
-        except: 
-            self.logger.errorPair("Unable to add fileID column to ", self.scratchDb.dvoDetectionTable)
-            return False
-
-        # add an index to the fileID column
-        self.scratchDb.createIndex(self.scratchDb.dvoDetectionTable, "fileID")
 
         # make sure we have an up-to-date Images table
@@ -665 +644 @@
         p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
+        if p.returncode != 0:
+            self.logger.errorPair("dvopsps failed on ", self.scratchDb.dvoDetectionTable)
+            raise
 
         ## dvopsps can take a very long time. try 2 or 3 times to re-establish communication with the db before proceeding?
@@ -670 +652 @@
         self.ippToPspsDb.setIngestedBox(boxId, self.scratchDb.dbHost)
 
-        # add fileID column
+        # run 'ANALYZE' to get indexes up-to-snuff
         sql = "ANALYZE TABLE " + self.scratchDb.dvoDetectionTable
         try: self.scratchDb.execute(sql)