Changeset 38837 for trunk/ippToPsps/jython/scratchdb.py

Timestamp:

Oct 10, 2015, 12:40:44 PM (11 years ago)

Author:

eugene

Message:

make code less forgiving: sql execute aborts on failures; deal with various hidden problems: add IF EXISTS to drop table operations to avoid raising unneeded error, make sure tables exist before trying to add indexes, test for existence of the stack _xsrc, _xfit, etc tables (and skip if missing); fix sqlLine.group to cast inputs to string before performing string ops; getKeyFloat now returns a float value which is safe with sqlLine.group, but can be used in a math expression; use python math. operators as needed (sqrt, fabs); fulltest.sh runs for camera, stack, object stages; update dvoSkyTable to use REGION_ID instead of special word INDEX; add existsClient method (avoid using mysql failure as a test for table existence); no need to test for exceptions to sql.execute since we abort on failure; replace esoteric SQL with dropTable calls; trap errors in stilts.treads in setupScratchdb; drop StackObjecThin and StackDetOffMeta along with other stack scratch tables

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (7 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -475 +475 @@
         # drop and create Images table
         self.logger.infoPair("Creating DVO table", dvoImagesTable)
-        sql = "DROP TABLE " + dvoImagesTable
-
-        try: self.execute(sql)
-        except: pass
-        
+        self.dropTable(dvoImagesTable)
+
         sql = "CREATE TABLE " + dvoImagesTable + " ( \
                SOURCE_ID SMALLINT, \
@@ -495 +492 @@
         # now detection table
         self.logger.infoPair("Dropping DVO table", dvoDetectionTable)
-        sql = "DROP TABLE " + dvoDetectionTable + " IF EXISTS"
-        try: self.execute(sql)
-        except: 
-            self.logger.errorPair("problem dropping DVO table", dvoDetectionTable)
-            pass
+        self.dropTable(dvoDetectionTable)
 
         self.logger.infoPair("Creating DVO table", "dvoDetection")
@@ -514 +507 @@
                decErr FLOAT, \
                zp FLOAT, \
+               zpFactor FLOAT, \
                telluricExt FLOAT, \
                airmass FLOAT, \
@@ -554 +548 @@
 
                tableName = self.getDbFriendlyTableName(region + "." + fileType) 
-               sql = "DROP TABLE " + tableName
-               try: self.execute(sql)
-               except:
-                    self.logger.errorPair("Unable to drop table", tableName)
-                    pass
+               self.dropTable(tableName)
 
         # deletedDetectionCount = detectionCount - self.getRowCount(self.dvoDetectionTable)
@@ -583 +573 @@
 
        sql = "set @@max_heap_table_size = " + str(tableSize)
-       try: self.execute(sql)
-       except: 
-           self.logger.errorPair("Unable to set max MEMORY table size for ", self.dvoDetectionTable)
-           return False
+       self.execute(sql)
 
        # create detections table
        self.logger.infoPair("Creating table", self.dvoDetectionTable)
        sql = "CREATE TABLE " + self.dvoDetectionTable + " LIKE dvoDetection"
-       try: self.execute(sql)
-       except:
-           self.logger.errorPair("Unable to create table", self.dvoDetectionTable)
-           return False
+       self.execute(sql)
 
        # XXX changing the dvoDetectionFull table to MEMORY
@@ -660 +644 @@
 
         sql = "SELECT \
-               INDEX_, \
+               REGION_ID, \
                R_MIN+ (R_MAX - R_MIN)/2.0, \
                D_MIN + (D_MAX - D_MIN)/2.0, \
@@ -689 +673 @@
 
         region = ""
-        sql = "SELECT NAME FROM " + self.dvoSkyTable + " WHERE INDEX_ = " + str(index)
+        sql = "SELECT NAME FROM " + self.dvoSkyTable + " WHERE REGION_ID = " + str(index)
         try:
             rs = self.executeQuery(sql)