Changeset 35417 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Apr 19, 2013, 4:35:54 PM (13 years ago)

Author:

eugene

Message:

use MEMORY engine for dvoDetectionFull; add error handline for dvopsps; check mysql version; remove some test verbosity; check for image existence in dvoImages; skip bad batches but do not exit; fix precision issues; add -realgpc option (part of -test mode); log times in milliseconds

Location:

trunk/ippToPsps

Files:

• . (modified) (1 prop)
• jython/stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -543 +543 @@
         # response = raw_input("updated dvo ")
         
+        # XXX EAM : note that in mysql versions later than 5.1, this fails
+        # unless the following is called first: 
+        # set session old_alter_table=1
+        # follow the command with 
+        # set session old_alter_table=0
+        # OF COURSE, this fails for mysql version < 5.5...
+        if self.scratchDb.version > 5.1:
+            self.scratchDb.execute("set session old_alter_table=1")
+
         sql = "ALTER IGNORE TABLE StackDetection ADD PRIMARY KEY (objID)"
         
+        if self.scratchDb.version > 5.1:
+            self.scratchDb.execute("set session old_alter_table=0")
+
         self.scratchDb.execute(sql)
         # response = raw_input("add primary key? ")
@@ -806 +818 @@
          ON (a.stackDetectID = b.detectID) where b.imageID = " + str(imageID) + \
          " INTO OUTFILE '" + dumpFile + "'"
-        print "sql: ", sql
-        self.scratchDb.execute(sql)
+
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.info("failed to select data for stackDetectionCalib")
+            self.logger.infoPair("sql: ", sql)
+            raise
 
         sql = "LOAD DATA INFILE '" + dumpFile + "' INTO TABLE " + tableName
-        print "sql: ", sql
-        self.scratchDb.execute(sql)
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.info("failed to load data from infile for stackDetectionCalib")
+            self.logger.infoPair("sql: ", sql)
+            raise
 
         ## XXX write this with the select/insert