Changeset 35060

Timestamp:

Jan 26, 2013, 5:47:08 AM (13 years ago)

Author:

eugene

Message:

replace detection calib insert/update with select into / load

Location:

branches/eam_branches/ipp-20121219/ippToPsps/jython

Files:

• detectionbatch.py (modified) (3 diffs)
• stackbatch.py (modified) (2 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py

@@ -3 +3 @@
 import os.path
 import sys
+import glob
 import time
 import stilts
+
 from java.lang import *
 from java.sql import *
@@ -529 +531 @@
     Populates the DetectionCalib table for this OTA
     '''
-    def populateDetectionCalibTable(self, ota):
+    def populateDetectionCalibTableUpdateInsert(self, ota):
 
         tableName = "DetectionCalib_" + ota
@@ -570 +572 @@
         self.scratchDb.execute(sql)
         self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
+        
+    '''
+    Populates the DetectionCalib table for this OTA
+    '''
+    def populateDetectionCalibTable(self, ota):
+
+        # target table name:
+        tableName = "DetectionCalib_" + ota
+        # drop then re-create table
+        self.scratchDb.dropTable(tableName)
+        sql = "CREATE TABLE " + tableName + " LIKE DetectionCalib"
+        try: self.scratchDb.execute(sql)
+        except: pass
+
+        dumpFile = "/tmp/datadump/genetest.xx.dat"
+        files = glob.glob(dumpFile)
+        if len(files) > 0:
+            os.unlink(dumpFile)
+
+        # insert all detections into table
+        sql = "SELECT \
+          a.objID,    \
+          a.detectID, \
+          a.ippObjID,      \
+          a.ippDetectID,   \
+          a.filterID,      \
+          a.surveyID,      \
+          b.ra,            \
+          b.dec_,          \
+          b.raErr,         \
+          b.decErr,        \
+          b.zp,            \
+          b.zpErr,         \
+          b.expTime,       \
+          b.airMass,       \
+          " + str(self.config.dataRelease) + " \
+         FROM              \
+           Detection_" + ota + " as a \
+         JOIN " + self.scratchDb.dvoDetectionTable + " as b \
+         ON (a.objID = b.objID AND a.detectID = b.detectID) \
+         INTO OUTFILE '" + dumpFile + "'"
+        print "sql: ", sql
+        self.scratchDb.execute(sql)
+
+        sql = "LOAD DATA INFILE '" + dumpFile + "' INTO TABLE " + tableName
+        print "sql: ", sql
+        self.scratchDb.execute(sql)
         
     '''

branches/eam_branches/ipp-20121219/ippToPsps/jython/stackbatch.py

@@ -787 +787 @@
           b.expTime,       \
           b.airMass,       \
-          a.dataRelease    \
+          " + str(self.config.dataRelease) + " \
          FROM              \
            StackDetection as a \
@@ -799 +799 @@
         print "sql: ", sql
         self.scratchDb.execute(sql)
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
+
+        ## XXX write this with the select/insert
+        # self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
 
     '''