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

Timestamp:

Nov 12, 2014, 2:58:40 PM (12 years ago)

Author:

heather

Message:

cleaning up the schema, and adding uniquePsps()id to all tables. Populated in
all except FO/FW/DF/DO (those are still in progress)

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (4 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -293 +293 @@
         self.generateRandomIDs()
 
-        self.generateStackDetectRowIDs()
+        self.generateStackDetectRowIDsAndPspsUniqueIDs()
 
         # add indexes StackObjectThin
@@ -944 +944 @@
 
     def generateRandomIDs(self):
-        sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)";
+        sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"
         try: self.scratchDb.execute(sql)
         except:
@@ -951 +951 @@
 
 
-    def generateStackDetectRowIDs(self):
+    def generateStackDetectRowIDsAndPspsUniqueIDs(self):
         sql = "UPDATE StackObjectThin join (select @r:=@r+1 rownum, objID from \
         (select @r:=0) r, StackObjectThin t) as foo using (objID) set \
-        stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum)";
+        stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum), \
+        uniquePspsSTid = ((" +str(self.batchID) "*1000000000 ) + rownum)";
         try: self.scratchDb.execute(sql)
         except:
@@ -1011 +1012 @@
             self.scratchDb.addColumn(table, filter + "haveData", "tinyint")
 
-        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, "
+        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, "
 
         for i in range(len(self.filters)):