Changeset 32193 for trunk/ippToPsps

Timestamp:

Aug 25, 2011, 1:08:36 PM (15 years ago)

Author:

rhenders

Message:

now using -1 to mean this stage has failed; changes queries to explicitely look for 1 or -1 or 0; added getProcessedButFailedDatastoreBatchIDs() method

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (5 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -66 +66 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
-               AND merged \
-               AND !deleted"
+               AND merged = 1\
+               AND deleted = 0"
 
         ids = []
@@ -84 +84 @@
 
     '''
+    Returns a list of processed batch IDs that are not loaded to the datastore
+    '''
+    def getProcessedButFailedDatastoreBatchIDs(self, epoch, dvoGpc1Label):
+
+        sql = "SELECT DISTINCT batch_id \
+               FROM batch \
+               WHERE timestamp > '" + epoch + "' \
+               AND dvo_db = '" + dvoGpc1Label + "' \
+               AND processed = 1\
+               AND loaded_to_datastore = -1"
+
+        ids = []
+        try:
+            rs = self.executeQuery(sql)
+            while (rs.next()):
+                ids.append(rs.getInt(1))
+        except:
+            self.logger.exception("Can't query for processed batch ids not loaded to datastore ipptopsps Db")
+
+        rs.close()
+
+        self.logger.debug("Found %d processed but-not-on-datastore items" % len(ids))
+
+        return ids
+
+    '''
     Returns a list of processed batch IDs that are not yet merged for this epoch and dvo label
     '''
@@ -92 +118 @@
                WHERE timestamp > '" + epoch + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
-               AND loaded_to_datastore \
-               AND !merged"
+               AND loaded_to_datastore = 1 \
+               AND merged = 0 OR merged = -1"
 
         ids = []
@@ -161 +187 @@
                FROM batch \
                WHERE batch_type = '" + batchType + "' \
-               AND loaded_to_datastore \
+               AND loaded_to_datastore = 1 \
                AND timestamp > '" + epoch + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
@@ -299 +325 @@
                WHERE stage_id = " + str(stage_id) + " \
                AND batch_type = '" + batchType + "' \
-               AND processed \
-               AND loaded_to_datastore"
+               AND processed = 1 \
+               AND loaded_to_datastore = 1"
 
         try: