Changeset 32654

Timestamp:

Nov 10, 2011, 3:59:12 PM (15 years ago)

Author:

rhenders

Message:

Removed redundant getAllUnfinishedBatchIDs() method. Not needed by ODM polling code anymore.

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (1 diff)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -125 +125 @@
 
         self.logger.debug("Found %d processed but-not-on-datastore items" % len(ids))
-
-        return ids
-
-    '''
-    Returns a list of processed batch IDs that either not yet loaded to the ODM or not merge_worthy or not merged
-    NOTE we exclude batches already deleted from the datastore, as sometimes we delete stuff prior to loading to ODM if there is a known problem with the batch
-    '''
-    def getAllUnfinishedBatchIDs(self, epoch, dvoGpc1Label, batchType):
-
-        sql = "SELECT batch_id \
-               FROM batch \
-               WHERE timestamp > '" + epoch + "' \
-               AND dvo_db = '" + dvoGpc1Label + "' \
-               AND loaded_to_datastore = 1 \
-               AND batch_type = '" + batchType + "' \
-               AND deleted_datastore = 0 \
-               AND loaded_to_ODM != -1 \
-               AND merge_worthy != -1 \
-               AND merged = 0"
-
-        ids = []
-        try:
-            rs = self.executeQuery(sql)
-            while (rs.next()):
-                ids.append(rs.getInt(1))
-        except:
-            self.logger.exception("Can't query for unloaded batch ids in ipptopsps Db")
-
-        rs.close()
-
-        self.logger.debug("Found %d unloaded items" % len(ids))
 
         return ids